STAM-2475

lanlin · Nov 30, 2018 · cd519e6 · cd519e6
1 parent 717c44e
commit cd519e6
Show file tree

Hide file tree

Showing 24 changed files with 682 additions and 323 deletions.
diff --git a/src/Accounts/Account.php b/src/Accounts/Account.php
@@ -52,7 +52,7 @@ public function getAccount(string $accessToken = null)
         $header = ['Authorization' => $accessToken];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setHeaderParams($header)
         ->get(API::LIST['account']);
     }

diff --git a/src/Accounts/Manage.php b/src/Accounts/Manage.php
@@ -61,7 +61,7 @@ public function getAccountsList(array $params = [])
         ];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($client['client_id'])
         ->setQuery($pagination)
         ->setHeaderParams($header)
@@ -84,7 +84,7 @@ public function getAccountInfo(string $accountId = null)
         $header = ['Authorization' => $client['client_secret']];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($client['client_id'], $accountId)
         ->setHeaderParams($header)
         ->get(API::LIST['listAnAccount']);
@@ -106,7 +106,7 @@ public function reactiveAccount(string $accountId = null)
         $header = ['Authorization' => $client['client_secret']];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($client['client_id'], $accountId)
         ->setHeaderParams($header)
         ->post(API::LIST['reactiveAnAccount']);
@@ -128,7 +128,7 @@ public function cancelAccount(string $accountId = null)
         $header = ['Authorization' => $client['client_secret']];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($client['client_id'], $accountId)
         ->setHeaderParams($header)
         ->post(API::LIST['cancelAnAccount']);

diff --git a/src/Authentication/Hosted.php b/src/Authentication/Hosted.php
@@ -88,7 +88,7 @@ public function postOAuthToken(string $code)
         $query = array_merge($query, $params);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($query)
         ->post(API::LIST['oAuthToken']);
     }
@@ -110,7 +110,7 @@ public function postOAuthRevoke(string $accessToken = null)
         $header = ['Authorization' => $accessToken];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setHeaderParams($header)
         ->post(API::LIST['oAuthRevoke']);
     }

diff --git a/src/Authentication/Native.php b/src/Authentication/Native.php
@@ -61,7 +61,7 @@ public function postConnectToken(string $code)
         $params['code'] = $code;
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setFormParams($params)
         ->post(API::LIST['connectToken']);
     }
@@ -92,7 +92,7 @@ public function postConnectAuthorize(array $params)
         V::doValidate($rules, $params);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setFormParams($params)
         ->post(API::LIST['connectAuthorize']);
     }

diff --git a/src/Calendars/Calendar.php b/src/Calendars/Calendar.php
@@ -62,7 +62,7 @@ public function getCalendarsList(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['calendars']);
@@ -95,7 +95,7 @@ public function getCalendar(string $calendarId, string $accessToken = null)
         $header = ['Authorization' => $params['access_token']];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($params['id'])
         ->setHeaderParams($header)
         ->get(API::LIST['oneCalendar']);

diff --git a/src/Contacts/Contact.php b/src/Contacts/Contact.php
@@ -1,8 +1,10 @@
 <?php namespace Nylas\Contacts;
 
 use Nylas\Utilities\API;
+use Nylas\Utilities\Helper;
 use Nylas\Utilities\Options;
 use Nylas\Utilities\Validate as V;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * ----------------------------------------------------------------------------------
@@ -54,7 +56,7 @@ public function getContactsList(array $params = [])
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['contacts']);
@@ -87,7 +89,7 @@ public function getContact(string $contactId, string $accessToken = null)
         $header = ['Authorization' => $params['access_token']];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($params['id'])
         ->setHeaderParams($header)
         ->get(API::LIST['oneContact']);
