From 88ce34f918e1651488707cce0b86be7e1f30357f Mon Sep 17 00:00:00 2001 From: Thisara-Welmilla Date: Tue, 12 Nov 2024 10:21:47 +0530 Subject: [PATCH] Update APIs to support custom authentication management. --- .../v1/model/MetaFederatedAuthenticator.java | 26 ++----------------- .../v1/core/ServerIdpManagementService.java | 2 ++ .../src/main/resources/idp.yaml | 2 -- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/gen/java/org/wso2/carbon/identity/api/server/idp/v1/model/MetaFederatedAuthenticator.java b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/gen/java/org/wso2/carbon/identity/api/server/idp/v1/model/MetaFederatedAuthenticator.java index b3591fdc82..46483c4c83 100644 --- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/gen/java/org/wso2/carbon/identity/api/server/idp/v1/model/MetaFederatedAuthenticator.java +++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/gen/java/org/wso2/carbon/identity/api/server/idp/v1/model/MetaFederatedAuthenticator.java @@ -22,7 +22,6 @@ import io.swagger.annotations.ApiModelProperty; import java.util.ArrayList; import java.util.List; -import org.wso2.carbon.identity.api.server.idp.v1.model.Endpoint; import org.wso2.carbon.identity.api.server.idp.v1.model.MetaProperty; import javax.validation.constraints.*; @@ -75,7 +74,6 @@ public static DefinedByEnum fromValue(String value) { private List properties = null; - private Endpoint endpoint; /** **/ @@ -201,25 +199,7 @@ public MetaFederatedAuthenticator addPropertiesItem(MetaProperty propertiesItem) return this; } - /** - **/ - public MetaFederatedAuthenticator endpoint(Endpoint endpoint) { - - this.endpoint = endpoint; - return this; - } - @ApiModelProperty(value = "") - @JsonProperty("endpoint") - @Valid - public Endpoint getEndpoint() { - return endpoint; - } - public void setEndpoint(Endpoint endpoint) { - this.endpoint = endpoint; - } - - @Override public boolean equals(java.lang.Object o) { @@ -236,13 +216,12 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.displayName, metaFederatedAuthenticator.displayName) && Objects.equals(this.definedBy, metaFederatedAuthenticator.definedBy) && Objects.equals(this.tags, metaFederatedAuthenticator.tags) && - Objects.equals(this.properties, metaFederatedAuthenticator.properties) && - Objects.equals(this.endpoint, metaFederatedAuthenticator.endpoint); + Objects.equals(this.properties, metaFederatedAuthenticator.properties); } @Override public int hashCode() { - return Objects.hash(authenticatorId, name, displayName, definedBy, tags, properties, endpoint); + return Objects.hash(authenticatorId, name, displayName, definedBy, tags, properties); } @Override @@ -257,7 +236,6 @@ public String toString() { sb.append(" definedBy: ").append(toIndentedString(definedBy)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" properties: ").append(toIndentedString(properties)).append("\n"); - sb.append(" endpoint: ").append(toIndentedString(endpoint)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java index ec4848cf03..1e9b62d92a 100644 --- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java @@ -1699,6 +1699,7 @@ private MetaFederatedAuthenticatorListItem createMetaFederatedAuthenticatorListI String authenticatorId = base64URLEncode(authenticatorConfig.getName()); metaFederatedAuthenticator.setName(authenticatorConfig.getName()); metaFederatedAuthenticator.setAuthenticatorId(authenticatorId); + metaFederatedAuthenticator.setDefinedBy(MetaFederatedAuthenticatorListItem.DefinedByEnum.SYSTEM); FederatedAuthenticatorConfig federatedAuthenticatorConfig = ApplicationAuthenticatorService.getInstance() .getFederatedAuthenticatorByName(authenticatorConfig.getName()); if (federatedAuthenticatorConfig != null) { @@ -1727,6 +1728,7 @@ private MetaFederatedAuthenticator createMetaFederatedAuthenticator(FederatedAut metaFederatedAuthenticator.setTags(Arrays.asList(tags)); } } + metaFederatedAuthenticator.setDefinedBy(MetaFederatedAuthenticator.DefinedByEnum.SYSTEM); Property[] properties = authenticatorConfig.getProperties(); List metaProperties = Arrays.stream(properties).map(propertyToExternalMeta).collect(Collectors .toList()); diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/resources/idp.yaml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/resources/idp.yaml index 875aa8ad8c..1e62cdb2d8 100644 --- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/resources/idp.yaml +++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/resources/idp.yaml @@ -2824,8 +2824,6 @@ components: type: array items: $ref: '#/components/schemas/MetaProperty' - endpoint: - $ref: '#/components/schemas/Endpoint' FederatedAuthenticatorRequest: type: object required: