18F · theabrad · Sep 18, 2023 · Sep 13, 2023 · Sep 13, 2023 · Sep 13, 2023
diff --git a/app/controllers/accounts/connected_accounts_controller.rb b/app/controllers/accounts/connected_accounts_controller.rb
@@ -10,7 +10,7 @@ def show
         decrypted_pii: nil,
         personal_key: flash[:personal_key],
         sp_session_request_url: sp_session_request_url_with_updated_params,
-        sp_name: decorated_session.sp_name,
+        sp_name: decorated_sp_session.sp_name,
         user: current_user,
         locked_for_session: pii_locked_for_session?(current_user),
       )

diff --git a/app/controllers/accounts/history_controller.rb b/app/controllers/accounts/history_controller.rb
@@ -10,7 +10,7 @@ def show
         decrypted_pii: nil,
         personal_key: flash[:personal_key],
         sp_session_request_url: sp_session_request_url_with_updated_params,
-        sp_name: decorated_session.sp_name,
+        sp_name: decorated_sp_session.sp_name,
         user: current_user,
         locked_for_session: pii_locked_for_session?(current_user),
       )

diff --git a/app/controllers/accounts/two_factor_authentication_controller.rb b/app/controllers/accounts/two_factor_authentication_controller.rb
@@ -11,7 +11,7 @@ def show
         decrypted_pii: nil,
         personal_key: flash[:personal_key],
         sp_session_request_url: sp_session_request_url_with_updated_params,
-        sp_name: decorated_session.sp_name,
+        sp_name: decorated_sp_session.sp_name,
         user: current_user,
         locked_for_session: pii_locked_for_session?(current_user),
       )

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -13,7 +13,7 @@ def show
       decrypted_pii: cacher.fetch,
       personal_key: flash[:personal_key],
       sp_session_request_url: sp_session_request_url_with_updated_params,
-      sp_name: decorated_session.sp_name,
+      sp_name: decorated_sp_session.sp_name,
       user: current_user,
       locked_for_session: pii_locked_for_session?(current_user),
     )

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base
     rescue_from error, with: :render_timeout
   end
 
-  helper_method :decorated_session, :user_fully_authenticated?
+  helper_method :decorated_sp_session, :user_fully_authenticated?
 
   prepend_before_action :add_new_relic_trace_attributes
   prepend_before_action :session_expires_at
@@ -79,15 +79,15 @@ def user_event_creator
     @user_event_creator ||= UserEventCreator.new(request: request, current_user: current_user)
   end
   delegate :create_user_event, :create_user_event_with_disavowal, to: :user_event_creator
-  delegate :remember_device_default, to: :decorated_session
+  delegate :remember_device_default, to: :decorated_sp_session
 
-  def decorated_session
-    @decorated_session ||= DecoratedSession.new(
+  def decorated_sp_session
+    @decorated_sp_session ||= ServiceProviderSessionCreator.new(
       sp: current_sp,
       view_context: view_context,
       sp_session: sp_session,
       service_provider_request: service_provider_request,
-    ).call
+    ).create_session
   end
 
   def default_url_options

diff --git a/app/controllers/concerns/idv_session.rb b/app/controllers/concerns/idv_session.rb
@@ -8,7 +8,7 @@ module IdvSession
 
   def confirm_idv_needed
     return if idv_session_user.active_profile.blank? ||
-              decorated_session.requested_more_recent_verification? ||
+              decorated_sp_session.requested_more_recent_verification? ||
               idv_session_user.reproof_for_irs?(service_provider: current_sp)
 
     redirect_to idv_activated_url

diff --git a/app/controllers/concerns/remember_device_concern.rb b/app/controllers/concerns/remember_device_concern.rb
@@ -18,7 +18,7 @@ def check_remember_device_preference
     return if remember_device_cookie.nil?
     return unless remember_device_cookie.valid_for_user?(
       user: current_user,
-      expiration_interval: decorated_session.mfa_expiration_interval,
+      expiration_interval: decorated_sp_session.mfa_expiration_interval,
     )
 
     handle_valid_remember_device_cookie(remember_device_cookie: remember_device_cookie)
