GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-26 00:21:36 +01:00
Code Issues Releases Activity

Merge branch 'fix-ios-redirect-loop' into 'dev'

Browse Source 
Fix iOS redirect loop

Closes #19

See merge request turris/reforis/foris-js!154
This commit is contained in:
Aleksandr Gumroian 2021-03-26 10:31:58 +00:00
commit 80d4dd914d
2 changed files with 21131 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21159
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
src/webSockets/WebSockets.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2020-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -7,8 +7,6 @@
/* eslint no-console: "off" */ /* eslint no-console: "off" */
import { ForisURLs } from "../utils/forisUrls";
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss"; const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
const URL = process.env.LIGHTTPD const URL = process.env.LIGHTTPD
@ -21,13 +19,7 @@ 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) { console.error("WS: Error observed:", e);
console.error(
"WS: Error observed, you aren't logged probably."
);
window.location.replace(ForisURLs.login);
}
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}`);