Browse Source
fix: oidc module - map() call on undefined; fix unrelate() usage (#5781)
pull/5791/head
Andrei Senchuk
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
2 deletions
-
server/modules/authentication/oidc/authentication.js
|
|
|
@ -32,13 +32,13 @@ module.exports = { |
|
|
|
if (conf.mapGroups) { |
|
|
|
const groups = _.get(profile, '_json.' + conf.groupsClaim) |
|
|
|
if (groups && _.isArray(groups)) { |
|
|
|
const currentGroups = (await user.$relatedQuery('groups').select('groups.id')).groups.map(g => g.id) |
|
|
|
const currentGroups = (await user.$relatedQuery('groups').select('groups.id')).map(g => g.id) |
|
|
|
const expectedGroups = Object.values(WIKI.auth.groups).filter(g => groups.includes(g.name)).map(g => g.id) |
|
|
|
for (const groupId of _.difference(expectedGroups, currentGroups)) { |
|
|
|
await user.$relatedQuery('groups').relate(groupId) |
|
|
|
} |
|
|
|
for (const groupId of _.difference(currentGroups, expectedGroups)) { |
|
|
|
await user.$relatedQuery('groups').unrelate(groupId) |
|
|
|
await user.$relatedQuery('groups').unrelate().where('groupId', groupId) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
