X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Frouter.js;h=ae298a7e1172249a879e5b5f6fd75bf088587392;hb=98f485791e915563996de4f37430b285ffc773ae;hp=2030397a8dc95c5a09fc0b3d8b24d7977267d6ed;hpb=1aeed627be63a298d3a093797c3728e3de30b464;p=vchess.git

diff --git a/client/src/router.js b/client/src/router.js
index 2030397a..ae298a7e 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -37,29 +37,21 @@ export default new Router({
           "GET",
           {token: to.params["token"]},
           (res) => {
-            store.state.user.id = res.id;
-            store.state.user.name = res.name;
+            if (!res.errmsg) //if not already logged in
+            {
+              store.state.user.id = res.id;
+              store.state.user.name = res.name;
+              store.state.user.email = res.email;
+              store.state.user.notify = res.notify;
+              localStorage["myname"] = res.name;
+              localStorage["myid"] = res.id;
+            }
+            next();
           }
         );
-        next();
       },
-      redirect: "/",
-    },
-    {
-      path: "/logout",
-      name: "logout",
-      beforeEnter: (to, from, next) => {
-        ajax(
-          "/logout",
-          "GET",
-          () => {
-            store.state.user.id = 0;
-            store.state.user.name = ""; //TODO: localStorage myId myname mysid ?
-          }
-        );
-        next();
-      },
-      redirect: "/",
+      component: Hall,
+      //redirect: "/", //problem: redirection before end of AJAX request
     },
 //    {
 //      path: "/about",