Sync from monorepo 565c3faf9fb1

Author: FusionAuth Automation

src/main/java/io/fusionauth/client/FusionAuthClient.java

@@ -144,6 +144,7 @@
 import io.fusionauth.domain.api.ThemeSearchRequest;
 import io.fusionauth.domain.api.ThemeSearchResponse;
 import io.fusionauth.domain.api.TwoFactorDisableRequest;
+import io.fusionauth.domain.api.TwoFactorUpdateRequest;
 import io.fusionauth.domain.api.TwoFactorRecoveryCodeResponse;
 import io.fusionauth.domain.api.TwoFactorRequest;
 import io.fusionauth.domain.api.TwoFactorResponse;
@@ -6296,6 +6297,22 @@ public ClientResponse<ThemeResponse, Errors> updateTheme(UUID themeId, ThemeRequ
         .go();
   }
 
+  /**
+   * Updates the two-factor method for the given user using a JSON body.
+   *
+   * @param userId The Id of the user to update.
+   * @param request The request information that contains the name and methodId along with any event information.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<Void, Errors> updateTwoFactor(UUID userId, TwoFactorUpdateRequest request) {
+    return start(Void.TYPE, Errors.class)
+        .uri("/api/user/two-factor")
+        .urlSegment(userId)
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .put()
+        .go();
+  }
+
   /**
    * Updates the user with the given Id.
    *

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

@@ -198,6 +198,7 @@ public boolean missingTemplate() {
     return Stream.of(templates.accountEdit,
                      templates.accountIndex,
                      templates.accountTwoFactorDisable,
+                     templates.accountTwoFactorEdit,
                      templates.accountTwoFactorEnable,
                      templates.accountTwoFactorIndex,
                      templates.accountWebAuthnAdd,
@@ -298,6 +299,7 @@ public static class Templates implements Buildable<Templates> {
         "accountEdit",
         "accountIndex",
         "accountTwoFactorDisable",
+        "accountTwoFactorEdit",
         "accountTwoFactorEnable",
         "accountTwoFactorIndex",
         "accountWebAuthnAdd",
@@ -353,6 +355,8 @@ public static class Templates implements Buildable<Templates> {
 
     public String accountTwoFactorDisable;
 
+    public String accountTwoFactorEdit;
+
     public String accountTwoFactorEnable;
 
     public String accountTwoFactorIndex;
@@ -454,6 +458,7 @@ public Templates(Templates other) {
       this.accountEdit = other.accountEdit;
       this.accountIndex = other.accountIndex;
       this.accountTwoFactorDisable = other.accountTwoFactorDisable;
+      this.accountTwoFactorEdit = other.accountTwoFactorEdit;
       this.accountTwoFactorEnable = other.accountTwoFactorEnable;
       this.accountTwoFactorIndex = other.accountTwoFactorIndex;
       this.accountWebAuthnAdd = other.accountWebAuthnAdd;
@@ -515,6 +520,7 @@ public boolean equals(Object o) {
       return Objects.equals(accountEdit, that.accountEdit) &&
              Objects.equals(accountIndex, that.accountIndex) &&
              Objects.equals(accountTwoFactorDisable, that.accountTwoFactorDisable) &&
+             Objects.equals(accountTwoFactorEdit, that.accountTwoFactorEdit) &&
              Objects.equals(accountTwoFactorEnable, that.accountTwoFactorEnable) &&
              Objects.equals(accountTwoFactorIndex, that.accountTwoFactorIndex) &&
              Objects.equals(accountWebAuthnAdd, that.accountWebAuthnAdd) &&
@@ -590,6 +596,7 @@ public int hashCode() {
           accountEdit,
           accountIndex,
           accountTwoFactorDisable,
+          accountTwoFactorEdit,
           accountTwoFactorEnable,
           accountTwoFactorIndex,
           accountWebAuthnAdd,
@@ -644,6 +651,7 @@ public void normalize() {
       accountEdit = lineReturns(trimToNull(accountEdit));
       accountIndex = lineReturns(trimToNull(accountIndex));
       accountTwoFactorDisable = lineReturns(trimToNull(accountTwoFactorDisable));
+      accountTwoFactorEdit = lineReturns(trimToNull(accountTwoFactorEdit));
       accountTwoFactorEnable = lineReturns(trimToNull(accountTwoFactorEnable));
       accountTwoFactorIndex = lineReturns(trimToNull(accountTwoFactorIndex));
       accountWebAuthnAdd = lineReturns(trimToNull(accountWebAuthnAdd));

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024, 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.
@@ -35,6 +35,8 @@ public class TwoFactorMethod implements Buildable<TwoFactorMethod> {
    */
   public static final String Email = "email";
 
+  public static final int MaximumNameLength = 256;
+
   /**
    * Method which authenticates using a code sent to a phone via SMS or voice.
    */
@@ -54,6 +56,8 @@ public class TwoFactorMethod implements Buildable<TwoFactorMethod> {
 
   public String mobilePhone;
 
+  public String name;
+
   public String secret;
 
   @JacksonConstructor
@@ -73,6 +77,7 @@ public TwoFactorMethod(TwoFactorMethod other) {
     this.lastUsed = other.lastUsed;
     this.method = other.method;
     this.mobilePhone = other.mobilePhone;
+    this.name = other.name;
     this.secret = other.secret;
   }
 
@@ -85,12 +90,12 @@ public boolean equals(Object o) {
       return false;
     }
     TwoFactorMethod that = (TwoFactorMethod) o;
-    return Objects.equals(authenticator, that.authenticator) && Objects.equals(email, that.email) && Objects.equals(id, that.id) && Objects.equals(lastUsed, that.lastUsed) && Objects.equals(method, that.method) && Objects.equals(mobilePhone, that.mobilePhone) && Objects.equals(secret, that.secret);
+    return Objects.equals(authenticator, that.authenticator) && Objects.equals(email, that.email) && Objects.equals(id, that.id) && Objects.equals(lastUsed, that.lastUsed) && Objects.equals(method, that.method) && Objects.equals(mobilePhone, that.mobilePhone) && Objects.equals(name, that.name) && Objects.equals(secret, that.secret);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(authenticator, email, id, lastUsed, method, mobilePhone, secret);
+    return Objects.hash(authenticator, email, id, lastUsed, method, mobilePhone, name, secret);
   }
 
   public void normalize() {

src/main/java/io/fusionauth/domain/api/TwoFactorRequest.java

@@ -37,6 +37,8 @@ public class TwoFactorRequest extends BaseEventRequest implements Buildable<TwoF
 
   public String mobilePhone;
 
+  public String name;
+
   public String secret;
 
   public String secretBase32Encoded;

src/main/java/io/fusionauth/domain/api/TwoFactorUpdateRequest.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 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.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+package io.fusionauth.domain.api;
+
+import com.inversoft.json.JacksonConstructor;
+import io.fusionauth.domain.Buildable;
+import io.fusionauth.domain.EventInfo;
+
+/**
+ * Request to update an existing two-factor method for a user.
+ */
+public class TwoFactorUpdateRequest extends BaseEventRequest implements Buildable<TwoFactorUpdateRequest> {
+  public String methodId;
+
+  public String name;
+
+  @JacksonConstructor
+  public TwoFactorUpdateRequest() {
+  }
+
+  public TwoFactorUpdateRequest(EventInfo eventInfo, String methodId, String name) {
+    super(eventInfo);
+    this.methodId = methodId;
+    this.name = name;
+  }
+}