diff --git a/app/src/Server.js b/app/src/Server.js index 6fe2d748..8a337dc1 100644 --- a/app/src/Server.js +++ b/app/src/Server.js @@ -44,7 +44,7 @@ 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.19 + * @version 1.5.20 * */ @@ -488,7 +488,7 @@ function startServer() { isPeerValid = await isAuthPeer(username, password); isPeerPresenter = presenter === '1' || presenter === 'true'; - if (isPeerPresenter) { + if (isPeerPresenter && !hostCfg.users_from_db) { const roomAllowedForUser = isRoomAllowedForUser('Direct Join with token', username, room); if (!roomAllowedForUser) { return res.status(401).json({ message: 'Direct Room Join for this User is Unauthorized' }); @@ -1221,9 +1221,11 @@ function startServer() { return cb('unauthorized'); } - const roomAllowedForUser = isRoomAllowedForUser('[Join]', peer_name, room.id); - if (!roomAllowedForUser) { - return cb('notAllowed'); + if (!hostCfg.users_from_db) { + const roomAllowedForUser = isRoomAllowedForUser('[Join]', peer_name, room.id); + if (!roomAllowedForUser) { + return cb('notAllowed'); + } } } @@ -1305,7 +1307,7 @@ function startServer() { return cb('isLobby'); } - if ((hostCfg.protected || hostCfg.user_auth) && isPresenter) { + if ((hostCfg.protected || hostCfg.user_auth) && isPresenter && !hostCfg.users_from_db) { const roomAllowedForUser = isRoomAllowedForUser('[Join]', peer_name, room.id); if (!roomAllowedForUser) { return cb('notAllowed'); diff --git a/package.json b/package.json index d50a9dee..6dfe1d3a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mirotalksfu", - "version": "1.5.19", + "version": "1.5.20", "description": "WebRTC SFU browser-based video calls", "main": "Server.js", "scripts": { diff --git a/public/js/Room.js b/public/js/Room.js index 7fa1cdf0..dca0ba90 100644 --- 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.19 + * @version 1.5.20 * */ @@ -4299,7 +4299,7 @@ function showAbout() { imageUrl: image.about, customClass: { image: 'img-about' }, position: 'center', - title: 'WebRTC SFU v1.5.15', + title: 'WebRTC SFU v1.5.20', html: `
diff --git a/public/js/RoomClient.js b/public/js/RoomClient.js index 5997e2f3..97f731ac 100644 --- 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.19 + * @version 1.5.20 * */