Merge remote-tracking branch 'upstream/develop' into mm-exporter

server/config/config.example.js

@@ -38,6 +38,13 @@ module.exports =
 	// URI and key for requesting geoip-based TURN server closest to the client
 	turnAPIKey        : 'examplekey',
 	turnAPIURI        : 'https://example.com/api/turn',
+	turnAPIparams	  :	{
+							'uri_schema'  : 'turn',
+							'transport'   : 'tcp',
+							'ip_ver'      : 'ipv4',
+							'servercount' : '2'	
+						},
+
 	// Backup turnservers if REST fails or is not configured
 	backupTurnServers : [
 		{
@@ -59,7 +66,7 @@ module.exports =
 		key  : `${__dirname}/../certs/mediasoup-demo.localhost.key.pem`
 	},
 	// listening Host or IP 
-	// If ommitted listens on every IP. ("0.0.0.0" and "::")
+	// If omitted listens on every IP. ("0.0.0.0" and "::")
 	//listeningHost: 'localhost',
 	// Listening port for https server.
 	listeningPort         : 443,

server/lib/Room.js

@@ -383,10 +383,7 @@ class Room extends EventEmitter
 						config.turnAPIURI,
 						{
 							params : {
-								'uri_schema'  : 'turn',
-								'transport'   : 'tcp',
-								'ip_ver'      : 'ipv4',
-								'servercount' : '2',
+								...config.turnAPIparams,
 								'api_key'     : config.turnAPIKey,
 								'ip'          : peer.socket.request.connection.remoteAddress
 							}

server/server.js

@@ -203,7 +203,7 @@ function setupLTI(ltiConfig)
 				if (lti.user_id && lti.custom_room)
 				{
 					user.id = lti.user_id;
-					user._lti = lti;
+					user._userinfo = { "lti" : lti };
 				}
 
 				if (lti.custom_room)
@@ -259,12 +259,15 @@ function setupOIDC(oidcIssuer)
 		{ client: oidcClient, params, passReqToCallback, usePKCE },
 		(tokenset, userinfo, done) =>
 		{
+			if (userinfo && tokenset) {
+				userinfo._tokenset_claims = tokenset.claims();
+			}
+
 			const user =
 			{
 				id        : tokenset.claims.sub,
 				provider  : tokenset.claims.iss,
-				_userinfo : userinfo,
-				_claims   : tokenset.claims
+				_userinfo : userinfo
 			};
 
 			return done(null, user);