X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=f8b6b24e098b1d4b48b1bfa3f853cf8a2e0acbec;hp=10ad10e694bffdafd592cb964ae1e56331a4d0ff;hb=HEAD;hpb=f0c68a04e31bb6a4b2f8b94a532ef3ca2eebbe3e

diff --git a/client/src/store.js b/client/src/store.js
index 10ad10e6..f8b6b24e 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,8 +1,10 @@
-// NOTE: do not use ajax() here because ajax.js require the store for translations
+// NOTE: do not use ajax() here because ajax.js requires the store
 import params from "./parameters"; //for server URL
 import { getRandString } from "./utils/alea";
+import { delCookie } from "./utils/cookie";
 
-// Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
+// Global store: see
+// https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
 export const store = {
   state: {
     variants: [],
@@ -11,16 +13,26 @@ export const store = {
     settings: {},
     lang: ""
   },
-  socketCloseListener: null,
   initialize() {
+    const headers = {
+      "Content-Type": "application/json;charset=UTF-8",
+      "X-Requested-With": "XMLHttpRequest"
+    };
     fetch(
-      params.serverUrl + "/variants",
-      {method: "GET"},
+      params.serverUrl + "/allvarslist",
+      {
+        method: "GET",
+        headers: headers
+      }
     )
     .then(res => res.json())
     .then(json => {
-      this.state.variants = json.variantArray.sort(
-        (v1,v2) => v1.name.localeCompare(v2.name));
+      if (!Array.isArray(json.variantArray)) {
+        alert("Variants loading failed: reload the page");
+        return;
+      }
+      this.state.variants = json.variantArray
+        .sort((v1,v2) => v1.name.localeCompare(v2.name));
     });
     let mysid = localStorage.getItem("mysid");
     // Assign mysid only once (until next time user clear browser data)
@@ -30,56 +42,64 @@ export const store = {
     }
     // Quick user setup using local storage:
     this.state.user = {
-      id: localStorage.getItem("myid") || 0,
+      id: parseInt(localStorage.getItem("myid") || "0", 10),
       name: localStorage.getItem("myname") || "", //"" for "anonymous"
       email: "", //unknown yet
       notify: false, //email notifications
       sid: mysid
     };
     // Slow verification through the server:
-    // NOTE: still superficial identity usurpation possible, but difficult.
     fetch(
       params.serverUrl + "/whoami",
       {
         method: "GET",
+        headers: headers,
         credentials: params.credentials
       }
     )
     .then(res => res.json())
     .then(json => {
-      this.state.user.id = json.id;
-      const storedId = localStorage.getItem("myid");
-      if (json.id > 0 && !storedId)
-        // User cleared localStorage
-        localStorage.setItem("myid", json.id);
-      else if (json.id == 0 && !!storedId)
-        // User cleared cookie
-        localStorage.removeItem("myid");
-      this.state.user.name = json.name;
-      const storedName = localStorage.getItem("myname");
-      if (!!json.name && !storedName)
-        // User cleared localStorage
-        localStorage.setItem("myname", json.name);
-      else if (!json.name && !!storedName)
-        // User cleared cookie
-        localStorage.removeItem("myname");
-      this.state.user.email = json.email;
-      this.state.user.notify = json.notify;
+      if (!json.id) {
+        // Removed, or wrong token
+        if (this.state.user.id > 0) {
+          this.state.user.id = 0;
+          localStorage.removeItem("myid");
+        }
+        if (!!this.state.user.name) {
+          this.state.user.name = "";
+          localStorage.removeItem("myname");
+        }
+        if (document.cookie.indexOf("token") >= 0) delCookie("token");
+      }
+      else {
+        if (this.state.user.id != json.id) {
+          this.state.user.id = json.id;
+          localStorage.setItem("myid", json.id);
+        }
+        if (this.state.user.name != json.name) {
+          this.state.user.name = json.name;
+          localStorage.setItem("myname", json.name);
+        }
+        this.state.user.email = json.email;
+        this.state.user.notify = json.notify;
+      }
     });
     // Settings initialized with values from localStorage
-    const getItemDefaultTrue = (item) => {
+    const getItemDefault = (item, defaut) => {
       const value = localStorage.getItem(item);
-      if (!value) return true;
+      if (!value) return defaut;
       return value == "true";
     };
     this.state.settings = {
       bcolor: localStorage.getItem("bcolor") || "lichess",
-      sound: getItemDefaultTrue("sound"),
-      hints: getItemDefaultTrue("hints"),
-      highlight: getItemDefaultTrue("highlight")
+      sound: getItemDefault("sound", true),
+      hints: getItemDefault("hints", true),
+      highlight: getItemDefault("highlight", true),
+      gotonext: getItemDefault("gotonext", true),
+      scrollmove: getItemDefault("scrollmove", false)
     };
     const supportedLangs = ["en", "es", "fr"];
-    const navLanguage = navigator.language.substr(0,2);
+    const navLanguage = navigator.language.substr(0, 2);
     this.state.lang =
       localStorage["lang"] ||
       (supportedLangs.includes(navLanguage) ? navLanguage : "en");