Sync from monorepo b9ce314f4344

Author: FusionAuth Automation

src/main/java/io/fusionauth/domain/FIPS.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025-2025, FusionAuth, All Rights Reserved
+ * Copyright (c) 2025-2026, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,8 +28,12 @@
 public class FIPS {
   public static final int FIPS_MIN_PASSWORD_LENGTH = 14;
 
+  public static final int FIPS_RECOVERY_CODE_LENGTH = 14;
+
   public static final int STANDARD_MIN_PASSWORD_LENGTH = 8;
 
+  public static final int STANDARD_RECOVERY_CODE_LENGTH = 10;
+
   private static volatile Boolean Enabled;
 
   /**
@@ -58,4 +62,8 @@ public static boolean isEnabled() {
   public static int minimumPasswordLength() {
     return isEnabled() ? FIPS_MIN_PASSWORD_LENGTH : STANDARD_MIN_PASSWORD_LENGTH;
   }
+
+  public static int minimumRecoveryCodeLength() {
+    return isEnabled() ? FIPS_RECOVERY_CODE_LENGTH : STANDARD_RECOVERY_CODE_LENGTH;
+  }
 }

src/main/java/io/fusionauth/domain/UserTwoFactorConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2023, FusionAuth, All Rights Reserved
+ * Copyright (c) 2021-2026, FusionAuth, All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,13 +33,19 @@ public class UserTwoFactorConfiguration implements Buildable<UserTwoFactorConfig
 
   public final List<String> recoveryCodes = new ArrayList<>();
 
+ public String recoveryCodeEncryptionScheme;
+
+ public Integer recoveryCodeWorkFactor;
+
   @JacksonConstructor
   public UserTwoFactorConfiguration() {
   }
 
   public UserTwoFactorConfiguration(UserTwoFactorConfiguration other) {
     other.methods.forEach(m -> methods.add(new TwoFactorMethod(m)));
     this.recoveryCodes.addAll(other.recoveryCodes);
+    this.recoveryCodeEncryptionScheme = other.recoveryCodeEncryptionScheme;
+    this.recoveryCodeWorkFactor = other.recoveryCodeWorkFactor;
   }
 
   @Override
@@ -51,7 +57,10 @@ public boolean equals(Object o) {
       return false;
     }
     UserTwoFactorConfiguration that = (UserTwoFactorConfiguration) o;
-    return Objects.equals(methods, that.methods) && Objects.equals(recoveryCodes, that.recoveryCodes);
+    return Objects.equals(methods, that.methods) &&
+           Objects.equals(recoveryCodes, that.recoveryCodes) &&
+           Objects.equals(recoveryCodeEncryptionScheme, that.recoveryCodeEncryptionScheme) &&
+           Objects.equals(recoveryCodeWorkFactor, that.recoveryCodeWorkFactor);
   }
 
   @JsonIgnore
@@ -74,11 +83,14 @@ public TwoFactorMethod getMethodById(String id) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(methods, recoveryCodes);
+    return Objects.hash(methods, recoveryCodes, recoveryCodeEncryptionScheme, recoveryCodeWorkFactor);
   }
 
   public UserTwoFactorConfiguration secure() {
     recoveryCodes.clear();
+    recoveryCodeWorkFactor = null;
+    recoveryCodeEncryptionScheme = null;
+
     methods.forEach(TwoFactorMethod::secure);
     return this;
   }