X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=52870e0af4cd505204b32eef7f2ffee30ea004ae;hb=dfa6eb760d51263b051f72d0fe968458d369f187;hp=e8f4284bf6f4b709e49f7128ebf609452afd0812;hpb=c66a829b3770122fe0ff2fb9db8def9635bbc334;p=vchess.git

diff --git a/client/src/store.js b/client/src/store.js
index e8f4284b..52870e0a 100644
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,56 +1,82 @@
 import { ajax } from "./utils/ajax";
 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: ""
   },
+  socketCloseListener: null,
   initialize() {
-    ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
+    ajax("/variants", "GET", res => {
+      this.state.variants = res.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.
+    ajax("/whoami", "GET", res => {
+      this.state.user.id = res.id;
+      const storedId = localStorage.getItem("myid");
+      if (res.id > 0 && !storedId)
+        // User cleared localStorage
+        localStorage.setItem("myid", res.id);
+      else if (res.id == 0 && !!storedId)
+        // User cleared cookie
+        localStorage.removeItem("myid");
+      this.state.user.name = res.name;
+      const storedName = localStorage.getItem("myname");
+      if (!!res.name && !storedName)
+        // User cleared localStorage
+        localStorage.setItem("myname", res.name);
+      else if (!res.name && !!storedName)
+        // User cleared cookie
+        localStorage.removeItem("myname");
+      this.state.user.email = res.email;
+      this.state.user.notify = res.notify;
+    });
     // Settings initialized with values from localStorage
     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: parseInt(localStorage.getItem("sound")) || 1,
+      hints: localStorage.getItem("hints") == "true",
+      highlight: localStorage.getItem("highlight") == "true"
     };
-    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() {
-    // Fill modalWelcome, and import translations from "./translations/$lang.js"
-    document.getElementById("modalWelcome").innerHTML =
-      require("raw-loader!pug-plain-loader!@/welcome/" + this.state.lang + ".pug");
+    // Import translations from "./translations/$lang.js"
     const tModule = await import("@/translations/" + this.state.lang + ".js");
     this.state.tr = tModule.translations;
   },
   setLanguage(lang) {
     this.state.lang = lang;
     this.setTranslations();
-  },
+  }
 };