merge

2021-08-08 15:47:53 +02:00
parent e9e96c9e30
commit 73a2cec4df
5 changed files with 38 additions and 20 deletions
@@ -33,7 +33,19 @@ class ConnectionManager {
        localUserStore.setAuthToken(null);
        const state = localUserStore.generateState();
        const nonce = localUserStore.generateNonce();
-        window.location.assign(`http://${PUSHER_URL}/login-screen?state=${state}&nonce=${nonce}`);
+
+        let loginUrl = `${PUSHER_URL}/login-screen?state=${state}&nonce=${nonce}`
+
+        if (loginUrl.startsWith("/")) {
+            loginUrl = window.location.protocol +
+                "//" +
+                window.location.host +
+                loginUrl;
+        } else {
+            loginUrl = `http://` + loginUrl;
+        }
+        
+        window.location.assign(loginUrl);
    }

    public logout() {