From 981fb44c366ced582da203cf6970ee225466036b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 10 Mar 2022 03:08:56 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/oauth/authorizations_controller.rb | 9 --------- 1 file changed, 9 deletions(-) (limited to 'app/controllers/oauth') diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index ccc155ddbf5..d1c409d071e 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -12,10 +12,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController # Overridden from Doorkeeper::AuthorizationsController to # include the call to session.delete def new - logger.info("#{self.class.name}#new: pre_auth_params['scope'] = #{pre_auth_params['scope'].inspect}") - if pre_auth.authorizable? - logger.info("#{self.class.name}#new: pre_auth.scopes = #{pre_auth.scopes.to_a.inspect}") if skip_authorization? || matching_token? auth = authorization.authorize parsed_redirect_uri = URI.parse(auth.redirect_uri) @@ -46,15 +43,9 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController auth_type = params.delete('gl_auth_type') return unless auth_type == 'login' - logger.info("#{self.class.name}: BEFORE application has read_user: #{application_has_read_user_scope?}") - logger.info("#{self.class.name}: BEFORE scope = #{params['scope'].inspect}") - ensure_read_user_scope! params['scope'] = Gitlab::Auth::READ_USER_SCOPE.to_s if application_has_read_user_scope? - - logger.info("#{self.class.name}: AFTER application has read_user: #{application_has_read_user_scope?}") - logger.info("#{self.class.name}: AFTER scope = #{params['scope'].inspect}") end # Configure the application to support read_user scope, if it already -- cgit v1.2.1