@@ -35,7 +35,7 @@ def remember_device_cookie
   def remember_device_expired_for_sp?
     expired_for_interval?(
       current_user,
-      decorated_session.mfa_expiration_interval,
+      decorated_sp_session.mfa_expiration_interval,
     )
   end
 

diff --git a/app/controllers/concerns/secure_headers_concern.rb b/app/controllers/concerns/secure_headers_concern.rb
@@ -21,7 +21,7 @@ def csp_uris
     # Returns fully formed CSP array w/"'self'" and redirect_uris
     SecureHeadersAllowList.csp_with_sp_redirect_uris(
       authorize_params[:redirect_uri],
-      decorated_session.sp_redirect_uris,
+      decorated_sp_session.sp_redirect_uris,
     )
   end
 

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -11,7 +11,7 @@ def show
       decrypted_pii: nil,
       personal_key: nil,
       sp_session_request_url: sp_session_request_url_with_updated_params,
-      sp_name: decorated_session.sp_name,
+      sp_name: decorated_sp_session.sp_name,
       user: current_user,
       locked_for_session: pii_locked_for_session?(current_user),
     )

diff --git a/app/controllers/idv/by_mail/enter_code_controller.rb b/app/controllers/idv/by_mail/enter_code_controller.rb
@@ -102,10 +102,10 @@ def prepare_for_personal_key
           UserAlerts::AlertUserAboutAccountVerified.call(
             user: current_user,
             date_time: event.created_at,
-            sp_name: decorated_session.sp_name,
+            sp_name: decorated_sp_session.sp_name,
           )
           flash[:success] = t('account.index.verification.success')
-        end
+      end
 
         idv_session.address_verification_mechanism = 'gpo'
         idv_session.address_confirmed!

diff --git a/app/controllers/idv/cancellations_controller.rb b/app/controllers/idv/cancellations_controller.rb
@@ -10,7 +10,7 @@ def new
       self.session_go_back_path = go_back_path || idv_path
       @hybrid_session = hybrid_session?
       @presenter = CancellationsPresenter.new(
-        sp_name: decorated_session.sp_name,
+        sp_name: decorated_sp_session.sp_name,
         url_options: url_options,
       )
     end
@@ -72,7 +72,7 @@ def cancel_session
     end
 
     def cancelled_redirect_path
-      if decorated_session.sp_name
+      if decorated_sp_session.sp_name
         return_to_sp_failure_to_proof_path(location_params)
       else
         account_path

diff --git a/app/controllers/idv/document_capture_controller.rb b/app/controllers/idv/document_capture_controller.rb
@@ -39,7 +39,7 @@ def extra_view_variables
       {
         document_capture_session_uuid: document_capture_session_uuid,
         flow_path: 'standard',
-        sp_name: decorated_session.sp_name,
+        sp_name: decorated_sp_session.sp_name,
         failure_to_proof_url: return_to_sp_failure_to_proof_url(step: 'document_capture'),
       }.merge(
         acuant_sdk_upgrade_a_b_testing_variables,

diff --git a/app/controllers/idv/getting_started_controller.rb b/app/controllers/idv/getting_started_controller.rb
@@ -13,7 +13,7 @@ def show
       Funnel::DocAuth::RegisterStep.new(current_user.id, sp_session[:issuer]).
         call('agreement', :view, true)
 
-      @sp_name = decorated_session.sp_name || APP_NAME
+      @sp_name = decorated_sp_session.sp_name || APP_NAME
       @title = t('doc_auth.headings.getting_started', sp_name: @sp_name)
     end
 

diff --git a/app/controllers/idv/review_controller.rb b/app/controllers/idv/review_controller.rb
@@ -128,7 +128,7 @@ def init_profile
         UserAlerts::AlertUserAboutAccountVerified.call(
           user: current_user,
           date_time: event.created_at,
-          sp_name: decorated_session.sp_name,
+          sp_name: decorated_sp_session.sp_name,
         )
       end
     end

diff --git a/app/controllers/idv/session_errors_controller.rb b/app/controllers/idv/session_errors_controller.rb
@@ -32,7 +32,7 @@ def failure
         rate_limit_type: :idv_resolution,
       )
       @expires_at = rate_limiter.expires_at
