STAM-2460

lanlin · Nov 27, 2018 · a3b27a7 · a3b27a7
1 parent cd42261
commit a3b27a7
Show file tree

Hide file tree

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

diff --git a/src/Accounts/Manage.php b/src/Accounts/Manage.php
@@ -44,7 +44,7 @@ public function __construct(Options $options)
      * @return mixed
      * @throws \Nylas\Exceptions\NylasException
      */
-    public function getAccountsList(array $params)
+    public function getAccountsList(array $params = [])
     {
         $rules = V::keySet(
             V::key('limit', V::intType()::min(1), false),
@@ -81,7 +81,6 @@ public function getAccountsList(array $params)
      *
      * @param string $accountId
      * @return mixed
-     * @throws \Nylas\Exceptions\NylasException
      */
     public function getAccountInfo(string $accountId = null)
     {
@@ -105,7 +104,6 @@ public function getAccountInfo(string $accountId = null)
      *
      * @param string $accountId
      * @return mixed
-     * @throws \Nylas\Exceptions\NylasException
      */
     public function reactiveAccount(string $accountId = null)
     {
@@ -129,7 +127,6 @@ public function reactiveAccount(string $accountId = null)
      *
      * @param string $accountId
      * @return mixed
-     * @throws \Nylas\Exceptions\NylasException
      */
     public function cancelAccount(string $accountId = null)
     {

diff --git a/src/Authentication/Hosted.php b/src/Authentication/Hosted.php
@@ -46,9 +46,12 @@ public function __construct(Options $options)
      */
     public function getOAuthAuthorize(array $params)
     {
+        $params['client_id'] = $this->options->getClientApps()['client_id'];
+
         $rules = V::keySet(
             V::key('login_hint', V::email()),
             V::key('redirect_uri', V::url()),
+            V::key('client_id', V::stringType()::notEmpty()),
             V::key('state', V::stringType()::length(1, 255), false)
         );
 
@@ -57,8 +60,6 @@ public function getOAuthAuthorize(array $params)
             throw new NylasException('invalid params');
         }
 
-        $params['client_id'] = $this->options->getClientApps()['client_id'];
-
         $query =
         [
             'scope'         => 'email',
@@ -67,7 +68,10 @@ public function getOAuthAuthorize(array $params)
 
         $query = array_merge($query, $params);
 
-        return $this->options->getRequest()->setQuery($query)->get(API::LIST['oAuthAuthorize']);
+        return $this->options
+        ->getRequest()
+        ->setQuery($query)
+        ->get(API::LIST['oAuthAuthorize']);
     }
 
     // ------------------------------------------------------------------------------
@@ -93,7 +97,10 @@ public function postOAuthToken(string $code)
         $query = ['grant_type' => 'authorization_code'];
         $query = array_merge($query, $params);
 
-        return $this->options->getRequest()->setQuery($query)->post(API::LIST['oAuthToken']);
+        return $this->options
+        ->getRequest()
+        ->setQuery($query)
+        ->post(API::LIST['oAuthToken']);
     }
 
     // ------------------------------------------------------------------------------
@@ -116,7 +123,10 @@ public function postOAuthRevoke(string $accessToken = null)
 
         $header = ['Authorization' => $accessToken];
 
-        return $this->options->getRequest()->setHeaderParams($header)->post(API::LIST['oAuthRevoke']);
+        return $this->options
+        ->getRequest()
+        ->setHeaderParams($header)
+        ->post(API::LIST['oAuthRevoke']);
     }
 
     // ------------------------------------------------------------------------------

diff --git a/src/Authentication/Native.php b/src/Authentication/Native.php
@@ -65,7 +65,10 @@ public function postConnectToken(string $code)
 
         $params['code'] = $code;
 
-        return $this->options->getRequest()->setFormParams($params)->post(API::LIST['connectToken']);
+        return $this->options
+        ->getRequest()
+        ->setFormParams($params)
+        ->post(API::LIST['connectToken']);
     }
 
     // ------------------------------------------------------------------------------
@@ -81,10 +84,13 @@ public function postConnectAuthorize(array $params)
     {
         $setting = $this->settingsRules($params);
 
+        $params['client_id'] = $this->options->getClientApps()['client_id'];
+
         $rules = V::keySet(
             V::key('name', V::stringType()::notEmpty()),
             V::key('settings', $setting),
             V::key('provider', V::in($this->providers)),
+            V::key('client_id', V::stringType()::notEmpty()),
             V::key('email_address', V::email()),
             V::key('reauth_account_id', V::stringType()::notEmpty(), false)
         );
@@ -94,9 +100,10 @@ public function postConnectAuthorize(array $params)
             throw new NylasException('invalid params');
         }
 
-        $params['client_id'] = $this->options->getClientApps()['client_id'];
-
-        return $this->options->getRequest()->setFormParams($params)->post(API::LIST['connectAuthorize']);
+        return $this->options
+        ->getRequest()
+        ->setFormParams($params)
+        ->post(API::LIST['connectAuthorize']);
     }
 
     // ------------------------------------------------------------------------------

diff --git a/src/Calendars/Calendar.php b/src/Calendars/Calendar.php
@@ -46,16 +46,16 @@ public function __construct(Options $options)
      */
     public function getCalendarsList(array $params)
     {
+        $params['access_token'] =
+        $params['access_token'] ?? $this->options->getAccessToken();
+
         $rule = V::keySet(
             V::key('view', V::in(['count', 'ids']), false),
             V::key('limit', V::intType()::min(1), false),
             V::key('offset', V::intType()::min(0), false),
             V::key('access_token', V::stringType()::notEmpty())
         );
 
-        $params['access_token'] =
-        $params['access_token'] ?? $this->options->getAccessToken();
-
         if (!$rule->validate($params))
         {
             throw new NylasException('invalid params');
@@ -65,7 +65,8 @@ public function getCalendarsList(array $params)
 
         unset($params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['calendars']);
@@ -102,7 +103,8 @@ public function getCalendar(string $calendarId, string $accessToken = null)
         $path   = [$params['id']];
         $header = ['Authorization' => $params['access_token']];
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setHeaderParams($header)
         ->get(API::LIST['oneCalendar']);

diff --git a/src/Contacts/Contact.php b/src/Contacts/Contact.php
@@ -58,7 +58,8 @@ public function getContactsList(array $params)
 
         unset($params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setQuery($params)
         ->setHeaderParams($header)
         ->get(API::LIST['contacts']);
@@ -95,7 +96,8 @@ public function getContact(string $contactId, string $accessToken = null)
         $path   = [$params['id']];
         $header = ['Authorization' => $params['access_token']];
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setHeaderParams($header)
         ->get(API::LIST['oneContact']);
@@ -126,7 +128,8 @@ public function addContact(array $params)
 
         unset($params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setFormParams($params)
         ->setHeaderParams($header)
         ->post(API::LIST['contacts']);
@@ -160,7 +163,8 @@ public function updateContact(array $params)
 
         unset($params['id'], $params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setFormParams($params)
         ->setHeaderParams($header)
@@ -198,7 +202,8 @@ public function deleteContact(string $contactId, string $accessToken = null)
         $path   = [$params['id']];
         $header = ['Authorization' => $params['access_token']];
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setHeaderParams($header)
         ->delete(API::LIST['oneContact']);
@@ -224,7 +229,10 @@ public function getContactGroups(string $accessToken = null)
 
         $header = ['Authorization' => $accessToken];
 
-        return $this->options->getRequest()->setHeaderParams($header)->get(API::LIST['contactsGroups']);
+        return $this->options
+        ->getRequest()
+        ->setHeaderParams($header)
+        ->get(API::LIST['contactsGroups']);
     }
 
     // ------------------------------------------------------------------------------
@@ -258,7 +266,8 @@ public function getContactPicture(string $contactId, string $accessToken = null)
         $path   = [$params['id']];
         $header = ['Authorization' => $params['access_token']];
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setHeaderParams($header)
         ->get(API::LIST['contactPic']);

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

diff --git a/src/Drafts/Draft.php b/src/Drafts/Draft.php
@@ -49,7 +49,7 @@ public function getDraftsList(string $anyEmail = null, string $accessToken = nul
     {
         $params = ['access_token' => $accessToken ?? $this->options->getAccessToken()];
 
-        if ($anyEmail) { $params['any_email'] = $anyEmail; }
+        !empty($anyEmail) AND $params['any_email'] = $anyEmail;
 
         $rule = V::keySet(
             V::key('access_token', V::stringType()::notEmpty()),
@@ -65,7 +65,8 @@ public function getDraftsList(string $anyEmail = null, string $accessToken = nul
         $header = ['Authorization' => $params['access_token']];
         $query  = empty($emails) ? [] : ['any_email' => $emails];
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setQuery($query)
         ->setHeaderParams($header)
         ->get(API::LIST['drafts']);
@@ -102,7 +103,8 @@ public function getDraft(string $draftId, string $accessToken = null)
         $path   = [$params['id']];
         $header = ['Authorization' => $params['access_token']];
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setHeaderParams($header)
         ->get(API::LIST['oneDraft']);
@@ -133,7 +135,8 @@ public function addDraft(array $params)
 
         unset($params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setFormParams($params)
         ->setHeaderParams($header)
         ->post(API::LIST['drafts']);
@@ -165,7 +168,8 @@ public function updateDraft(array $params)
 
         unset($params['id'], $params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setFormParams($params)
         ->setHeaderParams($header)
@@ -177,20 +181,13 @@ public function updateDraft(array $params)
     /**
      * delete draft
      *
-     * @param string $draftId
-     * @param string $version
-     * @param string $accessToken
+     * @param array $params
      * @return mixed
      * @throws \Nylas\Exceptions\NylasException
      */
-    public function deleteDraft(string $draftId, string $version, string $accessToken = null)
+    public function deleteDraft(array $params)
     {
-        $params =
-        [
-            'id'           => $draftId,
-            'version'      => $version,
-            'access_token' => $accessToken ?? $this->options->getAccessToken(),
-        ];
+        $params['access_token'] = $params['access_token'] ?? $this->options->getAccessToken();
 
         $rule = V::keySet(
             V::key('id', V::stringType()::notEmpty()),
@@ -208,7 +205,8 @@ public function deleteDraft(string $draftId, string $version, string $accessToke
 
         unset($params['id'], $params['access_token']);
 
-        return $this->options->getRequest()
+        return $this->options
+        ->getRequest()
         ->setPath($path)
         ->setFormParams($params)
         ->setHeaderParams($header)