Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Greenlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arbeitsgruppe Hardwarenahe IT-Systeme
Greenlight
Commits
ba8b07aa
Unverified
Commit
ba8b07aa
authored
Aug 4, 2023
by
Samuel Couillard
Committed by
GitHub
Aug 4, 2023
Browse files
Options
Downloads
Patches
Plain Diff
Add openid_connect to provider whitelist (#5364)
parent
30e17961
Branches
Branches containing commit
Tags
release-3.0.6.1
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/controllers/api/v1/migrations/external_controller.rb
+2
-2
2 additions, 2 deletions
app/controllers/api/v1/migrations/external_controller.rb
with
2 additions
and
2 deletions
app/controllers/api/v1/migrations/external_controller.rb
+
2
−
2
View file @
ba8b07aa
...
...
@@ -84,7 +84,7 @@ module Api
user_hash
=
user_params
.
to_h
# Re-write LDAP and Google to greenlight
user_hash
[
:provider
]
=
%w[greenlight ldap google]
.
include?
(
user_hash
[
:provider
])
?
'greenlight'
:
user_hash
[
:provider
]
user_hash
[
:provider
]
=
%w[greenlight ldap google
openid_connect
]
.
include?
(
user_hash
[
:provider
])
?
'greenlight'
:
user_hash
[
:provider
]
# Returns an error if the provider does not exist
unless
user_hash
[
:provider
]
==
'greenlight'
||
Tenant
.
exists?
(
name:
user_hash
[
:provider
])
...
...
@@ -119,7 +119,7 @@ module Api
room_hash
=
room_params
.
to_h
# Re-write LDAP and Google to greenlight
room_hash
[
:provider
]
=
%w[greenlight ldap google]
.
include?
(
room_hash
[
:provider
])
?
'greenlight'
:
room_hash
[
:provider
]
room_hash
[
:provider
]
=
%w[greenlight ldap google
openid_connect
]
.
include?
(
room_hash
[
:provider
])
?
'greenlight'
:
room_hash
[
:provider
]
unless
room_hash
[
:provider
]
==
'greenlight'
||
Tenant
.
exists?
(
name:
room_hash
[
:provider
])
return
render_error
(
status: :bad_request
,
errors:
'Provider does not exist'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment