Lint and a small bug
This commit is contained in:
+41
-18
@@ -173,7 +173,7 @@ class Room extends EventEmitter
|
|||||||
if (returning)
|
if (returning)
|
||||||
this._peerJoining(peer, true);
|
this._peerJoining(peer, true);
|
||||||
else if ( // Has a role that is allowed to bypass room lock
|
else if ( // Has a role that is allowed to bypass room lock
|
||||||
peer.roles.some((role) => config.accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
|
peer.roles.some((role) => accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
|
||||||
)
|
)
|
||||||
this._peerJoining(peer);
|
this._peerJoining(peer);
|
||||||
else if (this._locked)
|
else if (this._locked)
|
||||||
@@ -181,7 +181,7 @@ class Room extends EventEmitter
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Has a role that is allowed to bypass lobby
|
// Has a role that is allowed to bypass lobby
|
||||||
peer.roles.some((role) => config.accessFromRoles.BYPASS_LOBBY.includes(role)) ?
|
peer.roles.some((role) => accessFromRoles.BYPASS_LOBBY.includes(role)) ?
|
||||||
this._peerJoining(peer) :
|
this._peerJoining(peer) :
|
||||||
this._handleGuest(peer);
|
this._handleGuest(peer);
|
||||||
}
|
}
|
||||||
@@ -221,7 +221,7 @@ class Room extends EventEmitter
|
|||||||
this._lobby.on('peerRolesChanged', (peer) =>
|
this._lobby.on('peerRolesChanged', (peer) =>
|
||||||
{
|
{
|
||||||
if ( // Has a role that is allowed to bypass room lock
|
if ( // Has a role that is allowed to bypass room lock
|
||||||
peer.roles.some((role) => config.accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
|
peer.roles.some((role) => accessFromRoles.BYPASS_ROOM_LOCK.includes(role))
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this._lobby.promotePeer(peer.id);
|
this._lobby.promotePeer(peer.id);
|
||||||
@@ -231,7 +231,7 @@ class Room extends EventEmitter
|
|||||||
|
|
||||||
if ( // Has a role that is allowed to bypass lobby
|
if ( // Has a role that is allowed to bypass lobby
|
||||||
!this._locked &&
|
!this._locked &&
|
||||||
peer.roles.some((role) => config.accessFromRoles.BYPASS_LOBBY.includes(role))
|
peer.roles.some((role) => accessFromRoles.BYPASS_LOBBY.includes(role))
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this._lobby.promotePeer(peer.id);
|
this._lobby.promotePeer(peer.id);
|
||||||
@@ -591,7 +591,7 @@ class Room extends EventEmitter
|
|||||||
peers : peerInfos,
|
peers : peerInfos,
|
||||||
tracker : config.fileTracker,
|
tracker : config.fileTracker,
|
||||||
authenticated : peer.authenticated,
|
authenticated : peer.authenticated,
|
||||||
permissionsFromRoles : config.permissionsFromRoles,
|
permissionsFromRoles : permissionsFromRoles,
|
||||||
userRoles : userRoles
|
userRoles : userRoles
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -723,7 +723,8 @@ class Room extends EventEmitter
|
|||||||
|
|
||||||
if (
|
if (
|
||||||
appData.source === 'screen' &&
|
appData.source === 'screen' &&
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.SHARE_SCREEN.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.SHARE_SCREEN.includes(role))
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1026,7 +1027,7 @@ class Room extends EventEmitter
|
|||||||
case 'chatMessage':
|
case 'chatMessage':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.SEND_CHAT.includes(role))
|
!peer.roles.some((role) => permissionsFromRoles.SEND_CHAT.includes(role))
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1049,7 +1050,9 @@ class Room extends EventEmitter
|
|||||||
case 'moderator:clearChat':
|
case 'moderator:clearChat':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_CHAT.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.MODERATE_CHAT.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1087,7 +1090,9 @@ class Room extends EventEmitter
|
|||||||
case 'lockRoom':
|
case 'lockRoom':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1107,7 +1112,9 @@ class Room extends EventEmitter
|
|||||||
case 'unlockRoom':
|
case 'unlockRoom':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.CHANGE_ROOM_LOCK.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1167,7 +1174,9 @@ class Room extends EventEmitter
|
|||||||
case 'promotePeer':
|
case 'promotePeer':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.PROMOTE_PEER.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.PROMOTE_PEER.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1184,7 +1193,9 @@ class Room extends EventEmitter
|
|||||||
case 'promoteAllPeers':
|
case 'promoteAllPeers':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.PROMOTE_PEER.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.PROMOTE_PEER.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1199,7 +1210,9 @@ class Room extends EventEmitter
|
|||||||
case 'sendFile':
|
case 'sendFile':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.SHARE_FILE.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.SHARE_FILE.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1222,7 +1235,9 @@ class Room extends EventEmitter
|
|||||||
case 'moderator:clearFileSharing':
|
case 'moderator:clearFileSharing':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_FILES.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.MODERATE_FILES.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1258,7 +1273,9 @@ class Room extends EventEmitter
|
|||||||
case 'moderator:muteAll':
|
case 'moderator:muteAll':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1273,7 +1290,9 @@ class Room extends EventEmitter
|
|||||||
case 'moderator:stopAllVideo':
|
case 'moderator:stopAllVideo':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1288,7 +1307,9 @@ class Room extends EventEmitter
|
|||||||
case 'moderator:closeMeeting':
|
case 'moderator:closeMeeting':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
@@ -1305,7 +1326,9 @@ class Room extends EventEmitter
|
|||||||
case 'moderator:kickPeer':
|
case 'moderator:kickPeer':
|
||||||
{
|
{
|
||||||
if (
|
if (
|
||||||
!peer.roles.some((role) => config.permissionsFromRoles.MODERATE_ROOM.includes(role))
|
!peer.roles.some(
|
||||||
|
(role) => permissionsFromRoles.MODERATE_ROOM.includes(role)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
throw new Error('peer not authorized');
|
throw new Error('peer not authorized');
|
||||||
|
|
||||||
|
|||||||
+15
-3
@@ -199,7 +199,7 @@ function setupLTI(ltiConfig)
|
|||||||
if (lti.user_id && lti.custom_room)
|
if (lti.user_id && lti.custom_room)
|
||||||
{
|
{
|
||||||
user.id = lti.user_id;
|
user.id = lti.user_id;
|
||||||
user._userinfo = { "lti" : lti };
|
user._userinfo = { 'lti': lti };
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lti.custom_room)
|
if (lti.custom_room)
|
||||||
@@ -240,8 +240,18 @@ function setupOIDC(oidcIssuer)
|
|||||||
// redirect_uri defaults to client.redirect_uris[0]
|
// redirect_uri defaults to client.redirect_uris[0]
|
||||||
// response type defaults to client.response_types[0], then 'code'
|
// response type defaults to client.response_types[0], then 'code'
|
||||||
// scope defaults to 'openid'
|
// scope defaults to 'openid'
|
||||||
const params = (({clinet_id, redirect_uri, scope})=>({clinet_id, redirect_uri, scope}))(config.auth.oidc.clientOptions);
|
|
||||||
|
|
||||||
|
/* eslint-disable camelcase */
|
||||||
|
const params = (({
|
||||||
|
client_id,
|
||||||
|
redirect_uri,
|
||||||
|
scope
|
||||||
|
}) => ({
|
||||||
|
client_id,
|
||||||
|
redirect_uri,
|
||||||
|
scope
|
||||||
|
}))(config.auth.oidc.clientOptions);
|
||||||
|
/* eslint-enable camelcase */
|
||||||
|
|
||||||
// optional, defaults to false, when true req is passed as a first
|
// optional, defaults to false, when true req is passed as a first
|
||||||
// argument to verify fn
|
// argument to verify fn
|
||||||
@@ -256,7 +266,9 @@ function setupOIDC(oidcIssuer)
|
|||||||
{ client: oidcClient, params, passReqToCallback, usePKCE },
|
{ client: oidcClient, params, passReqToCallback, usePKCE },
|
||||||
(tokenset, userinfo, done) =>
|
(tokenset, userinfo, done) =>
|
||||||
{
|
{
|
||||||
if (userinfo && tokenset) {
|
if (userinfo && tokenset)
|
||||||
|
{
|
||||||
|
// eslint-disable-next-line camelcase
|
||||||
userinfo._tokenset_claims = tokenset.claims();
|
userinfo._tokenset_claims = tokenset.claims();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user