Commit 1ffd2cb0 authored by Małgorzata Ksionek's avatar Małgorzata Ksionek

Rename method based on cr comment

parent 064095cf
...@@ -8,7 +8,7 @@ module EE ...@@ -8,7 +8,7 @@ module EE
def leave def leave
super super
if current_user.authorized_by_provisioning_group? && membershipable == current_user.provisioned_by_group if current_user.authorized_by_provisioning_group?(membershipable)
sign_out current_user sign_out current_user
end end
end end
......
...@@ -33,7 +33,7 @@ class Groups::SsoController < Groups::ApplicationController ...@@ -33,7 +33,7 @@ class Groups::SsoController < Groups::ApplicationController
GroupSaml::Identity::DestroyService.new(linked_identity).execute GroupSaml::Identity::DestroyService.new(linked_identity).execute
if current_user.authorized_by_provisioning_group? && unauthenticated_group == current_user.provisioned_by_group if current_user.authorized_by_provisioning_group?(unauthenticated_group)
sign_out current_user sign_out current_user
else else
redirect_to profile_account_path redirect_to profile_account_path
......
...@@ -298,10 +298,6 @@ module EE ...@@ -298,10 +298,6 @@ module EE
managing_group.present? managing_group.present?
end end
def authorized_by_provisioning_group?
::Feature.enabled?(:block_password_auth_for_saml_users, type: :ops) && user_detail.provisioned_by_group?
end
def managed_by?(user) def managed_by?(user)
self.group_managed_account? && self.managing_group.owned_by?(user) self.group_managed_account? && self.managing_group.owned_by?(user)
end end
...@@ -318,7 +314,7 @@ module EE ...@@ -318,7 +314,7 @@ module EE
override :allow_password_authentication_for_web? override :allow_password_authentication_for_web?
def allow_password_authentication_for_web?(*) def allow_password_authentication_for_web?(*)
return false if group_managed_account? return false if group_managed_account?
return false if authorized_by_provisioning_group? return false if user_authorized_by_provisioning_group?
super super
end end
...@@ -326,11 +322,19 @@ module EE ...@@ -326,11 +322,19 @@ module EE
override :allow_password_authentication_for_git? override :allow_password_authentication_for_git?
def allow_password_authentication_for_git?(*) def allow_password_authentication_for_git?(*)
return false if group_managed_account? return false if group_managed_account?
return false if authorized_by_provisioning_group? return false if user_authorized_by_provisioning_group?
super super
end end
def user_authorized_by_provisioning_group?
::Feature.enabled?(:block_password_auth_for_saml_users, type: :ops) && user_detail.provisioned_by_group?
end
def authorized_by_provisioning_group?(group)
::Feature.enabled?(:block_password_auth_for_saml_users, type: :ops) && provisioned_by_group == group
end
def gitlab_employee? def gitlab_employee?
strong_memoize(:gitlab_employee) do strong_memoize(:gitlab_employee) do
::Gitlab.com? && ::Feature.enabled?(:gitlab_employee_badge) && gitlab_team_member? ::Gitlab.com? && ::Feature.enabled?(:gitlab_employee_badge) && gitlab_team_member?
......
...@@ -52,9 +52,9 @@ module Gitlab ...@@ -52,9 +52,9 @@ module Gitlab
def find_by_email def find_by_email
user = super user = super
return user if user&.authorized_by_provisioning_group? && user&.provisioned_by_group_id == saml_provider.group_id return user if user&.authorized_by_provisioning_group?(saml_provider.group)
false nil
end end
override :build_new_user override :build_new_user
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment