1 files changed, 28 insertions, 12 deletions
diff --git a/app/services/personal_access_tokens/rotate_service.rb b/app/services/personal_access_tokens/rotate_service.rb
index 32710629caf..13144a04c11 100644
--- a/app/services/personal_access_tokens/rotate_service.rb
+++ b/app/services/personal_access_tokens/rotate_service.rb
@@ -10,26 +10,18 @@ module PersonalAccessTokens
     end
 
     def execute(params = {})
-      return ServiceResponse.error(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 = ServiceResponse.error(message: _('failed to revoke token'))
+          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))
-
-        if new_token.persisted?
-          response = ServiceResponse.success(payload: { personal_access_token: new_token })
-        else
-          response = ServiceResponse.error(message: new_token.errors.full_messages.to_sentence)
-
-          raise ActiveRecord::Rollback
-        end
+        response = create_access_token(params)
+        raise ActiveRecord::Rollback unless response.success?
       end
 
       response
@@ -47,5 +39,29 @@ module PersonalAccessTokens
          scopes: token.scopes,
          expires_at: expires_at }
     end
+
+    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]
+
+      params[:expires_at] || EXPIRATION_PERIOD.from_now.to_date
+    end
+
+    def success_response(new_token)
+      ServiceResponse.success(payload: { personal_access_token: new_token })
+    end
+
+    def error_response(message)
+      ServiceResponse.error(message: message)
+    end
   end
 end