diff options
Diffstat (limited to 'app/services/members/approve_access_request_service.rb')
-rw-r--r-- | app/services/members/approve_access_request_service.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/app/services/members/approve_access_request_service.rb b/app/services/members/approve_access_request_service.rb index 19431ac76dc..6be08b590bc 100644 --- a/app/services/members/approve_access_request_service.rb +++ b/app/services/members/approve_access_request_service.rb @@ -1,25 +1,20 @@ module Members class ApproveAccessRequestService < Members::BaseService - # opts - A hash of options - # :ldap - The call is from a LDAP sync: current_user can be nil in that case - def execute(access_requester, opts = {}) - raise Gitlab::Access::AccessDeniedError unless can_update_access_requester?(access_requester, opts[:ldap]) + def execute(access_requester, skip_authorization: false, skip_log_audit_event: false) + raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_update_access_requester?(access_requester) access_requester.access_level = params[:access_level] if params[:access_level] access_requester.accept_request - after_execute(member: access_requester, **opts) + after_execute(member: access_requester, skip_log_audit_event: skip_log_audit_event) access_requester end private - def can_update_access_requester?(access_requester, ldap) - access_requester && ( - ldap || - can?(current_user, update_member_permission(access_requester), access_requester) - ) + def can_update_access_requester?(access_requester) + can?(current_user, update_member_permission(access_requester), access_requester) end end end |