login auth request keeps spinning while making redirect

iliakan · iliakan · commit 4aa2e93a92bb · 2015-04-11T12:25:56.000+03:00
diff --git a/client/xhr.js b/client/xhr.js
@@ -47,26 +47,27 @@ function xhr(options) {
     body = JSON.stringify(body);
   }
 
-
-  request.addEventListener('loadstart', event => {
-    request.timeStart = Date.now();
-    var e = wrapEvent('xhrstart', event);
-    document.dispatchEvent(e);
-  });
-  request.addEventListener('loadend', event => {
-    var e = wrapEvent('xhrend', event);
-    document.dispatchEvent(e);
-  });
-  request.addEventListener('success', event => {
-    var e = wrapEvent('xhrsuccess', event);
-    e.result = event.result;
-    document.dispatchEvent(e);
-  });
-  request.addEventListener('fail', event => {
-    var e = wrapEvent('xhrfail', event);
-    e.reason = event.reason;
-    document.dispatchEvent(e);
-  });
+  if (!options.noDocumentEvents) {
+    request.addEventListener('loadstart', event => {
+      request.timeStart = Date.now();
+      var e = wrapEvent('xhrstart', event);
+      document.dispatchEvent(e);
+    });
+    request.addEventListener('loadend', event => {
+      var e = wrapEvent('xhrend', event);
+      document.dispatchEvent(e);
+    });
+    request.addEventListener('success', event => {
+      var e = wrapEvent('xhrsuccess', event);
+      e.result = event.result;
+      document.dispatchEvent(e);
+    });
+    request.addEventListener('fail', event => {
+      var e = wrapEvent('xhrfail', event);
+      e.reason = event.reason;
+      document.dispatchEvent(e);
+    });
+  }
 
   if (!options.raw) { // means we want json
     request.setRequestHeader("Accept", "application/json");
@@ -143,15 +144,6 @@ function xhr(options) {
 
 }
 
-function addUrlParam(url, name, value) {
-  var param = encodeURIComponent(name) + '=' + encodeURIComponent(value);
-  if (~url.indexOf('?')) {
-    return url + '&' + param;
-  } else {
-    return url + '?' + param;
-  }
-
-}
 
 document.addEventListener('xhrfail', function(event) {
   new notification.Error(event.reason);
diff --git a/handlers/auth/client/authModal.js b/handlers/auth/client/authModal.js
@@ -28,11 +28,6 @@ function AuthModal(options) {
   }
 
   var self = this;
-  if (!options.callback) {
-    options.callback = function() {
-      self.successRedirect();
-    };
-  }
 
   this.options = options;
   this.setContent(clientRender(loginForm));
@@ -168,7 +163,7 @@ AuthModal.prototype.initEventHandlers = function() {
     var request = this.request({
       method: 'POST',
       url:    '/auth/reverify',
-      body: payload
+      body:   payload
     });
 
     var self = this;
@@ -214,10 +209,10 @@ AuthModal.prototype.submitRegisterForm = function(form) {
   payload.append("successRedirect", this.options.successRedirect);
 
   var request = this.request({
-    method:          'POST',
-    url:             '/auth/register',
+    method:         'POST',
+    url:            '/auth/register',
     normalStatuses: [201, 400],
-    body: payload
+    body:           payload
   });
 
   var self = this;
@@ -226,15 +221,14 @@ AuthModal.prototype.submitRegisterForm = function(form) {
     if (this.status == 201) {
       self.setContent(clientRender(loginForm));
       self.showFormMessage(
-          "<p>С адреса notify@javascript.ru отправлено письмо со ссылкой-подтверждением.</p>" +
-          "<p><a href='#' data-action-verify-email='" + form.elements.email.value + "'>перезапросить подтверждение.</a></p>",
+        "<p>С адреса notify@javascript.ru отправлено письмо со ссылкой-подтверждением.</p>" +
+        "<p><a href='#' data-action-verify-email='" + form.elements.email.value + "'>перезапросить подтверждение.</a></p>",
         'success'
       );
       return;
     }
 
     if (this.status == 400) {
-      debugger;
       for (var field in event.result.errors) {
         self.showInputError(form.elements[field], event.result.errors[field]);
       }
@@ -263,10 +257,10 @@ AuthModal.prototype.submitForgotForm = function(form) {
   payload.append("successRedirect", this.options.successRedirect);
 
   var request = this.request({
-    method: 'POST',
-    url:    '/auth/forgot',
+    method:         'POST',
+    url:            '/auth/forgot',
     normalStatuses: [200, 404],
-    body: payload
+    body:           payload
   });
 
   var self = this;
@@ -325,22 +319,36 @@ AuthModal.prototype.submitLoginForm = function(form) {
 
   if (hasErrors) return;
 
-  var request = this.request({
-    method: 'POST',
-    url:    '/auth/login/local',
+  var request = xhr({
+    method:           'POST',
+    url:              '/auth/login/local',
+    noDocumentEvents: true, // we handle all events/errors in this code
     normalStatuses: [200, 401],
-    body: new FormData(form)
+    body:             new FormData(form)
   });
 
-  var self = this;
-  request.addEventListener('success', function(event) {
+  var onEnd = this.startRequestIndication();
+
+  request.addEventListener('success', (event) => {
 
-    if (this.status != 200) {
-      self.onAuthFailure(event.result.message);
+    if (request.status == 401) {
+      onEnd();
+      this.onAuthFailure(event.result.message);
       return;
     }
 
-    self.onAuthSuccess(event.result.user);
+    // don't stop progress indication if login successful && we're making redirect
+    if (!this.options.callback) {
+      this.onAuthSuccess(event.result.user);
+    } else {
+      onEnd();
+      this.onAuthSuccess(event.result.user);
+    }
+  });
+
+  request.addEventListener('fail', (event) => {
+    onEnd();
+    this.onAuthFailure(event.reason);
   });
 
 };
@@ -362,7 +370,11 @@ AuthModal.prototype.openAuthPopup = function(url) {
  */
 AuthModal.prototype.onAuthSuccess = function(user) {
   window.currentUser = user;
-  this.options.callback();
+  if (this.options.callback) {
+    this.options.callback();
+  } else {
+    this.successRedirect();
+  }
 };
 
 
diff --git a/handlers/auth/strategies/localStrategy.js b/handlers/auth/strategies/localStrategy.js
@@ -18,6 +18,9 @@ module.exports = new LocalStrategy({
 
   co(function*() {
 
+    // @tyv UNCOMMENT SPINNER
+    // yield function(callback) {};
+
     if (!email) throw new UserAuthError('Укажите email.');
     if (!password) throw new UserAuthError('Укажите пароль.');
 
diff --git a/pm2/post_deploy.sh b/pm2/post_deploy.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
 
+# Hard upgrade:
 # stop
 # migrations
 # start
 
+# Regular upgrade (this script):
+# reload
 
+# this causes several seconds downtime, uncomment when the upgrade is required
 #/usr/local/bin/pm2 updatePM2
 
   # fixme: switch to startOrGracefulReload with 2 processes, with 1 process it doesn't actually restart the process
