mirror of
				https://gitlab.nic.cz/turris/reforis/foris-js.git
				synced 2025-11-03 23:00:31 +01:00 
			
		
		
		
	Merge branch 'fix-ios-redirect-loop' into 'dev'
Fix iOS redirect loop Closes #19 See merge request turris/reforis/foris-js!154
This commit is contained in:
		
							
								
								
									
										21159
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										21159
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -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.
 | 
			
		||||
 * See /LICENSE for more information.
 | 
			
		||||
@@ -7,8 +7,6 @@
 | 
			
		||||
 | 
			
		||||
/* eslint no-console: "off" */
 | 
			
		||||
 | 
			
		||||
import { ForisURLs } from "../utils/forisUrls";
 | 
			
		||||
 | 
			
		||||
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
 | 
			
		||||
 | 
			
		||||
const URL = process.env.LIGHTTPD
 | 
			
		||||
@@ -21,13 +19,7 @@ export class WebSockets {
 | 
			
		||||
    constructor() {
 | 
			
		||||
        this.ws = new WebSocket(URL);
 | 
			
		||||
        this.ws.onerror = (e) => {
 | 
			
		||||
            if (window.location.pathname !== ForisURLs.login) {
 | 
			
		||||
                console.error(
 | 
			
		||||
                    "WS: Error observed, you aren't logged probably."
 | 
			
		||||
                );
 | 
			
		||||
                window.location.replace(ForisURLs.login);
 | 
			
		||||
            }
 | 
			
		||||
            console.error(`WS: Error: ${e}`);
 | 
			
		||||
            console.error("WS: Error observed:", e);
 | 
			
		||||
        };
 | 
			
		||||
        this.ws.onmessage = (e) => {
 | 
			
		||||
            console.debug(`WS: Received Message: ${e.data}`);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user