Jelajahi Sumber

Fixed issue where GitHub authentication doesn't work on mobile devices. Made it impossible for authenticted users to go to /login or /signup.

KrisVos130 9 tahun lalu
induk
melakukan
4293ac58de
2 mengubah file dengan 18 tambahan dan 10 penghapusan
  1. 2 8
      app/client/client.js
  2. 16 2
      app/client/routes.js

+ 2 - 8
app/client/client.js

@@ -137,10 +137,7 @@ Template.register.events({
     },
 
     "click #github-login": function(){
-        Meteor.loginWithGithub()
-        Accounts.onLogin(function(){
-            window.location.href = "/"
-        });
+        Meteor.loginWithGithub({loginStyle: "redirect"});
     }
 });
 
@@ -187,10 +184,7 @@ Template.login.events({
     },
 
     "click #github-login": function(){
-        Meteor.loginWithGithub()
-        Accounts.onLogin(function(){
-            window.location.href = "/"
-        });
+        Meteor.loginWithGithub({loginStyle: "redirect"});
     }
 });
 

+ 16 - 2
app/client/routes.js

@@ -9,11 +9,25 @@ Router.route("/", {
 });
 
 Router.route("/login", {
-    template: "login"
+    action: function() {
+        var user = Meteor.user();
+        if (user === undefined || user === null) {
+            this.render("login");
+        } else {
+            this.redirect("/");
+        }
+    }
 });
 
 Router.route("/signup", {
-    template: "register"
+    action: function() {
+        var user = Meteor.user();
+        if (user === undefined || user === null) {
+            this.render("register");
+        } else {
+            this.redirect("/");
+        }
+    }
 });
 
 Router.route("/terms", {