Bläddra i källkod

fix: oidc module - map() call on undefined; fix unrelate() usage (#5781)

Andrei Senchuk 2 år sedan
förälder
incheckning
e6bbf9d088
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. 2 2
      server/modules/authentication/oidc/authentication.js

+ 2 - 2
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)
               }
             }
           }