Fixes and enhancements

[vchess.git] / client / src / store.js

diff --git a/client/src/store.js b/client/src/store.js
index a1e432f..52a5247 100644 (file)
--- a/client/src/store.js
+++ b/client/src/store.js
@@ -1,6 +1,5 @@
 import { ajax } from "./utils/ajax";
 import { getRandString } from "./utils/alea";
-import params from "./parameters"; //for socket connection
 
 // Global store: see https://medium.com/fullstackio/managing-state-in-vue-js-23a0352b1c87
 export const store =
@@ -9,23 +8,22 @@ export const store =
     variants: [],
     tr: {},
     user: {},
-    conn: null,
     settings: {},
     lang: "",
   },
   socketCloseListener: null,
-  initialize(page) {
+  initialize() {
     ajax("/variants", "GET", res => { this.state.variants = res.variantArray; });
-    let mysid = localStorage["mysid"];
+    let mysid = localStorage.getItem("mysid");
     if (!mysid)
     {
       mysid = getRandString();
-      localStorage["mysid"] = mysid; //done only once (unless user clear browser data)
+      localStorage.setItem("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"
+      id: localStorage.getItem("myid") || 0,
+      name: localStorage.getItem("myname") || "", //"" for "anonymous"
       email: "", //unknown yet
       notify: false, //email notifications
       sid: mysid,
@@ -34,19 +32,20 @@ export const store =
     // 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;
     });
-    const supportedLangs = ["en","es","fr"];
-    this.state.lang = localStorage["lang"] ||
-      (supportedLangs.includes(navigator.language)
-        ? navigator.language
-        : "en");
-    this.setTranslations();
-    // Initialize connection (even if the current page doesn't need it)
-    this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + mysid +
-      "&page=" + encodeURIComponent(page));
     // Settings initialized with values from localStorage
     this.state.settings = {
       bcolor: localStorage.getItem("bcolor") || "lichess",
@@ -54,12 +53,12 @@ export const store =
       hints: localStorage.getItem("hints") == "true",
       highlight: localStorage.getItem("highlight") == "true",
     };
-    this.socketCloseListener = () => {
-      // Next line may fail at first, but should retry and eventually success (TODO?)
-      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)
+        ? navigator.language
+        : "en");
+    this.setTranslations();
   },
   updateSetting: function(propName, value) {
     this.state.settings[propName] = value;