1 files changed, 20 insertions, 24 deletions

diff --git a/app/services/personal_access_tokens/rotate_service.rb b/app/services/personal_access_tokens/rotate_service.rb
index 55eff1e69aa..e381d86fbed 100644
--- a/app/services/personal_access_tokens/rotate_service.rb
+++ b/app/services/personal_access_tokens/rotate_service.rb
@@ -10,27 +10,19 @@ module PersonalAccessTokens
     end
 
     def execute(params = {})
-      return error_response(message: _('token already revoked')) if token.revoked?
+      return error_response(_('token already revoked')) if token.revoked?
 
       response = ServiceResponse.success
 
       PersonalAccessToken.transaction do
         unless token.revoke!
-          response = error_response
+          response = error_response(_('failed to revoke token'))
           raise ActiveRecord::Rollback
         end
 
-        target_user = token.user
-        new_token = target_user.personal_access_tokens.create(create_token_params(token, params))
+        response = create_access_token(params)
 
-        if new_token.persisted?
-          response = error_response unless update_bot_membership(target_user, new_token.expires_at)
-          response = success_response(new_token)
-        else
-          response = error_response(message: new_token.errors.full_messages.to_sentence)
-
-          raise ActiveRecord::Rollback
-        end
+        raise ActiveRecord::Rollback unless response.success?
       end
 
       response
@@ -40,6 +32,16 @@ module PersonalAccessTokens
 
     attr_reader :current_user, :token
 
+    def create_access_token(params)
+      target_user = token.user
+
+      new_token = target_user.personal_access_tokens.create(create_token_params(token, params))
+
+      return success_response(new_token) if new_token.persisted?
+
+      error_response(new_token.errors.full_messages.to_sentence)
+    end
+
     def expires_at(params)
       return params[:expires_at] if params[:expires_at]
 
@@ -50,22 +52,16 @@ module PersonalAccessTokens
       ServiceResponse.success(payload: { personal_access_token: new_token })
     end
 
-    def error_response(message: _('failed to revoke token'))
+    def error_response(message)
       ServiceResponse.error(message: message)
     end
 
     def create_token_params(token, params)
-      {  name: token.name,
-         previous_personal_access_token_id: token.id,
-         impersonation: token.impersonation,
-         scopes: token.scopes,
-         expires_at: expires_at(params) }
-    end
-
-    def update_bot_membership(target_user, expires_at)
-      return unless target_user.project_bot?
-
-      target_user.members.first.update(expires_at: expires_at)
+      { name: token.name,
+        previous_personal_access_token_id: token.id,
+        impersonation: token.impersonation,
+        scopes: token.scopes,
+        expires_at: expires_at(params) }
     end
   end
 end