Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions app/controllers/openid_connect/authorization_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,10 @@ def track_authorize_analytics(result)
end

def identity_needs_verification?
((@authorize_form.ial2_requested? || @authorize_form.ial2_strict_requested?) &&
(@authorize_form.ial2_requested? &&
(current_user.decorate.identity_not_verified? ||
decorated_session.requested_more_recent_verification?)) ||
current_user.decorate.reproof_for_irs?(service_provider: current_sp) ||
identity_needs_strict_ial2_verification?
end

def identity_needs_strict_ial2_verification?
@authorize_form.ial2_strict_requested? && !current_user.active_profile&.strict_ial2_proofed?
current_user.decorate.reproof_for_irs?(service_provider: current_sp)
end

def build_authorize_form_from_params
Expand Down
12 changes: 1 addition & 11 deletions app/forms/openid_connect_authorize_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class OpenidConnectAuthorizeForm
validate :validate_prompt
validate :validate_verified_within_format
validate :validate_verified_within_duration
validate :validate_liveness_checking_enabled_if_ial2_strict_requested

def initialize(params)
@acr_values = parse_to_values(params[:acr_values], Saml::Idp::Constants::VALID_AUTHN_CONTEXTS)
Expand Down Expand Up @@ -109,8 +108,7 @@ def ial

def_delegators :ial_context,
:ial2_or_greater?,
:ial2_requested?,
:ial2_strict_requested?
:ial2_requested?

private

Expand Down Expand Up @@ -249,12 +247,4 @@ def validate_privileges
)
end
end

def validate_liveness_checking_enabled_if_ial2_strict_requested
return if !ial2_strict_requested? || FeatureManagement.liveness_checking_enabled?
errors.add(
:acr_values, t('openid_connect.authorization.errors.liveness_checking_disabled'),
type: :liveness_checking_disabled
)
end
end
1 change: 0 additions & 1 deletion config/locales/openid_connect/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ en:
one: value must be at least %{count} day or older
other: value must be at least %{count} days or older
invalid_verified_within_format: Unrecognized format for verified_within
liveness_checking_disabled: Liveness checking is disabled
missing_ial: Missing a valid IAL level
no_auth: The acr_values are not authorized
no_valid_acr_values: No acceptable acr_values found
Expand Down
1 change: 0 additions & 1 deletion config/locales/openid_connect/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ es:
one: el valor debe ser al menos %{count} día o más
other: el valor debe tener al menos %{count} días o más
invalid_verified_within_format: Formato no reconocido para verified_within
liveness_checking_disabled: La verificación de la vida está deshabilitada
missing_ial: Falta un nivel de IAL válido
no_auth: Los acr_values no están autorizados
no_valid_acr_values: ial_valores encontrados no aceptables
Expand Down
1 change: 0 additions & 1 deletion config/locales/openid_connect/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ fr:
one: la valeur doit être d’au moins %{count} jour ou plus
other: la valeur doit être d’au moins %{count} jours ou plus
invalid_verified_within_format: Format non reconnu pour verified_within
liveness_checking_disabled: La vérification de la vivacité est désactivée
missing_ial: Manque un niveau IAL valide
no_auth: Les acr_values ne sont pas autorisées
no_valid_acr_values: Valeurs acr_values inacceptables trouvées
Expand Down
17 changes: 0 additions & 17 deletions spec/features/idv/strict_ial2/feature_flag_spec.rb

This file was deleted.

58 changes: 0 additions & 58 deletions spec/features/idv/strict_ial2/upgrade_spec.rb

This file was deleted.

75 changes: 0 additions & 75 deletions spec/features/idv/strict_ial2/usps_upload_disallowed_spec.rb

This file was deleted.