-      @sp_name = decorated_session.sp_name
+      @sp_name = decorated_sp_session.sp_name
       log_event(based_on_limiter: rate_limiter)
     end
 

diff --git a/app/controllers/idv/welcome_controller.rb b/app/controllers/idv/welcome_controller.rb
@@ -13,7 +13,7 @@ def show
       Funnel::DocAuth::RegisterStep.new(current_user.id, sp_session[:issuer]).
         call('welcome', :view, true)
 
-      @sp_name = decorated_session.sp_name || APP_NAME
+      @sp_name = decorated_sp_session.sp_name || APP_NAME
       @title = t('doc_auth.headings.getting_started', sp_name: @sp_name)
 
       @ab_test_bucket = getting_started_ab_test_bucket

diff --git a/app/controllers/idv_controller.rb b/app/controllers/idv_controller.rb
@@ -10,7 +10,7 @@ class IdvController < ApplicationController
   before_action :confirm_not_rate_limited
 
   def index
-    if decorated_session.requested_more_recent_verification? ||
+    if decorated_sp_session.requested_more_recent_verification? ||
        current_user.reproof_for_irs?(service_provider: current_sp)
       verify_identity
     elsif active_profile?

diff --git a/app/controllers/openid_connect/authorization_controller.rb b/app/controllers/openid_connect/authorization_controller.rb
@@ -88,7 +88,7 @@ def track_handoff_analytics(result, attributes = {})
     def identity_needs_verification?
       (@authorize_form.ial2_requested? &&
         (current_user.identity_not_verified? ||
-        decorated_session.requested_more_recent_verification?)) ||
+        decorated_sp_session.requested_more_recent_verification?)) ||
         current_user.reproof_for_irs?(service_provider: current_sp)
     end
 

diff --git a/app/controllers/saml_idp_controller.rb b/app/controllers/saml_idp_controller.rb
@@ -152,7 +152,7 @@ def handle_successful_handoff
 
   def render_template_for(message, action_url, type)
     # Returns fully formed CSP array w/"'self'", domain, and ServiceProvider#redirect_uris
-    redirect_uris = decorated_session.sp_redirect_uris ||
+    redirect_uris = decorated_sp_session.sp_redirect_uris ||
                     sp_from_request_issuer_logout&.redirect_uris.to_a.compact
     csp_uris = SecureHeadersAllowList.csp_with_sp_redirect_uris(
       action_url, redirect_uris

diff --git a/app/controllers/sign_out_controller.rb b/app/controllers/sign_out_controller.rb
@@ -6,7 +6,7 @@ def destroy
     irs_attempts_api_tracker.logout_initiated(
       success: true,
     )
-    url_after_cancellation = decorated_session.cancel_link_url
+    url_after_cancellation = decorated_sp_session.cancel_link_url
     sign_out
     flash[:success] = t('devise.sessions.signed_out')
     redirect_to(url_after_cancellation, allow_other_host: true)

diff --git a/app/controllers/sign_up/cancellations_controller.rb b/app/controllers/sign_up/cancellations_controller.rb
@@ -12,7 +12,7 @@ def new
 
     def destroy
       track_account_deletion_event
-      url_after_cancellation = decorated_session.cancel_link_url
+      url_after_cancellation = decorated_sp_session.cancel_link_url
       destroy_user
       flash[:success] = t('sign_up.cancel.success')
       redirect_to url_after_cancellation

diff --git a/app/controllers/sign_up/completions_controller.rb b/app/controllers/sign_up/completions_controller.rb
@@ -44,7 +44,7 @@ def completions_presenter
         current_user: current_user,
         current_sp: current_sp,
         decrypted_pii: pii,
-        requested_attributes: decorated_session.requested_attributes.map(&:to_sym),
+        requested_attributes: decorated_sp_session.requested_attributes.map(&:to_sym),
         ial2_requested: ial2_requested?,
         completion_context: needs_completion_screen_reason,
       )
