18F · aduth · Nov 7, 2024 · Nov 7, 2024 · Nov 7, 2024 · Nov 7, 2024
diff --git a/app/controllers/account_reset/cancel_controller.rb b/app/controllers/account_reset/cancel_controller.rb
@@ -6,7 +6,7 @@ def show
       return render :show unless token
 
       result = AccountReset::ValidateCancelToken.new(token).call
-      analytics.account_reset_cancel_token_validation(**result.to_h)
+      analytics.account_reset_cancel_token_validation(**result)
 
       if result.success?
         handle_valid_token
@@ -18,7 +18,7 @@ def show
     def create
       result = AccountReset::Cancel.new(session[:cancel_token]).call
 
-      analytics.account_reset_cancel(**result.to_h)
+      analytics.account_reset_cancel(**result)
 
       if result.success?
         handle_success

diff --git a/app/controllers/account_reset/delete_account_controller.rb b/app/controllers/account_reset/delete_account_controller.rb
@@ -6,7 +6,7 @@ def show
       render :show and return unless token
 
       result = AccountReset::ValidateGrantedToken.new(token, request, analytics).call
-      analytics.account_reset_granted_token_validation(**result.to_h)
+      analytics.account_reset_granted_token_validation(**result)
 
       if result.success?
         handle_valid_token

diff --git a/app/controllers/account_reset/request_controller.rb b/app/controllers/account_reset/request_controller.rb
@@ -23,7 +23,7 @@ def create
 
     def create_account_reset_request
       response = AccountReset::CreateRequest.new(current_user, sp_session[:issuer]).call
-      analytics.account_reset_request(**response.to_h, **analytics_attributes)
+      analytics.account_reset_request(**response, **analytics_attributes)
     end
 
     def confirm_two_factor_enabled

diff --git a/app/controllers/accounts/connected_accounts/selected_email_controller.rb b/app/controllers/accounts/connected_accounts/selected_email_controller.rb
@@ -20,7 +20,7 @@ def update
 
         result = @select_email_form.submit(form_params)
 
-        analytics.sp_select_email_submitted(**result.to_h)
+        analytics.sp_select_email_submitted(**result)
 
         if result.success?
           flash[:email_updated_identity_id] = identity.id

diff --git a/app/controllers/accounts/personal_keys_controller.rb b/app/controllers/accounts/personal_keys_controller.rb
@@ -19,7 +19,7 @@ def create
       analytics.profile_personal_key_create
       create_user_event(:new_personal_key)
       result = send_new_personal_key_notifications
-      analytics.profile_personal_key_create_notifications(**result.to_h)
+      analytics.profile_personal_key_create_notifications(**result)
 
       flash[:info] = t('account.personal_key.old_key_will_not_work')
       redirect_to manage_personal_key_url

diff --git a/app/controllers/api/internal/two_factor_authentication/auth_app_controller.rb b/app/controllers/api/internal/two_factor_authentication/auth_app_controller.rb
@@ -19,7 +19,7 @@ def update
             configuration_id: params[:id],
           ).submit(name: params[:name])
 
-          analytics.auth_app_update_name_submitted(**result.to_h)
+          analytics.auth_app_update_name_submitted(**result)
 
           if result.success?
             render json: { success: true }
@@ -34,7 +34,7 @@ def destroy
             configuration_id: params[:id],
           ).submit
 
-          analytics.auth_app_delete_submitted(**result.to_h)
+          analytics.auth_app_delete_submitted(**result)
 
           if result.success?
             create_user_event(:authenticator_disabled)

diff --git a/app/controllers/api/internal/two_factor_authentication/piv_cac_controller.rb b/app/controllers/api/internal/two_factor_authentication/piv_cac_controller.rb
@@ -20,7 +20,7 @@ def update
             configuration_id: params[:id],
           ).submit(name: params[:name])
 
-          analytics.piv_cac_update_name_submitted(**result.to_h)
+          analytics.piv_cac_update_name_submitted(**result)
 
           if result.success?
             render json: { success: true }
@@ -35,7 +35,7 @@ def destroy
             configuration_id: params[:id],
           ).submit
 
-          analytics.piv_cac_delete_submitted(**result.to_h)
+          analytics.piv_cac_delete_submitted(**result)
 
           if result.success?
             create_user_event(:piv_cac_disabled)

diff --git a/app/controllers/api/internal/two_factor_authentication/webauthn_controller.rb b/app/controllers/api/internal/two_factor_authentication/webauthn_controller.rb
@@ -19,7 +19,7 @@ def update
             configuration_id: params[:id],
           ).submit(name: params[:name])
 
-          analytics.webauthn_update_name_submitted(**result.to_h)
+          analytics.webauthn_update_name_submitted(**result)
 
           if result.success?
             render json: { success: true }
