diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/services/resource_access_tokens/revoke_service.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/services/resource_access_tokens/revoke_service.rb')
-rw-r--r-- | app/services/resource_access_tokens/revoke_service.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/services/resource_access_tokens/revoke_service.rb b/app/services/resource_access_tokens/revoke_service.rb index ece928dac31..59402701ddc 100644 --- a/app/services/resource_access_tokens/revoke_service.rb +++ b/app/services/resource_access_tokens/revoke_service.rb @@ -21,6 +21,8 @@ module ResourceAccessTokens destroy_bot_user + log_event + success("Access token #{access_token.name} has been revoked and the bot user has been scheduled for deletion.") rescue StandardError => error log_error("Failed to revoke access token for #{bot_user.name}: #{error.message}") @@ -57,6 +59,10 @@ module ResourceAccessTokens end end + def log_event + ::Gitlab::AppLogger.info "PROJECT ACCESS TOKEN REVOCATION: revoked_by: #{current_user.username}, project_id: #{resource.id}, token_user: #{access_token.user.name}, token_id: #{access_token.id}" + end + def error(message) ServiceResponse.error(message: message) end @@ -66,3 +72,5 @@ module ResourceAccessTokens end end end + +ResourceAccessTokens::RevokeService.prepend_if_ee('EE::ResourceAccessTokens::RevokeService') |