tweaked connection flow

Author: rmisio

js/main.js

@@ -399,7 +399,14 @@ var loadProfile = function(landingRoute, onboarded) {
 $(document).ajaxSend(function(e, jqXhr, settings) {
   // With this we could map ajax responses to the server config
   // that was active when they were initiated.
-  jqXhr.serverConfig = app.serverConfigs.getActive().id;
+  jqXhr.serverConfig = app.serverConfigs.getActive();
+});
+
+$(document).ajaxError(function(event, jqxhr, settings, thrownError) {
+  if (jqxhr.status === 401 && jqxhr.serverConfig.id === app.serverConfigs.getActive().id) {
+    app.serverConnectModal.failConnection('failed-auth', jqxhr.serverConfig)
+      .open();
+  }
 });
 
 launchOnboarding = function(guidCreating) {
@@ -447,24 +454,26 @@ pageConnectModal.on('cancel', () => {
 app.connectHeartbeatSocket();
 app.serverConnectModal = new ServerConnectModal().render();
 app.serverConnectModal.on('connected', (authenticated) => {
-  $loadingModal.removeClass('hide');
-
-  if (authenticated) {
-    profileLoaded && location.reload();
+  if (profileLoaded) {
+    // If we've already loaded called loadProfile() and then, we connect
+    // to a new server (or reconnect to the same server) we'll reload the
+    // app since some of the "global" components (Router, PageNav,
+    // SocketView...) were not designed to handle a new connection.
+    authenticated && location.reload();
+  } else {
+    // clear some flags so the heartbeat events will
+    // appropriatally loadProfile or launch onboarding
+    guidCreating = null;
+    loadProfileNeeded = true;
     app.serverConnectModal.close();
+    $loadingModal.removeClass('hide');
   }
 });
 
 app.getHeartbeatSocket().on('open', function(e) {
   removeStartupRetry();
   pageConnectModal.remove();
   $loadingModal.removeClass('hide');
-  onboardingModal && onboardingModal.remove();
-
-  // clear some flags so the heartbeat events will
-  // appropriatally loadProfile or launch onboarding
-  guidCreating = null;
-  loadProfileNeeded = true;
 });
 
 app.getHeartbeatSocket().on('close', (startUpRetry = function(e) {
@@ -518,6 +527,7 @@ app.getHeartbeatSocket().on('message', function(e) {
       case 'online':
         if (loadProfileNeeded && !guidCreating) {
           loadProfileNeeded = false;
+          onboardingModal && onboardingModal.remove();
 
           app.login().done(function(data) {
             if (data.success) {

js/views/pageNavServersVw.js

@@ -53,23 +53,21 @@ module.exports = BaseVw.extend({
       app.serverConnectModal.open();      
     }).open();
 
-    app.serverConnectModal.connect(serverConfig);
-      // .done(() => {
-      //   alert('im done');
-      //   this.pageConnectModal.remove();
-      // }).fail(() => {
-      //   alert('ive failed');
-      //   return;
-      //   alert('china town');
-      //   this.pageConnectModal.remove();
-      //   app.serverConnectModal.open();
-      // });
+    app.serverConnectModal.connect(serverConfig)
+      .done(() => {
+        this.pageConnectModal.remove();
+      }).fail(() => {
+        this.pageConnectModal.remove();
+        app.serverConnectModal.open();
+      });
   },
 
   render: function() {
+    var connectedServerConfig = app.serverConnectModal.getConnectedServer();
+
     loadTemplate('./js/templates/pageNavServersMenu.html', (t) => {
       this.$el.html(t({
-        connectedServer: this.collection.at(0).id,
+        connectedServer: connectedServerConfig && connectedServerConfig.id,
         servers: this.collection.toJSON()
       }));
     });

js/views/serverConnectModal.js

@@ -129,7 +129,7 @@ module.exports = BaseModal.extend({
 
     if (this.connectAttempt && this.connectAttempt.state() === 'pending') return this;
 
-    this.connectedServer = configMd;
+    this._connectedServer = configMd;
 
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
@@ -151,7 +151,7 @@ module.exports = BaseModal.extend({
     var msg;
 
     if (this.connectAttempt && this.connectAttempt.state() === 'pending') return this;
-    if (this.connectedServer && this.connectedServer.id === configMd.id) this.connectedServer = null;
+    if (this._connectedServer && this._connectedServer.id === configMd.id) this._connectedServer = null;
 
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
@@ -187,13 +187,13 @@ module.exports = BaseModal.extend({
     this.connectAttempt && this.connectAttempt.cancel();
     this.hideMessageBar();
 
-    if (this.connectedServer) {
+    if (this._connectedServer) {
       this.serverConfigsVw.setConnectionState({
-        id: this.connectedServer.id,
+        id: this._connectedServer.id,
         status: 'not-connected'
       });
 
-      this.connectedServer = null;    
+      this._connectedServer = null;    
     }
 
     this.serverConfigsVw.setConnectionState({
@@ -309,6 +309,10 @@ module.exports = BaseModal.extend({
     return promise;
   },
 
+  getConnectedServer: function() {
+    return this._connectedServer;
+  },
+
   close: function() {
     this.closeConfigForm();
     BaseModal.prototype.close.apply(this, arguments);