Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
8b74c35c
Commit
8b74c35c
authored
Feb 27, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SCIM API
parent
092c678a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
ee/lib/api/scim.rb
ee/lib/api/scim.rb
+12
-3
No files found.
ee/lib/api/scim.rb
View file @
8b74c35c
...
...
@@ -40,7 +40,9 @@ module API
check_group_saml_configured
end
desc
'Returns 200 if authenticated'
desc
'Get SAML users'
do
detail
'This feature was introduced in GitLab 11.9.'
end
get
do
group
=
find_group
(
params
[
:group
])
...
...
@@ -54,6 +56,9 @@ module API
present
identity
||
{},
with:
::
EE
::
Gitlab
::
Scim
::
Users
end
desc
'Get a SAML user'
do
detail
'This feature was introduced in GitLab 11.9.'
end
get
':id'
do
group
=
find_group
(
params
[
:group
])
...
...
@@ -67,6 +72,9 @@ module API
end
# rubocop: disable CodeReuse/ActiveRecord
desc
'Updates a SAML user'
do
detail
'This feature was introduced in GitLab 11.9.'
end
patch
':id'
do
scim_error!
(
message:
'Missing ID'
)
unless
params
[
:id
]
...
...
@@ -103,12 +111,13 @@ module API
end
# rubocop: enable CodeReuse/ActiveRecord
desc
'Removes a SAML user'
desc
'Removes a SAML user'
do
detail
'This feature was introduced in GitLab 11.9.'
end
delete
":id"
do
scim_error!
(
message:
'Missing ID'
)
unless
params
[
:id
]
group
=
find_group
(
params
[
:group
])
identity
=
GroupSamlIdentityFinder
.
find_by_group_and_uid
(
group:
group
,
uid:
params
[
:id
])
scim_not_found!
(
message:
"Resource
#{
params
[
:id
]
}
not found"
)
unless
identity
...
...
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