From 4f550c2a841a85bcf354f7f87023d4f6b357cebc Mon Sep 17 00:00:00 2001
From: Jonathan Hooper <jonathan.hooper@gsa.gov>
Date: Wed, 28 Feb 2024 14:37:19 -0500
Subject: [PATCH 1/2] Remove `tid` argument from OIDC auth helpers

This `tid` arg was used for the IRS attempts API. It has since been retired. These are leftover references and are never used.

[skip changelog]
---
 spec/support/oidc_auth_helper.rb | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/spec/support/oidc_auth_helper.rb b/spec/support/oidc_auth_helper.rb
index 5c7b0dc4f39..acfe7015790 100644
--- a/spec/support/oidc_auth_helper.rb
+++ b/spec/support/oidc_auth_helper.rb
@@ -62,11 +62,12 @@ def visit_idp_from_ial1_oidc_sp_defaulting_to_aal3(**args)
     oidc_path
   end
 
-  def ial1_params(prompt: nil,
-                  state: SecureRandom.hex,
-                  nonce: SecureRandom.hex,
-                  client_id: OIDC_IAL1_ISSUER,
-                  tid: nil)
+  def ial1_params(
+    prompt: nil,
+    state: SecureRandom.hex,
+    nonce: SecureRandom.hex,
+    client_id: OIDC_IAL1_ISSUER
+  )
     ial1_params = {
       client_id: client_id,
       response_type: 'code',
@@ -76,18 +77,18 @@ def ial1_params(prompt: nil,
       state: state,
       nonce: nonce,
     }
-    ial1_params[:tid] = tid if tid
     ial1_params[:prompt] = prompt if prompt
     ial1_params
   end
 
-  def ial2_params(prompt: nil,
-                  state: SecureRandom.hex,
-                  nonce: SecureRandom.hex,
-                  client_id: OIDC_ISSUER,
-                  acr_values: Saml::Idp::Constants::IAL2_AUTHN_CONTEXT_CLASSREF,
-                  tid: nil,
-                  biometric_comparison_required: false)
+  def ial2_params(
+    prompt: nil,
+    state: SecureRandom.hex,
+    nonce: SecureRandom.hex,
+    client_id: OIDC_ISSUER,
+    acr_values: Saml::Idp::Constants::IAL2_AUTHN_CONTEXT_CLASSREF,
+    biometric_comparison_required: false
+  )
     ial2_params = {
       client_id: client_id,
       response_type: 'code',
@@ -97,7 +98,6 @@ def ial2_params(prompt: nil,
       state: state,
       nonce: nonce,
     }
-    ial2_params[:tid] = tid if tid
     ial2_params[:prompt] = prompt if prompt
     if biometric_comparison_required
       ial2_params[:biometric_comparison_required] = 'true'
@@ -112,7 +112,6 @@ def vtr_params(
     nonce: SecureRandom.hex,
     client_id: OIDC_ISSUER,
     scope: 'openid email profile:name social_security_number',
-    tid: nil
   )
     vtr_params = {
       client_id: client_id,
@@ -123,7 +122,6 @@ def vtr_params(
       state: state,
       nonce: nonce,
     }
-    vtr_params[:tid] = tid if tid
     vtr_params[:prompt] = prompt if prompt
     vtr_params
   end

From e83c4f2b4b45e766ead9482edb69b0ae70544bce Mon Sep 17 00:00:00 2001
From: Jonathan Hooper <jonathan.hooper@gsa.gov>
Date: Wed, 28 Feb 2024 15:56:55 -0500
Subject: [PATCH 2/2] syntax error

---
 spec/support/oidc_auth_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/oidc_auth_helper.rb b/spec/support/oidc_auth_helper.rb
index acfe7015790..3c236979331 100644
--- a/spec/support/oidc_auth_helper.rb
+++ b/spec/support/oidc_auth_helper.rb
@@ -111,7 +111,7 @@ def vtr_params(
     state: SecureRandom.hex,
     nonce: SecureRandom.hex,
     client_id: OIDC_ISSUER,
-    scope: 'openid email profile:name social_security_number',
+    scope: 'openid email profile:name social_security_number'
   )
     vtr_params = {
       client_id: client_id,