18F · aduth · Feb 1, 2024 · Jan 29, 2024 · Jan 29, 2024 · Jan 29, 2024
diff --git a/Gemfile b/Gemfile
@@ -56,7 +56,7 @@ gem 'premailer-rails', '>= 1.12.0'
 gem 'profanity_filter'
 gem 'propshaft'
 gem 'rack', '>= 3.0'
-gem 'rack-attack', '>= 6.2.1'
+gem 'rack-attack', github: 'rack/rack-attack', ref: 'd9fedfae4f7f6409f33857763391f4e18a6d7467'
 gem 'rack-cors', '>= 1.0.5', require: 'rack/cors'
 gem 'rack-headers_filter'
 gem 'rack-timeout', require: false
@@ -112,8 +112,8 @@ group :development, :test do
   gem 'psych'
   gem 'rspec', '~> 3.12.0'
   gem 'rspec-rails', '~> 6.0'
-  gem 'rubocop', '~> 1.55.1', require: false
-  gem 'rubocop-performance', '~> 1.19.0', require: false
+  gem 'rubocop', '~> 1.59.0', require: false
+  gem 'rubocop-performance', '~> 1.20.2', require: false
   gem 'rubocop-rails', '>= 2.5.2', require: false
   gem 'rubocop-rspec', require: false
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -57,6 +57,14 @@ GIT
       selenium-webdriver (>= 4.0)
       webrick (>= 1.7)
 
+GIT
+  remote: https://github.com/rack/rack-attack.git
+  revision: d9fedfae4f7f6409f33857763391f4e18a6d7467
+  ref: d9fedfae4f7f6409f33857763391f4e18a6d7467
+  specs:
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -137,7 +145,7 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ahoy_matey (3.3.0)
       activesupport (>= 5)
@@ -222,11 +230,11 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    capybara (3.39.2)
+    capybara (3.40.0)
       addressable
       matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
@@ -435,7 +443,7 @@ GEM
     openssl-signature_algorithm (1.2.1)
       openssl (> 2.0, < 3.1)
     orm_adapter (0.5.0)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.3.0.0)
       ast (~> 2.4.1)
       racc
@@ -471,14 +479,12 @@ GEM
       pry (>= 0.10.4)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.3)
     rack (3.0.8)
-    rack-attack (6.7.0)
-      rack (>= 1.0, < 4)
     rack-cors (2.0.1)
       rack (>= 2.0.0)
     rack-headers_filter (0.0.1)
@@ -546,7 +552,7 @@ GEM
       redis-client (>= 0.9.0)
     redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     reline (0.4.1)
       io-console (~> 0.5)
     request_store (1.5.1)
@@ -591,15 +597,15 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.55.1)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
@@ -608,9 +614,9 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rails (2.20.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
@@ -805,7 +811,7 @@ DEPENDENCIES
   psych
   puma (~> 6.0)
   rack (>= 3.0)
-  rack-attack (>= 6.2.1)
+  rack-attack!
   rack-cors (>= 1.0.5)
   rack-headers_filter
   rack-mini-profiler (>= 1.1.3)
@@ -824,8 +830,8 @@ DEPENDENCIES
   rspec-rails (~> 6.0)
   rspec-retry
   rspec_junit_formatter
-  rubocop (~> 1.55.1)
-  rubocop-performance (~> 1.19.0)
+  rubocop (~> 1.59.0)
+  rubocop-performance (~> 1.20.2)
   rubocop-rails (>= 2.5.2)
   rubocop-rspec
   ruby-progressbar

diff --git a/app/assets/images/us_flag.svg b/app/assets/images/us_flag.svg
diff --git a/app/assets/stylesheets/components/_alert.scss b/app/assets/stylesheets/components/_alert.scss
@@ -19,8 +19,3 @@
 .usa-alert__text > p:last-child {
   margin-bottom: 0;
 }
-
-// Upstream fix: https://github.com/uswds/uswds/pull/5187
-.usa-alert .usa-alert__body::before {
-  height: units(2);
-}
diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss
@@ -30,32 +30,3 @@
     @include set-text-and-bg('primary-darker', $context: 'Button');
   }
 }
