Use currentAuthenticatorEnrollment (OKTA-609234)

okta · Jul 7, 2023 · 7dcadb2 · 7dcadb2
1 parent 875791e
commit 7dcadb2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/idx/remediators/Base/SelectAuthenticator.ts b/lib/idx/remediators/Base/SelectAuthenticator.ts
@@ -61,7 +61,9 @@ export class SelectAuthenticator<T extends SelectAuthenticatorValues = SelectAut
       // Don't select current authenticator (OKTA-612939)
       const isCurrentAuthenticator = context?.currentAuthenticator
         && context?.currentAuthenticator.value.id === matchedOption.relatesTo?.id;
-      return !isCurrentAuthenticator;
+      const isCurrentAuthenticatorEnrollment = context?.currentAuthenticatorEnrollment
+        && context?.currentAuthenticatorEnrollment.value.id === matchedOption.relatesTo?.id;
+      return !isCurrentAuthenticator && !isCurrentAuthenticatorEnrollment;
     }
 
     return false;