[mirotalksfu] - #161 add displayname
هذا الالتزام موجود في:
@@ -43,7 +43,7 @@ dependencies: {
|
|||||||
* @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
|
* @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
|
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
|
||||||
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
|
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
|
||||||
* @version 1.5.50
|
* @version 1.5.51
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -2919,7 +2919,9 @@ function startServer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function isRoomAllowedForUser(message, username, room) {
|
function isRoomAllowedForUser(message, username, room) {
|
||||||
log.debug('isRoomAllowedForUser ------>', { message, username, room });
|
const logData = { message, username, room };
|
||||||
|
|
||||||
|
log.debug('isRoomAllowedForUser ------>', logData);
|
||||||
|
|
||||||
const isOIDCEnabled = config.oidc && config.oidc.enabled;
|
const isOIDCEnabled = config.oidc && config.oidc.enabled;
|
||||||
|
|
||||||
@@ -2931,7 +2933,7 @@ function startServer() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = hostCfg.users.find((user) => user.username === username);
|
const user = hostCfg.users.find((user) => user.displayname === username || user.username === username);
|
||||||
|
|
||||||
if (!isOIDCEnabled && !user) {
|
if (!isOIDCEnabled && !user) {
|
||||||
log.debug('isRoomAllowedForUser - user not found', username);
|
log.debug('isRoomAllowedForUser - user not found', username);
|
||||||
@@ -2941,8 +2943,7 @@ function startServer() {
|
|||||||
if (
|
if (
|
||||||
isOIDCEnabled ||
|
isOIDCEnabled ||
|
||||||
!user.allowed_rooms ||
|
!user.allowed_rooms ||
|
||||||
user.allowed_rooms.includes('*') ||
|
(user.allowed_rooms && (!user.allowed_rooms.includes('*') || !user.allowed_rooms.includes(room)))
|
||||||
user.allowed_rooms.includes(room)
|
|
||||||
) {
|
) {
|
||||||
log.debug('isRoomAllowedForUser - user room allowed', room);
|
log.debug('isRoomAllowedForUser - user room allowed', room);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -177,16 +177,19 @@ module.exports = {
|
|||||||
{
|
{
|
||||||
username: 'username',
|
username: 'username',
|
||||||
password: 'password',
|
password: 'password',
|
||||||
|
displayname: 'username displayname',
|
||||||
allowed_rooms: ['*'],
|
allowed_rooms: ['*'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
username: 'username2',
|
username: 'username2',
|
||||||
password: 'password2',
|
password: 'password2',
|
||||||
|
displayname: 'username2 displayname',
|
||||||
allowed_rooms: ['room1', 'room2'],
|
allowed_rooms: ['room1', 'room2'],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
username: 'username3',
|
username: 'username3',
|
||||||
password: 'password3',
|
password: 'password3',
|
||||||
|
displayname: 'username3 displayname',
|
||||||
},
|
},
|
||||||
//...
|
//...
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "mirotalksfu",
|
"name": "mirotalksfu",
|
||||||
"version": "1.5.50",
|
"version": "1.5.51",
|
||||||
"description": "WebRTC SFU browser-based video calls",
|
"description": "WebRTC SFU browser-based video calls",
|
||||||
"main": "Server.js",
|
"main": "Server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -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 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
|
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
|
||||||
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
|
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
|
||||||
* @version 1.5.50
|
* @version 1.5.51
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -4436,7 +4436,7 @@ function showAbout() {
|
|||||||
imageUrl: image.about,
|
imageUrl: image.about,
|
||||||
customClass: { image: 'img-about' },
|
customClass: { image: 'img-about' },
|
||||||
position: 'center',
|
position: 'center',
|
||||||
title: 'WebRTC SFU v1.5.50',
|
title: 'WebRTC SFU v1.5.51',
|
||||||
html: `
|
html: `
|
||||||
<br />
|
<br />
|
||||||
<div id="about">
|
<div id="about">
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
* @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
|
* @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
|
* @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
|
||||||
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
|
* @author Miroslav Pejic - miroslav.pejic.85@gmail.com
|
||||||
* @version 1.5.50
|
* @version 1.5.51
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
المرجع في مشكلة جديدة
حظر مستخدم