X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=0234807f4c17edd815b0a2f1a1dc88c1d6e50b8d;hb=5ea8d11307ef9e50bdd0b93708570976f3f6012e;hp=12c756cf29ff828ea7f9540b0fb617a1123a558a;hpb=317b8a5610953b30cfb84382bd13764177ce830b;p=vchess.git

diff --git a/client/src/store.js b/client/src/store.js
index 12c756cf..0234807f 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -14,7 +14,7 @@ export const store =
     lang: "",
   },
   socketCloseListener: null,
-  initialize() {
+  initialize(page) {
     ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
     let mysid = localStorage["mysid"];
     if (!mysid)
@@ -22,6 +22,7 @@ export const store =
       mysid = getRandString();
       localStorage["mysid"] = mysid; //done only once (unless user clear browser data)
     }
+    // Quick user setup using local storage:
     this.state.user = {
       id: localStorage["myid"] || 0,
       name: localStorage["myname"] || "", //"" for "anonymous"
@@ -29,24 +30,16 @@ export const store =
       notify: false, //email notifications
       sid: mysid,
     };
-    if (this.state.user.id > 0)
-    {
-      ajax("/whoami", "GET", res => {
-        this.state.user.email = res.email;
-        this.state.user.notify = res.notify;
-      });
-      // TODO: fetch is simpler, but does not set req.xhr (for security check)
-//      fetch(params.serverUrl + "/whoami", {
-//        method: "GET",
-//        credentials: params.cors ? "include" : "omit",
-//      }).then((res) => {
-//        return res.json()
-//      }).then((user) => {
-//        this.state.user.email = user.email;
-//        this.state.user.notify = user.notify;
-//      });
-    }
-    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
+    // Slow verification through the server:
+    // NOTE: still superficial identity usurpation possible, but difficult.
+    ajax("/whoami", "GET", res => {
+      this.state.user.id = res.id;
+      this.state.user.name = res.name;
+      this.state.user.email = res.email;
+      this.state.user.notify = res.notify;
+    });
+    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
+      "&page=" + encodeURIComponent(page));
     // Settings initialized with values from localStorage
     this.state.settings = {
       bcolor: localStorage["bcolor"] || "lichess",
@@ -58,14 +51,15 @@ export const store =
     };
     this.socketCloseListener = () => {
       // Next line may fail at first, but should retry and eventually success (TODO?)
-      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
+      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
+        "&page=" + encodeURIComponent(page));
     };
     this.state.conn.onclose = this.socketCloseListener;
     const supportedLangs = ["en","es","fr"];
     this.state.lang = localStorage["lang"] ||
-      supportedLangs.includes(navigator.language)
+      (supportedLangs.includes(navigator.language)
         ? navigator.language
-        : "en";
+        : "en");
     this.setTranslations();
   },
   setTranslations: async function() {