Merge pull request #3269 from phaseshift3r/patch-1

Update oidc_server.js
This commit is contained in:
Lauri Ojansivu 2020-09-11 14:10:14 +03:00 committed by GitHub
commit abfedf573b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,7 +9,20 @@ OAuth.registerService('oidc', 2, null, function (query) {
var accessToken = token.access_token || token.id_token;
var expiresAt = (+new Date) + (1000 * parseInt(token.expires_in, 10));
var userinfo = getUserInfo(accessToken);
var claimsInAccessToken = process.env.OAUTH2_ADFS || false;
var userinfo;
if(claimsInAccessToken)
{
// hack when using custom claims in the accessToken. On premise ADFS
userinfo = getTokenContent(accessToken);
}
else
{
// normal behaviour, getting the claims from UserInfo endpoint.
userinfo = getUserInfo(accessToken);
}
if (userinfo.ocs) userinfo = userinfo.ocs.data; // Nextcloud hack
if (userinfo.metadata) userinfo = userinfo.metadata // Openshift hack
if (debug) console.log('XXX: userinfo:', userinfo);