diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml index ed31e5cc3c..a6e21a663d 100644 --- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.expired.password.identification - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml index 9556f329bd..25b84beec5 100644 --- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.expired.password.identification - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml index f33f86114c..86c5e00fa8 100644 --- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml +++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml index 52bc49a59e..ff0dfc6397 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.idle.account.identification - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml index 7a5f08dacb..febc5c3715 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.idle.account.identification - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml index db56afeed1..0039de35e9 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml index 1eaa88dfca..e5a67891b9 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.action.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml index 3891cc9662..848dd45d87 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.action.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ANDRule.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ANDRule.java new file mode 100644 index 0000000000..fb840a609c --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ANDRule.java @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.wso2.carbon.identity.api.server.action.management.v1.Expression; +import javax.validation.constraints.*; + +/** + * Expressions combined with AND condition. + **/ + +import io.swagger.annotations.*; +import java.util.Objects; +import javax.validation.Valid; +import javax.xml.bind.annotation.*; +@ApiModel(description = "Expressions combined with AND condition.") +public class ANDRule { + + +@XmlType(name="ConditionEnum") +@XmlEnum(String.class) +public enum ConditionEnum { + + @XmlEnumValue("AND") AND(String.valueOf("AND")); + + + private String value; + + ConditionEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static ConditionEnum fromValue(String value) { + for (ConditionEnum b : ConditionEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + private ConditionEnum condition; + private List expressions = new ArrayList(); + + + /** + **/ + public ANDRule condition(ConditionEnum condition) { + + this.condition = condition; + return this; + } + + @ApiModelProperty(required = true, value = "") + @JsonProperty("condition") + @Valid + @NotNull(message = "Property condition cannot be null.") + + public ConditionEnum getCondition() { + return condition; + } + public void setCondition(ConditionEnum condition) { + this.condition = condition; + } + + /** + **/ + public ANDRule expressions(List expressions) { + + this.expressions = expressions; + return this; + } + + @ApiModelProperty(required = true, value = "") + @JsonProperty("expressions") + @Valid + @NotNull(message = "Property expressions cannot be null.") + @Size(min=1) + public List getExpressions() { + return expressions; + } + public void setExpressions(List expressions) { + this.expressions = expressions; + } + + public ANDRule addExpressionsItem(Expression expressionsItem) { + this.expressions.add(expressionsItem); + return this; + } + + + + @Override + public boolean equals(java.lang.Object o) { + + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ANDRule anDRule = (ANDRule) o; + return Objects.equals(this.condition, anDRule.condition) && + Objects.equals(this.expressions, anDRule.expressions); + } + + @Override + public int hashCode() { + return Objects.hash(condition, expressions); + } + + @Override + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append("class ANDRule {\n"); + + sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); + sb.append(" expressions: ").append(toIndentedString(expressions)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n"); + } +} + diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ANDRuleResponse.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ANDRuleResponse.java new file mode 100644 index 0000000000..ae04c941e8 --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ANDRuleResponse.java @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.wso2.carbon.identity.api.server.action.management.v1.ExpressionResponse; +import javax.validation.constraints.*; + +/** + * Expressions combined with AND condition. + **/ + +import io.swagger.annotations.*; +import java.util.Objects; +import javax.validation.Valid; +import javax.xml.bind.annotation.*; +@ApiModel(description = "Expressions combined with AND condition.") +public class ANDRuleResponse { + + +@XmlType(name="ConditionEnum") +@XmlEnum(String.class) +public enum ConditionEnum { + + @XmlEnumValue("AND") AND(String.valueOf("AND")); + + + private String value; + + ConditionEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static ConditionEnum fromValue(String value) { + for (ConditionEnum b : ConditionEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + private ConditionEnum condition; + private List expressions = null; + + + /** + **/ + public ANDRuleResponse condition(ConditionEnum condition) { + + this.condition = condition; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("condition") + @Valid + public ConditionEnum getCondition() { + return condition; + } + public void setCondition(ConditionEnum condition) { + this.condition = condition; + } + + /** + **/ + public ANDRuleResponse expressions(List expressions) { + + this.expressions = expressions; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("expressions") + @Valid @Size(min=1) + public List getExpressions() { + return expressions; + } + public void setExpressions(List expressions) { + this.expressions = expressions; + } + + public ANDRuleResponse addExpressionsItem(ExpressionResponse expressionsItem) { + if (this.expressions == null) { + this.expressions = new ArrayList(); + } + this.expressions.add(expressionsItem); + return this; + } + + + + @Override + public boolean equals(java.lang.Object o) { + + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ANDRuleResponse anDRuleResponse = (ANDRuleResponse) o; + return Objects.equals(this.condition, anDRuleResponse.condition) && + Objects.equals(this.expressions, anDRuleResponse.expressions); + } + + @Override + public int hashCode() { + return Objects.hash(condition, expressions); + } + + @Override + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append("class ANDRuleResponse {\n"); + + sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); + sb.append(" expressions: ").append(toIndentedString(expressions)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n"); + } +} + diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionModel.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionModel.java index d1fd4c1747..9205b927d0 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionModel.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionModel.java @@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.identity.api.server.action.management.v1.Endpoint; +import org.wso2.carbon.identity.api.server.action.management.v1.ORRule; import javax.validation.constraints.*; @@ -36,6 +37,7 @@ public class ActionModel { private String name; private String description; private Endpoint endpoint; + private ORRule rule; /** **/ @@ -95,6 +97,24 @@ public void setEndpoint(Endpoint endpoint) { this.endpoint = endpoint; } + /** + **/ + public ActionModel rule(ORRule rule) { + + this.rule = rule; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("rule") + @Valid + public ORRule getRule() { + return rule; + } + public void setRule(ORRule rule) { + this.rule = rule; + } + @Override @@ -109,12 +129,13 @@ public boolean equals(java.lang.Object o) { ActionModel actionModel = (ActionModel) o; return Objects.equals(this.name, actionModel.name) && Objects.equals(this.description, actionModel.description) && - Objects.equals(this.endpoint, actionModel.endpoint); + Objects.equals(this.endpoint, actionModel.endpoint) && + Objects.equals(this.rule, actionModel.rule); } @Override public int hashCode() { - return Objects.hash(name, description, endpoint); + return Objects.hash(name, description, endpoint, rule); } @Override @@ -126,6 +147,7 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" endpoint: ").append(toIndentedString(endpoint)).append("\n"); + sb.append(" rule: ").append(toIndentedString(rule)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionResponse.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionResponse.java index cfe00792f8..3cf84ba92e 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionResponse.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionResponse.java @@ -24,6 +24,7 @@ import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.identity.api.server.action.management.v1.ActionType; import org.wso2.carbon.identity.api.server.action.management.v1.EndpointResponse; +import org.wso2.carbon.identity.api.server.action.management.v1.ORRuleResponse; import javax.validation.constraints.*; @@ -73,6 +74,7 @@ public static StatusEnum fromValue(String value) { private StatusEnum status; private EndpointResponse endpoint; + private ORRuleResponse rule; /** **/ @@ -182,6 +184,24 @@ public void setEndpoint(EndpointResponse endpoint) { this.endpoint = endpoint; } + /** + **/ + public ActionResponse rule(ORRuleResponse rule) { + + this.rule = rule; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("rule") + @Valid + public ORRuleResponse getRule() { + return rule; + } + public void setRule(ORRuleResponse rule) { + this.rule = rule; + } + @Override @@ -199,12 +219,13 @@ public boolean equals(java.lang.Object o) { Objects.equals(this.name, actionResponse.name) && Objects.equals(this.description, actionResponse.description) && Objects.equals(this.status, actionResponse.status) && - Objects.equals(this.endpoint, actionResponse.endpoint); + Objects.equals(this.endpoint, actionResponse.endpoint) && + Objects.equals(this.rule, actionResponse.rule); } @Override public int hashCode() { - return Objects.hash(id, type, name, description, status, endpoint); + return Objects.hash(id, type, name, description, status, endpoint, rule); } @Override @@ -219,6 +240,7 @@ public String toString() { sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" endpoint: ").append(toIndentedString(endpoint)).append("\n"); + sb.append(" rule: ").append(toIndentedString(rule)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionUpdateModel.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionUpdateModel.java index da71618d48..37d4c7b9e0 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionUpdateModel.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionUpdateModel.java @@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import org.wso2.carbon.identity.api.server.action.management.v1.EndpointUpdateModel; +import org.wso2.carbon.identity.api.server.action.management.v1.ORRule; import javax.validation.constraints.*; @@ -36,6 +37,7 @@ public class ActionUpdateModel { private String name; private String description; private EndpointUpdateModel endpoint; + private ORRule rule; /** **/ @@ -91,6 +93,24 @@ public void setEndpoint(EndpointUpdateModel endpoint) { this.endpoint = endpoint; } + /** + **/ + public ActionUpdateModel rule(ORRule rule) { + + this.rule = rule; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("rule") + @Valid + public ORRule getRule() { + return rule; + } + public void setRule(ORRule rule) { + this.rule = rule; + } + @Override @@ -105,12 +125,13 @@ public boolean equals(java.lang.Object o) { ActionUpdateModel actionUpdateModel = (ActionUpdateModel) o; return Objects.equals(this.name, actionUpdateModel.name) && Objects.equals(this.description, actionUpdateModel.description) && - Objects.equals(this.endpoint, actionUpdateModel.endpoint); + Objects.equals(this.endpoint, actionUpdateModel.endpoint) && + Objects.equals(this.rule, actionUpdateModel.rule); } @Override public int hashCode() { - return Objects.hash(name, description, endpoint); + return Objects.hash(name, description, endpoint, rule); } @Override @@ -122,6 +143,7 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" description: ").append(toIndentedString(description)).append("\n"); sb.append(" endpoint: ").append(toIndentedString(endpoint)).append("\n"); + sb.append(" rule: ").append(toIndentedString(rule)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionsApi.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionsApi.java index 288b185b9d..e35b2af9f9 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionsApi.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ActionsApi.java @@ -136,7 +136,6 @@ public Response deactivateAction(@ApiParam(value = "Name of the Action Type.",re @ApiResponse(code = 400, message = "Bad Request", response = Error.class), @ApiResponse(code = 401, message = "Unauthorized", response = Void.class), @ApiResponse(code = 403, message = "Forbidden", response = Void.class), - @ApiResponse(code = 404, message = "Not Found", response = Error.class), @ApiResponse(code = 500, message = "Server Error", response = Error.class) }) public Response deleteAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "Id of the Action.",required=true) @PathParam("actionId") String actionId) { diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/Expression.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/Expression.java new file mode 100644 index 0000000000..37ed6a1882 --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/Expression.java @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; + +/** + * Expressions in the rule. + **/ + +import io.swagger.annotations.*; +import java.util.Objects; +import javax.validation.Valid; +import javax.xml.bind.annotation.*; +@ApiModel(description = "Expressions in the rule.") +public class Expression { + + private String field; + private String operator; + private String value; + + /** + **/ + public Expression field(String field) { + + this.field = field; + return this; + } + + @ApiModelProperty(example = "application", required = true, value = "") + @JsonProperty("field") + @Valid + @NotNull(message = "Property field cannot be null.") + + public String getField() { + return field; + } + public void setField(String field) { + this.field = field; + } + + /** + **/ + public Expression operator(String operator) { + + this.operator = operator; + return this; + } + + @ApiModelProperty(example = "equals", required = true, value = "") + @JsonProperty("operator") + @Valid + @NotNull(message = "Property operator cannot be null.") + + public String getOperator() { + return operator; + } + public void setOperator(String operator) { + this.operator = operator; + } + + /** + **/ + public Expression value(String value) { + + this.value = value; + return this; + } + + @ApiModelProperty(example = "myapp", required = true, value = "") + @JsonProperty("value") + @Valid + @NotNull(message = "Property value cannot be null.") + + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + + + + @Override + public boolean equals(java.lang.Object o) { + + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Expression expression = (Expression) o; + return Objects.equals(this.field, expression.field) && + Objects.equals(this.operator, expression.operator) && + Objects.equals(this.value, expression.value); + } + + @Override + public int hashCode() { + return Objects.hash(field, operator, value); + } + + @Override + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append("class Expression {\n"); + + sb.append(" field: ").append(toIndentedString(field)).append("\n"); + sb.append(" operator: ").append(toIndentedString(operator)).append("\n"); + sb.append(" value: ").append(toIndentedString(value)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n"); + } +} + diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ExpressionResponse.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ExpressionResponse.java new file mode 100644 index 0000000000..134aafb95f --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ExpressionResponse.java @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.*; + +/** + * Expressions in the rule. + **/ + +import io.swagger.annotations.*; +import java.util.Objects; +import javax.validation.Valid; +import javax.xml.bind.annotation.*; +@ApiModel(description = "Expressions in the rule.") +public class ExpressionResponse { + + private String field; + private String operator; + private String value; + + /** + **/ + public ExpressionResponse field(String field) { + + this.field = field; + return this; + } + + @ApiModelProperty(example = "application", value = "") + @JsonProperty("field") + @Valid + public String getField() { + return field; + } + public void setField(String field) { + this.field = field; + } + + /** + **/ + public ExpressionResponse operator(String operator) { + + this.operator = operator; + return this; + } + + @ApiModelProperty(example = "equals", value = "") + @JsonProperty("operator") + @Valid + public String getOperator() { + return operator; + } + public void setOperator(String operator) { + this.operator = operator; + } + + /** + **/ + public ExpressionResponse value(String value) { + + this.value = value; + return this; + } + + @ApiModelProperty(example = "myapp", value = "") + @JsonProperty("value") + @Valid + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + + + + @Override + public boolean equals(java.lang.Object o) { + + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ExpressionResponse expressionResponse = (ExpressionResponse) o; + return Objects.equals(this.field, expressionResponse.field) && + Objects.equals(this.operator, expressionResponse.operator) && + Objects.equals(this.value, expressionResponse.value); + } + + @Override + public int hashCode() { + return Objects.hash(field, operator, value); + } + + @Override + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append("class ExpressionResponse {\n"); + + sb.append(" field: ").append(toIndentedString(field)).append("\n"); + sb.append(" operator: ").append(toIndentedString(operator)).append("\n"); + sb.append(" value: ").append(toIndentedString(value)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n"); + } +} + diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ORRule.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ORRule.java new file mode 100644 index 0000000000..42afa6827c --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ORRule.java @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.wso2.carbon.identity.api.server.action.management.v1.ANDRule; +import javax.validation.constraints.*; + +/** + * Rule configuration for the action. Combined with OR condition. + **/ + +import io.swagger.annotations.*; +import java.util.Objects; +import javax.validation.Valid; +import javax.xml.bind.annotation.*; +@ApiModel(description = "Rule configuration for the action. Combined with OR condition.") +public class ORRule { + + +@XmlType(name="ConditionEnum") +@XmlEnum(String.class) +public enum ConditionEnum { + + @XmlEnumValue("OR") OR(String.valueOf("OR")); + + + private String value; + + ConditionEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static ConditionEnum fromValue(String value) { + for (ConditionEnum b : ConditionEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + private ConditionEnum condition; + private List rules = null; + + + /** + **/ + public ORRule condition(ConditionEnum condition) { + + this.condition = condition; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("condition") + @Valid + public ConditionEnum getCondition() { + return condition; + } + public void setCondition(ConditionEnum condition) { + this.condition = condition; + } + + /** + **/ + public ORRule rules(List rules) { + + this.rules = rules; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("rules") + @Valid @Size(min=1) + public List getRules() { + return rules; + } + public void setRules(List rules) { + this.rules = rules; + } + + public ORRule addRulesItem(ANDRule rulesItem) { + if (this.rules == null) { + this.rules = new ArrayList(); + } + this.rules.add(rulesItem); + return this; + } + + + + @Override + public boolean equals(java.lang.Object o) { + + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ORRule orRule = (ORRule) o; + return Objects.equals(this.condition, orRule.condition) && + Objects.equals(this.rules, orRule.rules); + } + + @Override + public int hashCode() { + return Objects.hash(condition, rules); + } + + @Override + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append("class ORRule {\n"); + + sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); + sb.append(" rules: ").append(toIndentedString(rules)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n"); + } +} + diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ORRuleResponse.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ORRuleResponse.java new file mode 100644 index 0000000000..9f7ee026de --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/action/management/v1/ORRuleResponse.java @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.List; +import org.wso2.carbon.identity.api.server.action.management.v1.ANDRuleResponse; +import javax.validation.constraints.*; + +/** + * Rule configured for the action. + **/ + +import io.swagger.annotations.*; +import java.util.Objects; +import javax.validation.Valid; +import javax.xml.bind.annotation.*; +@ApiModel(description = "Rule configured for the action.") +public class ORRuleResponse { + + +@XmlType(name="ConditionEnum") +@XmlEnum(String.class) +public enum ConditionEnum { + + @XmlEnumValue("OR") OR(String.valueOf("OR")); + + + private String value; + + ConditionEnum(String v) { + value = v; + } + + public String value() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static ConditionEnum fromValue(String value) { + for (ConditionEnum b : ConditionEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + + private ConditionEnum condition; + private List rules = null; + + + /** + **/ + public ORRuleResponse condition(ConditionEnum condition) { + + this.condition = condition; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("condition") + @Valid + public ConditionEnum getCondition() { + return condition; + } + public void setCondition(ConditionEnum condition) { + this.condition = condition; + } + + /** + **/ + public ORRuleResponse rules(List rules) { + + this.rules = rules; + return this; + } + + @ApiModelProperty(value = "") + @JsonProperty("rules") + @Valid @Size(min=1) + public List getRules() { + return rules; + } + public void setRules(List rules) { + this.rules = rules; + } + + public ORRuleResponse addRulesItem(ANDRuleResponse rulesItem) { + if (this.rules == null) { + this.rules = new ArrayList(); + } + this.rules.add(rulesItem); + return this; + } + + + + @Override + public boolean equals(java.lang.Object o) { + + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ORRuleResponse orRuleResponse = (ORRuleResponse) o; + return Objects.equals(this.condition, orRuleResponse.condition) && + Objects.equals(this.rules, orRuleResponse.rules); + } + + @Override + public int hashCode() { + return Objects.hash(condition, rules); + } + + @Override + public String toString() { + + StringBuilder sb = new StringBuilder(); + sb.append("class ORRuleResponse {\n"); + + sb.append(" condition: ").append(toIndentedString(condition)).append("\n"); + sb.append(" rules: ").append(toIndentedString(rules)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n"); + } +} + diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/constants/ActionMgtEndpointConstants.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/constants/ActionMgtEndpointConstants.java index bbfc205c9e..8edbfb30ad 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/constants/ActionMgtEndpointConstants.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/constants/ActionMgtEndpointConstants.java @@ -24,6 +24,7 @@ public class ActionMgtEndpointConstants { private ActionMgtEndpointConstants() { + } public static final String ACTION_MANAGEMENT_PREFIX = "ACTION-"; @@ -47,11 +48,18 @@ public enum ErrorMessage { ERROR_NO_ACTION_FOUND_ON_GIVEN_ACTION_TYPE_AND_ID("60012", "Action is not found.", "No action is found for given action id and action type"), + ERROR_INVALID_RULE("60013", "Invalid rule.", "%s"), // Server errors. ERROR_NOT_IMPLEMENTED_ACTION_TYPE("650015", "Unable to perform the operation.", - "The requested action type is not currently supported by the server."); + "The requested action type is not currently supported by the server."), + ERROR_NOT_IMPLEMENTED_ACTION_RULE_FLOW_TYPE("650016", + "Unable to perform the operation.", + "Rules are not supported for the specified action type by the server."), + ERROR_WHILE_INITIALIZING_RULE_BUILDER("650017", + "Unable to perform the operation.", + "Error while retrieving rule metadata for rule validations."); private final String code; private final String message; diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/core/ServerActionManagementService.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/core/ServerActionManagementService.java index bf0989fe43..a2011a9f80 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/core/ServerActionManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/core/ServerActionManagementService.java @@ -24,6 +24,7 @@ import org.wso2.carbon.context.CarbonContext; import org.wso2.carbon.identity.action.management.exception.ActionMgtException; import org.wso2.carbon.identity.action.management.model.Action; +import org.wso2.carbon.identity.action.management.model.ActionRule; import org.wso2.carbon.identity.action.management.model.Authentication; import org.wso2.carbon.identity.action.management.model.EndpointConfig; import org.wso2.carbon.identity.api.server.action.management.common.ActionManagementServiceHolder; @@ -38,6 +39,7 @@ import org.wso2.carbon.identity.api.server.action.management.v1.Link; import org.wso2.carbon.identity.api.server.action.management.v1.constants.ActionMgtEndpointConstants; import org.wso2.carbon.identity.api.server.action.management.v1.util.ActionMgtEndpointUtil; +import org.wso2.carbon.identity.api.server.action.management.v1.util.RuleMapper; import java.util.ArrayList; import java.util.Arrays; @@ -72,10 +74,10 @@ public class ServerActionManagementService { public ActionResponse createAction(String actionType, ActionModel actionModel) { try { - validateActionType(actionType); + Action.ActionTypes validatedActionType = validateActionType(actionType); + String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); return buildActionResponse(ActionManagementServiceHolder.getActionManagementService() - .addAction(actionType, buildAction(actionModel), - CarbonContext.getThreadLocalCarbonContext().getTenantDomain())); + .addAction(actionType, buildAction(validatedActionType, actionModel, tenantDomain), tenantDomain)); } catch (ActionMgtException e) { throw ActionMgtEndpointUtil.handleActionMgtException(e); } @@ -121,10 +123,11 @@ public ActionResponse getActionByActionId(String actionType, String actionId) { public ActionResponse updateAction(String actionType, String actionId, ActionUpdateModel actionUpdateModel) { try { - validateActionType(actionType); + Action.ActionTypes validatedActionType = validateActionType(actionType); + String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain(); return buildActionResponse(ActionManagementServiceHolder.getActionManagementService() - .updateAction(actionType, actionId, buildUpdatingAction(actionUpdateModel), - CarbonContext.getThreadLocalCarbonContext().getTenantDomain())); + .updateAction(actionType, actionId, + buildUpdatingAction(validatedActionType, actionUpdateModel, tenantDomain), tenantDomain)); } catch (ActionMgtException e) { throw ActionMgtEndpointUtil.handleActionMgtException(e); } @@ -197,10 +200,11 @@ public List getActionTypes() { /** * Build ActionResponse from Action. * - * @param action Action object. - * @return ActionResponse object. + * @param action action object + * @return ActionResponse object + * @throws ActionMgtException If an error occurs while building the ActionResponse. */ - private ActionResponse buildActionResponse(Action action) { + private ActionResponse buildActionResponse(Action action) throws ActionMgtException { return new ActionResponse() .id(action.getId()) @@ -212,7 +216,9 @@ private ActionResponse buildActionResponse(Action action) { .uri(action.getEndpoint().getUri()) .authentication(new AuthenticationTypeResponse() .type(AuthenticationTypeResponse.TypeEnum.valueOf(action.getEndpoint() - .getAuthentication().getType().toString())))); + .getAuthentication().getType().toString())))) + .rule((action.getActionRule() != null) ? RuleMapper.toORRuleResponse(action.getActionRule()) : + null); } /** @@ -251,17 +257,26 @@ private List buildLinks(Action activatedAction) { } /** - * Create Action from the Action model. + * Build Action from the ActionModel. * - * @param actionModel Action model. + * @param actionType Action Type. + * @param actionModel Action Model. + * @param tenantDomain Tenant Domain. * @return Action. + * @throws ActionMgtException If an error occurs while building the Action. */ - private Action buildAction(ActionModel actionModel) { + private Action buildAction(Action.ActionTypes actionType, ActionModel actionModel, String tenantDomain) + throws ActionMgtException { Authentication authentication = buildAuthentication( Authentication.Type.valueOf(actionModel.getEndpoint().getAuthentication().getType().toString()), actionModel.getEndpoint().getAuthentication().getProperties()); + ActionRule actionRule = null; + if (actionModel.getRule() != null) { + actionRule = RuleMapper.toActionRule(actionModel.getRule(), actionType, tenantDomain); + } + return new Action.ActionRequestBuilder() .name(actionModel.getName()) .description(actionModel.getDescription()) @@ -269,16 +284,21 @@ private Action buildAction(ActionModel actionModel) { .uri(actionModel.getEndpoint().getUri()) .authentication(authentication) .build()) + .rule(actionRule) .build(); } /** * Build Action from the ActionUpdateModel. * - * @param actionUpdateModel ActionUpdateModel. + * @param actionType Action Type. + * @param actionUpdateModel Action Update Model. + * @param tenantDomain Tenant Domain. * @return Action. + * @throws ActionMgtException If an error occurs while building the Action. */ - private Action buildUpdatingAction(ActionUpdateModel actionUpdateModel) { + private Action buildUpdatingAction(Action.ActionTypes actionType, ActionUpdateModel actionUpdateModel, + String tenantDomain) throws ActionMgtException { EndpointConfig endpointConfig = null; if (actionUpdateModel.getEndpoint() != null) { @@ -295,10 +315,17 @@ private Action buildUpdatingAction(ActionUpdateModel actionUpdateModel) { .build(); } + ActionRule actionRule = null; + if (actionUpdateModel.getRule() != null) { + actionRule = RuleMapper.toActionRule(actionUpdateModel.getRule(), actionType, + tenantDomain); + } + return new Action.ActionRequestBuilder() .name(actionUpdateModel.getName()) .description(actionUpdateModel.getDescription()) .endpoint(endpointConfig) + .rule(actionRule) .build(); } @@ -365,18 +392,24 @@ private Authentication buildAuthentication(Authentication.Type authType, Map actionTypeObj.getPathParam().equals(actionType)) - .findFirst() - .orElseThrow(() -> ActionMgtEndpointUtil.handleException(Response.Status.BAD_REQUEST, - ERROR_INVALID_ACTION_TYPE)); + Action.ActionTypes actionTypeEnum = getActionTypeFromPath(actionType); if (NOT_IMPLEMENTED_ACTION_TYPES.contains(actionTypeEnum.getPathParam())) { throw ActionMgtEndpointUtil.handleException(Response.Status.NOT_IMPLEMENTED, ERROR_NOT_IMPLEMENTED_ACTION_TYPE); } + + return actionTypeEnum; + } + + private Action.ActionTypes getActionTypeFromPath(String actionType) { + + return Arrays.stream(Action.ActionTypes.filterByCategory(Action.ActionTypes.Category.PRE_POST)) + .filter(actionTypeObj -> actionTypeObj.getPathParam().equals(actionType)) + .findFirst() + .orElseThrow(() -> ActionMgtEndpointUtil.handleException(Response.Status.BAD_REQUEST, + ERROR_INVALID_ACTION_TYPE)); } } diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/ActionMgtEndpointUtil.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/ActionMgtEndpointUtil.java index e2f854d9b2..bb9949dd0d 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/ActionMgtEndpointUtil.java +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/ActionMgtEndpointUtil.java @@ -18,10 +18,12 @@ package org.wso2.carbon.identity.api.server.action.management.v1.util; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.wso2.carbon.identity.action.management.exception.ActionMgtClientException; import org.wso2.carbon.identity.action.management.exception.ActionMgtException; +import org.wso2.carbon.identity.action.management.exception.ActionMgtServerException; import org.wso2.carbon.identity.action.management.model.Action; import org.wso2.carbon.identity.api.server.action.management.v1.constants.ActionMgtEndpointConstants; import org.wso2.carbon.identity.api.server.common.Constants; @@ -91,6 +93,28 @@ public static APIError handleActionMgtException(ActionMgtException e) { return handleException(status, errorCode, e.getMessage(), e.getDescription()); } + public static ActionMgtServerException buildActionMgtServerException(ActionMgtEndpointConstants.ErrorMessage error, + Throwable e, String... data) { + + String description = error.getDescription(); + if (ArrayUtils.isNotEmpty(data)) { + description = String.format(description, data); + } + + return new ActionMgtServerException(error.getMessage(), description, error.getCode(), e); + } + + public static ActionMgtClientException buildActionMgtClientException(ActionMgtEndpointConstants.ErrorMessage error, + Throwable e, String... data) { + + String description = error.getDescription(); + if (ArrayUtils.isNotEmpty(data)) { + description = String.format(description, data); + } + + return new ActionMgtClientException(error.getMessage(), description, error.getCode()); + } + /** * Returns a generic error object. * diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/RuleMapper.java b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/RuleMapper.java new file mode 100644 index 0000000000..df52997292 --- /dev/null +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/java/org/wso2/carbon/identity/api/server/action/management/v1/util/RuleMapper.java @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you 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 org.wso2.carbon.identity.api.server.action.management.v1.util; + +import org.wso2.carbon.identity.action.management.exception.ActionMgtException; +import org.wso2.carbon.identity.action.management.model.Action; +import org.wso2.carbon.identity.action.management.model.ActionRule; +import org.wso2.carbon.identity.api.server.action.management.v1.ANDRule; +import org.wso2.carbon.identity.api.server.action.management.v1.ANDRuleResponse; +import org.wso2.carbon.identity.api.server.action.management.v1.ExpressionResponse; +import org.wso2.carbon.identity.api.server.action.management.v1.ORRule; +import org.wso2.carbon.identity.api.server.action.management.v1.ORRuleResponse; +import org.wso2.carbon.identity.api.server.action.management.v1.constants.ActionMgtEndpointConstants; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementClientException; +import org.wso2.carbon.identity.rule.management.exception.RuleManagementException; +import org.wso2.carbon.identity.rule.management.model.ANDCombinedRule; +import org.wso2.carbon.identity.rule.management.model.Expression; +import org.wso2.carbon.identity.rule.management.model.FlowType; +import org.wso2.carbon.identity.rule.management.model.ORCombinedRule; +import org.wso2.carbon.identity.rule.management.util.RuleBuilder; + +import java.util.ArrayList; +import java.util.List; + +import javax.ws.rs.core.Response; + +/** + * Mapper class for Rule. + * This class maps the Rule object and its sub-objects into API model objects and vice-versa. + */ +public class RuleMapper { + + /** + * Converts an ActionRule object from service model to an ORRuleResponse object from API model. + * + * @param actionRule ActionRule object. + * @return ORRuleResponse object. + * @throws ActionMgtException If an error occurs while converting the object. + */ + public static ORRuleResponse toORRuleResponse(ActionRule actionRule) throws ActionMgtException { + + ORCombinedRule orCombinedRule = (ORCombinedRule) actionRule.getRule(); + List andCombinedRuleList = orCombinedRule.getRules(); + + List andRuleResponseList = new ArrayList<>(); + for (ANDCombinedRule andCombinedRule : andCombinedRuleList) { + List expressionList = andCombinedRule.getExpressions(); + List expressionResponseList = new ArrayList<>(); + for (Expression expression : expressionList) { + ExpressionResponse expressionResponse = new ExpressionResponse().field(expression.getField()) + .operator(expression.getOperator()) + .value(expression.getValue().getFieldValue()); + expressionResponseList.add(expressionResponse); + } + ANDRuleResponse andRuleResponse = + new ANDRuleResponse().condition(ANDRuleResponse.ConditionEnum.AND) + .expressions(expressionResponseList); + andRuleResponseList.add(andRuleResponse); + } + + return new ORRuleResponse().condition(ORRuleResponse.ConditionEnum.OR) + .rules(andRuleResponseList); + } + + /** + * Converts an ORRule object from API model to an ActionRule object from service model. + * + * @param ruleRequest ORRule object. + * @param actionType Action type. + * @param tenantDomain Tenant domain. + * @return ActionRule object. + * @throws ActionMgtException If an error occurs while converting the object. + */ + public static ActionRule toActionRule(ORRule ruleRequest, Action.ActionTypes actionType, String tenantDomain) + throws ActionMgtException { + + List andRuleList = ruleRequest.getRules(); + if (andRuleList == null || andRuleList.isEmpty()) { + // Create an ActionRule object with null Rule to indicate to remove the Rule reference in Action. + return ActionRule.create(null); + } + + RuleBuilder ruleBuilder; + try { + ruleBuilder = RuleBuilder.create(getFlowType(actionType), tenantDomain); + } catch (RuleManagementException e) { + throw ActionMgtEndpointUtil.buildActionMgtServerException( + ActionMgtEndpointConstants.ErrorMessage.ERROR_WHILE_INITIALIZING_RULE_BUILDER, e); + } + + addExpressionsToRuleBuilder(andRuleList, ruleBuilder); + + try { + return ActionRule.create(ruleBuilder.build()); + } catch (RuleManagementClientException e) { + throw ActionMgtEndpointUtil.buildActionMgtClientException( + ActionMgtEndpointConstants.ErrorMessage.ERROR_INVALID_RULE, e, e.getMessage()); + } + } + + private static void addExpressionsToRuleBuilder(List andRuleList, RuleBuilder ruleBuilder) { + + for (int i = 0; i < andRuleList.size(); i++) { + if (i > 0) { // Add OR condition between AND conditions. + ruleBuilder.addOrCondition(); + } + + List expressionList = + andRuleList.get(i).getExpressions(); + for (org.wso2.carbon.identity.api.server.action.management.v1.Expression expression : expressionList) { + ruleBuilder.addAndExpression(new Expression.Builder().field(expression.getField()) + .operator(expression.getOperator()).value(expression.getValue()).build()); + } + } + } + + private static FlowType getFlowType(Action.ActionTypes actionType) { + + switch (actionType) { + case PRE_ISSUE_ACCESS_TOKEN: + return FlowType.PRE_ISSUE_ACCESS_TOKEN; + default: + throw ActionMgtEndpointUtil.handleException(Response.Status.NOT_IMPLEMENTED, + ActionMgtEndpointConstants.ErrorMessage.ERROR_NOT_IMPLEMENTED_ACTION_RULE_FLOW_TYPE); + } + } +} diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/resources/Actions.yaml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/resources/Actions.yaml index 87f66088c5..337a40f0c3 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/resources/Actions.yaml +++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/src/main/resources/Actions.yaml @@ -3,7 +3,7 @@ info: description: > This document specifies an **Action Management RESTful API** for **WSO2 Identity Server**. - version: 1.0.0 + version: v1 title: WSO2 Identity Server - Action Management Rest API termsOfService: 'http://swagger.io/terms/' contact: @@ -355,12 +355,6 @@ paths: description: Unauthorized '403': description: Forbidden - '404': - description: Not Found - content: - application/json: - schema: - $ref: '#/components/schemas/Error' '500': description: Server Error content: @@ -522,6 +516,8 @@ components: maxLength: 255 endpoint: $ref: '#/components/schemas/Endpoint' + rule: + $ref: '#/components/schemas/ORRule' Endpoint: type: object @@ -573,6 +569,8 @@ components: - INACTIVE endpoint: $ref: '#/components/schemas/EndpointResponse' + rule: + $ref: '#/components/schemas/ORRuleResponse' ActionBasicResponse: type: object @@ -697,6 +695,8 @@ components: maxLength: 255 endpoint: $ref: '#/components/schemas/EndpointUpdateModel' + rule: + $ref: '#/components/schemas/ORRule' EndpointUpdateModel: type: object @@ -708,6 +708,93 @@ components: authentication: $ref: '#/components/schemas/AuthenticationType' + ORRule: + type: object + description: Rule configuration for the action. Combined with OR condition. + properties: + condition: + type: string + enum: ["OR"] + rules: + type: array + items: + $ref: '#/components/schemas/ANDRule' + minItems: 1 + + ORRuleResponse: + type: object + description: Rule configured for the action. + properties: + condition: + type: string + enum: ["OR"] + rules: + type: array + items: + $ref: '#/components/schemas/ANDRuleResponse' + minItems: 1 + + ANDRule: + type: object + description: Expressions combined with AND condition. + required: + - condition + - expressions + properties: + condition: + type: string + enum: ["AND"] + expressions: + type: array + items: + $ref: '#/components/schemas/Expression' + minItems: 1 + + ANDRuleResponse: + type: object + description: Expressions combined with AND condition. + properties: + condition: + type: string + enum: ["AND"] + expressions: + type: array + items: + $ref: '#/components/schemas/ExpressionResponse' + minItems: 1 + + Expression: + type: object + description: Expressions in the rule. + required: + - field + - operator + - value + properties: + field: + type: string + example: application + operator: + type: string + example: equals + value: + type: string + example: myapp + + ExpressionResponse: + type: object + description: Expressions in the rule. + properties: + field: + type: string + example: application + operator: + type: string + example: equals + value: + type: string + example: myapp + Error: type: object properties: diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml index 80d318e0e1..161e519cc0 100644 --- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml index 712bd4538c..fbbe6dd977 100644 --- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.api.server.admin.advisory.management org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml index 54356f159e..89a875b63d 100644 --- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.api.server.admin.advisory.management org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml index 57d15087bd..12fcbb74f7 100644 --- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml index 34c9c8f178..9795b3dedf 100644 --- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.api.resource - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml index 89192e60d0..978f1c2c93 100644 --- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.api.resource - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml index c991e34fb9..8b2a13ba38 100644 --- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml @@ -22,7 +22,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml index 5065b260c8..e60d6b7193 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml @@ -22,12 +22,12 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.application.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml org.wso2.carbon.identity.api.server.application.management.common - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT jar diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml index 24c5e9014a..737c609eef 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.application.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml WSO2 Identity Server - Applications Rest API WSO2 Identity Server - Applications Rest API org.wso2.carbon.identity.api.server.application.management.v1 - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT jar diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml index 82ae26f7e5..d900c5c800 100644 --- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml @@ -22,12 +22,12 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml org.wso2.carbon.identity.api.server.application.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT pom diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml index 38b9f68e95..8d7d9df0cd 100644 --- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.authenticators - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.authenticators.common diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml index 55bac61357..59df1a4a77 100644 --- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.authenticators - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.authenticators.v1 diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml index 6a2aa18284..044c8eabf6 100644 --- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml index 5592f84b27..c46ac4d6f7 100644 --- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml @@ -24,7 +24,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.branding.preference.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.server.api diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml index a056d348cb..3b44068771 100644 --- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.api.server.branding.preference.management org.wso2.carbon.identity.server.api ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml index 8e21da3b14..1ffb23cba3 100644 --- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml @@ -22,7 +22,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml index 63bba1ba6c..fbb05f23bf 100644 --- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.api.server.claim.management org.wso2.carbon.identity.server.api ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.claim.management.common diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml index 05950f7112..51e9b10de5 100644 --- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.claim.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.rest.api.server.claim.management.v1 diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml index 19914df664..a49ae98a57 100644 --- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml index e50392e615..92e6bef8fc 100644 --- a/components/org.wso2.carbon.identity.api.server.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml @@ -19,7 +19,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml index be0fc2ddf7..d58d0b1a8f 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.configs - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.configs.common diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml index 7179f00a1a..732d40b118 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.configs - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.configs.v1 diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml index c287429c10..a6d93815ea 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml index a8f2d60ff6..65a2dd00df 100644 --- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.cors - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.cors.common diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml index d51cb3cd8c..08ae71bf25 100644 --- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.cors - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.cors.v1 diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml index 8039923be5..981ccf24fe 100644 --- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml index 15364db9e9..ed1d78ebbc 100644 --- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.email.template - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml index 2034d18441..15103f02f4 100644 --- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.email.template - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml index dd92983b49..8804cdc590 100644 --- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.email.template - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml index 8c405c42e6..1b8f97d675 100644 --- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml index f332191c34..50ff65ddc7 100644 --- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.api.server.extension.management org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml index 3ac474c3b4..9085e8ca74 100644 --- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.extension.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.extension.management.v1 diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml index d72f6e65e9..a112bbeb9a 100644 --- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml @@ -19,7 +19,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml index b220c87970..0908e4e45e 100644 --- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.api.server.identity.governance org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml index 2ecdf92bb4..2567d76f04 100644 --- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.identity.governance ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.identity.governance.v1 diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml index 1d767ed563..8f3aa81628 100644 --- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml index 43fed59f39..ff14158c2d 100644 --- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.api.server.idp org.wso2.carbon.identity.server.api ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml index 38e7368b4f..d482e64c6e 100644 --- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.idp ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 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 846711ec5f..c130e5bb5b 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 @@ -117,7 +117,6 @@ import org.wso2.carbon.idp.mgt.dao.IdPManagementDAO; import org.wso2.carbon.idp.mgt.model.ConnectedAppsResult; import org.wso2.carbon.idp.mgt.model.IdpSearchResult; -import org.wso2.carbon.user.core.UserCoreConstants; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.TypeDescription; @@ -2464,7 +2463,7 @@ private JustInTimeProvisioning createJITResponse(IdentityProvider idp) { JustInTimeProvisioning.SchemeEnum provisioningType = getProvisioningType(jitProvisionConfig); jitConfig.setScheme(provisioningType); String provisioningUserStore = StringUtils.isNotBlank(jitProvisionConfig.getProvisioningUserStore()) ? - jitProvisionConfig.getProvisioningUserStore() : UserCoreConstants.PRIMARY_DEFAULT_DOMAIN_NAME; + jitProvisionConfig.getProvisioningUserStore() : IdentityUtil.getPrimaryDomainName(); jitConfig.setUserstore(provisioningUserStore); jitConfig.setAssociateLocalUser(jitProvisionConfig.isAssociateLocalUserEnabled()); String attributeSyncMethod = StringUtils.isNotBlank(jitProvisionConfig.getAttributeSyncMethod()) ? diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml index 7fce3ea29a..71aaf633e5 100644 --- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml index 64b05c2da1..eac3e5c1af 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.idv.provider ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.idv.provider.common diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml index b1fadc3a4b..a3cb0e6e18 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.idv.provider ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.idv.provider.v1 diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml index a141db29ea..9f52e98977 100644 --- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml index c32fd86e98..d35959ce0b 100644 --- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.api.server.input.validation org.wso2.carbon.identity.server.api ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml index 306f60c7cc..525198bdcf 100644 --- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml @@ -22,14 +22,14 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.input.validation - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml WSO2 Identity Server - Input Validation Rest API WSO2 Identity Server - Validation Rest API org.wso2.carbon.identity.api.server.input.validation.v1 - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT jar diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml index 722b461af0..21bb965e16 100644 --- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml @@ -22,7 +22,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml index 4101cf8eab..ecb984a628 100644 --- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.keystore.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.keystore.management.common diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml index ff1ffadb04..ecb802f17f 100644 --- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.keystore.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.keystore.management.v1 diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml index f3a34bdea5..5fd783038c 100644 --- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml index ba355ca187..75be997635 100644 --- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.api.server.notification.sender org.wso2.carbon.identity.server.api ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml index da24aa9d5d..0137597eec 100644 --- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.api.server.notification.sender org.wso2.carbon.identity.server.api ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml index 27f3ca654b..3ad46319dd 100644 --- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml index b7e14cb5ff..99435c4f99 100644 --- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.notification.template - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml index bb984aef44..dc44c76e79 100644 --- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.notification.template - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml index 027a2d5b1d..93d8b9c7bb 100644 --- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml index c57d2ccbef..ac4835762f 100644 --- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.oidc.scope.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml index c881659b56..b7d0205af3 100644 --- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.oidc.scope.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.oidc.scope.management.v1 diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml index aee6880e01..756a284267 100644 --- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml index cb56dc5a79..b22bff513d 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.configs - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.organization.configs.common diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml index aff41ce334..849d3cf44e 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.configs - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT org.wso2.carbon.identity.api.server.organization.configs.v1 diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml index 1563202d73..d3c4aaa17e 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml index 88738e3a66..602aa3c82d 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml index b5537a86a6..a429995739 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml index ad1aef74fc..7eac505e69 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml index 240e0b503e..d0a400c28e 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.role.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml index f98c30ff9a..1d4b9f5436 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.role.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml index 504bd9ad62..272e782500 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml index 407e059c19..163108bfc7 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.selfservice ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml index 2ca59c3ff0..24e33431e5 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.selfservice ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.organization.selfservice.v1 diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml index 008f349764..ed7761b11f 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml index 1d60145efe..924cc2ce22 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.user.invitation.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml index 9b02e8bdcd..0130a7fbcf 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.organization.user.invitation.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml index 8c0f080ef5..e2f82b454f 100644 --- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml index 364b64a82c..f263460bab 100644 --- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.permission.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT WSO2 Identity Server - Common Permission Management WSO2 Identity Server - PCommon Permission Management diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml index c6bf848985..6e6a12b301 100644 --- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.permission.management ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.permission.management.v1 diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml index f290ca2a0d..a40f058868 100644 --- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml index 475a3bf09d..fb77c95645 100644 --- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.rule.metadata - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml index e388fbb58b..53fc1e56ed 100644 --- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.rule.metadata - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml index 8152356593..522194153a 100644 --- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml index 80a0bac313..29a836fbaa 100644 --- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.api.server.script.library org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml index 3b0fd0600e..36372600b2 100644 --- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml index 9797a4032a..b10e94ea35 100644 --- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml @@ -20,7 +20,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml index b27fdc30d9..fcb233a122 100644 --- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.secret.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml index 760490ec82..71a2575272 100644 --- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.secret.management - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml index 5162bd8ccb..2ca2e1ab54 100644 --- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.server.api identity-api-server - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml index c0eb4d6e33..59748f7aeb 100644 --- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.api.server.tenant.management org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml index fdb017b9e0..0bb337b3f3 100644 --- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml @@ -18,7 +18,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../../pom.xml diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml index 15d8acaa3b..a15d6a67cd 100644 --- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml @@ -18,7 +18,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml index 5d63c78dc4..d5de05a0cf 100644 --- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.api.server.userstore org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml index 3f9cfa0d4e..7bb7673c89 100644 --- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.server.userstore ../pom.xml - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT 4.0.0 org.wso2.carbon.identity.api.server.userstore.v1 diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml index a4dc2f6b75..a804e62b9e 100644 --- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml @@ -21,7 +21,7 @@ identity-api-server org.wso2.carbon.identity.server.api - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 89415187f9..473f4f6ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 identity-api-server pom - 1.3.19-SNAPSHOT + 1.3.21-SNAPSHOT WSO2 Identity Server - Server API Module @@ -821,7 +821,7 @@ 1.4 1.2.4 1.11.27 - 7.7.73 + 7.7.85 3.0.5 1.12.0 **/gen/**/*