X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=070b22cc374b58c52187a87b8135f543f0ab8804;hb=f6f2bef10910ddb3430a40f4ab393b225250234a;hp=935005abd4aee03113d92e13bbb712db362d8695;hpb=a7f9f050e44080e8caf888e3b230660abffa2400;p=vchess.git diff --git a/client/src/store.js b/client/src/store.js index 935005ab..070b22cc 100644 --- a/client/src/store.js +++ b/client/src/store.js @@ -2,6 +2,7 @@ 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 = { state: { @@ -14,22 +15,29 @@ export const store = }, initialize() { ajax("/variants", "GET", res => { this.state.variants = res.variantArray; }); + let mysid = localStorage["mysid"]; + if (!mysid) + { + mysid = getRandString(); + localStorage["mysid"] = mysid; //done only once (unless user clear browser data) + } this.state.user = { - id: 0, //unknown yet - name: "", //"anonymous" + id: localStorage["myid"] || 0, + name: localStorage["myname"] || "", //"" for "anonymous" email: "", //unknown yet notify: false, //email notifications - sid: localStorage["mysid"] || getRandString(), + sid: mysid, }; - ajax("/whoami", "GET", res => { - if (res.id > 0) - { - this.state.user.id = res.id; - this.state.user.name = res.name; + if (this.state.user.id > 0) + { + fetch(params.serverUrl + "/whoami", { + method: "GET", + credentials: params.cors ? "include" : "omit", + }).then((res) => { this.state.user.email = res.email; this.state.user.notify = res.notify; - } - }); + }); + } this.state.conn = new WebSocket(params.socketUrl + "/?sid=" + this.state.user.sid); // Settings initialized with values from localStorage this.state.settings = { @@ -42,7 +50,7 @@ export const store = }; 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"] ||