Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Try to fix OIDC login.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-06-12 06:29:57 +03:00
parent 25e294fd92
commit 8b31c0768c
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/wekan-oidc/oidc_server.js
View file

@ -13,12 +13,12 @@ OAuth.registerService('oidc', 2, null, function (query) {
if (debug) console.log('XXX: userinfo:', userinfo); if (debug) console.log('XXX: userinfo:', userinfo);
var serviceData = {}; var serviceData = {};
serviceData.id = userinfo[process.env.OAUTH2_ID_MAP] || userinfo["id"]; serviceData.id = userinfo[process.env.OAUTH2_ID_MAP]; // || userinfo["id"];
serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP] || userinfo["uid"]; serviceData.username = userinfo[process.env.OAUTH2_USERNAME_MAP]; // || userinfo["uid"];
serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"]; serviceData.fullname = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"];
serviceData.accessToken = accessToken; serviceData.accessToken = accessToken;
serviceData.expiresAt = expiresAt; serviceData.expiresAt = expiresAt;
serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"]; serviceData.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"];
if (accessToken) { if (accessToken) {
var tokenContent = getTokenContent(accessToken); var tokenContent = getTokenContent(accessToken);
@ -31,8 +31,8 @@ OAuth.registerService('oidc', 2, null, function (query) {
if (debug) console.log('XXX: serviceData:', serviceData); if (debug) console.log('XXX: serviceData:', serviceData);
var profile = {}; var profile = {};
profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP] || userinfo["displayName"]; profile.name = userinfo[process.env.OAUTH2_FULLNAME_MAP]; // || userinfo["displayName"];
profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP] || userinfo["email"]; profile.email = userinfo[process.env.OAUTH2_EMAIL_MAP]; // || userinfo["email"];
if (debug) console.log('XXX: profile:', profile); if (debug) console.log('XXX: profile:', profile);
return { return {

6
server/authentication.js
View file

@ -76,9 +76,11 @@ Meteor.startup(() => {
authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT, authorizationEndpoint: process.env.OAUTH2_AUTH_ENDPOINT,
userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT, userinfoEndpoint: process.env.OAUTH2_USERINFO_ENDPOINT,
tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT, tokenEndpoint: process.env.OAUTH2_TOKEN_ENDPOINT,
idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [], idTokenWhitelistFields: process.env.OAUTH2_ID_TOKEN_WHITELIST_FIELDS,
requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS || 'openid profile email', requestPermissions: process.env.OAUTH2_REQUEST_PERMISSIONS,
}, },
// OAUTH2_ID_TOKEN_WHITELIST_FIELDS || [],
// OAUTH2_REQUEST_PERMISSIONS || 'openid profile email',
} }
); );
} }