Merge feature/eng-3487/tenant-scoped-idps

src/main/java/io/fusionauth/domain/api/identityProvider/LookupResponse.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-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.
@@ -41,6 +41,7 @@ public LookupResponse() {
   public LookupResponse(BaseIdentityProvider<?> identityProvider) {
     this.identityProvider = new IdentityProviderDetails();
     this.identityProvider.id = identityProvider.id;
+    this.identityProvider.tenantId = identityProvider.tenantId;
     this.identityProvider.name = identityProvider.name;
     this.identityProvider.type = identityProvider.getType();
     // Add all enabled application Ids
@@ -81,6 +82,8 @@ public static class IdentityProviderDetails {
 
     public IdentityProviderOauth2Configuration oauth2;
 
+    public UUID tenantId;
+
     public IdentityProviderType type;
   }
 }

src/main/java/io/fusionauth/domain/provider/BaseIdentityProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-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.
@@ -58,6 +58,8 @@ public abstract class BaseIdentityProvider<D extends BaseIdentityProviderApplica
 
   public Map<UUID, IdentityProviderTenantConfiguration> tenantConfiguration = new HashMap<>();
 
+  public UUID tenantId;
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -79,14 +81,15 @@ public boolean equals(Object o) {
            Objects.equals(lastUpdateInstant, that.lastUpdateInstant) &&
            linkingStrategy == that.linkingStrategy &&
            Objects.equals(name, that.name) &&
+           Objects.equals(tenantId, that.tenantId) &&
            Objects.equals(tenantConfiguration, that.tenantConfiguration);
   }
 
   public abstract IdentityProviderType getType();
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), data, applicationConfiguration, debug, id, insertInstant, lambdaConfiguration, lastUpdateInstant, linkingStrategy, name, tenantConfiguration);
+    return Objects.hash(super.hashCode(), data, applicationConfiguration, debug, id, insertInstant, lambdaConfiguration, lastUpdateInstant, linkingStrategy, name, tenantId, tenantConfiguration);
   }
 
   @JsonIgnore

src/main/java/io/fusionauth/domain/provider/IdentityProviderType.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2019, FusionAuth, All Rights Reserved
+ * Copyright (c) 2018-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.

src/main/java/io/fusionauth/domain/search/IdentityProviderSearchCriteria.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, FusionAuth, All Rights Reserved
+ * Copyright (c) 2023-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.
@@ -37,6 +37,8 @@ public class IdentityProviderSearchCriteria extends BaseSearchCriteria {
 
   public String name;
 
+  public UUID tenantId;
+
   public IdentityProviderType type;
 
   @JacksonConstructor
@@ -69,6 +71,7 @@ protected String defaultOrderBy() {
     SortableFields.put("insertInstant", "insert_instant");
     SortableFields.put("name", "name");
     SortableFields.put("enabled", "enabled");
+    SortableFields.put("tenantId", "tenants_id");
     SortableFields.put("type", "type");
   }
 }