Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
ebf4da9b
Unverified
Commit
ebf4da9b
authored
Sep 17, 2022
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: oidc auth groups relate / unrelate
parent
4b300505
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
authentication.js
server/modules/authentication/oidc/authentication.js
+8
-6
No files found.
server/modules/authentication/oidc/authentication.js
View file @
ebf4da9b
...
@@ -31,12 +31,14 @@ module.exports = {
...
@@ -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
)
}
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment