From 9a9e43a6509ea87630777cc36ea913f02d14c7d5 Mon Sep 17 00:00:00 2001
From: Miroslav Pejic <miroslav.pejic.85@gmail.com>
Date: Wed, 6 Sep 2023 15:52:57 +0200
Subject: [PATCH] [mirotalksfu] - #125 improvements

---
 app/src/Server.js       |  6 ++++++
 public/js/Room.js       |  1 +
 public/views/login.html | 24 +++++++++++++++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/src/Server.js b/app/src/Server.js
index 599a2478..a31aa761 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -279,6 +279,9 @@ function startServer() {
                 return res.sendFile(views.room);
             }
         }
+        if (hostCfg.protected) {
+            return res.sendFile(views.login);
+        }
         res.redirect('/');
     });
 
@@ -287,6 +290,9 @@ function startServer() {
         if (hostCfg.authenticated) {
             res.sendFile(views.room);
         } else {
+            if (hostCfg.protected) {
+                return res.sendFile(views.login);
+            }
             res.redirect('/');
         }
     });
diff --git a/public/js/Room.js b/public/js/Room.js
index b26f069f..42c2b5e9 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -515,6 +515,7 @@ function getRoomPassword() {
         console.log('Direct join', { password: roomPassword });
         return roomPassword;
     }
+    return false;
 }
 
 // ####################################################
diff --git a/public/views/login.html b/public/views/login.html
index c8c813ca..9cff43ea 100644
--- a/public/views/login.html
+++ b/public/views/login.html
@@ -105,13 +105,12 @@
                                     </div>
                                 </div>
                                 <script>
+                                    console.log(window.location);
+
                                     const usernameInput = document.getElementById('username');
                                     const passwordInput = document.getElementById('password');
                                     const loginBtn = document.getElementById('loginButton');
 
-                                    const qs = new URLSearchParams(window.location.search);
-                                    const room = filterXSS(qs.get('room'));
-
                                     usernameInput.onkeyup = (e) => {
                                         if (e.keyCode === 13) {
                                             e.preventDefault();
@@ -133,6 +132,15 @@
                                         const username = filterXSS(document.getElementById('username').value);
                                         const password = filterXSS(document.getElementById('password').value);
 
+                                        // http://localhost:3010/join/?room=test
+                                        // http://localhost:3010/join/?room=test&password=0&name=mirotalksfu&audio=0&video=0&screen=0&notify=0
+                                        const qs = new URLSearchParams(window.location.search);
+                                        const room = filterXSS(qs.get('room'));
+
+                                        // http://localhost:3010/join/test
+                                        const pathParts = window.location.pathname.split('/');
+                                        const roomPath = pathParts[pathParts.length - 1];
+
                                         if (username && password) {
                                             axios
                                                 .post('/login', {
@@ -141,10 +149,16 @@
                                                 })
                                                 .then(function (response) {
                                                     console.log(response);
-                                                    // http://localhost:3010/?room=test
+
                                                     if (room) {
-                                                        return (window.location.href = '/join/' + room);
+                                                        return (window.location.href =
+                                                            '/join/' + window.location.search);
                                                     }
+
+                                                    if (roomPath) {
+                                                        return (window.location.href = '/join/' + roomPath);
+                                                    }
+
                                                     return (window.location.href = '/logged');
                                                 })
                                                 .catch(function (error) {