Refactoring authorization module.

plvhx · Mar 19, 2021 · 4c808b6 · 4c808b6
1 parent 14f6d42
commit 4c808b6
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "1.1-dev"
+			"dev-master": "1.2-dev"
 		}
 	},
 	"autoload": {

diff --git a/src/Auth/Authorization.php b/src/Auth/Authorization.php
@@ -33,22 +33,36 @@ class Authorization extends AbstractService implements AuthorizationInterface
      */
     private $cacheTag = 'authorization_metadata';
 
+    /**
+     * @var bool
+     */
+    private $cached;
+
     /**
      * @param CacheItemPoolInterface $cachePool
      * @param array $config
+     * @param bool $cached
      * @return void
      */
-    public function __construct(CacheItemPoolInterface $cachePool, array $config)
-    {
+    public function __construct(
+        CacheItemPoolInterface $cachePool,
+        array $config,
+        bool $cached = false
+    ) {
         parent::__construct($config);
         $this->setCachePool($cachePool);
+        $this->useCache($cached);
     }
 
     /**
      * {@inheritdoc}
      */
     public function authorize()
     {
+        if (!$this->isCached()) {
+            return $this->getCredentialFromServer();
+        }
+
         $currentCredential = $this->getCurrentCredentialFromCache();
 
         if (null === $currentCredential) {
@@ -91,6 +105,22 @@ public function getCacheTag()
         return $this->cacheTag;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function useCache(bool $cached)
+    {
+        $this->cached = $cached;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isCached(): bool
+    {
+        return $this->cached;
+    }
+
     /**
      * Fetch current credential from cache pool, if any.
      *

diff --git a/src/Auth/AuthorizationInterface.php b/src/Auth/AuthorizationInterface.php
@@ -49,4 +49,22 @@ public function setCacheTag(string $cacheTag);
      * @return string
      */
     public function getCacheTag();
+
+    /**
+     * Determine if authorization object caller
+     * want to save fetched authorization metadata
+     * or otherwise.
+     *
+     * @var bool $cached
+     * @return void
+     */
+    public function useCache(bool $cached);
+
+    /**
+     * Check if current authorization metadata
+     * is cached or not.
+     *
+     * @return bool
+     */
+    public function isCached(): bool;
 }
diff --git a/tests/Auth/AuthorizationTest.php b/tests/Auth/AuthorizationTest.php
@@ -47,7 +47,8 @@ protected function setUp(): void
     {
         $this->setAuthorization(new Authorization(
             new ArrayCachePool(),
-            ['client_secret' => 'abc', 'client_id' => 'cba']
+            ['client_secret' => 'abc', 'client_id' => 'cba'],
+            true
         ));
     }