From a9fbc92943181c4728f67a60486f8061b614ba2c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 21 Jan 2017 23:34:12 -0500
Subject: [PATCH] pass phony username/pass. do syncing steps synchronously.

---
 src/services/apiService.js  |  2 ++
 src/services/syncService.js | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/services/apiService.js b/src/services/apiService.js
index de32845035..b5375b48a3 100644
--- a/src/services/apiService.js
+++ b/src/services/apiService.js
@@ -345,6 +345,8 @@ function initApiService() {
                     postConnectToken(self, {
                         grant_type: 'password',
                         oldAuthBearer: authBearer,
+                        username: 'abcdefgh', // has to be something
+                        password: 'abcdefgh', // has to be something
                         scope: 'api offline_access',
                         client_id: 'browser'
                     }, function (token) {
diff --git a/src/services/syncService.js b/src/services/syncService.js
index 567116c35b..85414df8f1 100644
--- a/src/services/syncService.js
+++ b/src/services/syncService.js
@@ -34,14 +34,13 @@ function initSyncService() {
                         return;
                     }
 
-                    var promises = [];
-                    promises.push(syncVault(userId));
-                    promises.push(syncSettings(userId));
-
-                    Q.all(promises).then(function () {
-                        self.setLastSync(now, function () {
+                    syncVault(userId).then(function () {
+                        syncSettings(userId).then(function () {
                             self.syncCompleted(true);
                             callback(true);
+                        }, function () {
+                            self.syncCompleted(false);
+                            callback(false);
                         });
                     }, function () {
                         self.syncCompleted(false);