Merge PR #1639

2024-11-22 00:12:09 +03:00 · 2024-08-23 11:27:17 +02:00 · 2024-08-23 11:27:17 +02:00 · e04287bb72
commit e04287bb72
parent 4092486311 7bd603e687
7 changed files with 29 additions and 15 deletions
--- a/lib/fido/views/enterprise_attestation_dialog.dart
+++ b/lib/fido/views/enterprise_attestation_dialog.dart
@ -36,7 +36,14 @@ class EnableEnterpriseAttestationDialog extends ConsumerWidget {
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-            Text(l10n.p_enable_ep_attestation_desc),
+            Text(
+              l10n.p_enable_ep_attestation_desc,
+              style: Theme.of(context)
+                  .textTheme
+                  .bodyMedium
+                  ?.copyWith(fontWeight: FontWeight.w700),
+            ),
+            Text(l10n.p_enable_ep_attestation_disable_with_factory_reset),
          ]
              .map((e) => Padding(
                    padding: const EdgeInsets.symmetric(vertical: 8.0),
--- a/lib/fido/views/key_actions.dart
+++ b/lib/fido/views/key_actions.dart
@ -52,12 +52,11 @@ Widget _fidoBuildActions(BuildContext context, DeviceNode node, FidoState state,
  final authBlocked = state.pinBlocked;

  final enterpriseAttestation = state.enterpriseAttestation;
-  final showEnterpriseAttestation = enterpriseAttestation != null &&
+  final showEnterpriseAttestation =
+      enterpriseAttestation != null && fingerprints == null;
+  final canEnableEnterpriseAttestation = enterpriseAttestation == false &&
      !(state.alwaysUv && !state.hasPin) &&
-      !(!state.unlocked && state.hasPin) &&
-      fingerprints == null;
-  final canEnableEnterpriseAttestation =
-      enterpriseAttestation == false && showEnterpriseAttestation;
+      !(!state.unlocked && state.hasPin);

  return Column(
    children: [
@ -130,8 +129,11 @@ Widget _fidoBuildActions(BuildContext context, DeviceNode node, FidoState state,
              feature: features.enableEnterpriseAttestation,
              icon: const Icon(Symbols.local_police),
              title: l10n.s_ep_attestation,
-              subtitle:
-                  enterpriseAttestation ? l10n.s_enabled : l10n.s_disabled,
+              subtitle: enterpriseAttestation
+                  ? l10n.s_enabled
+                  : (state.alwaysUv && !state.hasPin)
+                      ? l10n.l_set_pin_first
+                      : l10n.s_disabled,
              onTap: canEnableEnterpriseAttestation
                  ? (context) {
                      Navigator.of(context).popUntil((route) => route.isFirst);
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@ -318,6 +318,7 @@
    "s_ep_attestation_enabled": null,
    "s_enable_ep_attestation": null,
    "p_enable_ep_attestation_desc": null,
+    "p_enable_ep_attestation_disable_with_factory_reset": null,
    "s_pin_required": null,
    "p_pin_required_desc": null,
    "l_piv_pin_blocked": null,
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@ -291,8 +291,8 @@
    "l_enter_fido2_pin": "Enter the FIDO2 PIN for your YubiKey",
    "l_pin_blocked_reset": "PIN is blocked; factory reset the FIDO application",
    "l_pin_blocked": "PIN is blocked",
-    "l_set_pin_first": "A PIN is required first",
-    "l_unlock_pin_first": "Unlock with PIN first",
+    "l_set_pin_first": "A PIN is required",
+    "l_unlock_pin_first": "Unlock with PIN",
    "l_pin_soft_locked": "PIN has been blocked until the YubiKey is removed and reinserted",
    "l_pin_change_required_desc": "A new PIN must be set before you can use this application",
    "p_enter_current_pin_or_reset": "Enter your current PIN. If you don't know your PIN, you'll need to unblock it with the PUK or reset the YubiKey.",
@ -318,6 +318,7 @@
    "s_ep_attestation_enabled": "Enterprise Attestation enabled",
    "s_enable_ep_attestation": "Enable Enterprise Attestation",
    "p_enable_ep_attestation_desc": "This will enable Enterprise Attestation, allowing authorized domains to uniquely identify your YubiKey.",
+    "p_enable_ep_attestation_disable_with_factory_reset": "Once enabled, Enterprise Attestation can only be disabled by performing a FIDO factory reset.",
    "s_pin_required": "PIN required",
    "p_pin_required_desc": "The action you are about to perform requires the PIV PIN to be entered.",
    "l_piv_pin_blocked": "Blocked, use PUK to reset",
@ -370,8 +371,8 @@
    "s_password_forgotten": "Password forgotten",
    "l_keystore_unavailable": "OS Keystore unavailable",
    "l_remember_pw_failed": "Failed to remember password",
-    "l_unlock_first": "Unlock with password first",
-    "l_set_password_first": "Set a password first",
+    "l_unlock_first": "Unlock with password",
+    "l_set_password_first": "Set a password",
    "l_enter_oath_pw": "Enter the OATH password for your YubiKey",
    "p_enter_current_password_or_reset": "Enter your current password. If you don't know your password, you'll need to reset the YubiKey.",
    "p_enter_new_password": "Enter your new password. A password may contain letters, numbers and special characters.",
@ -440,7 +441,7 @@
    "l_delete_account_desc": "Remove the account from your YubiKey",
    "s_account_deleted": "Account deleted",
    "p_warning_delete_account": "Warning! This action will delete the account from your YubiKey.",
-    "p_warning_disable_credential": "You will no longer be able to generate OTPs for this account. Make sure to first disable this credential from the website to avoid being locked out of your account.",
+    "p_warning_disable_credential": "You will no longer be able to generate OTPs for this account. Make sure to disable this credential from the website to avoid being locked out of your account.",
    "s_account_name": "Account name",
    "s_search_accounts": "Search accounts",
    "l_accounts_used": "{used} of {capacity} accounts used",
@ -814,9 +815,9 @@
    "p_factory_reset_an_app": "Factory reset an application on your YubiKey.",
    "p_factory_reset_desc": "Data is stored in multiple applications on the YubiKey, some of which can be factory reset independently of each other.\n\nSelect an application above to reset.",
    "p_warning_factory_reset": "Warning! This will irrevocably delete all OATH TOTP/HOTP accounts from your YubiKey.",
-    "p_warning_disable_credentials": "Your OATH credentials, as well as any password set, will be removed from this YubiKey. Make sure to first disable these from their respective web sites to avoid being locked out of your accounts.",
+    "p_warning_disable_credentials": "Your OATH credentials, as well as any password set, will be removed from this YubiKey. Make sure to disable these from their respective web sites to avoid being locked out of your accounts.",
    "p_warning_deletes_accounts": "Warning! This will irrevocably delete all U2F and FIDO2 accounts, including passkeys, from your YubiKey.",
-    "p_warning_disable_accounts": "Your credentials, as well as any PIN set, will be removed from this YubiKey. Make sure to first disable these from their respective web sites to avoid being locked out of your accounts.",
+    "p_warning_disable_accounts": "Your credentials, as well as any PIN set, will be removed from this YubiKey. Make sure to disable these from their respective web sites to avoid being locked out of your accounts.",
    "p_warning_piv_reset": "Warning! All data stored for PIV will be irrevocably deleted from your YubiKey.",
    "p_warning_piv_reset_desc": "This includes private keys and certificates. Your PIN, PUK, and management key will be reset to their factory default values.",
    "p_warning_global_reset": "Warning! This will irrevocably delete all saved data, including credentials, from your YubiKey.",
--- a/lib/l10n/app_fr.arb
+++ b/lib/l10n/app_fr.arb
@ -318,6 +318,7 @@
    "s_ep_attestation_enabled": null,
    "s_enable_ep_attestation": null,
    "p_enable_ep_attestation_desc": null,
+    "p_enable_ep_attestation_disable_with_factory_reset": null,
    "s_pin_required": "PIN requis",
    "p_pin_required_desc": "L'action que vous allez effectuer nécessite la saisie du PIN PIV.",
    "l_piv_pin_blocked": "Bloqué, utilisez PUK pour réinitialiser",
--- a/lib/l10n/app_ja.arb
+++ b/lib/l10n/app_ja.arb
@ -318,6 +318,7 @@
    "s_ep_attestation_enabled": null,
    "s_enable_ep_attestation": null,
    "p_enable_ep_attestation_desc": null,
+    "p_enable_ep_attestation_disable_with_factory_reset": null,
    "s_pin_required": "PINが必要",
    "p_pin_required_desc": "実行しようとしているアクションでは、PIV PINを入力する必要があります。",
    "l_piv_pin_blocked": "ブロックされています。リセットするにはPUKを使用してください",
--- a/lib/l10n/app_pl.arb
+++ b/lib/l10n/app_pl.arb
@ -318,6 +318,7 @@
    "s_ep_attestation_enabled": null,
    "s_enable_ep_attestation": null,
    "p_enable_ep_attestation_desc": null,
+    "p_enable_ep_attestation_disable_with_factory_reset": null,
    "s_pin_required": "Wymagany PIN",
    "p_pin_required_desc": "Czynność, którą zamierzasz wykonać, wymaga wprowadzenia kodu PIN PIV.",
    "l_piv_pin_blocked": "Zablokowano, użyj PUK, aby zresetować",