-
-// Upstream: https://github.com/18F/identity-design-system/pull/383
-.usa-button--danger.usa-button--outline {
-  &:not(:disabled, [aria-disabled='true']) {
-    background-color: color('white');
-    box-shadow: inset 0 0 0 $theme-button-stroke-width color('secondary');
-    color: color('secondary');
-
-    &:hover,
-    &.usa-button--hover {
-      background-color: color('secondary-lightest');
-      box-shadow: inset 0 0 0 $theme-button-stroke-width color('secondary-dark');
-      color: color('secondary-dark');
-    }
-  }
-
-  &:active,
-  &.usa-button--active {
-    &,
-    &:focus,
-    &.usa-button--focus,
-    &:hover,
-    &.usa-button--hover {
-      background-color: color('secondary-lighter');
-      box-shadow: inset 0 0 0 $theme-button-stroke-width color('secondary-darker');
-      color: color('secondary-darker');
-    }
-  }
-}
diff --git a/app/components/status_page_component.rb b/app/components/status_page_component.rb
@@ -30,7 +30,7 @@ def initialize(status: :error, icon: nil)
 
   def icon_name
     if @icon
-      "#{status}_#{icon}".to_sym
+      :"#{status}_#{icon}"
     else
       status.to_sym
     end

diff --git a/app/controllers/concerns/idv_session.rb → ...ntrollers/concerns/idv_session_concern.rb b/app/controllers/concerns/idv_session.rb → ...ntrollers/concerns/idv_session_concern.rb
@@ -1,4 +1,4 @@
-module IdvSession
+module IdvSessionConcern
   extend ActiveSupport::Concern
 
   included do

diff --git a/app/controllers/concerns/idv_step_concern.rb b/app/controllers/concerns/idv_step_concern.rb
@@ -1,7 +1,7 @@
 module IdvStepConcern
   extend ActiveSupport::Concern
 
-  include IdvSession
+  include IdvSessionConcern
   include RateLimitConcern
   include FraudReviewConcern
   include Idv::AbTestAnalyticsConcern

diff --git a/app/controllers/idv/by_mail/enter_code_controller.rb b/app/controllers/idv/by_mail/enter_code_controller.rb
@@ -2,7 +2,7 @@ module Idv
   module ByMail
     class EnterCodeController < ApplicationController
       include Idv::AvailabilityConcern
-      include IdvSession
+      include IdvSessionConcern
       include Idv::StepIndicatorConcern
       include FraudReviewConcern
 

diff --git a/app/controllers/idv/by_mail/enter_code_rate_limited_controller.rb b/app/controllers/idv/by_mail/enter_code_rate_limited_controller.rb
@@ -2,7 +2,7 @@ module Idv
   module ByMail
     class EnterCodeRateLimitedController < ApplicationController
       include Idv::AvailabilityConcern
-      include IdvSession
+      include IdvSessionConcern
       include FraudReviewConcern
 
       before_action :confirm_two_factor_authenticated

diff --git a/app/controllers/idv/by_mail/letter_enqueued_controller.rb b/app/controllers/idv/by_mail/letter_enqueued_controller.rb
@@ -2,7 +2,7 @@ module Idv
   module ByMail
     class LetterEnqueuedController < ApplicationController
       include Idv::AvailabilityConcern
-      include IdvSession
+      include IdvSessionConcern
       include Idv::StepIndicatorConcern
 
       before_action :confirm_two_factor_authenticated

diff --git a/app/controllers/idv/cancellations_controller.rb b/app/controllers/idv/cancellations_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class CancellationsController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
     include GoBackHelper
 
     before_action :confirm_idv_needed

diff --git a/app/controllers/idv/confirm_start_over_controller.rb b/app/controllers/idv/confirm_start_over_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class ConfirmStartOverController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
     include StepIndicatorConcern
     include GoBackHelper
 

diff --git a/app/controllers/idv/forgot_password_controller.rb b/app/controllers/idv/forgot_password_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class ForgotPasswordController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
 
     before_action :confirm_two_factor_authenticated
     before_action :confirm_idv_needed

diff --git a/app/controllers/idv/in_person/ready_to_verify_controller.rb b/app/controllers/idv/in_person/ready_to_verify_controller.rb
@@ -2,7 +2,7 @@ module Idv
   module InPerson
     class ReadyToVerifyController < ApplicationController
       include Idv::AvailabilityConcern
-      include IdvSession
+      include IdvSessionConcern
       include RenderConditionConcern
       include StepIndicatorConcern
       include OptInHelper

diff --git a/app/controllers/idv/in_person/verify_info_controller.rb b/app/controllers/idv/in_person/verify_info_controller.rb
@@ -75,7 +75,7 @@ def pii
         user_session.dig('idv/in_person', :pii_from_user)
       end
 
-      # override IdvSession concern
+      # override IdvSessionConcern
       def flow_session
         user_session.fetch('idv/in_person', {})
       end

diff --git a/app/controllers/idv/in_person_controller.rb b/app/controllers/idv/in_person_controller.rb
@@ -8,7 +8,7 @@ class InPersonController < ApplicationController
     before_action :confirm_two_factor_authenticated
     before_action :redirect_unless_enrollment
 
