Add Configuration class

Author: alexkart

examples/Looker.php renamed to examples/Configuration.php

@@ -2,12 +2,12 @@
 
 namespace App;
 
-class Looker extends \Alexkart\Looker\Looker {
-    protected function storeAccessToken($accessToken): void {
+class Configuration extends \Alexkart\Looker\Configuration {
+    public function storeAccessToken($accessToken): void {
         file_put_contents(__DIR__ . DIRECTORY_SEPARATOR . 'looker_access_token.txt', $accessToken);
     }
 
-    protected function loadAccessToken(): string {
+    public function loadAccessToken(): string {
         return (string)file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'looker_access_token.txt');
     }
 }

examples/test.php

@@ -2,12 +2,13 @@
 
 require_once(dirname(__DIR__) . '/vendor/autoload.php');
 
-$looker = new \Alexkart\Looker\Looker(
+$config = new \Alexkart\Looker\Configuration(
     'https://looker-host:19999/api/3.1',
     'client-id',
     'client-secret',
     'optional-access-token'
 );
+$looker = new \Alexkart\Looker\Looker($config);
 
 $looks = $looker->lookApi->searchLooks(null, 'test');
 var_dump($looks);

examples/test1.php

@@ -2,11 +2,12 @@
 
 require_once(dirname(__DIR__) . '/vendor/autoload.php');
 
-$looker = new \App\Looker(
+$config = new \App\Configuration(
     'https://looker-host:19999/api/3.1',
     'client-id',
     'client-secret',
 );
+$looker = new \Alexkart\Looker\Looker($config);
 
 $looks = $looker->lookApi->searchLooks(null, 'test');
 var_dump($looks);

src/Configuration.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace Alexkart\Looker;
+
+class Configuration {
+    private string $host;
+    private string $clientId;
+    private string $clientSecret;
+    private string $accessToken;
+    private bool $accessTokenRenewed = false;
+
+    public function __construct(string $host, string $clientId = '', string $clientSecret = '', string $accessToken = '') {
+        $this->host = $host;
+        $this->clientId = $clientId;
+        $this->clientSecret = $clientSecret;
+        $this->accessToken = $accessToken ?: $this->loadAccessToken();
+
+        $this->validate();
+    }
+
+    private function validate() {
+        if ($this->accessToken === '' && ($this->clientId === '' || $this->clientSecret === '')) {
+            throw new \Exception('You must provide either a valid access token or API credentials.');
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getHost(): string {
+        return $this->host;
+    }
+
+    /**
+     * @return string
+     */
+    public function getClientId(): string {
+        return $this->clientId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getClientSecret(): string {
+        return $this->clientSecret;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAccessToken(): string {
+        return $this->accessToken;
+    }
+
+    /**
+     * @param string $accessToken
+     */
+    public function setAccessToken(string $accessToken): void {
+        $this->accessToken = $accessToken;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAccessTokenRenewed(): bool {
+        return $this->accessTokenRenewed;
+    }
+
+    /**
+     * @param bool $accessTokenRenewed
+     */
+    public function setAccessTokenRenewed(bool $accessTokenRenewed): void {
+        $this->accessTokenRenewed = $accessTokenRenewed;
+    }
+
+    public function storeAccessToken($accessToken): void {
+    }
+
+    public function loadAccessToken(): string {
+        return '';
+    }
+}

src/Looker.php

@@ -38,48 +38,41 @@
  * @property Api\WorkspaceApi workspaceApi
  */
 class Looker {
-    private string $host;
-    private string $clientId;
-    private string $clientSecret;
-    private string $accessToken;
     /**
      * @var void
      */
     private Client $authenticatedClient;
     /**
      * @var void
      */
-    private $config;
-    private bool $accessTokenRenewed = false;
+    private $apiConfig;
+    private \Alexkart\Looker\Configuration $config;
 
-    public function __construct(string $host, string $clientId, string $clientSecret, string $accessToken = '') {
-        $this->host = $host;
-        $this->clientId = $clientId;
-        $this->clientSecret = $clientSecret;
-        $this->accessToken = $accessToken ?: $this->loadAccessToken();
+    public function __construct(\Alexkart\Looker\Configuration $config) {
+        $this->config = $config;
         $this->login();
     }
 
     public function __get(string $name) {
         $class = '\\Alexkart\\Looker\\' . ucfirst($name);
 
-        return new $class($this, $this->authenticatedClient, $this->config);
+        return new $class($this, $this->authenticatedClient, $this->apiConfig);
     }
 
     public function login(): void {
-        $this->config = new Configuration();
-        $this->config->setHost($this->host);
+        $this->apiConfig = new Configuration();
+        $this->apiConfig->setHost($this->config->getHost());
 
-        if ($this->accessToken === '') {
+        if ($this->config->getAccessToken() === '') {
             $apiInstance = new ApiAuthApi(
                 new Client(),
-                $this->config
+                $this->apiConfig
             );
 
             try {
-                $result = $apiInstance->login($this->clientId, $this->clientSecret);
-                $this->accessToken = $result->getAccessToken();
-                $this->accessTokenRenewed = true;
+                $result = $apiInstance->login($this->config->getClientId(), $this->config->getClientSecret());
+                $this->config->setAccessToken($result->getAccessToken());
+                $this->config->setAccessTokenRenewed(true);
             } catch (Exception $e) {
                 echo 'Exception when calling ApiAuthApi->login: ', $e->getMessage(), PHP_EOL;
             }
@@ -88,34 +81,27 @@ public function login(): void {
         $this->authenticatedClient = new Client([
             'verify' => false,
             'headers' => [
-                'Authorization' => 'token ' . $this->accessToken,
+                'Authorization' => 'token ' . $this->config->getAccessToken(),
             ],
         ]);
 
-        if ($this->accessTokenRenewed) {
-            $this->storeAccessToken($this->accessToken);
+        if ($this->config->isAccessTokenRenewed()) {
+            $this->config->storeAccessToken($this->config->getAccessToken());
         }
     }
 
     public function invalidateAccessToken(): void {
-        $this->accessToken = '';
+        $this->config->setAccessToken('');
     }
 
     public function getAuthenticatedClient() {
         return $this->authenticatedClient;
     }
 
-    protected function storeAccessToken($accessToken): void {
-    }
-
-    protected function loadAccessToken(): string {
-        return '';
-    }
-
     /**
      * @return string
      */
     public function getAccessToken(): string {
-        return $this->accessToken;
+        return $this->config->getAccessToken();
     }
 }