[mirotalksfu] - improvements

miroslavpejic85 · Oct 19, 2024 · b198ba8 · b198ba8
1 parent c1d9680
commit b198ba8
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/app/src/Server.js b/app/src/Server.js
@@ -55,7 +55,7 @@ dev dependencies: {
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.5.92
+ * @version 1.5.93
  *
  */
 
@@ -511,7 +511,12 @@ function startServer() {
                     if (isPeerPresenter && !hostCfg.users_from_db) {
                         const roomAllowedForUser = await isRoomAllowedForUser('Direct Join with token', username, room);
                         if (!roomAllowedForUser) {
-                            return res.status(401).json({ message: 'Direct Room Join for this User is Unauthorized' });
+                            log.warn('Direct Room Join for this User is Unauthorized', {
+                                username: username,
+                                room: room,
+                            });
+                            return res.redirect('/whoAreYou/' + room);
+                            //return res.status(401).json({ message: 'Direct Room Join for this User is Unauthorized' });
                         }
                     }
                 } catch (err) {
@@ -524,7 +529,9 @@ function startServer() {
                 const allowRoomAccess = isAllowedRoomAccess('/join/params', req, hostCfg, roomList, room);
                 const roomAllowedForUser = await isRoomAllowedForUser('Direct Join without token', name, room);
                 if (!allowRoomAccess && !roomAllowedForUser) {
-                    return res.status(401).json({ message: 'Direct Room Join Unauthorized' });
+                    log.warn('Direct Room Join Unauthorized', room);
+                    return res.redirect('/whoAreYou/' + room);
+                    //return res.status(401).json({ message: 'Direct Room Join Unauthorized' });
                 }
             }
 
@@ -578,9 +585,9 @@ function startServer() {
             }
             // 2. Protect room access with configuration check
             if (!OIDC.enabled && hostCfg.protected && !hostCfg.users_from_db) {
-                const roomExists = hostCfg.users.some(user => 
-                    user.allowed_rooms && user.allowed_rooms.includes(roomId)
-                );                
+                const roomExists = hostCfg.users.some(
+                    (user) => user.allowed_rooms && user.allowed_rooms.includes(roomId),
+                );
                 log.debug('/join/:roomId exists from config allowed rooms', roomExists);
                 return roomExists ? res.sendFile(views.room) : res.redirect('/whoAreYou/' + roomId);
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.5.92",
+    "version": "1.5.93",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {

diff --git a/public/js/Common.js b/public/js/Common.js
@@ -226,7 +226,8 @@ function joinRoom() {
         return;
     }
 
-    window.location.href = '/join/' + roomName;
+    //window.location.href = '/join/' + roomName;
+    window.location.href = '/join/?room=' + roomName;
     window.localStorage.lastRoom = roomName;
 }
 

diff --git a/public/js/Room.js b/public/js/Room.js
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.5.92
+ * @version 1.5.93
  *
  */
 
@@ -4500,7 +4500,7 @@ function showAbout() {
         imageUrl: image.about,
         customClass: { image: 'img-about' },
         position: 'center',
-        title: 'WebRTC SFU v1.5.92',
+        title: 'WebRTC SFU v1.5.93',
         html: `
         <br />
         <div id="about">

diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js
@@ -9,7 +9,7 @@
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.5.92
+ * @version 1.5.93
  *
  */