Sync from monorepo ae414f6ce430

Author: FusionAuth Automation

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, FusionAuth, All Rights Reserved
+ * Copyright (c) 2019-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.
@@ -31,6 +31,8 @@
 public class EmailConfiguration implements Buildable<EmailConfiguration> {
   public List<EmailHeader> additionalHeaders = new ArrayList<>();
 
+  public UUID adminTwoFactorMethodRemoveEmailTemplateId;
+
   public boolean debug;
 
   public String defaultFromEmail = "change-me@example.com";
@@ -96,6 +98,7 @@ public EmailConfiguration() {
 
   public EmailConfiguration(EmailConfiguration other) {
     this.additionalHeaders.addAll(other.additionalHeaders);
+    this.adminTwoFactorMethodRemoveEmailTemplateId = other.adminTwoFactorMethodRemoveEmailTemplateId;
     this.debug = other.debug;
     this.defaultFromEmail = other.defaultFromEmail;
     this.defaultFromName = other.defaultFromName;
@@ -139,6 +142,7 @@ public boolean equals(Object o) {
            verifyEmail == that.verifyEmail &&
            verifyEmailWhenChanged == that.verifyEmailWhenChanged &&
            Objects.equals(additionalHeaders, that.additionalHeaders) &&
+           Objects.equals(adminTwoFactorMethodRemoveEmailTemplateId, that.adminTwoFactorMethodRemoveEmailTemplateId) &&
            Objects.equals(debug, that.debug) &&
            Objects.equals(defaultFromEmail, that.defaultFromEmail) &&
            Objects.equals(defaultFromName, that.defaultFromName) &&
@@ -168,7 +172,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(additionalHeaders, debug, defaultFromEmail, defaultFromName, emailUpdateEmailTemplateId, emailVerifiedEmailTemplateId, forgotPasswordEmailTemplateId, host, implicitEmailVerificationAllowed, loginIdInUseOnCreateEmailTemplateId, loginIdInUseOnUpdateEmailTemplateId, loginNewDeviceEmailTemplateId, loginSuspiciousEmailTemplateId, password, passwordResetSuccessEmailTemplateId, passwordUpdateEmailTemplateId, passwordlessEmailTemplateId, port, properties, security, setPasswordEmailTemplateId, twoFactorMethodAddEmailTemplateId, twoFactorMethodRemoveEmailTemplateId, unverified, username, verificationEmailTemplateId, verificationStrategy, verifyEmail, verifyEmailWhenChanged);
+    return Objects.hash(additionalHeaders, adminTwoFactorMethodRemoveEmailTemplateId, debug, defaultFromEmail, defaultFromName, emailUpdateEmailTemplateId, emailVerifiedEmailTemplateId, forgotPasswordEmailTemplateId, host, implicitEmailVerificationAllowed, loginIdInUseOnCreateEmailTemplateId, loginIdInUseOnUpdateEmailTemplateId, loginNewDeviceEmailTemplateId, loginSuspiciousEmailTemplateId, password, passwordResetSuccessEmailTemplateId, passwordUpdateEmailTemplateId, passwordlessEmailTemplateId, port, properties, security, setPasswordEmailTemplateId, twoFactorMethodAddEmailTemplateId, twoFactorMethodRemoveEmailTemplateId, unverified, username, verificationEmailTemplateId, verificationStrategy, verifyEmail, verifyEmailWhenChanged);
   }
 
   public void normalize() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025, FusionAuth, All Rights Reserved
+ * Copyright (c) 2024-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.
@@ -27,6 +27,8 @@
  */
 public class TenantPhoneConfiguration implements Buildable<TenantPhoneConfiguration> {
 
+  public UUID adminTwoFactorMethodRemoveTemplateId;
+
   public UUID forgotPasswordTemplateId;
 
   public UUID identityUpdateTemplateId;
@@ -70,6 +72,7 @@ public TenantPhoneConfiguration() {
   }
 
   public TenantPhoneConfiguration(TenantPhoneConfiguration other) {
+    this.adminTwoFactorMethodRemoveTemplateId = other.adminTwoFactorMethodRemoveTemplateId;
     this.forgotPasswordTemplateId = other.forgotPasswordTemplateId;
     this.identityUpdateTemplateId = other.identityUpdateTemplateId;
     this.implicitPhoneVerificationAllowed = other.implicitPhoneVerificationAllowed;
@@ -102,6 +105,7 @@ public boolean equals(Object o) {
     TenantPhoneConfiguration that = (TenantPhoneConfiguration) o;
     return implicitPhoneVerificationAllowed == that.implicitPhoneVerificationAllowed &&
            verifyPhoneNumber == that.verifyPhoneNumber &&
+           Objects.equals(adminTwoFactorMethodRemoveTemplateId, that.adminTwoFactorMethodRemoveTemplateId) &&
            Objects.equals(forgotPasswordTemplateId, that.forgotPasswordTemplateId) &&
            Objects.equals(identityUpdateTemplateId, that.identityUpdateTemplateId) &&
            Objects.equals(loginIdInUseOnCreateTemplateId, that.loginIdInUseOnCreateTemplateId) &&
@@ -124,6 +128,6 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(forgotPasswordTemplateId, identityUpdateTemplateId, implicitPhoneVerificationAllowed, loginIdInUseOnCreateTemplateId, loginIdInUseOnUpdateTemplateId, loginNewDeviceTemplateId, loginSuspiciousTemplateId, messengerId, passwordResetSuccessTemplateId, passwordUpdateTemplateId, passwordlessTemplateId, setPasswordTemplateId, twoFactorMethodAddTemplateId, twoFactorMethodRemoveTemplateId, unverified, verificationCompleteTemplateId, verificationStrategy, verificationTemplateId, verifyPhoneNumber);
+    return Objects.hash(adminTwoFactorMethodRemoveTemplateId, forgotPasswordTemplateId, identityUpdateTemplateId, implicitPhoneVerificationAllowed, loginIdInUseOnCreateTemplateId, loginIdInUseOnUpdateTemplateId, loginNewDeviceTemplateId, loginSuspiciousTemplateId, messengerId, passwordResetSuccessTemplateId, passwordUpdateTemplateId, passwordlessTemplateId, setPasswordTemplateId, twoFactorMethodAddTemplateId, twoFactorMethodRemoveTemplateId, unverified, verificationCompleteTemplateId, verificationStrategy, verificationTemplateId, verifyPhoneNumber);
   }
 }