allow setting state as a string for direct setup

Symplicity · Jan 11, 2024 · 464157a · 464157a
1 parent a67d291
commit 464157a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Interfaces/TokenInterface.php b/src/Interfaces/TokenInterface.php
@@ -24,9 +24,9 @@ public function refresh(string $refreshToken, string $redirectUrl) : TokenEntity
 
     /**
      * Get AuthorizationUrl.
-     * @param array<string, string> $state
+     * @param array<string, string> | string $state
      * @param string $redirectUrl
      * @return string
      */
-    public function getAuthorizationUrl(array $state, string $redirectUrl) : string;
+    public function getAuthorizationUrl(array|string $state, string $redirectUrl) : string;
 }
diff --git a/src/Token.php b/src/Token.php
@@ -102,8 +102,10 @@ public function refresh(string $refreshToken, string $redirectUrl, ?AbstractProv
             ->setTokenReceivedOn();
     }
 
-    /** @param array<string, string> $state */
-    public function getAuthorizationUrl(array $state, string $redirectUrl): string
+    /**
+     * @param array<string, string>|string $state
+     */
+    public function getAuthorizationUrl(array|string $state, string $redirectUrl): string
     {
         $tokenAuthorizationProvider = new GenericProvider([
             'clientId' => $this->clientId,
@@ -116,7 +118,10 @@ public function getAuthorizationUrl(array $state, string $redirectUrl): string
             'urlResourceOwnerDetails' => static::OAUTH_USER_INFO_URL
         ]);
 
-        $state = \json_encode($state);
+        if (\is_array($state)) {
+            $state = \json_encode($state);
+        }
+
         return $tokenAuthorizationProvider->getAuthorizationUrl([
             'state' => $state,
             'scope' => $this->scopes

diff --git a/tests/TokenTest.php b/tests/TokenTest.php
@@ -100,6 +100,9 @@ public function testAuthorizationUrl()
 
         $authUrl = $this->tokenHandler->getAuthorizationUrl(['123'], 'test.com');
         $this->assertEquals('https://login.microsoftonline.com/common/oauth2/v2.0/authorize?state=%5B%22123%22%5D&scope=openid%20offline_access%20https%3A%2F%2Fgraph.microsoft.com%2Fcalendars.readwrite&response_type=code&approval_prompt=auto&redirect_uri=test.com&client_id=foo', $authUrl);
+
+        $authUrl = $this->tokenHandler->getAuthorizationUrl('abc123333', 'test.com');
+        $this->assertEquals('https://login.microsoftonline.com/common/oauth2/v2.0/authorize?state=abc123333&scope=openid%20offline_access%20https%3A%2F%2Fgraph.microsoft.com%2Fcalendars.readwrite&response_type=code&approval_prompt=auto&redirect_uri=test.com&client_id=foo', $authUrl);
     }
 
     private function getProvider(MockHandler $mock): AbstractProvider