X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fstore.js;h=9d1c6e6285b6d9e25f0f48f1fca1e2db5d4d5796;hp=935005abd4aee03113d92e13bbb712db362d8695;hb=98f485791e915563996de4f37430b285ffc773ae;hpb=d737116438d84785f2cee6661b35c18fef039a64 diff --git a/client/src/store.js b/client/src/store.js index 935005ab..9d1c6e62 100644 --- a/client/src/store.js +++ b/client/src/store.js @@ -14,22 +14,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 = {