rebase merge conflict. fix mis-inserted function in auth count concer…

…n, leverage helper method
18F · May 7, 2024 · 4d0d82f · 4d0d82f
1 parent a389e68
commit 4d0d82f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/app/controllers/concerns/authorization_count_concern.rb b/app/controllers/concerns/authorization_count_concern.rb
@@ -27,9 +27,9 @@ def bump_auth_count
   def delete_auth_count(request_id)
     session[:sp_auth_count].delete request_id
   end
-end
 
-def sign_in_duration
-  return unless session[:sign_in_page_visited_at]
-  (Time.zone.now - Time.zone.parse(session[:sign_in_page_visited_at])).seconds.to_i
+  def sign_in_duration
+    return unless session[:sign_in_page_visited_at]
+    (Time.zone.now - Time.zone.parse(session[:sign_in_page_visited_at])).seconds.to_i
+  end
 end
diff --git a/spec/controllers/openid_connect/authorization_controller_spec.rb b/spec/controllers/openid_connect/authorization_controller_spec.rb
@@ -52,7 +52,7 @@
       before do
         stub_sign_in user
         session[:sign_in_flow] = sign_in_flow
-        session[:sign_in_page_visited_at] = (Time.zone.now - 2.minutes).to_s
+        session[:sign_in_page_visited_at] = 1.minute.ago.to_s
       end
 
       context 'acr with valid params' do
@@ -146,6 +146,7 @@
               'SP redirect initiated',
               ial: 1,
               billed_ial: 1,
+              sign_in_duration_seconds: 60,
               sign_in_flow:,
               acr_values: 'http://idmanagement.gov/ns/assurance/ial/1',
               vtr: nil,
@@ -201,6 +202,7 @@
             expect(@analytics).to have_logged_event(
               'SP redirect initiated',
               ial: 1,
+              sign_in_duration_seconds: 60,
               billed_ial: 1,
               sign_in_flow:,
               acr_values: '',
@@ -396,6 +398,7 @@
               expect(@analytics).to have_logged_event(
                 'SP redirect initiated',
                 ial: 2,
+                sign_in_duration_seconds: 60,
                 billed_ial: 2,
                 sign_in_flow:,
                 acr_values: 'http://idmanagement.gov/ns/assurance/ial/2',
@@ -770,6 +773,7 @@
                 expect(@analytics).to have_logged_event(
                   'SP redirect initiated',
                   ial: 0,
+                  sign_in_duration_seconds: 60,
                   billed_ial: 2,
                   sign_in_flow:,
                   acr_values: 'http://idmanagement.gov/ns/assurance/ial/0',
@@ -861,6 +865,7 @@
                 expect(@analytics).to have_logged_event(
                   'SP redirect initiated',
                   ial: 0,
+                  sign_in_duration_seconds: 60,
                   billed_ial: 1,
                   sign_in_flow:,
                   acr_values: 'http://idmanagement.gov/ns/assurance/ial/0',
@@ -955,6 +960,7 @@
                 expect(@analytics).to have_logged_event(
                   'SP redirect initiated',
                   ial: 0,
+                  sign_in_duration_seconds: 60,
                   billed_ial: 1,
                   sign_in_flow:,
                   acr_values: 'http://idmanagement.gov/ns/assurance/ial/0',
@@ -1120,6 +1126,7 @@
             expect(@analytics).to have_logged_event(
               'SP redirect initiated',
               ial: 1,
+              sign_in_duration_seconds: 60,
               billed_ial: 1,
               sign_in_flow:,
               acr_values: 'http://idmanagement.gov/ns/assurance/ial/1',
@@ -1176,6 +1183,7 @@
             expect(@analytics).to have_logged_event(
               'SP redirect initiated',
               ial: 1,
+              sign_in_duration_seconds: 60,
               billed_ial: 1,
               sign_in_flow:,
               acr_values: '',
@@ -1372,6 +1380,7 @@
               expect(@analytics).to have_logged_event(
                 'SP redirect initiated',
                 ial: 2,
+                sign_in_duration_seconds: 60,
                 billed_ial: 2,
                 sign_in_flow:,
                 acr_values: 'http://idmanagement.gov/ns/assurance/ial/2',
@@ -1748,6 +1757,7 @@
                 expect(@analytics).to have_logged_event(
                   'SP redirect initiated',
                   ial: 0,
+                  sign_in_duration_seconds: 60,
                   billed_ial: 2,
                   sign_in_flow:,
                   acr_values: 'http://idmanagement.gov/ns/assurance/ial/0',
@@ -1839,6 +1849,7 @@
                 expect(@analytics).to have_logged_event(
                   'SP redirect initiated',
                   ial: 0,
+                  sign_in_duration_seconds: 60,
                   billed_ial: 1,
                   sign_in_flow:,
                   acr_values: 'http://idmanagement.gov/ns/assurance/ial/0',
@@ -1933,6 +1944,7 @@
                 expect(@analytics).to have_logged_event(
                   'SP redirect initiated',
                   ial: 0,
+                  sign_in_duration_seconds: 60,
                   billed_ial: 1,
                   sign_in_flow:,
                   acr_values: 'http://idmanagement.gov/ns/assurance/ial/0',