LG-11784: deletion request 30 days

app/controllers/account_reset/pending_controller.rb

@@ -1,7 +1,7 @@
 module AccountReset
   class PendingController < ApplicationController
     include UserAuthenticator
-    include ActionView::Helpers::DateHelper
+    include AccountResetConcern
 
     before_action :authenticate_user
     before_action :confirm_account_reset_request_exists
@@ -32,16 +32,5 @@ def pending_account_reset_request
         current_user,
       ).call
     end
-
-    def account_reset_deletion_period_interval
-      current_time = Time.zone.now
-
-      distance_of_time_in_words(
-        current_time,
-        current_time + IdentityConfig.store.account_reset_wait_period_days.days,
-        true,
-        accumulate_on: :hours,
-      )
-    end
   end
 end

app/controllers/account_reset/request_controller.rb

@@ -1,7 +1,7 @@
 module AccountReset
   class RequestController < ApplicationController
     include TwoFactorAuthenticatable
-    include ActionView::Helpers::DateHelper
+    include AccountResetConcern
 
     before_action :confirm_two_factor_enabled
 
@@ -41,16 +41,5 @@ def analytics_attributes
         email_addresses: current_user.email_addresses.count,
       }
     end
-
-    def account_reset_deletion_period_interval
-      current_time = Time.zone.now
-
-      distance_of_time_in_words(
-        current_time,
-        current_time + IdentityConfig.store.account_reset_wait_period_days.days,
-        true,
-        accumulate_on: :hours,
-      )
-    end
   end
 end

app/controllers/concerns/account_reset_concern.rb

@@ -0,0 +1,35 @@
+module AccountResetConcern
+  include ActionView::Helpers::DateHelper
+  def account_reset_deletion_period_interval
+    current_time = Time.zone.now
+
+    distance_of_time_in_words(
+      current_time,
+      current_time + account_reset_wait_period_days,
+      true,
+      accumulate_on: reset_accumulation_type,
+    )
+  end
+
+  def account_reset_wait_period_days
+    if supports_fraud_account_reset?
+      IdentityConfig.store.account_reset_fraud_user_wait_period_days.days
+    else
+      IdentityConfig.store.account_reset_wait_period_days.days
+    end
+  end
+
+  def supports_fraud_account_reset?
+    (current_user.fraud_review_pending? ||
+      current_user.fraud_rejection?) &&
+      (IdentityConfig.store.account_reset_fraud_user_wait_period_days.present? )
+  end
+
+  def reset_accumulation_type
+    if account_reset_wait_period_days > 3
+      :days
+    else
+      :hours
+    end
+  end
+end

app/mailers/user_mailer.rb

@@ -144,7 +144,7 @@ def personal_key_regenerated
   def account_reset_request(account_reset)
     with_user_locale(user) do
       @token = account_reset&.request_token