-    include IdvSession
+    include IdvSessionConcern
     include Flow::FlowStateMachine
     include Idv::ThreatMetrixConcern
 

diff --git a/app/controllers/idv/mail_only_warning_controller.rb b/app/controllers/idv/mail_only_warning_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class MailOnlyWarningController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
     include StepIndicatorConcern
 
     before_action :confirm_two_factor_authenticated

diff --git a/app/controllers/idv/resend_otp_controller.rb b/app/controllers/idv/resend_otp_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class ResendOtpController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
     include PhoneOtpRateLimitable
     include PhoneOtpSendable
 

diff --git a/app/controllers/idv/session_errors_controller.rb b/app/controllers/idv/session_errors_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class SessionErrorsController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
     include StepIndicatorConcern
 
     before_action :confirm_two_factor_authenticated_or_user_id_in_session

diff --git a/app/controllers/idv/sessions_controller.rb b/app/controllers/idv/sessions_controller.rb
@@ -1,7 +1,7 @@
 module Idv
   class SessionsController < ApplicationController
     include Idv::AvailabilityConcern
-    include IdvSession
+    include IdvSessionConcern
 
     before_action :confirm_two_factor_authenticated
 

diff --git a/app/controllers/idv_controller.rb b/app/controllers/idv_controller.rb
@@ -1,5 +1,5 @@
 class IdvController < ApplicationController
-  include IdvSession
+  include IdvSessionConcern
   include AccountReactivationConcern
   include VerifyProfileConcern
   include RateLimitConcern

diff --git a/app/controllers/redirect/policy_controller.rb b/app/controllers/redirect/policy_controller.rb
@@ -7,4 +7,4 @@ def show
       )
     end
   end
-  end
+end
diff --git a/app/forms/idv/address_form.rb b/app/forms/idv/address_form.rb
@@ -34,7 +34,7 @@ def submit(params)
     def consume_params(params)
       params.each do |key, value|
         raise_invalid_address_parameter_error(key) unless ATTRIBUTES.include?(key.to_sym)
-        send("#{key}=", value)
+        send(:"#{key}=", value)
         if send(key) != @pii[key] && (send(key).present? || @pii[key].present?)
           @address_edited = true
         end

diff --git a/app/forms/idv/api_image_upload_form.rb b/app/forms/idv/api_image_upload_form.rb
@@ -188,7 +188,7 @@ def determine_response(form_response:, client_response:, doc_pii_response:)
       return form_response unless form_response.success?
 
       # doc_pii validation failed
-      return doc_pii_response if (doc_pii_response.present? && !doc_pii_response.success?)
+      return doc_pii_response if doc_pii_response.present? && !doc_pii_response.success?
 
       client_response
     end

diff --git a/app/forms/idv/in_person/address_form.rb b/app/forms/idv/in_person/address_form.rb
@@ -32,7 +32,7 @@ def submit(params)
       def consume_params(params)
         params.each do |key, value|
           raise_invalid_address_parameter_error(key) unless ATTRIBUTES.include?(key.to_sym)
-          send("#{key}=", value)
+          send(:"#{key}=", value)
         end
       end
 

diff --git a/app/forms/idv/ssn_format_form.rb b/app/forms/idv/ssn_format_form.rb
@@ -36,7 +36,7 @@ def updating_ssn?
     def consume_params(params)
       params.each do |key, value|
         raise_invalid_ssn_parameter_error(key) unless ATTRIBUTES.include?(key.to_sym)
-        send("#{key}=", value)
+        send(:"#{key}=", value)
       end
     end
 

diff --git a/app/forms/idv/state_id_form.rb b/app/forms/idv/state_id_form.rb
@@ -38,7 +38,7 @@ def submit(params)
     def consume_params(params)
       params.each do |key, value|
         raise_invalid_state_id_parameter_error(key) unless ATTRIBUTES.include?(key.to_sym)
-        send("#{key}=", value)
+        send(:"#{key}=", value)
       end
     end
 

diff --git a/app/javascript/packages/build-sass/index.js b/app/javascript/packages/build-sass/index.js
@@ -26,7 +26,7 @@ const TARGETS = browserslistToTargets(
  * Compiles a given Sass file.
  *
  * @param {string} file File to build.
- * @param {BuildOptions & SyncSassOptions} options Build options.
+ * @param {Partial<BuildOptions> & SyncSassOptions} options Build options.
  *
  * @return {Promise<CompileResult>}
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ def show @@
           )
         end
       end
-      end
+    end