@@ -75,15 +75,15 @@ def sign_user_out_and_instruct_to_go_back_to_mobile_app
       sign_out
       flash[:info] = t(
         'instructions.go_back_to_mobile_app',
-        friendly_name: decorated_session.sp_name,
+        friendly_name: decorated_sp_session.sp_name,
       )
       redirect_to new_user_session_url
     end
 
     def analytics_attributes(page_occurence)
       { ial2: sp_session[:ial2],
         ialmax: sp_session[:ialmax],
-        service_provider_name: decorated_session.sp_name,
+        service_provider_name: decorated_sp_session.sp_name,
         sp_session_requested_attributes: sp_session[:requested_attributes],
         sp_request_requested_attributes: service_provider_request.requested_attributes,
         page_occurence: page_occurence,

diff --git a/app/controllers/two_factor_authentication/sms_opt_in_controller.rb b/app/controllers/two_factor_authentication/sms_opt_in_controller.rb
@@ -72,7 +72,7 @@ def other_options_mfa_url
     def cancel_url
       if user_fully_authenticated?
         account_path
-      elsif decorated_session.sp_name
+      elsif decorated_sp_session.sp_name
         return_to_sp_cancel_path
       else
         sign_out_path

diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
@@ -22,7 +22,7 @@ def new
 
       @ial = sp_session_ial
       @issuer_forced_reauthentication = issuer_forced_reauthentication?(
-        issuer: decorated_session.sp_issuer,
+        issuer: decorated_sp_session.sp_issuer,
       )
       analytics.sign_in_page_visit(
         flash: flash[:alert],

diff --git a/app/decorators/session_decorator.rb → ...corators/null_service_provider_session.rb b/app/decorators/session_decorator.rb → ...corators/null_service_provider_session.rb
@@ -1,4 +1,4 @@
-class SessionDecorator
+class NullServiceProviderSession
   def initialize(view_context: nil)
     @view_context = view_context
   end

diff --git a/...ors/service_provider_session_decorator.rb → app/decorators/service_provider_session.rb b/...ors/service_provider_session_decorator.rb → app/decorators/service_provider_session.rb
@@ -1,4 +1,4 @@
-class ServiceProviderSessionDecorator
+class ServiceProviderSession
   include ActionView::Helpers::TranslationHelper
   include Rails.application.routes.url_helpers
 

diff --git a/app/services/decorated_session.rb → ...vices/service_provider_session_creator.rb b/app/services/decorated_session.rb → ...vices/service_provider_session_creator.rb
@@ -1,21 +1,21 @@
-class DecoratedSession
+class ServiceProviderSessionCreator
   def initialize(sp:, view_context:, sp_session:, service_provider_request:)
     @sp = sp
     @view_context = view_context
     @sp_session = sp_session
     @service_provider_request = service_provider_request
   end
 
-  def call
+  def create_session
     if sp
-      ServiceProviderSessionDecorator.new(
+      ServiceProviderSession.new(
         sp: sp,
         view_context: view_context,
         sp_session: sp_session,
         service_provider_request: service_provider_request,
       )
     else
-      SessionDecorator.new(view_context: view_context)
+      NullServiceProviderSession.new(view_context: view_context)
     end
   end
 

diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -25,5 +25,5 @@
 <% end %>
 
 <%= render(PageFooterComponent.new) do %>
-  <%= link_to t('links.cancel'), decorated_session.cancel_link_url %>
+  <%= link_to t('links.cancel'), decorated_sp_session.cancel_link_url %>
 <% end %>
diff --git a/app/views/devise/sessions/_return_to_service_provider.html.erb b/app/views/devise/sessions/_return_to_service_provider.html.erb
@@ -1,4 +1,4 @@
 <%= link_to(
-      "‹ #{t('links.back_to_sp', sp: decorated_session.sp_name)}",
+      "‹ #{t('links.back_to_sp', sp: decorated_sp_session.sp_name)}",
       return_to_sp_cancel_path,
     ) %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -1,6 +1,6 @@
 <% title t('titles.visitors.index') %>
 
-<% if decorated_session.sp_name %>
+<% if decorated_sp_session.sp_name %>
   <%= render 'sign_up/registrations/sp_registration_heading' %>
 <% end %>
 
@@ -19,7 +19,7 @@
 
 <% if @issuer_forced_reauthentication %>
   <p>
-    <%= t('account.login.forced_reauthentication_notice_html', sp_name: decorated_session.sp_name) %>
+    <%= t('account.login.forced_reauthentication_notice_html', sp_name: decorated_sp_session.sp_name) %>
   </p>
 <% end %>
 
@@ -64,7 +64,7 @@
 <% end %>
 
 <%= render PageFooterComponent.new do %>
-  <% if decorated_session.sp_name %>
+  <% if decorated_sp_session.sp_name %>
     <div class="margin-bottom-1">
       <%= render 'devise/sessions/return_to_service_provider' %>
     </div>

diff --git a/app/views/idv/by_mail/letter_enqueued/show.html.erb b/app/views/idv/by_mail/letter_enqueued/show.html.erb
@@ -26,14 +26,14 @@
     <%= t('idv.messages.come_back_later_password_html') %>
   </p>
   <p>
-    <% if decorated_session.sp_name.present? %>
-      <%= t('idv.messages.come_back_later_sp_html', sp: decorated_session.sp_name) %>
+    <% if decorated_sp_session.sp_name.present? %>
+      <%= t('idv.messages.come_back_later_sp_html', sp: decorated_sp_session.sp_name) %>
     <% else %>
       <%= t('idv.messages.come_back_later_no_sp_html', app_name: APP_NAME) %>
     <% end %>
   </p>
   <div class="margin-top-5 margin-bottom-1">
-  <% if decorated_session.sp_name.present? %>
+  <% if decorated_sp_session.sp_name.present? %>
     <%= link_to(
           t('idv.cancel.actions.exit', app_name: APP_NAME),
           return_to_sp_cancel_path(location: :come_back_later),

diff --git a/app/views/idv/document_capture/show.html.erb b/app/views/idv/document_capture/show.html.erb
@@ -2,7 +2,7 @@
       'idv/shared/document_capture',
       document_capture_session_uuid: document_capture_session_uuid,
       flow_path: 'standard',
-      sp_name: decorated_session.sp_name,
+      sp_name: decorated_sp_session.sp_name,
       failure_to_proof_url: failure_to_proof_url,
       acuant_sdk_upgrade_a_b_testing_enabled: acuant_sdk_upgrade_a_b_testing_enabled,
       use_alternate_sdk: use_alternate_sdk,

diff --git a/app/views/idv/hybrid_mobile/document_capture/show.html.erb b/app/views/idv/hybrid_mobile/document_capture/show.html.erb
@@ -2,7 +2,7 @@
       'idv/shared/document_capture',
       document_capture_session_uuid: document_capture_session_uuid,
       flow_path: 'hybrid',
-      sp_name: decorated_session.sp_name,
+      sp_name: decorated_sp_session.sp_name,
       failure_to_proof_url: failure_to_proof_url,
       acuant_sdk_upgrade_a_b_testing_enabled: acuant_sdk_upgrade_a_b_testing_enabled,
       use_alternate_sdk: use_alternate_sdk,