Merge pull request #26 from timothyarmes/verify-email-bug

Accounts.verifyEmail should not be called on the server.
meteor-useraccounts · Jan 8, 2016 · 9b8bfeb · 9b8bfeb
2 parents 2d98f3c + 74709a2
commit 9b8bfeb
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -194,7 +194,6 @@ AccountsTemplates.configureRoute = function(route, options) {
     }
 
     layoutRegions[contentRegion] = React.createElement(BlazeToReact, { blazeTemplate: template });
-
   }
 
   function doLayout() {
@@ -226,12 +225,14 @@ AccountsTemplates.configureRoute = function(route, options) {
           doLayout();
 
           var token = params.paramToken;
-          Accounts.verifyEmail(token, function(error) {
-            AccountsTemplates.setDisabled(false);
-            AccountsTemplates.submitCallback(error, route, function() {
-              AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.emailVerified);
-            });
-          });
+          if (Meteor.isClient) {
+             Accounts.verifyEmail(token, function(error) {
+               AccountsTemplates.setDisabled(false);
+               AccountsTemplates.submitCallback(error, route, function() {
+                 AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.emailVerified);
+               });
+             });
+          }
         }
       });
     } else {