Merge pull request #15 from skn-036:v1.0

skn-036 · web-flow · commit c94028812ca7 · 2025-02-05T22:02:40.000+06:00
#17 resolved guzzleHttp request or response
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "skn036/laravel-gmail-api",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "Wrapper around gmail api for laravel.",
     "keywords": [
         "Muhammad Sajedul Karim",
diff --git a/src/Draft/GmailDraft.php b/src/Draft/GmailDraft.php
@@ -4,10 +4,13 @@
 use Skn036\Gmail\Draft\Sendable\Draft;
 use Skn036\Gmail\Gmail;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
+use Skn036\Gmail\Helper\GmailHelpers;
 use Skn036\Gmail\Message\GmailMessage;
 
 class GmailDraft
 {
+    use GmailHelpers;
+
     /**
      * Draft from gmail
      * @var \Google_Service_Gmail_Draft
@@ -75,10 +78,18 @@ public function edit()
     public function send(array $optParams = [])
     {
         $service = $this->client->initiateService();
-        $message = $service->users_drafts->send('me', $this->draft, $optParams);
+        $message = $this->executeRequest(
+            $service->users_drafts->send('me', $this->draft, $optParams),
+            $this->client,
+            'Google_Service_Gmail_Message'
+        );
 
         return new GmailMessage(
-            $service->users_messages->get('me', $message->getId()),
+            $this->executeRequest(
+                $service->users_messages->get('me', $message->getId()),
+                $this->client,
+                'Google_Service_Gmail_Message'
+            ),
             $this->client
         );
     }
@@ -93,7 +104,10 @@ public function send(array $optParams = [])
     public function delete(array $optParams = [])
     {
         $service = $this->client->initiateService();
-        $service->users_drafts->delete('me', $this->id, $optParams);
+        $this->executeRequest(
+            $service->users_drafts->delete('me', $this->id, $optParams),
+            $this->client
+        );
     }
 
     /**
diff --git a/src/Draft/GmailDraftResponse.php b/src/Draft/GmailDraftResponse.php
@@ -6,9 +6,12 @@
 use Skn036\Gmail\Draft\Sendable\Draft;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
 use Skn036\Gmail\Exceptions\TokenNotValidException;
+use Skn036\Gmail\Helper\GmailHelpers;
 
 class GmailDraftResponse extends GmailFilter
 {
+    use GmailHelpers;
+
     /**
      * Gmail Client
      * @var Gmail|GmailFacade
@@ -114,7 +117,8 @@ public function edit(GmailDraft|string $draftOrDraftId)
     public function delete(GmailDraft|string $draftOrDraftId, array $optParams = [])
     {
         $draftId = $draftOrDraftId instanceof GmailDraft ? $draftOrDraftId->id : $draftOrDraftId;
-        $this->service->users_drafts->delete('me', $draftId, $optParams);
+        $responseOrRequest = $this->service->users_drafts->delete('me', $draftId, $optParams);
+        $this->executeRequest($responseOrRequest, $this->client);
     }
 
     /**
@@ -128,14 +132,11 @@ public function delete(GmailDraft|string $draftOrDraftId, array $optParams = [])
     protected function getGmailDraftListResponse($optParams = [])
     {
         $responseOrRequest = $this->service->users_drafts->listUsersDrafts('me', $optParams);
-
-        if (get_class($responseOrRequest) === 'GuzzleHttp\Psr7\Request') {
-            $responseOrRequest = $this->service
-                ->getClient()
-                ->execute($responseOrRequest, 'Google_Service_Gmail_ListDraftsResponse');
-        }
-
-        return $responseOrRequest;
+        return $this->executeRequest(
+            $responseOrRequest,
+            $this->client,
+            'Google_Service_Gmail_ListDraftsResponse'
+        );
     }
 
     /**
diff --git a/src/Label/GmailLabelResponse.php b/src/Label/GmailLabelResponse.php
@@ -70,7 +70,12 @@ public function list(array $optParams = [])
      */
     public function get(string $labelId, array $optParams = [])
     {
-        $label = $this->service->users_labels->get('me', $labelId, $optParams);
+        $responseOrRequest = $this->service->users_labels->get('me', $labelId, $optParams);
+        $label = $this->executeRequest(
+            $responseOrRequest,
+            $this->client,
+            'Google_Service_Gmail_Label'
+        );
         return new GmailLabel($label);
     }
 
@@ -184,12 +189,7 @@ protected function getGmailLabelListResponse($optParams = [])
      */
     protected function getGmailLabelResponse($id)
     {
-        $responseOrRequest = $this->service->users_labels->get('me', $id);
-        return $this->executeRequest(
-            $responseOrRequest,
-            $this->client,
-            'Google_Service_Gmail_Label'
-        );
+        return $this->service->users_labels->get('me', $id);
     }
 
     /**
diff --git a/src/Message/GmailMessage.php b/src/Message/GmailMessage.php
@@ -4,14 +4,15 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Skn036\Gmail\Draft\Sendable\Draft;
+use Skn036\Gmail\Helper\GmailHelpers;
 use Skn036\Gmail\Message\Sendable\Email;
 use Skn036\Gmail\Message\Traits\ExtractMessage;
 use Skn036\Gmail\Gmail;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
 
 class GmailMessage
 {
-    use ExtractMessage;
+    use ExtractMessage, GmailHelpers;
 
     /**
      * Message from gmail
@@ -323,7 +324,11 @@ public function modifyLabels(
         }
 
         $service = $this->client->initiateService();
-        $message = $service->users_messages->modify('me', $this->id, $modify, $optParams);
+        $message = $this->executeRequest(
+            $service->users_messages->modify('me', $this->id, $modify, $optParams),
+            $this->client,
+            'Google_Service_Gmail_Message'
+        );
         $this->setLabels($message->getLabelIds());
 
         return $this;
@@ -365,7 +370,11 @@ public function removeLabels(array|string $labelIds = [], array $optParams = [])
     public function trash($optParams = [])
     {
         $service = $this->client->initiateService();
-        $message = $service->users_messages->trash('me', $this->id, $optParams);
+        $message = $this->executeRequest(
+            $service->users_messages->trash('me', $this->id, $optParams),
+            $this->client,
+            'Google_Service_Gmail_Message'
+        );
         $this->setLabels($message->getLabelIds());
         return $this;
     }
@@ -380,7 +389,11 @@ public function trash($optParams = [])
     public function untrash($optParams = [])
     {
         $service = $this->client->initiateService();
-        $message = $service->users_messages->untrash('me', $this->id, $optParams);
+        $message = $this->executeRequest(
+            $service->users_messages->untrash('me', $this->id, $optParams),
+            $this->client,
+            'Google_Service_Gmail_Message'
+        );
         $this->setLabels($message->getLabelIds());
         return $this;
     }
@@ -397,7 +410,10 @@ public function untrash($optParams = [])
     public function delete($optParams = [])
     {
         $service = $this->client->initiateService();
-        $service->users_messages->delete('me', $this->id, $optParams);
+        $this->executeRequest(
+            $service->users_messages->delete('me', $this->id, $optParams),
+            $this->client
+        );
     }
 
     /**
diff --git a/src/Message/GmailMessageAttachment.php b/src/Message/GmailMessageAttachment.php
@@ -5,9 +5,12 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
+use Skn036\Gmail\Helper\GmailHelpers;
 
 class GmailMessageAttachment
 {
+    use GmailHelpers;
+
     /**
      * Attachment MessagePart or id of the attachment
      * @var \Google_Service_Gmail_MessagePart
@@ -110,12 +113,17 @@ public function getData(array $optParams = [])
         }
 
         $service = $this->client->initiateService();
-        $part = $service->users_messages_attachments->get(
-            'me',
-            $this->messageId,
-            $this->id,
-            $optParams
+        $part = $this->executeRequest(
+            $service->users_messages_attachments->get(
+                'me',
+                $this->messageId,
+                $this->id,
+                $optParams
+            ),
+            $this->client,
+            'Google_Service_Gmail_MessagePart'
         );
+
         if ($part->data) {
             $this->data = $part->data;
         }
diff --git a/src/Message/GmailMessageResponse.php b/src/Message/GmailMessageResponse.php
@@ -5,12 +5,15 @@
 use Illuminate\Support\Collection;
 use Skn036\Gmail\Filters\GmailFilter;
 use Skn036\Gmail\Draft\Sendable\Draft;
+use Skn036\Gmail\Helper\GmailHelpers;
 use Skn036\Gmail\Message\Sendable\Email;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
 use Skn036\Gmail\Exceptions\TokenNotValidException;
 
 class GmailMessageResponse extends GmailFilter
 {
+    use GmailHelpers;
+
     /**
      * Gmail Client
      * @var Gmail|GmailFacade
@@ -78,7 +81,11 @@ public function next()
      */
     public function get(string $id)
     {
-        $message = $this->getGmailMessageResponse($id);
+        $message = $this->executeRequest(
+            $this->getGmailMessageResponse($id),
+            $this->client,
+            'Google_Service_Gmail_Message'
+        );
         return new GmailMessage($message, $this->client);
     }
 
@@ -303,7 +310,10 @@ public function batchModifyLabels(
         $batchModifyRequest->setAddLabelIds($addLabelIds);
         $batchModifyRequest->setRemoveLabelIds($removeLabelIds);
 
-        return $this->service->users_messages->batchModify('me', $batchModifyRequest, $optParams);
+        return $this->executeRequest(
+            $this->service->users_messages->batchModify('me', $batchModifyRequest, $optParams),
+            $this->client
+        );
     }
 
     /**
@@ -355,7 +365,10 @@ public function batchDelete(Collection|array $messagesOrMessageIds, array $optPa
         $batchDeleteRequest = new \Google_Service_Gmail_BatchDeleteMessagesRequest();
         $batchDeleteRequest->setIds($messageIds);
 
-        return $this->service->users_messages->batchDelete('me', $batchDeleteRequest, $optParams);
+        return $this->executeRequest(
+            $this->service->users_messages->batchDelete('me', $batchDeleteRequest, $optParams),
+            $this->client
+        );
     }
 
     /**
@@ -368,15 +381,11 @@ public function batchDelete(Collection|array $messagesOrMessageIds, array $optPa
      */
     protected function getGmailMessageListResponse($optParams = [])
     {
-        $responseOrRequest = $this->service->users_messages->listUsersMessages('me', $optParams);
-
-        if (get_class($responseOrRequest) === 'GuzzleHttp\Psr7\Request') {
-            $responseOrRequest = $this->service
-                ->getClient()
-                ->execute($responseOrRequest, 'Google_Service_Gmail_ListMessagesResponse');
-        }
-
-        return $responseOrRequest;
+        return $this->executeRequest(
+            $this->service->users_messages->listUsersMessages('me', $optParams),
+            $this->client,
+            'Google_Service_Gmail_ListMessagesResponse'
+        );
     }
 
     /**
diff --git a/src/Message/Sendable/Email.php b/src/Message/Sendable/Email.php
@@ -3,11 +3,14 @@
 
 use Skn036\Gmail\Gmail;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
+use Skn036\Gmail\Helper\GmailHelpers;
 use Skn036\Gmail\Message\GmailMessage;
 use Skn036\Gmail\Message\GmailMessageResponse;
 
 class Email extends Sendable
 {
+    use GmailHelpers;
+
     /**
      * Summary of __construct
      *
@@ -31,7 +34,11 @@ public function send(array $optParams = [])
         $postBody = $this->setGmailMessageBody();
         $service = $this->client->initiateService();
 
-        $message = $service->users_messages->send('me', $postBody, $optParams);
+        $message = $this->executeRequest(
+            $service->users_messages->send('me', $postBody, $optParams),
+            $this->client,
+            'Google_Service_Gmail_Message'
+        );
         return (new GmailMessageResponse($this->client))->get($message->getId());
     }
 
diff --git a/src/Thread/GmailThread.php b/src/Thread/GmailThread.php
diff --git a/src/Thread/GmailThreadResponse.php b/src/Thread/GmailThreadResponse.php
diff --git a/src/Watch/GmailWatchRequest.php b/src/Watch/GmailWatchRequest.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "skn036/laravel-gmail-api",`
`3`		`- "version": "1.0.4",`
	`3`	`+ "version": "1.0.5",`
`4`	`4`	`"description": "Wrapper around gmail api for laravel.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"Muhammad Sajedul Karim",`