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

#15 handing guzzle request on label

Author: skn-036

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "skn036/laravel-gmail-api",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "description": "Wrapper around gmail api for laravel.",
     "keywords": [
         "Muhammad Sajedul Karim",

src/Helper/GmailHelpers.php

@@ -0,0 +1,26 @@
+<?php
+namespace Skn036\Gmail\Helper;
+
+trait GmailHelpers
+{
+    /**
+     * resolve Guzzle response if not a request
+     *
+     * @param mixed $responseOrRequest
+     * @param \Google_Client $client
+     * @param string|null $expectedClass
+     *
+     * @return mixed;
+     */
+    protected function executeRequest(
+        mixed $responseOrRequest,
+        \Google_Client $client,
+        ?string $expectedClass = null
+    ) {
+        if (get_class($responseOrRequest) === 'GuzzleHttp\Psr7\Request') {
+            $responseOrRequest = $client->execute($responseOrRequest, $expectedClass);
+        }
+
+        return $responseOrRequest;
+    }
+}

src/Label/GmailLabelResponse.php

@@ -4,9 +4,12 @@
 use Skn036\Gmail\Gmail;
 use Skn036\Gmail\Facades\Gmail as GmailFacade;
 use Skn036\Gmail\Exceptions\TokenNotValidException;
+use Skn036\Gmail\Helper\GmailHelpers;
 
 class GmailLabelResponse
 {
+    use GmailHelpers;
+
     /**
      * Gmail Client
      * @var Gmail|GmailFacade
@@ -67,7 +70,13 @@ 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);
     }
 
@@ -91,7 +100,14 @@ public function get(string $labelId, array $optParams = [])
     public function create(array $params, array $optParams = [])
     {
         $label = $this->paramsToLabelPayload($params);
-        $createdLabel = $this->service->users_labels->create('me', $label, $optParams);
+
+        $responseOrRequest = $this->service->users_labels->create('me', $label, $optParams);
+        $createdLabel = $this->executeRequest(
+            $responseOrRequest,
+            $this->client,
+            'Google_Service_Gmail_Label'
+        );
+
         return $this->get($createdLabel->getId());
     }
 
@@ -116,7 +132,19 @@ public function create(array $params, array $optParams = [])
     public function update(string $labelId, array $params, array $optParams = [])
     {
         $label = $this->paramsToLabelPayload($params);
-        $updatedLabel = $this->service->users_labels->update('me', $labelId, $label, $optParams);
+
+        $responseOrRequest = $this->service->users_labels->update(
+            'me',
+            $labelId,
+            $label,
+            $optParams
+        );
+        $updatedLabel = $this->executeRequest(
+            $responseOrRequest,
+            $this->client,
+            'Google_Service_Gmail_Label'
+        );
+
         return $this->get($updatedLabel->getId());
     }
 
@@ -132,28 +160,26 @@ public function update(string $labelId, array $params, array $optParams = [])
      */
     public function delete(string $labelId, array $optParams = [])
     {
-        $this->service->users_labels->delete('me', $labelId, $optParams);
+        $responseOrRequest = $this->service->users_labels->delete('me', $labelId, $optParams);
+        $this->executeRequest($responseOrRequest, $this->client);
     }
 
     /**
      * List labels request to gmail
      *
      * @param array $optParams
      *
-     * @return \Google_Service_Gmail_ListLabelsResponse|\GuzzleHttp\Psr7\Request
+     * @return \Google_Service_Gmail_ListLabelsResponse
      * @throws \Google\Service\Exception
      */
     protected function getGmailLabelListResponse($optParams = [])
     {
         $responseOrRequest = $this->service->users_labels->listUsersLabels('me', $optParams);
-
-        if (get_class($responseOrRequest) === 'GuzzleHttp\Psr7\Request') {
-            $responseOrRequest = $this->service
-                ->getClient()
-                ->execute($responseOrRequest, 'Google_Service_Gmail_ListLabelsResponse');
-        }
-
-        return $responseOrRequest;
+        return $this->executeRequest(
+            $responseOrRequest,
+            $this->client,
+            'Google_Service_Gmail_ListLabelsResponse'
+        );
     }
 
     /**
@@ -164,7 +190,12 @@ protected function getGmailLabelListResponse($optParams = [])
      */
     protected function getGmailLabelResponse($id)
     {
-        return $this->service->users_labels->get('me', $id);
+        $responseOrRequest = $this->service->users_labels->get('me', $id);
+        return $this->executeRequest(
+            $responseOrRequest,
+            $this->client,
+            'Google_Service_Gmail_Label'
+        );
     }
 
     /**