-      @account_reset_deletion_period_hours = account_reset_deletion_period_hours
+      @account_reset_deletion_period_interval = account_reset_deletion_period_interval
       @header = t(
         'user_mailer.account_reset_request.header',
         interval: account_reset_deletion_period_interval,
@@ -160,7 +160,7 @@ def account_reset_granted(account_reset)
     with_user_locale(user) do
       @token = account_reset&.request_token
       @granted_token = account_reset&.granted_token
-      @account_reset_deletion_period_hours = account_reset_deletion_period_hours
+      @account_reset_deletion_period_interval = account_reset_deletion_period_interval
       @account_reset_token_valid_period = account_reset_token_valid_period
       mail(
         to: email_address.email,
@@ -436,14 +436,24 @@ def account_reset_deletion_period_interval
 
     distance_of_time_in_words(
       current_time,
-      current_time + IdentityConfig.store.account_reset_wait_period_days.days,
+      current_time + account_reset_wait_period_days,
       true,
-      accumulate_on: :hours,
+      accumulate_on: reset_accumulation_type,
     )
   end
 
-  def account_reset_deletion_period_hours
-    IdentityConfig.store.account_reset_wait_period_days.days.in_hours.to_i
+  def account_reset_wait_period_days
+    if supports_fraud_account_reset?
+      IdentityConfig.store.account_reset_fraud_user_wait_period_days.days
+    else
+      IdentityConfig.store.account_reset_wait_period_days.days
+    end
+  end
+
+  def supports_fraud_account_reset?
+    (user.fraud_review_pending? ||
+      user.fraud_rejection?) &&
+      (IdentityConfig.store.account_reset_fraud_user_wait_period_days.present?)
   end
 
   def account_reset_token_valid_period
@@ -456,4 +466,12 @@ def account_reset_token_valid_period
       accumulate_on: :hours,
     )
   end
+
+  def reset_accumulation_type
+    if account_reset_wait_period_days > 3
+      :days
+    else
+      :hours
+    end
+  end
 end

app/presenters/account_reset/pending_presenter.rb

@@ -9,7 +9,7 @@ def initialize(account_reset_request)
     end
 
     def time_remaining_until_granted(now: Time.zone.now)
-      wait_time = IdentityConfig.store.account_reset_wait_period_days.days
+      wait_time = account_reset_wait_period_days
 
       distance_of_time_in_words(
         now,
@@ -19,8 +19,41 @@ def time_remaining_until_granted(now: Time.zone.now)
       )
     end
 
-    def account_reset_deletion_period_hours
-      IdentityConfig.store.account_reset_wait_period_days.days.in_hours.to_i
+    def account_reset_deletion_period
+      current_time = Time.zone.now
+
+      distance_of_time_in_words(
+        current_time,
+        current_time + account_reset_wait_period_days,
+        true,
+        accumulate_on: reset_accumulation_type,
+      )
+    end
+
+    def account_reset_wait_period_days
+      if supports_fraud_account_reset?
+        IdentityConfig.store.account_reset_fraud_user_wait_period_days.days
+      else
+        IdentityConfig.store.account_reset_wait_period_days.days
+      end
+    end
+
+    def supports_fraud_account_reset?
+      (account_reset_request_user.fraud_review_pending? ||
+        account_reset_request_user.fraud_rejection?) &&
+        (IdentityConfig.store.account_reset_fraud_user_wait_period_days.present?)
+    end
+
+    def account_reset_request_user
+      account_reset_request.user
+    end
+
+    def reset_accumulation_type
+      if account_reset_wait_period_days > 3
+        :days
+      else
+        :hours
+      end
     end
   end
 end

app/presenters/two_factor_login_options_presenter.rb

@@ -149,9 +149,23 @@ def account_reset_deletion_period_interval
 
     view.distance_of_time_in_words(
       current_time,
-      current_time + IdentityConfig.store.account_reset_wait_period_days.days,
+      current_time + account_reset_wait_period_days,
       true,
       accumulate_on: :hours,
     )
   end
+
+  def account_reset_wait_period_days
+    if supports_fraud_account_reset?
+      IdentityConfig.store.account_reset_fraud_user_wait_period_days.days
+    else
+      IdentityConfig.store.account_reset_wait_period_days.days
+    end
+  end
+
+  def supports_fraud_account_reset?
+    (user.fraud_review_pending? ||
+      user.fraud_rejection?) &&
+      (IdentityConfig.store.account_reset_fraud_user_wait_period_days.present?)
+  end
 end

app/services/account_reset/grant_requests_and_send_emails.rb

@@ -8,6 +8,7 @@ def perform(now)
         sql_query_for_users_eligible_to_delete_their_accounts,
         tvalue: now - IdentityConfig.store.account_reset_wait_period_days.days,
       ).order('requested_at ASC').each do |arr|
+        next if fraud_wait_period_not_met?(arr, now)
         notifications_sent += 1 if grant_request_and_send_email(arr)
       end
 
@@ -48,5 +49,17 @@ def grant_request_and_send_email(arr)
       end
       true
     end
