diff options
author | Nick Schonning <nschonni@gmail.com> | 2023-02-18 17:09:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-19 07:09:40 +0900 |
commit | 2177daeae92b77be6797ba8f2ab6ebe1e641e078 (patch) | |
tree | 2cf004cd1611bd53f21cdb8021e98aa499448627 /app/controllers/concerns | |
parent | 167709f6b0731c163619c58afcb0ca11bb393e54 (diff) |
Autofix Rubocop Style/RedundantBegin (#23703)
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r-- | app/controllers/concerns/rate_limit_headers.rb | 12 | ||||
-rw-r--r-- | app/controllers/concerns/two_factor_authentication_concern.rb | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/controllers/concerns/rate_limit_headers.rb b/app/controllers/concerns/rate_limit_headers.rb index b21abfb03..30702f00e 100644 --- a/app/controllers/concerns/rate_limit_headers.rb +++ b/app/controllers/concerns/rate_limit_headers.rb @@ -6,13 +6,11 @@ module RateLimitHeaders class_methods do def override_rate_limit_headers(method_name, options = {}) around_action(only: method_name, if: :current_account) do |_controller, block| - begin - block.call - ensure - rate_limiter = RateLimiter.new(current_account, options) - rate_limit_headers = rate_limiter.to_headers - response.headers.merge!(rate_limit_headers) unless response.headers['X-RateLimit-Remaining'].present? && rate_limit_headers['X-RateLimit-Remaining'].to_i > response.headers['X-RateLimit-Remaining'].to_i - end + block.call + ensure + rate_limiter = RateLimiter.new(current_account, options) + rate_limit_headers = rate_limiter.to_headers + response.headers.merge!(rate_limit_headers) unless response.headers['X-RateLimit-Remaining'].present? && rate_limit_headers['X-RateLimit-Remaining'].to_i > response.headers['X-RateLimit-Remaining'].to_i end end end diff --git a/app/controllers/concerns/two_factor_authentication_concern.rb b/app/controllers/concerns/two_factor_authentication_concern.rb index 27f2367a8..e69b67a79 100644 --- a/app/controllers/concerns/two_factor_authentication_concern.rb +++ b/app/controllers/concerns/two_factor_authentication_concern.rb @@ -79,13 +79,11 @@ module TwoFactorAuthenticationConcern @body_classes = 'lighter' @webauthn_enabled = user.webauthn_enabled? - @scheme_type = begin - if user.webauthn_enabled? && user_params[:otp_attempt].blank? - 'webauthn' - else - 'totp' - end - end + @scheme_type = if user.webauthn_enabled? && user_params[:otp_attempt].blank? + 'webauthn' + else + 'totp' + end set_locale { render :two_factor } end |