don't redirect to login if already on an AT route

meteor-useraccounts · Aug 10, 2015 · aa83215 · aa83215
1 parent ef29c61
commit aa83215
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/lib/client/client.js b/lib/client/client.js
@@ -51,18 +51,22 @@ AccountsTemplates.setPrevPath = function(newPath) {
 
 AccountsTemplates.ensureSignedIn = function(context, redirect) {
   if (!Meteor.userId()) {
-    AccountsTemplates.setState(AccountsTemplates.options.defaultState, function() {
-      var err = AccountsTemplates.texts.errors.mustBeLoggedIn;
-      AccountsTemplates.state.form.set("error", [err]);
-    });
+    // if we're not already on an AT route
+    if (!_.contains(AccountsTemplates.knownRoutes, context.path)) {
+
+      AccountsTemplates.setState(AccountsTemplates.options.defaultState, function() {
+        var err = AccountsTemplates.texts.errors.mustBeLoggedIn;
+        AccountsTemplates.state.form.set("error", [err]);
+      });
 
-    // used after the signIn is submitted
-    AccountsTemplates.avoidDefaultRedirect = true;
-    AccountsTemplates.redirectToPrevPath = true;
+      // redirect settings
+      AccountsTemplates.avoidDefaultRedirect = true;
+      AccountsTemplates.redirectToPrevPath = true;
 
-    // redirect to defined sign-in route and then redirect back
-    // to original route after successful sign in
-    redirect('signIn');
+      // redirect to defined sign-in route and then redirect back
+      // to original route after successful sign in
+      redirect('signIn');
+    }
   }
 };