@@ -34,7 +34,7 @@ def destroy
             configuration_id: params[:id],
           ).submit
 
-          analytics.webauthn_delete_submitted(**result.to_h)
+          analytics.webauthn_delete_submitted(**result)
 
           if result.success?
             create_user_event(:webauthn_key_removed)

diff --git a/app/controllers/concerns/idv/verify_info_concern.rb b/app/controllers/concerns/idv/verify_info_concern.rb
@@ -219,7 +219,7 @@ def async_state_done(current_async_state)
         flash[:success] = t('doc_auth.forms.doc_success')
         redirect_to next_step_url
       end
-      analytics.idv_doc_auth_verify_proofing_results(**analytics_arguments, **form_response.to_h)
+      analytics.idv_doc_auth_verify_proofing_results(**analytics_arguments, **form_response)
     end
 
     def next_step_url

diff --git a/app/controllers/concerns/two_factor_authenticatable_methods.rb b/app/controllers/concerns/two_factor_authenticatable_methods.rb
@@ -14,7 +14,7 @@ def auth_methods_session
   def handle_verification_for_authentication_context(result:, auth_method:, extra_analytics: nil)
     increment_mfa_selection_attempt_count(auth_method)
     analytics.multi_factor_auth(
-      **result.to_h,
+      **result,
       multi_factor_auth_method: auth_method,
       enabled_mfa_methods_count: mfa_context.enabled_mfa_methods_count,
       new_device: new_device?,

diff --git a/app/controllers/event_disavowal_controller.rb b/app/controllers/event_disavowal_controller.rb
@@ -10,13 +10,13 @@ def new
       success: true,
       extra: EventDisavowal::BuildDisavowedEventAnalyticsAttributes.call(disavowed_event),
     )
-    analytics.event_disavowal(**result.to_h)
+    analytics.event_disavowal(**result)
     @forbidden_passwords = forbidden_passwords
   end
 
   def create
     result = password_reset_from_disavowal_form.submit(password_reset_params)
-    analytics.event_disavowal_password_reset(**result.to_h)
+    analytics.event_disavowal_password_reset(**result)
     if result.success?
       handle_successful_password_reset
     else
@@ -50,7 +50,7 @@ def validate_disavowed_event
       return
     end
 
-    analytics.event_disavowal_token_invalid(**result.to_h)
+    analytics.event_disavowal_token_invalid(**result)
     flash[:error] = (result.errors[:event] || result.errors.first.last).first
     redirect_to root_url
   end

diff --git a/app/controllers/idv/by_mail/enter_code_controller.rb b/app/controllers/idv/by_mail/enter_code_controller.rb
@@ -53,7 +53,7 @@ def create
         @gpo_verify_form = build_gpo_verify_form
 
         result = @gpo_verify_form.submit(resolved_authn_context_result.enhanced_ipp?)
-        analytics.idv_verify_by_mail_enter_code_submitted(**result.to_h)
+        analytics.idv_verify_by_mail_enter_code_submitted(**result)
 
         if !result.success?
           if rate_limiter.limited?

diff --git a/app/controllers/idv/in_person/address_controller.rb b/app/controllers/idv/in_person/address_controller.rb
@@ -25,7 +25,7 @@ def update
         form_result = form.submit(flow_params)
 
         analytics.idv_in_person_proofing_residential_address_submitted(
-          **analytics_arguments.merge(**form_result.to_h),
+          **analytics_arguments.merge(**form_result),
         )
 
         if form_result.success?

diff --git a/app/controllers/idv/in_person/state_id_controller.rb b/app/controllers/idv/in_person/state_id_controller.rb
@@ -31,7 +31,7 @@ def update
           end
 
           analytics.idv_in_person_proofing_state_id_submitted(
-            **analytics_arguments.merge(**form_result.to_h),
+            **analytics_arguments.merge(**form_result),
           )
           # Accept Date of Birth from both memorable date and input date components
           formatted_dob = MemorableDateComponent.extract_date_param flow_params&.[](:dob)

diff --git a/app/controllers/idv/otp_verification_controller.rb b/app/controllers/idv/otp_verification_controller.rb
@@ -22,7 +22,7 @@ def show
     def update
       clear_future_steps!
       result = phone_confirmation_otp_verification_form.submit(code: params[:code])
-      analytics.idv_phone_confirmation_otp_submitted(**result.to_h, **ab_test_analytics_buckets)
+      analytics.idv_phone_confirmation_otp_submitted(**result, **ab_test_analytics_buckets)
 
       if result.success?
         idv_session.mark_phone_step_complete!

diff --git a/app/controllers/idv/phone_controller.rb b/app/controllers/idv/phone_controller.rb
@@ -55,7 +55,7 @@ def create
       Funnel::DocAuth::RegisterStep.new(current_user.id, current_sp&.issuer).
         call(:verify_phone, :update, result.success?)
 
