Pass a UrlBuilder instance to the static factory, instead of base url and secret.

Author: donquixote

src/BigBlueButton.php

@@ -158,14 +158,18 @@ public static function createWithHttpClient(
         ClientInterface $httpClient,
         RequestFactoryInterface $requestFactory,
         StreamFactoryInterface $streamFactory,
-        string $baseUrl,
-        #[\SensitiveParameter]
-        string $secret,
+        UrlBuilder $urlBuilder,
     ): static {
         // Extending classes need to override this method, if they change the
         // constructor signature.
         // @phpstan-ignore new.static
-        $instance                 = new static($baseUrl, $secret);
+        $instance = new static(
+            // The current version of the constructor does not support injecting
+            // A UrlBuilder instance. As a stop-gap, extract the relevant values
+            // so that a new instance will be created in the constructor.
+            $urlBuilder->getBaseUrl(),
+            $urlBuilder->getSecret(),
+        );
         $instance->httpClient     = $httpClient;
         $instance->requestFactory = $requestFactory;
         $instance->streamFactory  = $streamFactory;

src/Util/UrlBuilder.php

@@ -68,6 +68,19 @@ public function setSecret(
         return $this;
     }
 
+    /**
+     * Gets the secret.
+     *
+     * This method only exists to support a deprecated property in the
+     * BigBlueButton class.
+     *
+     * @internal
+     */
+    public function getSecret(): string
+    {
+        return $this->secret;
+    }
+
     public function setBaseUrl(string $baseUrl): self
     {
         // add tailing dir-separator if missing
@@ -80,6 +93,19 @@ public function setBaseUrl(string $baseUrl): self
         return $this;
     }
 
+    /**
+     * Gets the base url.
+     *
+     * This method only exists to support a deprecated property in the
+     * BigBlueButton class.
+     *
+     * @internal
+     */
+    public function getBaseUrl(): string
+    {
+        return $this->baseUrl;
+    }
+
     public function setHashingAlgorithm(HashingAlgorithm $hashingAlgorithm): self
     {
         $this->hashingAlgorithm = $hashingAlgorithm;

tests/BigBlueButtonGuzzleTest.php

@@ -20,6 +20,8 @@
 
 namespace BigBlueButton;
 
+use BigBlueButton\Enum\HashingAlgorithm;
+use BigBlueButton\Util\UrlBuilder;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\HttpFactory;
 
@@ -46,8 +48,11 @@ public function setUp(): void
             $client,
             $factory,
             $factory,
-            getenv('BBB_SERVER_BASE_URL') ?: $this->fail(),
-            getenv('BBB_SECRET') ?: getenv('BBB_SECURITY_SALT') ?: $this->fail(),
+            new UrlBuilder(
+                getenv('BBB_SECRET') ?: getenv('BBB_SECURITY_SALT') ?: $this->fail(),
+                getenv('BBB_SERVER_BASE_URL') ?: $this->fail(),
+                HashingAlgorithm::SHA_256,
+            ),
         );
     }
 }

tests/Util/FixturesGuzzleTest.php

@@ -21,6 +21,7 @@
 namespace BigBlueButton\Util;
 
 use BigBlueButton\BigBlueButton;
+use BigBlueButton\Enum\HashingAlgorithm;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\HttpFactory;
 
@@ -40,8 +41,11 @@ public function setUp(): void
             $client,
             $factory,
             $factory,
-            getenv('BBB_SERVER_BASE_URL') ?: $this->fail(),
-            getenv('BBB_SECRET') ?: getenv('BBB_SECURITY_SALT') ?: $this->fail(),
+            new UrlBuilder(
+                getenv('BBB_SECRET') ?: getenv('BBB_SECURITY_SALT') ?: $this->fail(),
+                getenv('BBB_SERVER_BASE_URL') ?: $this->fail(),
+                HashingAlgorithm::SHA_256,
+            ),
         );
 
         parent::setUp();