Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for auth because of updated signaling

master
Håvar Aambø Fosstveit 2019-06-03 14:04:15 +02:00
parent 65f320cd48
commit 8a98f9b841
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server/server.js
View File

@ -161,33 +161,33 @@ async function setupAuth(oidcIssuer)
user.Photos = [ { value: userinfo.picture } ]; user.Photos = [ { value: userinfo.picture } ];
} }
} }
if (typeof(userinfo.nickname) !== 'undefined') if (userinfo.nickname != null)
{ {
user.displayName = userinfo.nickname; user.displayName = userinfo.nickname;
} }
if (typeof(userinfo.name) !== 'undefined') if (userinfo.name != null)
{ {
user.displayName = userinfo.name; user.displayName = userinfo.name;
} }
if (typeof(userinfo.email) !== 'undefined') if (userinfo.email != null)
{ {
user.emails = [ { value: userinfo.email } ]; user.emails = [ { value: userinfo.email } ];
} }
if (typeof(userinfo.given_name) !== 'undefined') if (userinfo.given_name != null)
{ {
user.name = { givenName: userinfo.given_name }; user.name = { givenName: userinfo.given_name };
} }
if (typeof(userinfo.family_name) !== 'undefined') if (userinfo.family_name != null)
{ {
user.name = { familyName: userinfo.family_name }; user.name = { familyName: userinfo.family_name };
} }
if (typeof(userinfo.middle_name) !== 'undefined') if (userinfo.middle_name != null)
{ {
user.name = { middleName: userinfo.middle_name }; user.name = { middleName: userinfo.middle_name };
} }
@ -240,17 +240,17 @@ async function setupAuth(oidcIssuer)
let displayName; let displayName;
let photo; let photo;
if (typeof(req.user) !== 'undefined') if (req.user != null)
{ {
if (typeof(req.user.displayName) !== 'undefined') if (req.user.displayName != null)
displayName = req.user.displayName; displayName = req.user.displayName;
else else
displayName = ''; displayName = '';
if ( if (
typeof(req.user.Photos) !== 'undefined' && req.user.Photos != null &&
typeof(req.user.Photos[0]) !== 'undefined' && req.user.Photos[0] != null &&
typeof(req.user.Photos[0].value) !== 'undefined' req.user.Photos[0].value != null
) )
photo = req.user.Photos[0].value; photo = req.user.Photos[0].value;
else else
@ -259,9 +259,9 @@ async function setupAuth(oidcIssuer)
const data = const data =
{ {
peerId : state.peerId, peerId : state.peerId,
name : displayName, displayName : displayName,
picture : photo picture : photo
}; };
const room = rooms.get(state.roomId); const room = rooms.get(state.roomId);