Sync from monorepo 797cf4b8ea23

Author: FusionAuth Automation

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

@@ -189,6 +189,8 @@
 import io.fusionauth.domain.api.identity.verify.VerifyStartRequest;
 import io.fusionauth.domain.api.identity.verify.VerifyStartResponse;
 import io.fusionauth.domain.api.identity.verify.VerifySendRequest;
+import io.fusionauth.domain.api.identityProvider.IdentityProviderConnectionTestRequest;
+import io.fusionauth.domain.api.identityProvider.IdentityProviderConnectionTestResponse;
 import io.fusionauth.domain.api.identityProvider.IdentityProviderLinkRequest;
 import io.fusionauth.domain.api.identityProvider.IdentityProviderLinkResponse;
 import io.fusionauth.domain.api.identityProvider.IdentityProviderLoginRequest;
@@ -213,6 +215,10 @@
 import io.fusionauth.domain.api.report.MonthlyActiveUserReportResponse;
 import io.fusionauth.domain.api.report.RegistrationReportResponse;
 import io.fusionauth.domain.api.report.TotalsReportResponse;
+import io.fusionauth.domain.api.tenantManager.TenantManagerConfigurationRequest;
+import io.fusionauth.domain.api.tenantManager.TenantManagerConfigurationResponse;
+import io.fusionauth.domain.api.tenantManager.TenantManagerIdentityProviderTypeConfigurationRequest;
+import io.fusionauth.domain.api.tenantManager.TenantManagerIdentityProviderTypeConfigurationResponse;
 import io.fusionauth.domain.api.twoFactor.SecretResponse;
 import io.fusionauth.domain.api.twoFactor.TwoFactorLoginRequest;
 import io.fusionauth.domain.api.twoFactor.TwoFactorSendRequest;
@@ -1186,6 +1192,22 @@ public ClientResponse<TenantResponse, Errors> createTenant(UUID tenantId, Tenant
         .go();
   }
 
