Added auth cache

Interfacelab · Dec 10, 2018 · 72fe842 · 72fe842
1 parent 05bca31
commit 72fe842
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "autoload": {
         "psr-4": {
-            "ChrisWhite\\B2\\": "src/"
+            "ILAB\\B2\\": "src/"
         }
     },
     "autoload-dev": {

diff --git a/src/AuthCacheInterface.php b/src/AuthCacheInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace ILAB\B2;
+
+interface AuthCacheInterface {
+    /**
+     * Returns the auth data for the given key
+     *
+     * @param $key
+     * @return array|null
+     */
+    public function cachedB2Auth($key);
+
+    /**
+     * Caches authentication data
+     * @param $key
+     * @param $authData
+     */
+    public function cacheB2Auth($key, $authData);
+}
diff --git a/src/Client.php b/src/Client.php
@@ -21,11 +21,14 @@ class Client
     /**
      * Client constructor. Accepts the account ID, application key and an optional array of options.
      *
-     * @param $accountId
-     * @param $applicationKey
+     * @param string $applicationKeyId
+     * @param string $applicationKey
      * @param array $options
+     * @param AuthCacheInterface $authCache
+     *
+     * @throws \Exception
      */
-    public function __construct($applicationKeyId, $applicationKey, array $options = [])
+    public function __construct($applicationKeyId, $applicationKey, array $options = [], $authCache = null)
     {
         $this->applicationKeyId = $applicationKeyId;
         $this->applicationKey = $applicationKey;
@@ -36,7 +39,7 @@ public function __construct($applicationKeyId, $applicationKey, array $options =
             $this->client = new HttpClient(['exceptions' => false]);
         }
 
-        $this->authorizeAccount();
+        $this->authorizeAccount($authCache);
     }
 
     /**
@@ -412,20 +415,36 @@ public function deleteFile(array $options)
     /**
      * Authorize the B2 account in order to get an auth token and API/download URLs.
      *
+     * @param AuthCacheInterface $authCache
      * @throws \Exception
      */
-    protected function authorizeAccount()
+    protected function authorizeAccount($authCache = null)
     {
-        $response = $this->client->request('GET', 'https://api.backblazeb2.com/b2api/v2/b2_authorize_account', [
-            'headers' => [
-                'Authorization' => 'Basic ' . base64_encode($this->applicationKeyId . ":" . $this->applicationKey)
-            ]
-        ]);
+        $auth = base64_encode($this->applicationKeyId . ":" . $this->applicationKey);
+
+        $authData = [];
+        if (!empty($authCache)) {
+            $authData = $authCache->cachedB2Auth($auth);
+        }
 
-        $this->accountId = $response['accountId'];
-        $this->authToken = $response['authorizationToken'];
-        $this->apiUrl = $response['apiUrl'].'/b2api/v2';
-        $this->downloadUrl = $response['downloadUrl'];
+        if (empty($authData)) {
+            $authData = $this->client->request('GET', 'https://api.backblazeb2.com/b2api/v2/b2_authorize_account', [
+                'headers' => [
+                    'Authorization' => 'Basic ' . $auth
+                ]
+            ]);
+
+            if (!empty($authData) && !empty($authCache)) {
+                $authCache->cacheB2Auth($auth, $authData);
+            }
+        }
+
+        if (!empty($authData)) {
+            $this->accountId = $authData['accountId'];
+            $this->authToken = $authData['authorizationToken'];
+            $this->apiUrl = $authData['apiUrl'].'/b2api/v2';
+            $this->downloadUrl = $authData['downloadUrl'];
+        }
     }
 
     /**