Misc updates.

tomshaw · Oct 17, 2023 · f1ee924 · f1ee924
1 parent 564c118
commit f1ee924
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 84 deletions.
diff --git a/src/Api/GoogleCalendar.php b/src/Api/GoogleCalendar.php
@@ -16,9 +16,7 @@ final class GoogleCalendar
 
     public function __construct(GoogleClient $client)
     {
-        if (! $client->getAccessToken()) {
-            $client->createAuthUrl();
-        }
+        $client->initialize();
 
         $this->service = new Calendar($client->client);
     }

diff --git a/src/Api/GoogleMail.php b/src/Api/GoogleMail.php
@@ -29,9 +29,7 @@ final class GoogleMail
 
     public function __construct(GoogleClient $client)
     {
-        if (! $client->getAccessToken()) {
-            $client->createAuthUrl();
-        }
+        $client->initialize();
 
         $this->service = new Gmail($client->client);
 

diff --git a/src/Contracts/GoogleClientInterface.php b/src/Contracts/GoogleClientInterface.php
@@ -8,19 +8,7 @@
 
 interface GoogleClientInterface
 {
-    public function setAuthConfig(string $authConfig): GoogleClient;
-
-    public function setApplicationName(string $applicationName): GoogleClient;
-
-    public function addScope(array $scopes): GoogleClient;
-
-    public function setAccessType(string $accessType = 'offline'): GoogleClient;
-
-    public function setPrompt(string $prompt = 'none'): GoogleClient;
-
-    public function setApprovalPrompt(string $approvalPrompt = 'offline'): GoogleClient;
-
-    public function setIncludeGrantedScopes(bool $includeGrantedScopes = true): GoogleClient;
+    public function initialize(): GoogleClient;
 
     public function createAuthUrl(): void;
 

diff --git a/src/GoogleClient.php b/src/GoogleClient.php
@@ -28,84 +28,43 @@ public function __construct(
             throw new GoogleClientException('Unable to load client secrets.');
         }
 
-        $this->client->setAuthConfig(config('google-api.auth_config'));
+        $client->setAuthConfig(config('google-api.auth_config'));
 
-        $this->client->addScope(config('google-api-scopes'));
+        $client->addScope(config('google-api-scopes'));
 
-        $this->client->setApplicationName(config('google-api.application_name'));
+        $client->setApplicationName(config('google-api.application_name'));
 
-        $this->client->setPrompt(config('google-api.prompt'));
+        $client->setPrompt(config('google-api.prompt'));
 
-        $this->client->setApprovalPrompt(config('google-api.approval_prompt'));
+        $client->setApprovalPrompt(config('google-api.approval_prompt'));
 
-        $this->client->setAccessType(config('google-api.access_type'));
+        $client->setAccessType(config('google-api.access_type'));
 
-        $this->client->setIncludeGrantedScopes(config('google-api.include_grant_scopes'));
-
-        $accessToken = $this->getAccessToken();
-
-        if ($accessToken) {
-            if ($accessToken instanceof Collection) {
-                $this->client->setAccessToken($accessToken->toArray());
-            } else {
-                $this->client->setAccessToken($accessToken->makeHidden(['id'])->toArray());
-            }
-
-            if ($this->client->isAccessTokenExpired()) {
-                $accessRefreshToken = $this->fetchAccessTokenWithRefreshToken($this->client->getRefreshToken());
-                if (is_array($accessRefreshToken)) {
-                    $this->client->setAccessToken($accessRefreshToken);
-                    $this->setAccessToken($accessRefreshToken);
-                }
-            }
-        }
-    }
-
-    public function setAuthConfig(string $authConfig): GoogleClient
-    {
-        $this->client->setAuthConfig($authConfig);
-
-        return $this;
-    }
-
-    public function setApplicationName(string $applicationName): GoogleClient
-    {
-        $this->client->setApplicationName($applicationName);
-
-        return $this;
-    }
-
-    public function addScope(array $scopes): GoogleClient
-    {
-        $this->client->addScope($scopes);
-
-        return $this;
-    }
-
-    public function setAccessType(string $accessType = 'offline'): GoogleClient
-    {
-        $this->client->setAccessType($accessType);
-
-        return $this;
+        $client->setIncludeGrantedScopes(config('google-api.include_grant_scopes'));
     }
 
-    public function setPrompt(string $prompt = 'none'): GoogleClient
+    public function initialize(): GoogleClient
     {
-        $this->client->setPrompt($prompt);
+        $accessToken = $this->getAccessToken();
 
-        return $this;
-    }
+        if (! $accessToken) {
+            throw new GoogleClientException('Invalid or missing token.');
+        }
 
-    public function setApprovalPrompt(string $approvalPrompt = 'offline'): GoogleClient
-    {
-        $this->client->setApprovalPrompt($approvalPrompt);
+        if ($accessToken instanceof Collection) {
+            $this->client->setAccessToken($accessToken->toArray());
+        } else {
+            $this->client->setAccessToken($accessToken->makeHidden(['id'])->toArray());
+        }
 
-        return $this;
-    }
+        if ($this->client->isAccessTokenExpired()) {
+            $accessRefreshToken = $this->fetchAccessTokenWithRefreshToken($this->client->getRefreshToken());
 
-    public function setIncludeGrantedScopes(bool $includeGrantedScopes = true): GoogleClient
-    {
-        $this->client->setPrompt($includeGrantedScopes);
+            if (is_array($accessRefreshToken)) {
+                $this->client->setAccessToken($accessRefreshToken);
+                $this->setAccessToken($accessRefreshToken);
+            }
+        }
 
         return $this;
     }