Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Discourse SAML
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Giacomo Vercesi
Discourse SAML
Commits
0e29a1fa
Commit
0e29a1fa
authored
8 years ago
by
Robin Ward
Browse files
Options
Downloads
Patches
Plain Diff
Add option to retrive the `uid` from the extra info
parent
d8ca81b2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugin.rb
+5
-0
5 additions, 0 deletions
plugin.rb
with
5 additions
and
0 deletions
plugin.rb
+
5
−
0
View file @
0e29a1fa
...
...
@@ -40,6 +40,11 @@ class SamlAuthenticator < ::Auth::OAuth2Authenticator
if
auth
.
extra
.
present?
&&
auth
.
extra
[
:raw_info
].
present?
result
.
username
=
auth
.
extra
[
:raw_info
].
attributes
[
'screenName'
].
try
(
:first
)
||
uid
end
if
GlobalSetting
.
try
(
:saml_use_uid
)
&&
auth
.
extra
.
present?
&&
auth
.
extra
[
:raw_info
].
present?
result
.
username
=
auth
.
extra
[
:raw_info
].
attributes
[
'uid'
].
try
(
:first
)
||
uid
end
result
.
email
=
auth
[
:info
].
email
||
uid
result
.
email_valid
=
true
...
...
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