diff --git a/.rubocop.yml b/.rubocop.yml index 4bdeb7a9..baeca80a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,15 +7,13 @@ inherit_mode: plugins: - rubocop-capybara + - rubocop-factory_bot - rubocop-performance - rubocop-rails - rubocop-rake - rubocop-rspec - rubocop-rspec_rails -require: - - rubocop-factory_bot - AllCops: NewCops: enable Exclude: diff --git a/Gemfile b/Gemfile index 64c02468..20a18914 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ group :development do gem 'listen', '~> 3.9' gem 'rails_best_practices', '~> 1.20' gem 'reek', '~> 6.5' - gem 'rubocop', '~> 1.78', require: false + gem 'rubocop', '~> 1.80', require: false gem 'rubocop-capybara', '~> 2.22' gem 'rubocop-factory_bot', '~> 2.27', require: false gem 'rubocop-performance', '~> 1.26', require: false diff --git a/Gemfile.lock b/Gemfile.lock index a8716a1b..540fd3cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -536,7 +536,7 @@ GEM rswag-ui (2.16.0) actionpack (>= 5.2, < 8.1) railties (>= 5.2, < 8.1) - rubocop (1.78.0) + rubocop (1.80.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -544,7 +544,7 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.45.1, < 2.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.46.0) @@ -697,7 +697,7 @@ DEPENDENCIES rspec-retry! rswag-api (~> 2.16.0) rswag-ui (~> 2.16.0) - rubocop (~> 1.78) + rubocop (~> 1.80) rubocop-capybara (~> 2.22) rubocop-factory_bot (~> 2.27) rubocop-performance (~> 1.26) diff --git a/app/controllers/api/v1/passwords_controller.rb b/app/controllers/api/v1/passwords_controller.rb index 96f5f358..59497fc3 100644 --- a/app/controllers/api/v1/passwords_controller.rb +++ b/app/controllers/api/v1/passwords_controller.rb @@ -4,6 +4,7 @@ module API module V1 class PasswordsController < DeviseTokenAuth::PasswordsController include API::Concerns::ActAsAPIRequest + protect_from_forgery with: :null_session private diff --git a/app/controllers/api/v1/registrations_controller.rb b/app/controllers/api/v1/registrations_controller.rb index 75f7a3d4..9858757b 100644 --- a/app/controllers/api/v1/registrations_controller.rb +++ b/app/controllers/api/v1/registrations_controller.rb @@ -4,6 +4,7 @@ module API module V1 class RegistrationsController < DeviseTokenAuth::RegistrationsController include API::Concerns::ActAsAPIRequest + protect_from_forgery with: :null_session private diff --git a/app/controllers/api/v1/sessions_controller.rb b/app/controllers/api/v1/sessions_controller.rb index b6643e74..f461467d 100644 --- a/app/controllers/api/v1/sessions_controller.rb +++ b/app/controllers/api/v1/sessions_controller.rb @@ -4,6 +4,7 @@ module API module V1 class SessionsController < DeviseTokenAuth::SessionsController include API::Concerns::ActAsAPIRequest + protect_from_forgery with: :null_session private diff --git a/app/models/concerns/ransackable.rb b/app/models/concerns/ransackable.rb index b81078c9..f04df606 100644 --- a/app/models/concerns/ransackable.rb +++ b/app/models/concerns/ransackable.rb @@ -5,7 +5,7 @@ module Ransackable class_methods do def ransackable_attributes(auth_object = nil) - return (column_names + ransackers.keys) if auth_object == :admin + return column_names + ransackers.keys if auth_object == :admin const_defined?(:RANSACK_ATTRIBUTES) ? self::RANSACK_ATTRIBUTES : [] end diff --git a/app/objects/impersonation/authenticator.rb b/app/objects/impersonation/authenticator.rb index 133aad15..0054b82f 100644 --- a/app/objects/impersonation/authenticator.rb +++ b/app/objects/impersonation/authenticator.rb @@ -25,9 +25,7 @@ def data end def user - @user ||= User.find(data['user_id']).tap do |it| - it.impersonated_by = admin_user_id - end + @user ||= User.find(data['user_id']).tap { it.impersonated_by = admin_user_id } end def admin_user_id diff --git a/spec/requests/api/v1/concerns/impersonation/hooks_spec.rb b/spec/requests/api/v1/concerns/impersonation/hooks_spec.rb index 053b03b5..31c07ef6 100644 --- a/spec/requests/api/v1/concerns/impersonation/hooks_spec.rb +++ b/spec/requests/api/v1/concerns/impersonation/hooks_spec.rb @@ -4,6 +4,7 @@ before do stub_const('FakeController', Class.new(API::V1::APIController) do include API::Concerns::Impersonation::Hooks + skip_after_action :verify_authorized def show