From 682839b0c03cc123e4b72094b6d1bbf8f695d28a Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 18 Aug 2025 17:00:56 -0400 Subject: [PATCH] Move settings/applications#regenerate -> settings/applications/tokens#destroy --- .../applications/tokens_controller.rb | 20 +++++++++++++++++++ .../settings/applications_controller.rb | 9 +-------- .../settings/applications/show.html.haml | 2 +- config/routes/settings.rb | 4 +--- 4 files changed, 23 insertions(+), 12 deletions(-) create mode 100644 app/controllers/settings/applications/tokens_controller.rb diff --git a/app/controllers/settings/applications/tokens_controller.rb b/app/controllers/settings/applications/tokens_controller.rb new file mode 100644 index 00000000000..8f48a33f3a9 --- /dev/null +++ b/app/controllers/settings/applications/tokens_controller.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +module Settings + class Applications::TokensController < BaseController + before_action :set_application + + def destroy + @access_token = current_user.token_for_app(@application) + @access_token.destroy + + redirect_to settings_application_path(@application), notice: t('applications.token_regenerated') + end + + private + + def set_application + @application = current_user.applications.find(params[:application_id]) + end + end +end diff --git a/app/controllers/settings/applications_controller.rb b/app/controllers/settings/applications_controller.rb index 8e39741f896..28dd75abaef 100644 --- a/app/controllers/settings/applications_controller.rb +++ b/app/controllers/settings/applications_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Settings::ApplicationsController < Settings::BaseController - before_action :set_application, only: [:show, :update, :destroy, :regenerate] + before_action :set_application, only: [:show, :update, :destroy] def index @applications = current_user.applications.order(id: :desc).page(params[:page]) @@ -45,13 +45,6 @@ class Settings::ApplicationsController < Settings::BaseController redirect_to settings_applications_path, notice: I18n.t('applications.destroyed') end - def regenerate - @access_token = current_user.token_for_app(@application) - @access_token.destroy - - redirect_to settings_application_path(@application), notice: I18n.t('applications.token_regenerated') - end - private def set_application diff --git a/app/views/settings/applications/show.html.haml b/app/views/settings/applications/show.html.haml index bfde27daa96..1a03f259c00 100644 --- a/app/views/settings/applications/show.html.haml +++ b/app/views/settings/applications/show.html.haml @@ -20,7 +20,7 @@ %code= current_user.token_for_app(@application).token %tr %th - %td= table_link_to 'refresh', t('applications.regenerate_token'), regenerate_settings_application_path(@application), method: :post + %td= table_link_to 'refresh', t('applications.regenerate_token'), settings_application_token_path(@application), method: :delete %hr/ diff --git a/config/routes/settings.rb b/config/routes/settings.rb index cefa24316db..cc82c0c65ed 100644 --- a/config/routes/settings.rb +++ b/config/routes/settings.rb @@ -53,9 +53,7 @@ namespace :settings do end resources :applications, except: [:edit] do - member do - post :regenerate - end + resource :token, module: :applications, only: :destroy end resource :delete, only: [:show, :destroy]