-      analytics.idv_phone_confirmation_form_submitted(**result.to_h, **ab_test_analytics_buckets)
+      analytics.idv_phone_confirmation_form_submitted(**result, **ab_test_analytics_buckets)
       if result.success?
         submit_proofing_attempt
         redirect_to idv_phone_path

diff --git a/app/controllers/idv/resend_otp_controller.rb b/app/controllers/idv/resend_otp_controller.rb
@@ -13,7 +13,7 @@ class ResendOtpController < ApplicationController
 
     def create
       result = send_phone_confirmation_otp
-      analytics.idv_phone_confirmation_otp_resent(**result.to_h)
+      analytics.idv_phone_confirmation_otp_resent(**result)
       if result.success?
         redirect_to idv_otp_verification_url
       else

diff --git a/app/controllers/openid_connect/user_info_controller.rb b/app/controllers/openid_connect/user_info_controller.rb
@@ -18,7 +18,7 @@ def show
     def authenticate_identity_via_bearer_token
       verifier = AccessTokenVerifier.new(request.env['HTTP_AUTHORIZATION'])
       response, identity = verifier.submit
-      analytics.openid_connect_bearer_token(**response.to_h)
+      analytics.openid_connect_bearer_token(**response)
 
       if response.success?
         @current_identity = identity

diff --git a/app/controllers/risc/security_events_controller.rb b/app/controllers/risc/security_events_controller.rb
@@ -11,7 +11,7 @@ def create
       form = SecurityEventForm.new(body: request.body.read)
       result = form.submit
 
-      analytics.security_event_received(**result.to_h)
+      analytics.security_event_received(**result)
 
       if result.success?
         head :accepted

diff --git a/app/controllers/sign_up/email_confirmations_controller.rb b/app/controllers/sign_up/email_confirmations_controller.rb
@@ -21,9 +21,7 @@ def create
     private
 
     def log_validator_result
-      analytics.user_registration_email_confirmation(
-        **email_confirmation_token_validator_result.to_h,
-      )
+      analytics.user_registration_email_confirmation(**email_confirmation_token_validator_result)
     end
 
     def clear_setup_piv_cac_from_sign_in

diff --git a/app/controllers/sign_up/passwords_controller.rb b/app/controllers/sign_up/passwords_controller.rb
@@ -42,7 +42,7 @@ def render_page
     end
 
     def track_analytics(result)
-      analytics.password_creation(**result.to_h)
+      analytics.password_creation(**result)
     end
 
     def permitted_params

diff --git a/app/controllers/sign_up/registrations_controller.rb b/app/controllers/sign_up/registrations_controller.rb
@@ -24,7 +24,7 @@ def create
 
       result = @register_user_email_form.submit(permitted_params.merge(request_id:))
 
-      analytics.user_registration_email(**result.to_h)
+      analytics.user_registration_email(**result)
 
       if result.success?
         process_successful_creation

diff --git a/app/controllers/sign_up/select_email_controller.rb b/app/controllers/sign_up/select_email_controller.rb
@@ -21,7 +21,7 @@ def create
 
       result = @select_email_form.submit(form_params)
 
-      analytics.sp_select_email_submitted(**result.to_h, needs_completion_screen_reason:)
+      analytics.sp_select_email_submitted(**result, needs_completion_screen_reason:)
 
       if result.success?
         user_session[:selected_email_id_for_linked_identity] = form_params[:selected_email_id]

diff --git a/app/controllers/two_factor_authentication/options_controller.rb b/app/controllers/two_factor_authentication/options_controller.rb
@@ -34,7 +34,7 @@ def index
     def create
       @two_factor_options_form = TwoFactorLoginOptionsForm.new(current_user)
       result = @two_factor_options_form.submit(two_factor_options_form_params)
-      analytics.multi_factor_auth_option_list(**result.to_h)
+      analytics.multi_factor_auth_option_list(**result)
 
       if result.success?
         process_valid_form

diff --git a/app/controllers/two_factor_authentication/personal_key_verification_controller.rb b/app/controllers/two_factor_authentication/personal_key_verification_controller.rb
@@ -61,7 +61,7 @@ def handle_result(result)
 
     def alert_user_about_personal_key_sign_in(disavowal_token)
       response = UserAlerts::AlertUserAboutPersonalKeySignIn.call(current_user, disavowal_token)
-      analytics.personal_key_alert_about_sign_in(**response.to_h)
+      analytics.personal_key_alert_about_sign_in(**response)
     end
 
     def remove_personal_key

