INT-996 fetch preferences and user before everything else

(cherry picked from commit b32c590)

Author: rueckstiess

src/app.js

@@ -21,6 +21,7 @@ var getOrCreateClient = require('mongodb-scope-client');
 var ViewSwitcher = require('ampersand-view-switcher');
 var View = require('ampersand-view');
 var localLinks = require('local-links');
+var async = require('async');
 
 var QueryOptions = require('./models/query-options');
 var Connection = require('./models/connection');
@@ -142,17 +143,21 @@ var Application = View.extend({
 
     this.startRouter();
   },
-  startRouter: function() {
-    this.router = new Router();
-    debug('Listening for page changes from the router...');
-    this.listenTo(this.router, 'page', this.onPageChange);
-
-    debug('Starting router...');
-    this.router.history.start({
-      pushState: false,
-      root: '/'
-    });
-
+  fetchUser: function(done) {
+    debug('preferences fetched, now getting user');
+    User.getOrCreate(this.preferences.currentUserId, function(err, user) {
+      if (err) {
+        metrics.error(err, 'user: get or create');
+        done(err);
+      }
+      this.user.set(user.serialize());
+      this.user.trigger('sync');
+      this.preferences.save({currentUserId: user.id});
+      debug('user fetch successful', user.serialize());
+      done(null, user);
+    }.bind(this));
+  },
+  fetchPreferences: function(done) {
     // every time the preferences change, test if we should start one of
     // the external services.
     this.preferences.on('sync', function() {
@@ -164,22 +169,24 @@ var Application = View.extend({
     }.bind(this));
 
     this.preferences.fetch({
-      success: function() {
-        User.getOrCreate(this.preferences.currentUserId, function(err, user) {
-          if (err) {
-            metrics.error(err, 'user: get or create');
-            return;
-          }
-          this.user.set(user.serialize());
-          this.user.trigger('sync');
-          this.preferences.save({currentUserId: user.id});
-        }.bind(this));
-      }.bind(this),
+      success: function(resp) {
+        done(null, resp);
+      },
       error: function(model, err) {
         metrics.error(err, 'preferences: fetch');
       }
     });
+  },
+  startRouter: function() {
+    this.router = new Router();
+    debug('Listening for page changes from the router...');
+    this.listenTo(this.router, 'page', this.onPageChange);
 
+    debug('Starting router...');
+    this.router.history.start({
+      pushState: false,
+      root: '/'
+    });
     app.statusbar.hide();
   },
   onFatalError: function(id, err) {
@@ -284,40 +291,51 @@ app.extend({
     this.trigger(msg, arg);
   },
   metrics: metrics,
-  init: function() {
-    domReady(function() {
-      state.render();
-
-      if (!connectionId) {
-        // Not serving a part of the app which uses the client,
-        // so we can just start everything up now.
-        state.startRouter();
-        return;
-      }
+  onDomReady: function() {
+    state.render();
+
+    if (!connectionId) {
+      // Not serving a part of the app which uses the client,
+      // so we can just start everything up now.
+      state.startRouter();
+      return;
+    }
 
-      app.statusbar.show('Retrieving connection details...');
+    app.statusbar.show('Retrieving connection details...');
 
-      state.connection = new Connection({
-        _id: connectionId
-      });
+    state.connection = new Connection({
+      _id: connectionId
+    });
 
-      debug('looking up connection `%s`...', connectionId);
-      getConnection(state.connection, function(err) {
-        if (err) {
-          state.onFatalError('fetch connection', err);
-          return;
-        }
-        app.statusbar.show('Connecting to MongoDB...');
+    debug('looking up connection `%s`...', connectionId);
+    getConnection(state.connection, function(err) {
+      if (err) {
+        state.onFatalError('fetch connection', err);
+        return;
+      }
+      app.statusbar.show('Connecting to MongoDB...');
 
-        var endpoint = app.endpoint;
-        var connection = state.connection.serialize();
+      var endpoint = app.endpoint;
+      var connection = state.connection.serialize();
 
-        app.client = getOrCreateClient(endpoint, connection)
-          .on('readable', state.onClientReady.bind(state))
-          .on('error', state.onFatalError.bind(state, 'create client'));
+      app.client = getOrCreateClient(endpoint, connection)
+        .on('readable', state.onClientReady.bind(state))
+        .on('error', state.onFatalError.bind(state, 'create client'));
 
-        state.startClientStalledTimer();
-      });
+      state.startClientStalledTimer();
+    });
+  },
+  init: function() {
+    var self = this;
+    async.series([
+      state.fetchPreferences.bind(state),
+      state.fetchUser.bind(state)
+    ], function(err) {
+      if (err) {
+        throw err;
+      }
+      // as soon as dom is ready, render and set up the rest
+      domReady(self.onDomReady);
     });
     // set up ipc
     ipc.on('message', this.onMessageReceived.bind(this));

src/connect/index.js

@@ -203,7 +203,6 @@ var ConnectView = View.extend({
   subviews: {
     sidebar: {
       hook: 'sidebar-subview',
-      waitFor: 'connections.fetched',
       prepareView: function(el) {
         return new SidebarView({
           el: el,

src/home/index.js

@@ -57,15 +57,6 @@ var HomeView = View.extend({
   },
   render: function() {
     this.renderWithTemplate(this);
-    // once prefs are synced (fetched in ../app.js), check if version
-    // is new and show tour and optin modal.
-    if (app.preferences.fetched) {
-      this.preferencesSynced();
-    } else {
-      app.preferences.once('sync', this.preferencesSynced.bind(this));
-    }
-  },
-  preferencesSynced: function() {
     if (app.preferences.lastKnownVersion !== app.meta['App Version']) {
       app.preferences.save('lastKnownVersion', app.meta['App Version']);
       this.showTour();