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

Simplified user info on login.

master
Håvar Aambø Fosstveit 2019-10-25 14:53:47 +02:00
parent 80c6c441cb
commit e17d712ed5
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
server/server.js
View File

@ -185,15 +185,15 @@ async function setupAuth(oidcIssuer)
_claims : tokenset.claims _claims : tokenset.claims
}; };
if (typeof(userinfo.picture) !== 'undefined') if (userinfo.picture != null)
{ {
if (!userinfo.picture.match(/^http/g)) if (!userinfo.picture.match(/^http/g))
{ {
user.Photos = [ { value: `data:image/jpeg;base64, ${userinfo.picture}` } ]; user.picture = `data:image/jpeg;base64, ${userinfo.picture}`;
} }
else else
{ {
user.Photos = [ { value: userinfo.picture } ]; user.picture = userinfo.picture;
} }
} }
@ -209,22 +209,22 @@ async function setupAuth(oidcIssuer)
if (userinfo.email != null) if (userinfo.email != null)
{ {
user.emails = [ { value: userinfo.email } ]; user.email = userinfo.email;
} }
if (userinfo.given_name != null) if (userinfo.given_name != null)
{ {
user.name = { givenName: userinfo.given_name }; user.name.givenName = userinfo.given_name;
} }
if (userinfo.family_name != null) if (userinfo.family_name != null)
{ {
user.name = { familyName: userinfo.family_name }; user.name.familyName = userinfo.family_name;
} }
if (userinfo.middle_name != null) if (userinfo.middle_name != null)
{ {
user.name = { middleName: userinfo.middle_name }; user.name.middleName = userinfo.middle_name;
} }
return done(null, user); return done(null, user);
@ -262,7 +262,7 @@ async function setupAuth(oidcIssuer)
const state = JSON.parse(base64.decode(req.query.state)); const state = JSON.parse(base64.decode(req.query.state));
let displayName; let displayName;
let photo; let picture;
if (req.user != null) if (req.user != null)
{ {
@ -271,14 +271,10 @@ async function setupAuth(oidcIssuer)
else else
displayName = ''; displayName = '';
if ( if (req.user.picture != null)
req.user.Photos != null && picture = req.user.picture;
req.user.Photos[0] != null &&
req.user.Photos[0].value != null
)
photo = req.user.Photos[0].value;
else else
photo = '/static/media/buddy.403cb9f6.svg'; picture = '/static/media/buddy.403cb9f6.svg';
} }
const peer = peers.get(state.id); const peer = peers.get(state.id);
@ -286,9 +282,8 @@ async function setupAuth(oidcIssuer)
peer && (peer.authenticated = true); peer && (peer.authenticated = true);
res.send(httpHelper({ res.send(httpHelper({
success : true, displayName,
displayName : displayName, picture
picture : photo
})); }));
} }
); );