X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=13c600b77fcf9d619c4f5329ee76f269a2c4b494;hp=32347119caedfef7dec35c302402422c2b82925f;hb=eb2d61de8d569470fa329a484efe9bab420b2b82;hpb=7c3cd3794ee13c41fc623179f7d4142d0d3e74da

diff --git a/client/src/store.js b/client/src/store.js
index 32347119..13c600b7 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,47 +1,107 @@
-import { ajax } from "./utils/ajax";
+// 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 params from "./parameters"; //for socket connection
 
-export const store =
-{
+// Global store: see
+// https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
+export const store = {
   state: {
     variants: [],
     tr: {},
     user: {},
-    conn: null,
     settings: {},
-    lang: "",
+    lang: ""
   },
   initialize() {
-    ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
+    const headers = {
+      "Content-Type": "application/json;charset=UTF-8",
+      "X-Requested-With": "XMLHttpRequest"
+    };
+    fetch(
+      params.serverUrl + "/variants",
+      {
+        method: "GET",
+        headers: headers
+      }
+    )
+    .then(res => res.json())
+    .then(json => {
+      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)
+    if (!mysid) {
+      mysid = getRandString();
+      localStorage.setItem("mysid", mysid);
+    }
+    // Quick user setup using local storage:
     this.state.user = {
-      // id and name could be undefined
-      id: localStorage["myuid"],
-      name: localStorage["myname"],
+      id: localStorage.getItem("myid") || 0,
+      name: localStorage.getItem("myname") || "", //"" for "anonymous"
+      email: "", //unknown yet
+      notify: false, //email notifications
+      sid: mysid
     };
-    // TODO: if there is a socket ID in localStorage, it means a live game was interrupted (and should resume)
-    const mysid = localStorage["mysid"] || getRandString();
-    this.state.conn = new WebSocket(params.socketUrl + "/?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;
+    });
     // Settings initialized with values from localStorage
+    const getItemDefaultTrue = (item) => {
+      const value = localStorage.getItem(item);
+      if (!value) return true;
+      return value == "true";
+    };
     this.state.settings = {
-      bcolor: localStorage["bcolor"] || "lichess",
-      sound: parseInt(localStorage["sound"]) || 2,
-      hints: parseInt(localStorage["hints"]) || 1,
-      coords: !!eval(localStorage["coords"]),
-      highlight: !!eval(localStorage["highlight"]),
-      sqSize: parseInt(localStorage["sqSize"]),
+      bcolor: localStorage.getItem("bcolor") || "lichess",
+      sound: getItemDefaultTrue("sound"),
+      hints: getItemDefaultTrue("hints"),
+      highlight: getItemDefaultTrue("highlight"),
+      gotonext: getItemDefaultTrue("gotonext"),
     };
-    const socketCloseListener = () => {
-      this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid);
-    }
-    this.state.conn.onclose = socketCloseListener;
-    const supportedLangs = ["en","es","fr"];
-    this.state.lang = localStorage["lang"] ||
-      supportedLangs.includes(navigator.language)
-        ? navigator.language
-        : "en";
+    const supportedLangs = ["en", "es", "fr"];
+    const navLanguage = navigator.language.substr(0, 2);
+    this.state.lang =
+      localStorage["lang"] ||
+      (supportedLangs.includes(navLanguage) ? navLanguage : "en");
     this.setTranslations();
   },
+  updateSetting: function(propName, value) {
+    this.state.settings[propName] = value;
+    localStorage.setItem(propName, value);
+  },
   setTranslations: async function() {
     // Import translations from "./translations/$lang.js"
     const tModule = await import("@/translations/" + this.state.lang + ".js");
@@ -50,5 +110,5 @@ export const store =
   setLanguage(lang) {
     this.state.lang = lang;
     this.setTranslations();
-  },
+  }
 };