-
-
Notifications
You must be signed in to change notification settings - Fork 340
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
30ed28c
commit aaf7698
Showing
4 changed files
with
12 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -44,7 +44,7 @@ dependencies: { | |
* @license For commercial or closed source, contact us at [email protected] or purchase directly via CodeCanyon | ||
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 | ||
* @author Miroslav Pejic - [email protected] | ||
* @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'); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 [email protected] or purchase directly via CodeCanyon | ||
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 | ||
* @author Miroslav Pejic - [email protected] | ||
* @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: ` | ||
<br /> | ||
<div id="about"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ | |
* @license For commercial or closed source, contact us at [email protected] or purchase directly via CodeCanyon | ||
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970 | ||
* @author Miroslav Pejic - [email protected] | ||
* @version 1.5.19 | ||
* @version 1.5.20 | ||
* | ||
*/ | ||
|
||
|