liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: oidc auth groups relate / unrelate

Browse Source
This commit is contained in:
NGPixel
2022-09-17 17:54:11 -04:00
parent 4b3005057f
commit ebf4da9bea
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/modules/authentication/oidc/authentication.js
View File

@@ -31,12 +31,14 @@ module.exports = {
}) })
if (conf.mapGroups) { if (conf.mapGroups) {
const groups = _.get(profile, '_json.' + conf.groupsClaim) const groups = _.get(profile, '_json.' + conf.groupsClaim)
if (groups) { if (groups && _.isArray(groups)) {
const groupIDs = Object.values(WIKI.auth.groups) const currentGroups = (await user.$relatedQuery('groups').select('groups.id')).groups.map(g => g.id)
.filter(g => groups.includes(g.name)) const expectedGroups = Object.values(WIKI.auth.groups).filter(g => groups.includes(g.name)).map(g => g.id)
.map(g => g.id) for (const groupId of _.difference(expectedGroups, currentGroups)) {
for (let groupID of groupIDs) { await user.$relatedQuery('groups').relate(groupId)
await user.$relatedQuery('groups').relate(groupID) }
for (const groupId of _.difference(currentGroups, expectedGroups)) {
await user.$relatedQuery('groups').unrelate(groupId)
} }
} }
} }