VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-03 16:04:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2025-06-05 09:12:18 +00:00
parent a4308a3876
commit f7b15c4536
272 changed files with 2246 additions and 2124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/gitlab/auth.rb
View File

@ -253,7 +253,8 @@ module Gitlab
identity = ::Gitlab::Auth::Identity.link_from_oauth_token(token)
return if identity && !identity.valid?
user = User.id_in(token.resource_owner_id).first
resource_owner_id = identity&.composite? ? identity.scoped_user.id : token.resource_owner_id
user = User.id_in(resource_owner_id).first
return unless user && user.can_log_in_with_non_expired_password?
Gitlab::Auth::Result.new(user, nil, :oauth, abilities_for_scopes(token.scopes))