+
+    def fraud_wait_period_not_met?(arr, now)
+      if (arr.user.fraud_review_pending? ||
+        arr.user.fraud_rejection?) &&
+         (fraud_wait_period_days > 0)
+        return arr.requested_at > (now - fraud_wait_period_days)
+      end
+    end
+
+    def fraud_wait_period_days
+      IdentityConfig.store.account_reset_fraud_user_wait_period_days.days
+    end
   end
 end

app/views/account_reset/pending/show.html.erb

@@ -5,7 +5,7 @@
 <p>
   <%= t(
         'account_reset.pending.wait_html',
-        hours: @pending_presenter.account_reset_deletion_period_hours,
+        waiting_period: @pending_presenter.account_reset_deletion_period,
         interval: @pending_presenter.time_remaining_until_granted,
       ) %>
 </p>

app/views/user_mailer/account_reset_granted.html.erb

@@ -1,5 +1,5 @@
 <p class="lead">
-  <%= t('user_mailer.account_reset_granted.intro_html', hours: @account_reset_deletion_period_hours, app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %>
+  <%= t('user_mailer.account_reset_granted.intro_html', waiting_period: @account_reset_deletion_period_interval, app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray')) %>
 </p>
 
 <table class="button expanded large">

app/views/user_mailer/account_reset_request.html.erb

@@ -1,5 +1,5 @@
 <p class="lead">
-  <%= t('user_mailer.account_reset_request.intro_html', app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), hours: @account_reset_deletion_period_hours) %>
+  <%= t('user_mailer.account_reset_request.intro_html', app_name: link_to(APP_NAME, IdentityConfig.store.mailer_domain_name, class: 'gray'), waiting_period: @account_reset_deletion_period_interval) %>
 </p>
 
 <p class="lead">

config/application.yml.default

@@ -24,6 +24,7 @@ all_redirect_uris_cache_duration_minutes: 2
 allowed_ialmax_providers: '[]'
 allowed_verified_within_providers: '[]'
 account_reset_token_valid_for_days: 1
+account_reset_fraud_user_wait_period_days:
 account_reset_wait_period_days: 1
 account_suspended_support_code: EFGHI
 acuant_assure_id_password: ''
@@ -507,6 +508,7 @@ production:
 test:
   aamva_private_key: 123abc
   aamva_public_key: 123abc
+  account_reset_fraud_user_wait_period_days: 30
   acuant_assure_id_url: https://example.com
   acuant_facial_match_url: https://facial_match.example.com
   acuant_passlive_url: https://liveness.example.com

config/locales/account_reset/en.yml

@@ -33,8 +33,8 @@ en:
       confirm: If you cancel now, you must create a new request and wait another
         %{interval} to delete your account.
       header: You requested to delete your account
-      wait_html: There is a %{hours}-hour waiting period to delete your account. In
-        <strong>%{interval}</strong>, you will receive an email with
+      wait_html: There is a %{waiting_period} waiting period to delete your account.
+        In <strong>%{interval}</strong>, you will receive an email with
         instructions to complete the deletion.
     recovery_options:
       check_saved_credential: See if you have a saved credential

config/locales/account_reset/es.yml

@@ -34,9 +34,9 @@ es:
       confirm: Si cancela ahora, debe crear una nueva solicitud y esperar otras
         %{interval} para eliminar su cuenta.
       header: Solicitaste eliminar tu cuenta
-      wait_html: Hay un período de espera de %{hours} horas para eliminar su cuenta.
-        En <strong>%{interval}</strong>, recibirá un correo electrónico con
-        instrucciones para completar la eliminación.
+      wait_html: Hay un período de espera de %{waiting_period} para eliminar su
+        cuenta. En <strong>%{interval}</strong>, recibirá un correo electrónico
+        con instrucciones para completar la eliminación.
     recovery_options:
       check_saved_credential: Verifica si tienes una credencial almacenada
       check_webauthn_platform_info: Si has habilitado el desbloqueo facial o táctil,

config/locales/account_reset/fr.yml

@@ -34,7 +34,7 @@ fr:
       confirm: Si vous annulez maintenant, vous devez créer une nouvelle demande et
         attendre encore %{interval} pour supprimer votre compte.
       header: Vous avez demandé de supprimer votre compte
-      wait_html: Il y a un délai d’attente de %{hours} heures pour supprimer votre
+      wait_html: Il y a un délai d’attente de %{waiting_period} pour supprimer votre
         compte. Dans <strong>%{interval}</strong>, vous recevrez un e-mail avec
         des instructions pour terminer la suppression.
     recovery_options:

config/locales/user_mailer/en.yml

@@ -20,8 +20,8 @@ en:
       button: Yes, continue deleting
       cancel_link_text: please cancel
       help_html: If you don’t want to delete your account, %{cancel_account_reset_html}.
-      intro_html: Your %{hours} hour waiting period has ended. Please complete step 2
-        of the process.<br><br> If you’ve been unable to locate your
+      intro_html: Your %{waiting_period} waiting period has ended. Please complete
+        step 2 of the process.<br><br> If you’ve been unable to locate your
         authentication methods, select “confirm deletion” to delete your
         %{app_name} account.<br><br> In the future, if you need to access
         participating government websites who use %{app_name}, you can create a
@@ -33,13 +33,14 @@ en:
         to cancel.
       header: Your account will be deleted in %{interval}
       intro_html: 'As a security measure, %{app_name} requires a two-step process to
-        delete your account:<br><br> Step One: There is a %{hours} hour waiting
-        period if you have lost access to your authentication methods and need
-        to delete your account. If you locate your authentication methods, you
-        can sign in to your %{app_name} account to cancel this request.<br><br>
-        Step Two: After your %{hours} hour waiting period, you will receive an
-        email that will ask you to confirm the deletion of your %{app_name}
-        account. Your account will not be deleted until you confirm.'
+        delete your account:<br><br> Step One: There is a %{waiting_period}
+        waiting period if you have lost access to your authentication methods
+        and need to delete your account. If you locate your authentication
+        methods, you can sign in to your %{app_name} account to cancel this
+        request.<br><br> Step Two: After your %{waiting_period} waiting period,
+        you will receive an email that will ask you to confirm the deletion of
+        your %{app_name} account. Your account will not be deleted until you
+        confirm.'
       subject: How to delete your %{app_name} account
     account_verified:
       change_password_link: change your password

config/locales/user_mailer/es.yml

@@ -22,7 +22,7 @@ es:
       button: Sí, continúa eliminando
       cancel_link_text: por favor cancele
       help_html: Si no desea eliminar su cuenta, %{cancel_account_reset_html}.
-      intro_html: Su período de espera de %{hours} horas ha finalizado. Complete el
+      intro_html: Su período de espera de %{waiting_period} ha finalizado. Complete el
         paso 2 del proceso.<br><br>Si no ha podido localizar sus métodos de
         autenticación, seleccione “confirmar eliminación” para eliminar su
         cuenta de %{app_name}.<br><br> En el futuro, si necesita acceder a los
@@ -36,13 +36,13 @@ es:
       header: Su cuenta será eliminada en %{interval}
       intro_html: 'Como medida de seguridad, %{app_name} requiere un proceso de dos
         pasos para eliminar su cuenta:<br><br> Paso uno: hay un período de
-        espera de %{hours} horas si ha perdido el acceso a sus métodos de
+        espera de %{waiting_period} si ha perdido el acceso a sus métodos de
         autenticación y necesita eliminar su cuenta. Si encuentra sus métodos de
         autenticación, puede iniciar sesión en su cuenta %{app_name} para
         cancelar esta solicitud.<br><br> Paso dos: Después de su período de
-        espera de %{hours} horas, recibirá un correo electrónico que le pedirá
-        que confirme la eliminación de su cuenta %{app_name}. Su cuenta no se
-        eliminará hasta que confirme.'
+        espera de %{waiting_period}, recibirá un correo electrónico que le
+        pedirá que confirme la eliminación de su cuenta %{app_name}. Su cuenta
+        no se eliminará hasta que confirme.'
       subject: Cómo eliminar su cuenta de %{app_name}
     account_verified:
       change_password_link: cambiar tu contraseña