diff --git a/app/controllers/users/auth_app_controller.rb b/app/controllers/users/auth_app_controller.rb
@@ -14,7 +14,7 @@ def edit; end
     def update
       result = form.submit(name: params.dig(:form, :name))
 
-      analytics.auth_app_update_name_submitted(**result.to_h)
+      analytics.auth_app_update_name_submitted(**result)
 
       if result.success?
         flash[:success] = t('two_factor_authentication.auth_app.renamed')
@@ -28,7 +28,7 @@ def update
     def destroy
       result = form.submit
 
-      analytics.auth_app_delete_submitted(**result.to_h)
+      analytics.auth_app_delete_submitted(**result)
 
       if result.success?
         flash[:success] = t('two_factor_authentication.auth_app.deleted')

diff --git a/app/controllers/users/edit_phone_controller.rb b/app/controllers/users/edit_phone_controller.rb
@@ -18,7 +18,7 @@ def edit
     def update
       @edit_phone_form = EditPhoneForm.new(current_user, phone_configuration)
       result = @edit_phone_form.submit(edit_phone_params)
-      analytics.phone_change_submitted(**result.to_h)
+      analytics.phone_change_submitted(**result)
       if result.success?
         redirect_to account_url
       else

diff --git a/app/controllers/users/email_confirmations_controller.rb b/app/controllers/users/email_confirmations_controller.rb
@@ -4,7 +4,7 @@ module Users
   class EmailConfirmationsController < ApplicationController
     def create
       result = email_confirmation_token_validator.submit
-      analytics.add_email_confirmation(**result.to_h)
+      analytics.add_email_confirmation(**result)
       if result.success?
         process_successful_confirmation(email_address)
       else

diff --git a/app/controllers/users/email_language_controller.rb b/app/controllers/users/email_language_controller.rb
@@ -10,7 +10,7 @@ def show
 
     def update
       form_response = UpdateEmailLanguageForm.new(current_user).submit(update_email_params)
-      analytics.email_language_updated(**form_response.to_h)
+      analytics.email_language_updated(**form_response)
 
       flash[:success] = I18n.t('account.email_language.updated') if form_response.success?
 

diff --git a/app/controllers/users/emails_controller.rb b/app/controllers/users/emails_controller.rb
@@ -25,7 +25,7 @@ def add
       result = @add_user_email_form.submit(
         current_user, permitted_params
       )
-      analytics.add_email_request(**result.to_h)
+      analytics.add_email_request(**result)
 
       if result.success?
         process_successful_creation
@@ -58,7 +58,7 @@ def confirm_delete
 
     def delete
       result = DeleteUserEmailForm.new(current_user, email_address).submit
-      analytics.email_deletion_request(**result.to_h)
+      analytics.email_deletion_request(**result)
       if result.success?
         handle_successful_delete
       else

diff --git a/app/controllers/users/passwords_controller.rb b/app/controllers/users/passwords_controller.rb
@@ -26,7 +26,7 @@ def update
 
       result = @update_user_password_form.submit(user_password_params)
 
-      analytics.password_changed(**result.to_h)
+      analytics.password_changed(**result)
 
       if result.success?
         handle_valid_password

diff --git a/app/controllers/users/phone_setup_controller.rb b/app/controllers/users/phone_setup_controller.rb
@@ -33,7 +33,7 @@ def index
     def create
       @new_phone_form = NewPhoneForm.new(user: current_user, analytics: analytics)
       result = @new_phone_form.submit(new_phone_form_params)
-      analytics.multi_factor_auth_phone_setup(**result.to_h)
+      analytics.multi_factor_auth_phone_setup(**result)
 
       if result.success?
         handle_create_success(@new_phone_form.phone)

diff --git a/app/controllers/users/piv_cac_controller.rb b/app/controllers/users/piv_cac_controller.rb
@@ -16,7 +16,7 @@ def edit; end
     def update
       result = form.submit(name: params.dig(:form, :name))
 
-      analytics.piv_cac_update_name_submitted(**result.to_h)
+      analytics.piv_cac_update_name_submitted(**result)
 
       if result.success?
         flash[:success] = presenter.rename_success_alert_text
@@ -30,7 +30,7 @@ def update
     def destroy
       result = form.submit
 
-      analytics.piv_cac_delete_submitted(**result.to_h)
+      analytics.piv_cac_delete_submitted(**result)
 
       if result.success?
         create_user_event(:piv_cac_disabled)

diff --git a/app/controllers/users/piv_cac_login_controller.rb b/app/controllers/users/piv_cac_login_controller.rb
@@ -54,7 +54,7 @@ def process_piv_cac_login
       else
         process_invalid_submission
       end
-      analytics.piv_cac_login(**result.to_h, new_device: @new_device)
+      analytics.piv_cac_login(**result, new_device: @new_device)
     end
 
     def piv_cac_login_form