fix so that login handlers run after registration

stormpath · Jul 14, 2016 · 6839124 · 6839124
1 parent 7afa483
commit 6839124
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/helpers/login-with-oauth-provider.js b/lib/helpers/login-with-oauth-provider.js
@@ -39,7 +39,7 @@ module.exports = function loginWithOAuthProvider(options, req, res) {
       });
     }
 
-    function continueWithHandlers(preHandler, postHandler) {
+    function continueWithHandlers(preHandler, postHandler, onCompleted) {
       preHandler(options, req, res, function (err) {
         if (err) {
           return oauth.errorResponder(req, res, err);
@@ -51,20 +51,22 @@ module.exports = function loginWithOAuthProvider(options, req, res) {
               return oauth.errorResponder(req, res, err);
             }
 
-            continueWithTokenExchange();
+            onCompleted();
           });
         }
 
-        continueWithTokenExchange();
+        onCompleted();
       });
     }
 
     if (preRegistrationHandler && providerAccountResult.created) {
-      return continueWithHandlers(preRegistrationHandler, postRegistrationHandler);
+      return continueWithHandlers(preRegistrationHandler, postRegistrationHandler, function () {
+        continueWithHandlers(preLoginHandler, postLoginHandler, continueWithTokenExchange);
+      });
     }
 
-    if (preLoginHandler && !providerAccountResult.created) {
-      return continueWithHandlers(preLoginHandler, postLoginHandler);
+    if (preLoginHandler) {
+      return continueWithHandlers(preLoginHandler, postLoginHandler, continueWithTokenExchange);
     }
 
     continueWithTokenExchange();