@@ -115,7 +117,7 @@ public function addContact(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setFormParams($params)
         ->setHeaderParams($header)
         ->post(API::LIST['contacts']);
@@ -146,7 +148,7 @@ public function updateContact(array $params)
         unset($params['id'], $params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($path)
         ->setFormParams($params)
         ->setHeaderParams($header)
@@ -180,7 +182,7 @@ public function deleteContact(string $contactId, string $accessToken = null)
         $header = ['Authorization' => $params['access_token']];
 
         $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($params['id'])
         ->setHeaderParams($header)
         ->delete(API::LIST['oneContact']);
@@ -203,45 +205,69 @@ public function getContactGroups(string $accessToken = null)
         $header = ['Authorization' => $accessToken];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setHeaderParams($header)
         ->get(API::LIST['contactsGroups']);
     }
 
     // ------------------------------------------------------------------------------
 
     /**
-     * get contact picture
+     * get contact picture file (support multiple download)
      *
      * @param array $params
+     * @param string $accessToken
      * @return array
      */
-    public function getContactPicture(array $params)
+    public function getContactPicture(array $params, string $accessToken = null)
     {
-        $params['access_token'] =
-        $params['access_token'] ?? $this->options->getAccessToken();
+        $downloadArr = Helper::arrayToMulti($params);
+        $accessToken = $accessToken ?? $this->options->getAccessToken();
+
+        V::doValidate($this->pictureRules(), $downloadArr);
+        V::doValidate(V::stringType()->notEmpty(), $accessToken);
+
+        $method = [];
+        $target = API::LIST['contactPic'];
+        $header = ['Authorization' => $accessToken];
 
+        foreach ($downloadArr as $item)
+        {
+            $sink = $item['path'];
+
+            $request = $this->options
+            ->getAsync()
+            ->setPath($item['id'])
+            ->setHeaderParams($header);
+
+            $method[] = function () use ($request, $target, $sink)
+            {
+                return $request->getSink($target, $sink);
+            };
+        }
+
+        return $this->options->getAsync()->pool($method, true);
+    }
+
+    // ------------------------------------------------------------------------------
+
+    /**
+     * rules for download picture
+     *
+     * @return \Respect\Validation\Validator
+     */
+    private function pictureRules()
+    {
         $path = V::oneOf(
             V::resourceType(),
             V::stringType()->notEmpty(),
-            V::instance('\Psr\Http\Message\StreamInterface')
+            V::instance(StreamInterface::class)
         );
 
-        $rule = V::keySet(
+        return  V::arrayType()->each(V::keySet(
             V::key('id', V::stringType()->notEmpty()),
-            V::key('path', $path),
-            V::key('access_token', V::stringType()->notEmpty())
-        );
-
-        V::doValidate($rule, $params);
-
-        $header = ['Authorization' => $params['access_token']];
-
-        return $this->options
-        ->getRequest()
-        ->setPath($params['id'])
-        ->setHeaderParams($header)
-        ->getSink(API::LIST['contactPic'], $params['path']);
+            V::key('path', $path)
+        ));
     }
 
     // ------------------------------------------------------------------------------

diff --git a/src/Deltas/Delta.php b/src/Deltas/Delta.php
@@ -51,7 +51,7 @@ public function getLatestCursor(string $accessToken = null)
         $header = ['Authorization' => $accessToken];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setHeaderParams($header)
         ->post(API::LIST['deltaLatestCursor']);
     }
@@ -78,7 +78,7 @@ public function getSetOfDeltas(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['delta']);
@@ -109,7 +109,7 @@ public function longPollingDelta(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['deltaLongpoll']);
@@ -137,7 +137,7 @@ public function streamingDelta(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['deltaStreaming']);

diff --git a/src/Drafts/Draft.php b/src/Drafts/Draft.php
@@ -9,6 +9,7 @@
  * Nylas Drafts
  * ----------------------------------------------------------------------------------
  *
+ * @info include inline image <img src="cid:file_id">
  * @author lanlin
  * @change 2018/11/23
  */
@@ -61,7 +62,7 @@ public function getDraftsList(string $anyEmail = null, string $accessToken = nul
         $query  = empty($emails) ? [] : ['any_email' => $emails];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setQuery($query)
         ->setHeaderParams($header)
         ->get(API::LIST['drafts']);
@@ -94,7 +95,7 @@ public function getDraft(string $draftId, string $accessToken = null)
         $header = ['Authorization' => $params['access_token']];
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($params['id'])
         ->setHeaderParams($header)
         ->get(API::LIST['oneDraft']);
@@ -122,7 +123,7 @@ public function addDraft(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setFormParams($params)
         ->setHeaderParams($header)
         ->post(API::LIST['drafts']);
@@ -151,7 +152,7 @@ public function updateDraft(array $params)
         unset($params['id'], $params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setPath($path)
         ->setFormParams($params)
         ->setHeaderParams($header)
@@ -164,15 +165,15 @@ public function updateDraft(array $params)
      * delete draft
      *
      * @param array $params
-     * @return mixed
+     * @return void
      */
     public function deleteDraft(array $params)
     {
         $params['access_token'] = $params['access_token'] ?? $this->options->getAccessToken();
 
         $rule = V::keySet(
             V::key('id', V::stringType()->notEmpty()),
-            V::key('version', V::stringType()->notEmpty()),
+            V::key('version', V::intType()->min(0)),
             V::key('access_token', V::stringType()->notEmpty())
         );
 
@@ -183,8 +184,8 @@ public function deleteDraft(array $params)
 
         unset($params['id'], $params['access_token']);
 
-        return $this->options
-        ->getRequest()
+        $this->options
+        ->getSync()
         ->setPath($path)
         ->setFormParams($params)
         ->setHeaderParams($header)
@@ -238,7 +239,7 @@ private function getUpdateRules()
         $update =
         [
             V::key('id', V::stringType()->notEmpty()),
-            V::key('version', V::stringType()->length(1, null))
+            V::key('version', V::intType()->min(0))
         ];
 
         return array_merge($rules, $update);

diff --git a/src/Drafts/Sending.php b/src/Drafts/Sending.php
@@ -48,8 +48,8 @@ public function sendDraft(array $params)
         $params['access_token'] ?? $this->options->getAccessToken();
 
         $rules = V::keySet(
-            V::key('draft', V::stringType()->notEmpty()),
             V::key('version', V::intType()->min(0)),
+            V::key('draft_id', V::stringType()->notEmpty()),
             V::key('access_token', V::stringType()->notEmpty())
         );
 
@@ -60,7 +60,7 @@ public function sendDraft(array $params)
         unset($params['access_token']);
 
         return $this->options
-        ->getRequest()
+        ->getSync()
         ->setFormParams($params)
         ->setHeaderParams($header)
         ->post(API::LIST['sending']);