GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2025-10-31 22:30:31 +01:00
Code Issues Releases Activity

Fix infinity redirect loop when WS error occurs

Browse Source 
There were situations when reForis infinity loop had occurred when the user was
already logged in, but the client rejected the `wss` connection. The location
path was not `/login`, and an infinity redirect took place. This should fix it.
This commit is contained in:
Aleksandr Gumroian
2021-06-14 17:29:33 +02:00
parent 67b8386cd0
commit f3b1ef741a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/webSockets/WebSockets.js
View File

@@ -21,13 +21,13 @@ export class WebSockets {
constructor() { constructor() {
this.ws = new WebSocket(URL); this.ws = new WebSocket(URL);
this.ws.onerror = (e) => { this.ws.onerror = (e) => {
if (window.location.pathname !== ForisURLs.login) { if (!window.initialData.logged) {
console.error( console.error(
"WS: Error observed, you aren't logged probably." "WS: Error observed, you aren't logged probably."
); );
window.location.replace(ForisURLs.login); window.location.replace(ForisURLs.login);
} }
console.error(`WS: Error: ${e}`); console.error("WS: Error:", e);
}; };
this.ws.onmessage = (e) => { this.ws.onmessage = (e) => {
console.debug(`WS: Received Message: ${e.data}`); console.debug(`WS: Received Message: ${e.data}`);