From 144fd7f3724805d48d439fbbe771ac72aaf44361 Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Wed, 23 Nov 2016 12:36:38 -0800
Subject: [PATCH] Remove EdgehillAPI from auth and fix NylasRequest and
 perspective

---
 .../onboarding/lib/onboarding-helpers.es6             | 11 +----------
 src/K2                                                |  2 +-
 src/flux/nylas-api-request.es6                        |  2 +-
 src/mailbox-perspective.coffee                        |  4 +++-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/internal_packages/onboarding/lib/onboarding-helpers.es6 b/internal_packages/onboarding/lib/onboarding-helpers.es6
index e5ce23233..4c82c5dc2 100644
--- a/internal_packages/onboarding/lib/onboarding-helpers.es6
+++ b/internal_packages/onboarding/lib/onboarding-helpers.es6
@@ -1,7 +1,7 @@
 /* eslint global-require: 0 */
 
 import crypto from 'crypto';
-import {EdgehillAPI, NylasAPI, AccountStore, RegExpUtils, IdentityStore} from 'nylas-exports';
+import {NylasAPI, AccountStore, RegExpUtils, IdentityStore} from 'nylas-exports';
 
 const IMAP_FIELDS = new Set([
   "imap_host",
@@ -110,15 +110,6 @@ export function runAuthRequest(accountInfo) {
       sendImmediately: true,
     },
   })
-  .then((json) => {
-    json.email = data.email;
-    return EdgehillAPI.makeRequest({
-      path: "/connect/nylas",
-      method: "POST",
-      timeout: 60000,
-      body: json,
-    })
-  })
 }
 
 export function isValidHost(value) {
diff --git a/src/K2 b/src/K2
index 05874d5d7..d7ec67db1 160000
--- a/src/K2
+++ b/src/K2
@@ -1 +1 @@
-Subproject commit 05874d5d79a7ac24cdd1d5c7a607ff5e5e5d29fa
+Subproject commit d7ec67db1830185427c1175d941013be27cd9478
diff --git a/src/flux/nylas-api-request.es6 b/src/flux/nylas-api-request.es6
index 4aa1ba83b..aab084b06 100644
--- a/src/flux/nylas-api-request.es6
+++ b/src/flux/nylas-api-request.es6
@@ -12,7 +12,7 @@ import NylasAPI from './nylas-api'
 export default class NylasAPIRequest {
   constructor(api, options) {
     const defaults = {
-      url: `${options.APIRoot || options.LocalSyncRoot || api.LocalSyncRoot}${options.path}`,
+      url: `${options.APIRoot || options.LocalSyncRoot || api.APIRoot || api.LocalSyncRoot}${options.path}`,
       method: 'GET',
       json: true,
       timeout: 15000,
diff --git a/src/mailbox-perspective.coffee b/src/mailbox-perspective.coffee
index bd62e80b6..87ed8dd3b 100644
--- a/src/mailbox-perspective.coffee
+++ b/src/mailbox-perspective.coffee
@@ -73,7 +73,9 @@ class MailboxPerspective
   # Instance Methods
 
   constructor: (@accountIds) ->
-    unless @accountIds instanceof Array and _.every(@accountIds, _.isString)
+    unless @accountIds instanceof Array and _.every(@accountIds, (aid) =>
+      (typeof aid is 'string') or (typeof aid is 'number')
+    )
       throw new Error("#{@constructor.name}: You must provide an array of string `accountIds`")
     @