Update scopes when regenerating a token

melba-ch · Mar 4, 2022 · 011edce · 011edce
1 parent d05ac2f
commit 011edce
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/src/Auth/ZohoAuthProvider.php b/src/Auth/ZohoAuthProvider.php
@@ -9,7 +9,6 @@
 use League\OAuth2\Client\Token\AccessToken;
 use League\OAuth2\Client\Token\AccessTokenInterface;
 use MelbaCh\LaravelZoho\Clients\ZohoUrlFactory;
-use MelbaCh\LaravelZoho\Repositories\ConfigRepository;
 use Psr\Http\Message\ResponseInterface;
 
 class ZohoAuthProvider extends AbstractProvider
@@ -62,7 +61,7 @@ public function getResourceOwnerDetailsUrl(AccessToken $token): string
      */
     protected function getDefaultScopes(): array
     {
-        return app(ConfigRepository::class)->scopes();
+        return config('zoho.scopes', []);
     }
 
     /**

diff --git a/src/Controllers/ZohoAuthController.php b/src/Controllers/ZohoAuthController.php
@@ -9,6 +9,7 @@
 use League\OAuth2\Client\Token\AccessTokenInterface;
 use MelbaCh\LaravelZoho\Auth\ZohoAuthProvider;
 use MelbaCh\LaravelZoho\Repositories\AccessTokenRepository;
+use MelbaCh\LaravelZoho\Repositories\ConfigRepository;
 
 class ZohoAuthController extends Controller
 {
@@ -24,15 +25,20 @@ public function __construct()
      *
      * @throws IdentityProviderException
      */
-    public function requestToken(AccessTokenRepository $accessTokenRepository)
-    {
-        if (! request()->get('code')) {
+    public function requestToken(
+        AccessTokenRepository $accessTokenRepository,
+        ConfigRepository      $configRepository,
+    ) {
+        if (!request()->get('code')) {
             return $this->redirectToZoho();
         }
 
         $this->verifyState();
 
         $token = $this->getAccessToken($accessTokenRepository);
+
+        $configRepository->setScopes(config('zoho.scopes', []));
+
         if ($token instanceof RedirectResponse) {
             return $token;
         }
@@ -80,8 +86,8 @@ private function getAccessToken(
             ]);
         } catch (IdentityProviderException $e) {
             request()->session()->flash('zoho.access_token_error', [
-                'code'     => $e->getCode(),
-                'message'  => $e->getMessage(),
+                'code'    => $e->getCode(),
+                'message' => $e->getMessage(),
             ]);
 
             return redirect(config('zoho.on_error_url', '/'));

diff --git a/src/Repositories/ConfigRepository.php b/src/Repositories/ConfigRepository.php
@@ -14,6 +14,8 @@ public function region(): string;
 
     public function scopes(): array;
 
+    public function setScopes(array $scopes): self;
+
     public function secret(): string;
 
     public function clientId(): string;

diff --git a/src/Repositories/DatabaseConfigRepository.php b/src/Repositories/DatabaseConfigRepository.php
@@ -41,6 +41,14 @@ public function scopes(): array
         return $this->get()['parameters']['scopes'] ?? [];
     }
 
+    public function setScopes(array $scopes): self
+    {
+        $config = $this->get();
+        $config['parameters']['scopes'] = $scopes;
+        $this->store($config);
+        return $this;
+    }
+
     public function secret(): string
     {
         return $this->get()['secrets']['secret'] ?? '';

diff --git a/src/Repositories/DefaultConfigRepository.php b/src/Repositories/DefaultConfigRepository.php
@@ -36,6 +36,12 @@ public function scopes(): array
         return $this->config['parameters']['scopes'];
     }
 
+    public function setScopes(array $scopes): ConfigRepository
+    {
+        // Not supported
+        return $this;
+    }
+
     public function secret(): string
     {
         return $this->config['secrets']['secret'];

diff --git a/tests/Controllers/ZohoAuthControllerTest.php b/tests/Controllers/ZohoAuthControllerTest.php
@@ -26,6 +26,7 @@ protected function setUp(): void
             $repository->shouldReceive('secret')->andReturn('123-789');
             $repository->shouldReceive('region')->andReturn('EU');
             $repository->shouldReceive('scopes')->andReturn(['my-scope', 'my-another-scope']);
+            $repository->shouldReceive('setScopes')->andReturnSelf();
         });
     }
 
@@ -41,7 +42,7 @@ public function it_redirect_the_user_to_zoho_when_code_is_not_provided(): void
             'access_type'     => 'offline',
             'prompt'          => 'consent',
             'state'           => session('oauth2state'),
-            'scope'           => 'my-scope,my-another-scope',
+            'scope'           => implode(',', config('zoho.scopes')),
             'response_type'   => 'code',
             'approval_prompt' => 'auto',
             'client_id'       => 'abc-xyz',