+  /**
+   * Creates a tenant manager identity provider type configuration for the given identity provider type.
+   *
+   * @param type The type of the identity provider.
+   * @param request The request object that contains all the information used to create the tenant manager identity provider type configuration.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TenantManagerIdentityProviderTypeConfigurationResponse, Errors> createTenantManagerIdentityProviderTypeConfiguration(IdentityProviderType type, TenantManagerIdentityProviderTypeConfigurationRequest request) {
+    return start(TenantManagerIdentityProviderTypeConfigurationResponse.class, Errors.class)
+        .uri("/api/tenant-manager/identity-provider")
+        .urlSegment(type)
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .post()
+        .go();
+  }
+
   /**
    * Creates a Theme. You can optionally specify an Id for the theme, if not provided one will be generated.
    *
@@ -1766,6 +1788,20 @@ public ClientResponse<Void, Errors> deleteTenantAsync(UUID tenantId) {
         .go();
   }
 
+  /**
+   * Deletes the tenant manager identity provider type configuration for the given identity provider type.
+   *
+   * @param type The type of the identity provider.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<Void, Errors> deleteTenantManagerIdentityProviderTypeConfiguration(IdentityProviderType type) {
+    return start(Void.TYPE, Errors.class)
+        .uri("/api/tenant-manager/identity-provider")
+        .urlSegment(type)
+        .delete()
+        .go();
+  }
+
   /**
    * Deletes the tenant based on the given request (sent to the API as JSON). This permanently deletes all information, metrics, reports and data associated
    * with the tenant and everything under the tenant (applications, users, etc).
@@ -3068,6 +3104,36 @@ public ClientResponse<TenantResponse, Errors> patchTenant(UUID tenantId, Map<Str
         .go();
   }
 
+  /**
+   * Updates, via PATCH, the Tenant Manager configuration.
+   *
+   * @param request The request that contains just the new Tenant Manager configuration information.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TenantManagerConfigurationResponse, Errors> patchTenantManagerConfiguration(Map<String, Object> request) {
+    return start(TenantManagerConfigurationResponse.class, Errors.class)
+        .uri("/api/tenant-manager")
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .patch()
+        .go();
+  }
+
+  /**
+   * Patches the tenant manager identity provider type configuration for the given identity provider type.
+   *
+   * @param type The type of the identity provider.
+   * @param request The request object that contains the new tenant manager identity provider type configuration information.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TenantManagerIdentityProviderTypeConfigurationResponse, Errors> patchTenantManagerIdentityProviderTypeConfiguration(IdentityProviderType type, Map<String, Object> request) {
+    return start(TenantManagerIdentityProviderTypeConfigurationResponse.class, Errors.class)
+        .uri("/api/tenant-manager/identity-provider")
+        .urlSegment(type)
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .patch()
+        .go();
+  }
+
   /**
    * Updates, via PATCH, the theme with the given Id.
    *
@@ -3816,6 +3882,20 @@ public ClientResponse<IdentityProviderResponse, Errors> retrieveIdentityProvider
         .go();
   }
 
+  /**
+   * Retrieves the results for an identity provider connection test.
+   *
+   * @param connectionTestId The connection test id to retrieve results for.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<IdentityProviderConnectionTestResponse, Errors> retrieveIdentityProviderConnectionTestResults(String connectionTestId) {
+    return start(IdentityProviderConnectionTestResponse.class, Errors.class)
+        .uri("/api/identity-provider/test")
+        .urlParameter("connectionTestId", connectionTestId)
+        .get()
+        .go();
+  }
+
   /**
    * Retrieves all the identity providers.
    *
@@ -4387,6 +4467,18 @@ public ClientResponse<TenantResponse, Errors> retrieveTenant(UUID tenantId) {
         .go();
   }
 
+  /**
+   * Retrieves the Tenant Manager configuration.
+   *
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TenantManagerConfigurationResponse, Void> retrieveTenantManagerConfiguration() {
+    return start(TenantManagerConfigurationResponse.class, Void.TYPE)
+        .uri("/api/tenant-manager")
+        .get()
+        .go();
+  }
+
   /**
    * Retrieves all the tenants.
    *
@@ -5635,6 +5727,20 @@ public ClientResponse<Void, Errors> sendVerifyIdentity(VerifySendRequest request
         .go();
   }
 
+  /**
+   * Begins an identity provider connection test.
+   *
+   * @param request The request that contains information on the connection test.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<IdentityProviderConnectionTestResponse, Errors> startIdentityProviderConnectionTest(IdentityProviderConnectionTestRequest request) {
+    return start(IdentityProviderConnectionTestResponse.class, Errors.class)
+        .uri("/api/identity-provider/test")
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .post()
+        .go();
+  }
+
   /**
    * Begins a login request for a 3rd party login that requires user interaction such as HYPR.
    *
@@ -6144,6 +6250,36 @@ public ClientResponse<TenantResponse, Errors> updateTenant(UUID tenantId, Tenant
         .go();
   }
 
+  /**
+   * Updates the Tenant Manager configuration.
+   *
+   * @param request The request that contains all the new Tenant Manager configuration information.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TenantManagerConfigurationResponse, Errors> updateTenantManagerConfiguration(TenantManagerConfigurationRequest request) {
+    return start(TenantManagerConfigurationResponse.class, Errors.class)
+        .uri("/api/tenant-manager")
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .put()
+        .go();
+  }
+
+  /**
+   * Updates the tenant manager identity provider type configuration for the given identity provider type.
+   *
+   * @param type The type of the identity provider.
+   * @param request The request object that contains the updated tenant manager identity provider type configuration.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TenantManagerIdentityProviderTypeConfigurationResponse, Errors> updateTenantManagerIdentityProviderTypeConfiguration(IdentityProviderType type, TenantManagerIdentityProviderTypeConfigurationRequest request) {
+    return start(TenantManagerIdentityProviderTypeConfigurationResponse.class, Errors.class)
+        .uri("/api/tenant-manager/identity-provider")
+        .urlSegment(type)
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .put()
+        .go();
+  }
+
   /**
    * Updates the theme with the given Id.
    *

src/main/java/io/fusionauth/client/json/PreviewMessageTemplateResponseDeserializer.java

@@ -4,8 +4,6 @@
 package io.fusionauth.client.json;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
@@ -14,10 +12,7 @@
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import com.inversoft.error.Errors;
 import io.fusionauth.domain.api.PreviewMessageTemplateResponse;
-import io.fusionauth.domain.message.Message;
-import io.fusionauth.domain.message.MessageType;
 import io.fusionauth.domain.message.sms.SMSMessage;
-import io.fusionauth.domain.message.voice.VoiceMessage;
 
 /**
  * @author Daniel King
@@ -27,18 +22,6 @@ public PreviewMessageTemplateResponseDeserializer() {
     super(PreviewMessageTemplateResponse.class);
   }
 
-  private static MessageType extractType(DeserializationContext ctxt, JsonParser p, JsonNode messageNode) throws IOException {
-    JsonNode node = messageNode.at("/type");
-    MessageType type = MessageType.safeValueOf(node.asText());
-    if (type == null) {
-      String sorted = Arrays.stream(MessageType.values()).map(Enum::name).sorted().collect(Collectors.joining(", "));
-      return (MessageType) ctxt.handleUnexpectedToken(Message.class, node.asToken(), p,
-                                                      "Expected the type field to be one of [" + sorted + "], but found [" + node.asText() + "]");
-    }
-
-    return type;
-  }
-
   @Override
   public PreviewMessageTemplateResponse deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
     return deserialize(p, ctxt, new PreviewMessageTemplateResponse());
@@ -54,16 +37,16 @@ public PreviewMessageTemplateResponse deserialize(JsonParser p, DeserializationC
       response.errors = p.getCodec().treeToValue(errorsNode, Errors.class);
     }
 
-    JsonNode messageNode = node.at("/previewMessage");
-    MessageType messageType = extractType(ctxt, p, messageNode);
-    if (messageType == MessageType.Voice) {
-      response.previewMessage = new VoiceMessage();
-    } else {
-      SMSMessage message = new SMSMessage();
-      response.message = message;
-      response.previewMessage = message;
+    JsonNode previewNode = node.at("/previewMessage");
+    if (!previewNode.isMissingNode()) {
+      response.previewMessage = previewNode.asText();
+    }
+
+    JsonNode messageNode = node.at("/message");
+    if (!messageNode.isMissingNode()) {
+      response.message = new SMSMessage();
+      ((ObjectMapper) p.getCodec()).readerForUpdating(response.message).readValue(messageNode);
     }
-    ((ObjectMapper) p.getCodec()).readerForUpdating(response.previewMessage).readValue(messageNode);
 
     return response;
   }

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

@@ -589,6 +589,8 @@ public String toString() {
   public static class RegistrationConfiguration extends Enableable implements Buildable<RegistrationConfiguration> {
     public Requirable birthDate = new Requirable();
 
+    public boolean completeRegistration;
+
     public boolean confirmPassword;
 
     public Requirable firstName = new Requirable();
@@ -615,6 +617,7 @@ public RegistrationConfiguration() {
 
     public RegistrationConfiguration(RegistrationConfiguration other) {
       this.birthDate = new Requirable(other.birthDate);
+      this.completeRegistration = other.completeRegistration;
       this.confirmPassword = other.confirmPassword;
       this.enabled = other.enabled;
       this.firstName = new Requirable(other.firstName);
@@ -640,7 +643,8 @@ public boolean equals(Object o) {
         return false;
       }
       RegistrationConfiguration that = (RegistrationConfiguration) o;
-      return confirmPassword == that.confirmPassword &&
+      return completeRegistration == that.completeRegistration &&
+             confirmPassword == that.confirmPassword &&
              Objects.equals(birthDate, that.birthDate) &&
              Objects.equals(firstName, that.firstName) &&
              Objects.equals(formId, that.formId) &&
@@ -655,7 +659,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-      return Objects.hash(super.hashCode(), birthDate, confirmPassword, firstName, formId, fullName, lastName, loginIdType, middleName, mobilePhone, preferredLanguages, type);
+      return Objects.hash(super.hashCode(), birthDate, completeRegistration, confirmPassword, firstName, formId, fullName, lastName, loginIdType, middleName, mobilePhone, preferredLanguages, type);
     }
 
     public String toString() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-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.
@@ -19,6 +19,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.UUID;
 
 import com.inversoft.json.ToString;
 import io.fusionauth.domain.util.Normalizer;
@@ -45,6 +46,8 @@ public class AuditLog implements Buildable<AuditLog> {
 
   public String reason;
 
+  public UUID tenantId;
+
   public AuditLog() {
   }
 
@@ -69,12 +72,13 @@ public boolean equals(Object o) {
            Objects.equals(message, auditLog.message) &&
            Objects.equals(newValue, auditLog.newValue) &&
            Objects.equals(oldValue, auditLog.oldValue) &&
-           Objects.equals(reason, auditLog.reason);
+           Objects.equals(reason, auditLog.reason) &&
+           Objects.equals(tenantId, auditLog.tenantId);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(data, id, insertInstant, insertUser, message, newValue, oldValue, reason);
+    return Objects.hash(data, id, insertInstant, insertUser, message, newValue, oldValue, reason, tenantId);
   }
 
   public void normalize() {

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

@@ -42,6 +42,8 @@ public class ExternalIdentifierConfiguration implements Buildable<ExternalIdenti
 
   public int externalAuthenticationIdTimeToLiveInSeconds = 300;
 
+  public int identityProviderConnectionTestTimeToLiveInSeconds = 1800;
+
   public int loginIntentTimeToLiveInSeconds = 1800;
 
   public int oneTimePasswordTimeToLiveInSeconds = 60;
@@ -102,6 +104,7 @@ public ExternalIdentifierConfiguration(ExternalIdentifierConfiguration other) {
     this.emailVerificationIdTimeToLiveInSeconds = other.emailVerificationIdTimeToLiveInSeconds;
     this.emailVerificationOneTimeCodeGenerator = new SecureGeneratorConfiguration(other.emailVerificationOneTimeCodeGenerator);
     this.externalAuthenticationIdTimeToLiveInSeconds = other.externalAuthenticationIdTimeToLiveInSeconds;
+    this.identityProviderConnectionTestTimeToLiveInSeconds = other.identityProviderConnectionTestTimeToLiveInSeconds;
     this.phoneVerificationIdGenerator = new SecureGeneratorConfiguration(other.phoneVerificationIdGenerator);
     this.phoneVerificationIdTimeToLiveInSeconds = other.phoneVerificationIdTimeToLiveInSeconds;
     this.phoneVerificationOneTimeCodeGenerator = new SecureGeneratorConfiguration(other.phoneVerificationOneTimeCodeGenerator);
@@ -141,6 +144,7 @@ public boolean equals(Object o) {
            deviceCodeTimeToLiveInSeconds == that.deviceCodeTimeToLiveInSeconds &&
            emailVerificationIdTimeToLiveInSeconds == that.emailVerificationIdTimeToLiveInSeconds &&
            externalAuthenticationIdTimeToLiveInSeconds == that.externalAuthenticationIdTimeToLiveInSeconds &&
+           identityProviderConnectionTestTimeToLiveInSeconds == that.identityProviderConnectionTestTimeToLiveInSeconds &&
            phoneVerificationIdTimeToLiveInSeconds == that.phoneVerificationIdTimeToLiveInSeconds &&
            loginIntentTimeToLiveInSeconds == that.loginIntentTimeToLiveInSeconds &&
            oneTimePasswordTimeToLiveInSeconds == that.oneTimePasswordTimeToLiveInSeconds &&
@@ -181,6 +185,7 @@ public int hashCode() {
                         emailVerificationIdTimeToLiveInSeconds,
                         emailVerificationOneTimeCodeGenerator,
                         externalAuthenticationIdTimeToLiveInSeconds,
+                        identityProviderConnectionTestTimeToLiveInSeconds,
                         phoneVerificationIdGenerator,
                         phoneVerificationIdTimeToLiveInSeconds,
                         phoneVerificationOneTimeCodeGenerator,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2025, 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.