Merge branch 'develop' of github.com:FusionAuth/fusionauth-java-client into lyle/ENG-3375/introspect-and-libs

Author: lyleschemmerling

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

@@ -218,6 +218,7 @@
 import io.fusionauth.domain.api.twoFactor.TwoFactorStartRequest;
 import io.fusionauth.domain.api.twoFactor.TwoFactorStartResponse;
 import io.fusionauth.domain.api.twoFactor.TwoFactorStatusResponse;
+import io.fusionauth.domain.api.twoFactor.TwoFactorStatusRequest;
 import io.fusionauth.domain.api.user.ActionRequest;
 import io.fusionauth.domain.api.user.ActionResponse;
 import io.fusionauth.domain.api.user.ChangePasswordRequest;
@@ -548,6 +549,26 @@ public ClientResponse<Void, Errors> checkChangePasswordUsingId(String changePass
         .go();
   }
 
+  /**
+   * Check to see if the user must obtain a Trust Token Id in order to complete a change password request.
+   * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
+   * your password, you must obtain a Trust Token by completing a Two-Factor Step-Up authentication.
+   * <p>
+   * An HTTP status code of 400 with a general error code of [TrustTokenRequired] indicates that a Trust Token is required to make a POST request to this API.
+   *
+   * @param changePasswordId The change password Id used to find the user. This value is generated by FusionAuth once the change password workflow has been initiated.
+   * @param ipAddress (Optional) IP address of the user changing their password. This is used for MFA risk assessment.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<Void, Errors> checkChangePasswordUsingIdAndIPAddress(String changePasswordId, String ipAddress) {
+    return startAnonymous(Void.TYPE, Errors.class)
+        .uri("/api/user/change-password")
+        .urlSegment(changePasswordId)
+        .urlParameter("ipAddress", ipAddress)
+        .get()
+        .go();
+  }
+
   /**
    * Check to see if the user must obtain a Trust Token Id in order to complete a change password request.
    * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
@@ -566,6 +587,26 @@ public ClientResponse<Void, Errors> checkChangePasswordUsingJWT(String encodedJW
         .go();
   }
 
+  /**
+   * Check to see if the user must obtain a Trust Token Id in order to complete a change password request.
+   * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
+   * your password, you must obtain a Trust Token by completing a Two-Factor Step-Up authentication.
+   * <p>
+   * An HTTP status code of 400 with a general error code of [TrustTokenRequired] indicates that a Trust Token is required to make a POST request to this API.
+   *
+   * @param encodedJWT The encoded JWT (access token).
+   * @param ipAddress (Optional) IP address of the user changing their password. This is used for MFA risk assessment.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<Void, Errors> checkChangePasswordUsingJWTAndIPAddress(String encodedJWT, String ipAddress) {
+    return startAnonymous(Void.TYPE, Errors.class)
+        .uri("/api/user/change-password")
+        .authorization("Bearer " + encodedJWT)
+        .urlParameter("ipAddress", ipAddress)
+        .get()
+        .go();
+  }
+
   /**
    * Check to see if the user must obtain a Trust Request Id in order to complete a change password request.
    * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
@@ -584,6 +625,26 @@ public ClientResponse<Void, Errors> checkChangePasswordUsingLoginId(String login
         .go();
   }
 
+  /**
+   * Check to see if the user must obtain a Trust Request Id in order to complete a change password request.
+   * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
+   * your password, you must obtain a Trust Request Id by completing a Two-Factor Step-Up authentication.
+   * <p>
+   * An HTTP status code of 400 with a general error code of [TrustTokenRequired] indicates that a Trust Token is required to make a POST request to this API.
+   *
+   * @param loginId The loginId (email or username) of the User that you intend to change the password for.
+   * @param ipAddress (Optional) IP address of the user changing their password. This is used for MFA risk assessment.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<Void, Errors> checkChangePasswordUsingLoginIdAndIPAddress(String loginId, String ipAddress) {
+    return start(Void.TYPE, Errors.class)
+        .uri("/api/user/change-password")
+        .urlParameter("loginId", loginId)
+        .urlParameter("ipAddress", ipAddress)
+        .get()
+        .go();
+  }
+
   /**
    * Check to see if the user must obtain a Trust Request Id in order to complete a change password request.
    * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
@@ -604,6 +665,28 @@ public ClientResponse<Void, Errors> checkChangePasswordUsingLoginIdAndLoginIdTyp
         .go();
   }
 
+  /**
+   * Check to see if the user must obtain a Trust Request Id in order to complete a change password request.
+   * When a user has enabled Two-Factor authentication, before you are allowed to use the Change Password API to change
+   * your password, you must obtain a Trust Request Id by completing a Two-Factor Step-Up authentication.
+   * <p>
+   * An HTTP status code of 400 with a general error code of [TrustTokenRequired] indicates that a Trust Token is required to make a POST request to this API.
+   *
+   * @param loginId The loginId of the User that you intend to change the password for.
+   * @param loginIdTypes The identity types that FusionAuth will compare the loginId to.
+   * @param ipAddress (Optional) IP address of the user changing their password. This is used for MFA risk assessment.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<Void, Errors> checkChangePasswordUsingLoginIdAndLoginIdTypesAndIPAddress(String loginId, List<String> loginIdTypes, String ipAddress) {
+    return start(Void.TYPE, Errors.class)
+        .uri("/api/user/change-password")
+        .urlParameter("loginId", loginId)
+        .urlParameter("loginIdTypes", loginIdTypes)
+        .urlParameter("ipAddress", ipAddress)
+        .get()
+        .go();
+  }
+
   /**
    * Make a Client Credentials grant request to obtain an access token.
    *
@@ -4352,6 +4435,24 @@ public ClientResponse<TwoFactorStatusResponse, Errors> retrieveTwoFactorStatus(U
         .go();
   }
 
+  /**
+   * Retrieve a user's two-factor status.
+   * <p>
+   * This can be used to see if a user will need to complete a two-factor challenge to complete a login,
+   * and optionally identify the state of the two-factor trust across various applications. This operation
+   * provides more payload options than retrieveTwoFactorStatus.
+   *
+   * @param request The request object that contains all the information used to check the status.
+   * @return The ClientResponse object.
+   */
+  public ClientResponse<TwoFactorStatusResponse, Errors> retrieveTwoFactorStatusWithRequest(TwoFactorStatusRequest request) {
+    return start(TwoFactorStatusResponse.class, Errors.class)
+        .uri("/api/two-factor/status")
+        .bodyHandler(new JSONBodyHandler(request, objectMapper()))
+        .post()
+        .go();
+  }
+
   /**
    * Retrieves the user for the given Id.
    *

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

@@ -454,6 +454,8 @@ public static class LambdaConfiguration {
 
     public UUID idTokenPopulateId;
 
+    public UUID multiFactorRequirementId;
+
     public UUID samlv2PopulateId;
 
     public UUID selfServiceRegistrationValidationId;
@@ -467,6 +469,7 @@ public LambdaConfiguration() {
     public LambdaConfiguration(LambdaConfiguration other) {
       this.accessTokenPopulateId = other.accessTokenPopulateId;
       this.idTokenPopulateId = other.idTokenPopulateId;
+      this.multiFactorRequirementId = other.multiFactorRequirementId;
       this.samlv2PopulateId = other.samlv2PopulateId;
       this.selfServiceRegistrationValidationId = other.selfServiceRegistrationValidationId;
       this.userinfoPopulateId = other.userinfoPopulateId;
@@ -483,14 +486,15 @@ public boolean equals(Object o) {
       LambdaConfiguration that = (LambdaConfiguration) o;
       return Objects.equals(accessTokenPopulateId, that.accessTokenPopulateId) &&
              Objects.equals(idTokenPopulateId, that.idTokenPopulateId) &&
+             Objects.equals(multiFactorRequirementId, that.multiFactorRequirementId) &&
              Objects.equals(samlv2PopulateId, that.samlv2PopulateId) &&
              Objects.equals(selfServiceRegistrationValidationId, that.selfServiceRegistrationValidationId) &&
              Objects.equals(userinfoPopulateId, that.userinfoPopulateId);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hash(accessTokenPopulateId, idTokenPopulateId, samlv2PopulateId, selfServiceRegistrationValidationId, userinfoPopulateId);
+      return Objects.hash(accessTokenPopulateId, idTokenPopulateId, multiFactorRequirementId, samlv2PopulateId, selfServiceRegistrationValidationId, userinfoPopulateId);
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2024, FusionAuth, All Rights Reserved
+ * Copyright (c) 2019-2025, 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.
@@ -22,6 +22,7 @@
  */
 @SuppressWarnings("ALL")
 public enum LambdaType {
+  // This is an ordinal enum, so make sure new values are added to the end
   // @formatter:off
   JWTPopulate("populate", "" +
       //language=JavaScript
@@ -496,7 +497,24 @@ public enum LambdaType {
        "\n" +
        "  console.info('Hello World!');" +
        "\n" +
-       "}\n");
+       "}\n"),
+  MFARequirement("checkRequired", "" +
+      //language=JavaScript
+      "// Check whether MFA is required, for a particular action, user, and application, in a given context.\n" +
+      "function checkRequired(result, user, registration, context) {\n" +
+       "  //  When writing a lambda we've added a few helpers to make life easier.\n" +
+       "  //  console.info('Hello World');         # This will create an EventLog of type Information\n" +
+       "  //  console.error('Not good.');          # This will create an EventLog of type Error\n" +
+       "  //  console.debug('Step 42 completed.'); # This will create an EventLog of type Debug\n" +
+       "  //  \n" +
+       "  //  To dump an entire object to the EventLog you can use JSON.stringify, for example: \n" +
+       "  //  console.info(JSON.stringify(user)); \n" +
+       "\n" +
+       "  // Happy coding! Perform your MFA requirement check here.\n" +
+       "\n" +
+       "  console.info('Hello World!');" +
+       "\n" +
+      "}\n");
   // @formatter:on
 
   private final String example;

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025, 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;
+
+/**
+ * Communicate various actions/contexts in which multi-factor authentication can be used.
+ */
+public enum MultiFactorAction {
+  changePassword,
+  login,
+  stepUp
+}

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

@@ -267,6 +267,12 @@ public JWTConfiguration lookupJWTConfiguration(Application application) {
     return jwtConfiguration;
   }
 
+  /**
+   * Lookup the login MFA policy
+   *
+   * @param application application to examine
+   * @return policy in effect
+   */
   @JsonIgnore
   public MultiFactorLoginPolicy lookupMultiFactorLoginPolicy(Application application) {
     if (application != null && application.multiFactorConfiguration.loginPolicy != null) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2024, FusionAuth, All Rights Reserved
+ * Copyright (c) 2022-2025, 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 TenantLambdaConfiguration implements Buildable<TenantLambdaConfiguration> {
   public UUID loginValidationId;
 
+  public UUID multiFactorRequirementId;
+
   public UUID scimEnterpriseUserRequestConverterId;
 
   public UUID scimEnterpriseUserResponseConverterId;
@@ -45,6 +47,7 @@ public TenantLambdaConfiguration() {
 
   public TenantLambdaConfiguration(TenantLambdaConfiguration other) {
     this.loginValidationId = other.loginValidationId;
+    this.multiFactorRequirementId = other.multiFactorRequirementId;
     this.scimEnterpriseUserRequestConverterId = other.scimEnterpriseUserRequestConverterId;
     this.scimEnterpriseUserResponseConverterId = other.scimEnterpriseUserResponseConverterId;
     this.scimGroupRequestConverterId = other.scimGroupRequestConverterId;
@@ -63,6 +66,7 @@ public boolean equals(Object o) {
     }
     TenantLambdaConfiguration that = (TenantLambdaConfiguration) o;
     return Objects.equals(loginValidationId, that.loginValidationId) &&
+           Objects.equals(multiFactorRequirementId, that.multiFactorRequirementId) &&
            Objects.equals(scimEnterpriseUserRequestConverterId, that.scimEnterpriseUserRequestConverterId) &&
            Objects.equals(scimEnterpriseUserResponseConverterId, that.scimEnterpriseUserResponseConverterId) &&
            Objects.equals(scimGroupRequestConverterId, that.scimGroupRequestConverterId) &&
@@ -74,6 +78,7 @@ public boolean equals(Object o) {
   @Override
   public int hashCode() {
     return Objects.hash(loginValidationId,
+                        multiFactorRequirementId,
                         scimEnterpriseUserRequestConverterId,
                         scimEnterpriseUserResponseConverterId,
                         scimGroupRequestConverterId,

src/main/java/io/fusionauth/domain/api/identity/verify/ExistingUserStrategy.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025, 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.identity.verify;
+
+/**
+ * Represent the various states/expectations of a user in the context of starting verification
+ */
+public enum ExistingUserStrategy {
+  mustExist,
+  mustNotExist
+}

src/main/java/io/fusionauth/domain/api/identity/verify/VerifyStartRequest.java

@@ -27,6 +27,12 @@
 public class VerifyStartRequest implements Buildable<VerifyStartRequest> {
   public UUID applicationId;
 
+  /**
+   * When MustExist (default), loginId/loginIdType must correspond to a user in the tenant. When this is MustNotExist, verification can begin
+   * without a user, in order to perform verification before user creation.
+   */
+  public ExistingUserStrategy existingUserStrategy = ExistingUserStrategy.mustExist;
+
   public String loginId;
 
   public String loginIdType;

src/main/java/io/fusionauth/domain/api/twoFactor/TwoFactorStatusRequest.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025, 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.twoFactor;
+
+import java.util.UUID;
+
+import com.inversoft.json.JacksonConstructor;
+import io.fusionauth.domain.MultiFactorAction;
+import io.fusionauth.domain.api.BaseEventRequest;
+
+/**
+ * Check the status of two-factor authentication for a user, with more options than on a GET request.
+ */
+public class TwoFactorStatusRequest extends BaseEventRequest {
+  // required
+  public final UUID userId;
+
+  public String accessToken;
+
+  public MultiFactorAction action = MultiFactorAction.login;
+
+  public UUID applicationId;
+
+  public String twoFactorTrustId;
+
+  public TwoFactorStatusRequest(UUID userId) {
+    this.userId = userId;
+  }
+
+  @JacksonConstructor
+  private TwoFactorStatusRequest() {
+    // will be overridden by Jackson
+    this.userId = null;
+  }
+}