more init sequence connect tweaks

Author: rmisio

js/main.js

@@ -453,27 +453,29 @@ pageConnectModal.on('cancel', () => {
 
 app.connectHeartbeatSocket();
 app.serverConnectModal = new ServerConnectModal().render();
-app.serverConnectModal.on('connected', (authenticated) => {
+app.serverConnectModal.on('connected', () => {
   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');
+    location.reload();
   }
 });
 
 app.getHeartbeatSocket().on('open', function(e) {
   removeStartupRetry();
   pageConnectModal.remove();
   $loadingModal.removeClass('hide');
+
+  if (!profileLoaded) {
+    // 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('close', (startUpRetry = function(e) {
@@ -495,15 +497,24 @@ removeStartupRetry = function() {
   clearTimeout(startUpRetry.timeout);
   app.getHeartbeatSocket().off('close', startUpRetry);
   app.getHeartbeatSocket().on('close', (e) => {
-    app.serverConnectModal.failConnection(null, app.serverConfigs.getActive())
-      .open();    
+    app.serverConnectModal.failConnection(null, app.serverConfigs.getActive());
+    
+    if (app.serverConnectModal.getConnectAttempt()) {
+      app.serverConnectModal.getConnectAttempt()
+        .fail(() => {
+          app.serverConnectModal.open();
+        });
+    } else {
+      app.serverConnectModal.open();
+    }      
   });
 };
 
 app.getHeartbeatSocket().on('message', function(e) {
   if (e.jsonData && e.jsonData.status) {
     switch (e.jsonData.status) {
       case 'generating GUID':
+        profileLoaded && location.reload();
         if (guidCreating) return;
 
         // todo: put in some timeout in the off chance the guid
@@ -514,6 +525,8 @@ app.getHeartbeatSocket().on('message', function(e) {
         launchOnboarding(guidCreating);
         break;
       case 'GUID generation complete':
+        profileLoaded && location.reload();
+
         app.serverConfigs.getActive().save({
           username: e.jsonData.username,
           password: e.jsonData.password

js/templates/pageNav.html

@@ -72,6 +72,7 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
       <div class="noOverflow inlineBlock" style="max-width: 171px"><%= ob.connectedServer.name %></div>
       <span class="pull-right txt-muted ion-arrow-right-b positionRelative" style="top: 4px"></span>
     </a>
+    <hr/>
     <a href="#userPage">
       <span class="ion-document-text fontSize12 marginRight2 textOpacity1"></span>
     	<%= polyglot.t('nav.myPage') %>

js/views/serverConnectModal.js

@@ -142,7 +142,7 @@ module.exports = BaseModal.extend({
   },
 
   onCancelClick: function(e) {
-    this.connectAttempt && this.connectAttempt.cancel();
+    this._connectAttempt && this._connectAttempt.cancel();
   },  
 
   onConnectClick: function(e) {
@@ -155,10 +155,10 @@ module.exports = BaseModal.extend({
 
     // todo: validate args
 
-    if (this.connectAttempt && this.connectAttempt.state() === 'pending') return this;
-
     this._connectedServer = configMd;
 
+    if (this._connectAttempt && this._connectAttempt.state() === 'pending') return this;
+
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
       status: 'connected'
@@ -178,8 +178,8 @@ 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._connectAttempt && this._connectAttempt.state() === 'pending') return this;
 
     this.serverConfigsVw.setConnectionState({
       id: configMd.id,
@@ -212,7 +212,7 @@ module.exports = BaseModal.extend({
         active configuration in the ServerConfigs collection.`);
     }
 
-    this.connectAttempt && this.connectAttempt.cancel();
+    this._connectAttempt && this._connectAttempt.cancel();
     this.hideMessageBar();
 
     if (this._connectedServer) {
@@ -232,16 +232,16 @@ module.exports = BaseModal.extend({
     this.setModalOptions({ showCloseButton: false });
     this.serverConfigs.setActive(configMd.id);
 
-    this.connectAttempt = this.attemptConnection().done(() => {
+    this._connectAttempt = this.attemptConnection().done(() => {
       this.succeedConnection(configMd);
     }).fail((reason) => {
       this.failConnection(reason, configMd)
     }).always(() => {
-      this.connectAttempt = null;
+      this._connectAttempt = null;
     });
 
-    this.connectAttempt.serverId = configMd.id;
-    connectAttempt = this.connectAttempt;
+    this._connectAttempt.serverId = configMd.id;
+    connectAttempt = this._connectAttempt;
 
     return connectAttempt;
   },
@@ -280,7 +280,6 @@ module.exports = BaseModal.extend({
       loginRequest = app.login().done(function(data) {
         if (data.success) {
           conclude(false, data);
-          self.trigger('connected', true);
         } else {
           if (data.reason === 'too many attempts') {
             conclude(true, 'failed-auth-too-many');
@@ -341,6 +340,10 @@ module.exports = BaseModal.extend({
     return this._connectedServer;
   },
 
+  getConnectAttempt: function() {
+    return this._connectAttempt;
+  },  
+
   close: function() {
     this.closeConfigForm();
     BaseModal.prototype.close.apply(this, arguments);