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 a6e21a663d..c619506e74 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.21-SNAPSHOT + 1.3.25-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 25b84beec5..e7d9ffd854 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.21-SNAPSHOT + 1.3.25-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 86c5e00fa8..8046d34649 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.21-SNAPSHOT + 1.3.25-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 ff0dfc6397..2694de8dd5 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 @@ -1,25 +1,27 @@ 4.0.0 org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.idle.account.identification - 1.3.21-SNAPSHOT + 1.3.25-SNAPSHOT ../pom.xml @@ -61,11 +63,6 @@ cxf-rt-rs-service-description provided - - org.springframework - spring-web - provided - javax.ws.rs javax.ws.rs-api diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/IdleAccountIdentificationServiceHolder.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/IdleAccountIdentificationServiceHolder.java index 43daf15a0c..2b7faf2931 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/IdleAccountIdentificationServiceHolder.java +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/IdleAccountIdentificationServiceHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com). + * Copyright (c) 2023-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 @@ -18,6 +18,7 @@ package org.wso2.carbon.identity.api.idle.account.identification.common; +import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.identity.idle.account.identification.services.IdleAccountIdentificationService; /** @@ -25,26 +26,22 @@ */ public class IdleAccountIdentificationServiceHolder { - private static IdleAccountIdentificationService idleAccountIdentificationService; + private IdleAccountIdentificationServiceHolder() {} - /** - * Get IdleAccountIdentificationService OSGi service. - * - * @return Idle account identification Service. - */ - public static IdleAccountIdentificationService getIdleAccountIdentificationService() { + private static class IdleAccountServiceHolder { - return idleAccountIdentificationService; + static final IdleAccountIdentificationService SERVICE = + (IdleAccountIdentificationService) PrivilegedCarbonContext.getThreadLocalCarbonContext() + .getOSGiService(IdleAccountIdentificationService.class, null); } /** - * Set IdleAccountIdentificationService OSGi service. + * Get IdleAccountIdentificationService OSGi service. * - * @param idleAccountIdentificationService Idle account identification Service. + * @return Idle account identification Service. */ - public static void setIdleAccountIdentificationService( - IdleAccountIdentificationService idleAccountIdentificationService) { + public static IdleAccountIdentificationService getIdleAccountIdentificationService() { - IdleAccountIdentificationServiceHolder.idleAccountIdentificationService = idleAccountIdentificationService; + return IdleAccountServiceHolder.SERVICE; } } diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/factory/IdleAccountIdentificationOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/factory/IdleAccountIdentificationOSGIServiceFactory.java deleted file mode 100644 index f35f28b3c0..0000000000 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/common/factory/IdleAccountIdentificationOSGIServiceFactory.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2023, 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.idle.account.identification.common.factory; - -import org.springframework.beans.factory.config.AbstractFactoryBean; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.identity.idle.account.identification.services.IdleAccountIdentificationService; - -/** - * Factory Beans serve as a factory for creating other beans within the IOC container. This factory bean is used to - * instantiate the IdleAccountIdentificationService type of object inside the container. - */ -public class IdleAccountIdentificationOSGIServiceFactory extends AbstractFactoryBean { - - private IdleAccountIdentificationService idleAccountIdentificationService; - - @Override - public Class getObjectType() { - - return Object.class; - } - - @Override - protected IdleAccountIdentificationService createInstance() throws Exception { - - if (this.idleAccountIdentificationService == null) { - IdleAccountIdentificationService taskOperationService = - (IdleAccountIdentificationService) PrivilegedCarbonContext. - getThreadLocalCarbonContext().getOSGiService(IdleAccountIdentificationService.class, null); - - if (taskOperationService == null) { - throw new Exception("Unable to retrieve Idle account identification service."); - } - this.idleAccountIdentificationService = taskOperationService; - } - return this.idleAccountIdentificationService; - } -} 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 febc5c3715..f851ea122b 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 @@ -1,18 +1,20 @@ 4.0.0 @@ -20,7 +22,7 @@ org.wso2.carbon.identity.server.api org.wso2.carbon.identity.api.idle.account.identification - 1.3.21-SNAPSHOT + 1.3.25-SNAPSHOT ../pom.xml @@ -104,11 +106,6 @@ cxf-rt-rs-service-description provided - - org.springframework - spring-web - provided - javax.ws.rs javax.ws.rs-api diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/InactiveUsersApi.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/InactiveUsersApi.java index ec07c75116..563444fd10 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/InactiveUsersApi.java +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/InactiveUsersApi.java @@ -18,16 +18,10 @@ package org.wso2.carbon.identity.api.idle.account.identification.v1; -import org.springframework.beans.factory.annotation.Autowired; -import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.apache.cxf.jaxrs.ext.multipart.Multipart; -import java.io.InputStream; -import java.util.List; - +import org.wso2.carbon.identity.api.idle.account.identification.v1.factories.InactiveUsersApiServiceFactory; import org.wso2.carbon.identity.api.idle.account.identification.v1.model.Error; import org.wso2.carbon.identity.api.idle.account.identification.v1.model.InactiveUser; import org.wso2.carbon.identity.api.idle.account.identification.v1.model.Unauthorized; -import org.wso2.carbon.identity.api.idle.account.identification.v1.InactiveUsersApiService; import javax.validation.Valid; import javax.ws.rs.*; @@ -35,15 +29,17 @@ import io.swagger.annotations.*; import org.wso2.carbon.identity.idle.account.identification.exception.IdleAccountIdentificationClientException; -import javax.validation.constraints.*; - @Path("/inactive-users") @Api(description = "The inactive-users API") public class InactiveUsersApi { - @Autowired - private InactiveUsersApiService delegate; + private final InactiveUsersApiService delegate; + + public InactiveUsersApi() { + + this.delegate = InactiveUsersApiServiceFactory.getInactiveUsersApi(); + } @Valid @GET diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersApiServiceFactory.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersApiServiceFactory.java index d3b2f2ce5b..3d48d0cd92 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersApiServiceFactory.java +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/gen/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersApiServiceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com). + * Copyright (c) 2023-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 @@ -21,12 +21,20 @@ import org.wso2.carbon.identity.api.idle.account.identification.v1.InactiveUsersApiService; import org.wso2.carbon.identity.api.idle.account.identification.v1.impl.InactiveUsersApiServiceImpl; +/** + * Factory class for InactiveUsersApiService. + */ public class InactiveUsersApiServiceFactory { - private final static InactiveUsersApiService service = new InactiveUsersApiServiceImpl(); + private final static InactiveUsersApiService SERVICE = new InactiveUsersApiServiceImpl(); + /** + * Get InactiveUsersApiService. + * + * @return InactiveUsersApiService. + */ public static InactiveUsersApiService getInactiveUsersApi() { - return service; + return SERVICE; } } diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/core/InactiveUsersManagementApiService.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/core/InactiveUsersManagementApiService.java index c8d11acfea..dc8962da16 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/core/InactiveUsersManagementApiService.java +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/core/InactiveUsersManagementApiService.java @@ -21,7 +21,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.identity.api.idle.account.identification.common.IdleAccountIdentificationServiceHolder; import org.wso2.carbon.identity.api.idle.account.identification.common.util.IdleAccountIdentificationConstants; import org.wso2.carbon.identity.api.idle.account.identification.v1.model.InactiveUser; import org.wso2.carbon.identity.api.server.common.error.APIError; @@ -34,6 +33,7 @@ import org.wso2.carbon.identity.idle.account.identification.exception.IdleAccountIdentificationException; import org.wso2.carbon.identity.idle.account.identification.exception.IdleAccountIdentificationServerException; import org.wso2.carbon.identity.idle.account.identification.models.InactiveUserModel; +import org.wso2.carbon.identity.idle.account.identification.services.IdleAccountIdentificationService; import java.io.IOException; import java.time.LocalDate; @@ -58,8 +58,14 @@ */ public class InactiveUsersManagementApiService { + private final IdleAccountIdentificationService idleAccountIdentificationService; private static final Log LOG = LogFactory.getLog(InactiveUsersManagementApiService.class); + public InactiveUsersManagementApiService(IdleAccountIdentificationService idleAccountIdentificationService) { + + this.idleAccountIdentificationService = idleAccountIdentificationService; + } + /** * Get inactive users. * @@ -79,11 +85,11 @@ public List getInactiveUsers(String inactiveAfter, String excludeB validateDatesCombination(inactiveAfterDate, excludeBeforeDate); if (excludeBeforeDate == null) { - inactiveUsers = IdleAccountIdentificationServiceHolder.getIdleAccountIdentificationService(). - getInactiveUsersFromSpecificDate(inactiveAfterDate, tenantDomain); + inactiveUsers = idleAccountIdentificationService + .getInactiveUsersFromSpecificDate(inactiveAfterDate, tenantDomain); } else { - inactiveUsers = IdleAccountIdentificationServiceHolder.getIdleAccountIdentificationService(). - getLimitedInactiveUsersFromSpecificDate(inactiveAfterDate, excludeBeforeDate, tenantDomain); + inactiveUsers = idleAccountIdentificationService + .getLimitedInactiveUsersFromSpecificDate(inactiveAfterDate, excludeBeforeDate, tenantDomain); } return buildResponse(inactiveUsers); } catch (IdleAccountIdentificationException e) { diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersManagementApiServiceFactory.java new file mode 100644 index 0000000000..757d317120 --- /dev/null +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/factories/InactiveUsersManagementApiServiceFactory.java @@ -0,0 +1,49 @@ +/* + * 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.idle.account.identification.v1.factories; + +import org.wso2.carbon.identity.api.idle.account.identification.common.IdleAccountIdentificationServiceHolder; +import org.wso2.carbon.identity.api.idle.account.identification.v1.core.InactiveUsersManagementApiService; +import org.wso2.carbon.identity.idle.account.identification.services.IdleAccountIdentificationService; + +/** + * Factory class for InactiveUsersManagementApiService. + */ +public class InactiveUsersManagementApiServiceFactory { + + private static final InactiveUsersManagementApiService SERVICE; + + static { + IdleAccountIdentificationService idleAccountIdentificationService = IdleAccountIdentificationServiceHolder + .getIdleAccountIdentificationService(); + if (idleAccountIdentificationService == null) { + throw new IllegalStateException("IdleAccountIdentificationService is not available from OSGi context."); + } + SERVICE = new InactiveUsersManagementApiService(idleAccountIdentificationService); + } + + /** + * Get InactiveUsersManagementApiService. + * + * @return InactiveUsersManagementApiService + */ + public static InactiveUsersManagementApiService getInactiveUsersManagementApiService() { + return SERVICE; + } +} diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/impl/InactiveUsersApiServiceImpl.java b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/impl/InactiveUsersApiServiceImpl.java index 17ae630943..dbd29676e7 100644 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/impl/InactiveUsersApiServiceImpl.java +++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/java/org/wso2/carbon/identity/api/idle/account/identification/v1/impl/InactiveUsersApiServiceImpl.java @@ -18,11 +18,11 @@ package org.wso2.carbon.identity.api.idle.account.identification.v1.impl; -import org.springframework.beans.factory.annotation.Autowired; import org.wso2.carbon.identity.api.idle.account.identification.common.ContextLoader; import org.wso2.carbon.identity.api.idle.account.identification.v1.InactiveUsersApiService; import org.wso2.carbon.identity.api.idle.account.identification.v1.core.InactiveUsersManagementApiService; import org.wso2.carbon.identity.idle.account.identification.exception.IdleAccountIdentificationClientException; +import org.wso2.carbon.identity.api.idle.account.identification.v1.factories.InactiveUsersManagementApiServiceFactory; import javax.ws.rs.core.Response; @@ -31,15 +31,23 @@ */ public class InactiveUsersApiServiceImpl implements InactiveUsersApiService { - @Autowired - private InactiveUsersManagementApiService inactiveUsersManagementApiService; + private final InactiveUsersManagementApiService inactiveUsersManagementApiService; + + public InactiveUsersApiServiceImpl() { + try { + this.inactiveUsersManagementApiService = InactiveUsersManagementApiServiceFactory + .getInactiveUsersManagementApiService(); + } catch (IllegalStateException e) { + throw new RuntimeException("Error occurred while initiating inactive users management service.", e); + } + } @Override public Response getInactiveUsers(String inactiveAfter, String excludeBefore) { String tenantDomain = ContextLoader.getTenantDomainFromContext(); - return Response.ok().entity( - inactiveUsersManagementApiService.getInactiveUsers(inactiveAfter, excludeBefore, tenantDomain)).build(); + return Response.ok().entity(inactiveUsersManagementApiService + .getInactiveUsers(inactiveAfter, excludeBefore, tenantDomain)).build(); } @Override diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/resources/META-INF/cxf/idle-account-identification-cxf.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/resources/META-INF/cxf/idle-account-identification-cxf.xml deleted file mode 100644 index 83515dca8b..0000000000 --- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/src/main/resources/META-INF/cxf/idle-account-identification-cxf.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - 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 0039de35e9..49305457ce 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.21-SNAPSHOT + 1.3.25-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 e5a67891b9..608cdc3f40 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.21-SNAPSHOT + 1.3.25-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 848dd45d87..7d6c0e34a7 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.21-SNAPSHOT + 1.3.25-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 index fb840a609c..5d1c0c3075 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/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 @@ -28,14 +28,14 @@ import javax.validation.constraints.*; /** - * Expressions combined with AND condition. + * A sub-rule that combines expressions 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.") +@ApiModel(description = "A sub-rule that combines expressions with AND condition.") public class ANDRule { @@ -76,6 +76,7 @@ public static ConditionEnum fromValue(String value) { /** + * The logical condition for combining the expressions. For ANDRule, the value must always be \"AND\". **/ public ANDRule condition(ConditionEnum condition) { @@ -83,7 +84,7 @@ public ANDRule condition(ConditionEnum condition) { return this; } - @ApiModelProperty(required = true, value = "") + @ApiModelProperty(required = true, value = "The logical condition for combining the expressions. For ANDRule, the value must always be \"AND\".") @JsonProperty("condition") @Valid @NotNull(message = "Property condition cannot be null.") @@ -96,6 +97,7 @@ public void setCondition(ConditionEnum condition) { } /** + * A list of expressions that are combined using the AND condition. All expressions must evaluate to true for the ANDRule to pass. **/ public ANDRule expressions(List expressions) { @@ -103,11 +105,11 @@ public ANDRule expressions(List expressions) { return this; } - @ApiModelProperty(required = true, value = "") + @ApiModelProperty(required = true, value = "A list of expressions that are combined using the AND condition. All expressions must evaluate to true for the ANDRule to pass.") @JsonProperty("expressions") @Valid @NotNull(message = "Property expressions cannot be null.") - @Size(min=1) + @Size(min=1) public List getExpressions() { return expressions; } 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 index ae04c941e8..df1f3bd10a 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/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 @@ -28,14 +28,14 @@ import javax.validation.constraints.*; /** - * Expressions combined with AND condition. + * Represents a rule configuration that combines multiple expressions with an AND condition. All expressions in the ANDRule must evaluate to true for the rule to be satisfied. **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; -@ApiModel(description = "Expressions combined with AND condition.") +@ApiModel(description = "Represents a rule configuration that combines multiple expressions with an AND condition. All expressions in the ANDRule must evaluate to true for the rule to be satisfied.") public class ANDRuleResponse { @@ -76,6 +76,7 @@ public static ConditionEnum fromValue(String value) { /** + * The logical condition for combining the expressions. For ANDRule, the value must always be \"AND\". **/ public ANDRuleResponse condition(ConditionEnum condition) { @@ -83,7 +84,7 @@ public ANDRuleResponse condition(ConditionEnum condition) { return this; } - @ApiModelProperty(value = "") + @ApiModelProperty(value = "The logical condition for combining the expressions. For ANDRule, the value must always be \"AND\".") @JsonProperty("condition") @Valid public ConditionEnum getCondition() { @@ -94,6 +95,7 @@ public void setCondition(ConditionEnum condition) { } /** + * A list of expressions that are combined using the AND condition. All expressions must evaluate to true for the ANDRule to pass. **/ public ANDRuleResponse expressions(List expressions) { @@ -101,7 +103,7 @@ public ANDRuleResponse expressions(List expressions) { return this; } - @ApiModelProperty(value = "") + @ApiModelProperty(value = "A list of expressions that are combined using the AND condition. All expressions must evaluate to true for the ANDRule to pass.") @JsonProperty("expressions") @Valid @Size(min=1) public List getExpressions() { 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/ActionBasicResponse.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/ActionBasicResponse.java index 283466df93..c6b8aacfc2 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/ActionBasicResponse.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/ActionBasicResponse.java @@ -78,6 +78,7 @@ public static StatusEnum fromValue(String value) { /** + * Unique identifier of the action. **/ public ActionBasicResponse id(String id) { @@ -85,7 +86,7 @@ public ActionBasicResponse id(String id) { return this; } - @ApiModelProperty(example = "24f64d17-9824-4e28-8413-de45728d8e84", value = "") + @ApiModelProperty(example = "24f64d17-9824-4e28-8413-de45728d8e84", value = "Unique identifier of the action.") @JsonProperty("id") @Valid public String getId() { @@ -114,6 +115,7 @@ public void setType(ActionType type) { } /** + * Name of the action. **/ public ActionBasicResponse name(String name) { @@ -121,7 +123,7 @@ public ActionBasicResponse name(String name) { return this; } - @ApiModelProperty(example = "Access Token Pre Issue", value = "") + @ApiModelProperty(example = "Access Token Pre Issue", value = "Name of the action.") @JsonProperty("name") @Valid @Size(min=1,max=255) public String getName() { @@ -132,6 +134,7 @@ public void setName(String name) { } /** + * Description of the action. **/ public ActionBasicResponse description(String description) { @@ -139,7 +142,7 @@ public ActionBasicResponse description(String description) { return this; } - @ApiModelProperty(example = "This is the configuration of pre-action for issuing access token.", value = "") + @ApiModelProperty(example = "This action invokes before issuing an access token.", value = "Description of the action.") @JsonProperty("description") @Valid @Size(max=255) public String getDescription() { @@ -150,6 +153,7 @@ public void setDescription(String description) { } /** + * Status of the action. **/ public ActionBasicResponse status(StatusEnum status) { @@ -157,7 +161,7 @@ public ActionBasicResponse status(StatusEnum status) { return this; } - @ApiModelProperty(value = "") + @ApiModelProperty(value = "Status of the action.") @JsonProperty("status") @Valid public StatusEnum getStatus() { @@ -175,7 +179,7 @@ public ActionBasicResponse links(List links) { return this; } - @ApiModelProperty(example = "[{\"href\":\"/t/wso2.com/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84\",\"method\":\"GET\",\"rel\":\"self\"}]", value = "") + @ApiModelProperty(example = "[{\"href\":\"/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84\",\"method\":\"GET\",\"rel\":\"self\"}]", value = "") @JsonProperty("links") @Valid public List getLinks() { 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 9205b927d0..1161d43879 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 @@ -40,6 +40,7 @@ public class ActionModel { private ORRule rule; /** + * Name of the action. **/ public ActionModel name(String name) { @@ -47,7 +48,7 @@ public ActionModel name(String name) { return this; } - @ApiModelProperty(example = "Access Token Pre Issue", required = true, value = "") + @ApiModelProperty(example = "Pre Issue Access Token Action", required = true, value = "Name of the action.") @JsonProperty("name") @Valid @NotNull(message = "Property name cannot be null.") @@ -60,6 +61,7 @@ public void setName(String name) { } /** + * Description of the action. **/ public ActionModel description(String description) { @@ -67,7 +69,7 @@ public ActionModel description(String description) { return this; } - @ApiModelProperty(example = "This is the configuration of pre-action for issuing access token.", value = "") + @ApiModelProperty(example = "This action invokes before issuing an access token.", value = "Description of the action.") @JsonProperty("description") @Valid @Size(max=255) public String getDescription() { 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 3cf84ba92e..556093abea 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 @@ -77,6 +77,7 @@ public static StatusEnum fromValue(String value) { private ORRuleResponse rule; /** + * Unique identifier of the action. **/ public ActionResponse id(String id) { @@ -84,7 +85,7 @@ public ActionResponse id(String id) { return this; } - @ApiModelProperty(example = "24f64d17-9824-4e28-8413-de45728d8e84", value = "") + @ApiModelProperty(example = "24f64d17-9824-4e28-8413-de45728d8e84", value = "Unique identifier of the action.") @JsonProperty("id") @Valid public String getId() { @@ -113,6 +114,7 @@ public void setType(ActionType type) { } /** + * Name of the action. **/ public ActionResponse name(String name) { @@ -120,7 +122,7 @@ public ActionResponse name(String name) { return this; } - @ApiModelProperty(example = "Access Token Pre Issue", value = "") + @ApiModelProperty(example = "Access Token Pre Issue", value = "Name of the action.") @JsonProperty("name") @Valid @Size(min=1,max=255) public String getName() { @@ -131,6 +133,7 @@ public void setName(String name) { } /** + * Description of the action. **/ public ActionResponse description(String description) { @@ -138,7 +141,7 @@ public ActionResponse description(String description) { return this; } - @ApiModelProperty(example = "This is the configuration of pre-action for issuing access token.", value = "") + @ApiModelProperty(example = "This action invokes before issuing an access token.", value = "Description of the action.") @JsonProperty("description") @Valid @Size(max=255) public String getDescription() { @@ -149,6 +152,7 @@ public void setDescription(String description) { } /** + * Status of the action. **/ public ActionResponse status(StatusEnum status) { @@ -156,7 +160,7 @@ public ActionResponse status(StatusEnum status) { return this; } - @ApiModelProperty(value = "") + @ApiModelProperty(example = "ACTIVE", value = "Status of the action.") @JsonProperty("status") @Valid public StatusEnum getStatus() { 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/ActionTypesResponseItem.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/ActionTypesResponseItem.java index 7c09805fe7..d80d91a095 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/ActionTypesResponseItem.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/ActionTypesResponseItem.java @@ -58,6 +58,7 @@ public void setType(ActionType type) { } /** + * Display name of the action type. **/ public ActionTypesResponseItem displayName(String displayName) { @@ -65,7 +66,7 @@ public ActionTypesResponseItem displayName(String displayName) { return this; } - @ApiModelProperty(example = "Pre Issue Access Token.", value = "") + @ApiModelProperty(example = "Pre Issue Access Token.", value = "Display name of the action type.") @JsonProperty("displayName") @Valid public String getDisplayName() { @@ -76,6 +77,7 @@ public void setDisplayName(String displayName) { } /** + * Description of the action type. **/ public ActionTypesResponseItem description(String description) { @@ -83,7 +85,7 @@ public ActionTypesResponseItem description(String description) { return this; } - @ApiModelProperty(example = "Extension point configuration for Pre Issue Access Token.", value = "") + @ApiModelProperty(example = "Extension point configuration for Pre Issue Access Token.", value = "Description of the action type.") @JsonProperty("description") @Valid public String getDescription() { @@ -94,6 +96,7 @@ public void setDescription(String description) { } /** + * Number of actions configured under the action type. **/ public ActionTypesResponseItem count(Integer count) { @@ -101,7 +104,7 @@ public ActionTypesResponseItem count(Integer count) { return this; } - @ApiModelProperty(example = "2", value = "") + @ApiModelProperty(example = "1", value = "Number of actions configured under the action type.") @JsonProperty("count") @Valid public Integer getCount() { @@ -112,6 +115,7 @@ public void setCount(Integer count) { } /** + * API endpoint referring to the location of the given action type. **/ public ActionTypesResponseItem self(String self) { @@ -119,7 +123,7 @@ public ActionTypesResponseItem self(String self) { return this; } - @ApiModelProperty(example = "/t/wso2.com/api/server/v1/actions/preIssueAccessToken", value = "") + @ApiModelProperty(example = "/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84", value = "API endpoint referring to the location of the given action type.") @JsonProperty("self") @Valid public String getSelf() { 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 37d4c7b9e0..439ad4d73e 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 @@ -40,6 +40,7 @@ public class ActionUpdateModel { private ORRule rule; /** + * Updating name of the action. **/ public ActionUpdateModel name(String name) { @@ -47,7 +48,7 @@ public ActionUpdateModel name(String name) { return this; } - @ApiModelProperty(example = "Access Token Pre Issue", value = "") + @ApiModelProperty(example = "Pre Issue Access Token Action", value = "Updating name of the action.") @JsonProperty("name") @Valid @Size(min=1,max=255) public String getName() { @@ -58,6 +59,7 @@ public void setName(String name) { } /** + * Updating description of the action. **/ public ActionUpdateModel description(String description) { @@ -65,7 +67,7 @@ public ActionUpdateModel description(String description) { return this; } - @ApiModelProperty(example = "This is the configuration of pre-action for issuing access token.", value = "") + @ApiModelProperty(example = "This action invokes before issuing an access token.", value = "Updating description of the action.") @JsonProperty("description") @Valid @Size(max=255) public String getDescription() { 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 e35b2af9f9..84d0e7cecd 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 @@ -52,21 +52,22 @@ public class ActionsApi { @Path("/{actionType}/{actionId}/activate") @Produces({ "application/json" }) - @ApiOperation(value = "Activates the action by given Id. ", notes = "This API provides the capability to activate an action by action Id.
Scope required:
* internal_action_mgt_update ", response = ActionBasicResponse.class, authorizations = { + @ApiOperation(value = "Activate Action", notes = "This API activates an action using the action's type and unique ID. Scope (Permission) required: ``internal_action_mgt_update`` ", response = ActionBasicResponse.class, authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { }) }, tags={ "Actions", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "OK", response = ActionBasicResponse.class), + @ApiResponse(code = 200, message = "Action Activated", response = ActionBasicResponse.class), @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) + @ApiResponse(code = 500, message = "Server Error", response = Error.class), + @ApiResponse(code = 501, message = "Not Implemented", response = Error.class) }) - public Response activateAction(@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) { + public Response activateAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "Unique identifier of the action.",required=true) @PathParam("actionId") String actionId) { return delegate.activateAction(actionType, actionId ); } @@ -76,22 +77,21 @@ public Response activateAction(@ApiParam(value = "Name of the Action Type.",requ @Path("/{actionType}") @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "Add action ", notes = "This API provides the capability to store the action information that is provided by users.
Scope required:
* internal_action_mgt_create ", response = ActionResponse.class, authorizations = { + @ApiOperation(value = "Add Action", notes = "This API creates an action and returns the action details along with the action's unique ID. Scope (Permission) required: ``internal_action_mgt_create`` ", response = ActionResponse.class, authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { }) }, tags={ "Actions", }) @ApiResponses(value = { - @ApiResponse(code = 201, message = "Successful response.", response = ActionResponse.class), + @ApiResponse(code = 201, message = "Action Created", response = ActionResponse.class), @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 = 409, message = "Conflict", response = Error.class), @ApiResponse(code = 500, message = "Server Error", response = Error.class), @ApiResponse(code = 501, message = "Not Implemented", response = Error.class) }) - public Response createAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "This represents the action to be created." ,required=true) @Valid ActionModel actionModel) { + public Response createAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "This represents the information of the action to be created." ,required=true) @Valid ActionModel actionModel) { return delegate.createAction(actionType, actionModel ); } @@ -101,21 +101,22 @@ public Response createAction(@ApiParam(value = "Name of the Action Type.",requir @Path("/{actionType}/{actionId}/deactivate") @Produces({ "application/json" }) - @ApiOperation(value = "Deactivates the action by given Id. ", notes = "This API provides the capability to deactivate an action by action Id.
Scope required:
* internal_action_mgt_update ", response = ActionBasicResponse.class, authorizations = { + @ApiOperation(value = "Deactivate Action", notes = "This API deactivates an action using the action's type and unique ID. Scope (Permission) required: ``internal_action_mgt_update`` ", response = ActionBasicResponse.class, authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { }) }, tags={ "Actions", }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "OK", response = ActionBasicResponse.class), + @ApiResponse(code = 200, message = "Action Deactivated", response = ActionBasicResponse.class), @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) + @ApiResponse(code = 500, message = "Server Error", response = Error.class), + @ApiResponse(code = 501, message = "Not Implemented", response = Error.class) }) - public Response deactivateAction(@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) { + public Response deactivateAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "Unique identifier of the action.",required=true) @PathParam("actionId") String actionId) { return delegate.deactivateAction(actionType, actionId ); } @@ -125,20 +126,21 @@ public Response deactivateAction(@ApiParam(value = "Name of the Action Type.",re @Path("/{actionType}/{actionId}") @Produces({ "application/json" }) - @ApiOperation(value = "Delete action by action type and action id. ", notes = "This API provides the capability to delete an action by action type.
Scope required:
* internal_action_mgt_delete ", response = Void.class, authorizations = { + @ApiOperation(value = "Delete Action", notes = "This API deletes an action using the action's type and unique ID. Scope (Permission) required: ``internal_action_mgt_delete`` ", response = Void.class, authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { }) }, tags={ "Actions", }) @ApiResponses(value = { - @ApiResponse(code = 204, message = "Successfully Deleted", response = Void.class), + @ApiResponse(code = 204, message = "Action Deleted", response = Void.class), @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 = 500, message = "Server Error", response = Error.class) + @ApiResponse(code = 500, message = "Server Error", response = Error.class), + @ApiResponse(code = 501, message = "Not Implemented", 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) { + public Response deleteAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "Unique identifier of the action.",required=true) @PathParam("actionId") String actionId) { return delegate.deleteAction(actionType, actionId ); } @@ -148,7 +150,7 @@ public Response deleteAction(@ApiParam(value = "Name of the Action Type.",requir @Path("/{actionType}/{actionId}") @Produces({ "application/json" }) - @ApiOperation(value = "Retrieve Action information by given Id. ", notes = "This API provides the capability to retrieve the action by action Id.
Scope required:
* internal_action_mgt_view ", response = ActionResponse.class, authorizations = { + @ApiOperation(value = "Retrieve Action by ID", notes = "This API provides the capability to retrieve the action by action Id. Scope (Permission) required: ``internal_action_mgt_view`` ", response = ActionResponse.class, authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { @@ -163,7 +165,7 @@ public Response deleteAction(@ApiParam(value = "Name of the Action Type.",requir @ApiResponse(code = 500, message = "Server Error", response = Error.class), @ApiResponse(code = 501, message = "Not Implemented", response = Error.class) }) - public Response getActionByActionId(@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) { + public Response getActionByActionId(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "Unique identifier of the action.",required=true) @PathParam("actionId") String actionId) { return delegate.getActionByActionId(actionType, actionId ); } @@ -173,20 +175,17 @@ public Response getActionByActionId(@ApiParam(value = "Name of the Action Type." @Path("/types") @Produces({ "application/json" }) - @ApiOperation(value = "Detailed summary of the Action Types ", notes = "This API provides the capability to retrieve the detailed summary of the action types.
Scope required:
* internal_action_mgt_view ", response = ActionTypesResponseItem.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "List Action Types", notes = "This API returns the detailed summary of the action types. Scope (Permission) required: ``internal_action_mgt_view`` ", response = ActionTypesResponseItem.class, responseContainer = "List", authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { }) - }, tags={ "Actions", }) + }, tags={ "Action Types", }) @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = ActionTypesResponseItem.class, responseContainer = "List"), - @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), - @ApiResponse(code = 501, message = "Not Implemented", response = Error.class) + @ApiResponse(code = 500, message = "Server Error", response = Error.class) }) public Response getActionTypes() { @@ -198,7 +197,7 @@ public Response getActionTypes() { @Path("/{actionType}") @Produces({ "application/json" }) - @ApiOperation(value = "List action ", notes = "This API provides the capability to retrieve the action by action type.
Scope required:
* internal_action_mgt_view ", response = ActionBasicResponse.class, responseContainer = "List", authorizations = { + @ApiOperation(value = "List Actions", notes = "This API returns actions according to the action type. Scope (Permission) required: ``internal_action_mgt_view`` ", response = ActionBasicResponse.class, responseContainer = "List", authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { @@ -223,23 +222,24 @@ public Response getActionsByActionType(@ApiParam(value = "Name of the Action Typ @Path("/{actionType}/{actionId}") @Consumes({ "application/json" }) @Produces({ "application/json" }) - @ApiOperation(value = "Update Action information by given Id. ", notes = "This API provides the capability to update Action information by given Id.
Scope required:
* internal_action_mgt_update ", response = ActionResponse.class, authorizations = { + @ApiOperation(value = "Update Action", notes = "This API updates an action and return the updated action. Scope (Permission) required: ``internal_action_mgt_update`` ", response = ActionResponse.class, authorizations = { @Authorization(value = "BasicAuth"), @Authorization(value = "OAuth2", scopes = { }) }, tags={ "Actions" }) @ApiResponses(value = { - @ApiResponse(code = 200, message = "OK", response = ActionResponse.class), + @ApiResponse(code = 200, message = "Action Updated", response = ActionResponse.class), @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) + @ApiResponse(code = 500, message = "Server Error", response = Error.class), + @ApiResponse(code = 501, message = "Not Implemented", response = Error.class) }) - public Response updateAction(@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, @ApiParam(value = "This represents the action information to be updated." ,required=true) @Valid ActionUpdateModel actionUpdateModel) { + public Response updateAction(@ApiParam(value = "Name of the Action Type.",required=true, allowableValues="preIssueAccessToken, preUpdatePassword, preUpdateProfile, preRegistration") @PathParam("actionType") String actionType, @ApiParam(value = "Unique identifier of the action.",required=true) @PathParam("actionId") String actionId, @ApiParam(value = "This represents the action to be updated." ,required=true) @Valid ActionUpdateModel body) { - return delegate.updateAction(actionType, actionId, actionUpdateModel ); + return delegate.updateAction(actionType, actionId, body ); } } 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/AuthenticationType.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/AuthenticationType.java index c2e6338cb8..ba3a6f0c1b 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/AuthenticationType.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/AuthenticationType.java @@ -27,12 +27,15 @@ import java.util.Map; import javax.validation.constraints.*; +/** + * The type of authentication required by the action's endpoint. The following options are supported: - NONE: No authentication is required. <br> ``{ \"type\": \"NONE\" }`` - BASIC: Basic authentication with a username and password.<br> ``{ \"type\": \"BASIC\", \"properties\": { \"username\": \"auth_username\", \"password\": \"auth_password\" } }`` - API_KEY: API key-based authentication, where the key is provided in an HTTP header.<br> ``{ \"type\": \"API_KEY\", \"properties\": { \"header\": \"X-API-Key\", \"value\": \"12345-abcde-67890\" } }`` - BEARER: Bearer token-based authentication.<br/> ``{ \"type\": \"BEARER\", \"properties\": { \"accessToken\": \"0d6fed02-eac0-332b-8998-213a543139a0\" } }`` + **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; - +@ApiModel(description = "The type of authentication required by the action's endpoint. The following options are supported: - NONE: No authentication is required.
``{ \"type\": \"NONE\" }`` - BASIC: Basic authentication with a username and password.
``{ \"type\": \"BASIC\", \"properties\": { \"username\": \"auth_username\", \"password\": \"auth_password\" } }`` - API_KEY: API key-based authentication, where the key is provided in an HTTP header.
``{ \"type\": \"API_KEY\", \"properties\": { \"header\": \"X-API-Key\", \"value\": \"12345-abcde-67890\" } }`` - BEARER: Bearer token-based authentication.
``{ \"type\": \"BEARER\", \"properties\": { \"accessToken\": \"0d6fed02-eac0-332b-8998-213a543139a0\" } }`` ") public class AuthenticationType { @@ -69,7 +72,7 @@ public static TypeEnum fromValue(String value) { } private TypeEnum type; - private Map properties = new HashMap(); + private Map properties = null; /** @@ -93,6 +96,7 @@ public void setType(TypeEnum type) { } /** + * Authentication properties specific to the selected type. **/ public AuthenticationType properties(Map properties) { @@ -100,11 +104,9 @@ public AuthenticationType properties(Map properties) { return this; } - @ApiModelProperty(example = "{\"username\":\"auth_username\",\"password\":\"auth_password\"}", required = true, value = "") + @ApiModelProperty(value = "Authentication properties specific to the selected type.") @JsonProperty("properties") @Valid - @NotNull(message = "Property properties cannot be null.") - public Map getProperties() { return properties; } @@ -114,6 +116,9 @@ public void setProperties(Map properties) { public AuthenticationType putPropertiesItem(String key, Object propertiesItem) { + if (this.properties == null) { + this.properties = new HashMap(); + } this.properties.put(key, propertiesItem); return this; } 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/AuthenticationTypeResponse.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/AuthenticationTypeResponse.java index 91056333bc..ea1875792f 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/AuthenticationTypeResponse.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/AuthenticationTypeResponse.java @@ -24,12 +24,15 @@ import io.swagger.annotations.ApiModelProperty; import javax.validation.constraints.*; +/** + * Authentication configurations of the action. + **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; - +@ApiModel(description = "Authentication configurations of the action.") public class AuthenticationTypeResponse { @@ -68,6 +71,7 @@ public static TypeEnum fromValue(String value) { private TypeEnum type; /** + * Type of the authentication. **/ public AuthenticationTypeResponse type(TypeEnum type) { @@ -75,7 +79,7 @@ public AuthenticationTypeResponse type(TypeEnum type) { return this; } - @ApiModelProperty(example = "BASIC", required = true, value = "") + @ApiModelProperty(example = "BASIC", required = true, value = "Type of the authentication.") @JsonProperty("type") @Valid @NotNull(message = "Property type cannot be null.") 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/Endpoint.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/Endpoint.java index 4f51963f0b..5146990b64 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/Endpoint.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/Endpoint.java @@ -25,18 +25,22 @@ import org.wso2.carbon.identity.api.server.action.management.v1.AuthenticationType; import javax.validation.constraints.*; +/** + * Endpoint configurations of the action. + **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; - +@ApiModel(description = "Endpoint configurations of the action.") public class Endpoint { private String uri; private AuthenticationType authentication; /** + * HTTPS URI of the endpoint. **/ public Endpoint uri(String uri) { @@ -44,11 +48,11 @@ public Endpoint uri(String uri) { return this; } - @ApiModelProperty(example = "https://abc.com/token", required = true, value = "") + @ApiModelProperty(example = "https://myextension.com/token", required = true, value = "HTTPS URI of the endpoint.") @JsonProperty("uri") @Valid @NotNull(message = "Property uri cannot be null.") - @Pattern(regexp="^https?://.+") + @Pattern(regexp="^https?://.+") public String getUri() { return uri; } 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/EndpointResponse.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/EndpointResponse.java index 359f05762f..f6a17bb06b 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/EndpointResponse.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/EndpointResponse.java @@ -25,18 +25,22 @@ import org.wso2.carbon.identity.api.server.action.management.v1.AuthenticationTypeResponse; import javax.validation.constraints.*; +/** + * Endpoint configurations of the action. + **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; - +@ApiModel(description = "Endpoint configurations of the action.") public class EndpointResponse { private String uri; private AuthenticationTypeResponse authentication; /** + * HTTPS URI of the endpoint. **/ public EndpointResponse uri(String uri) { @@ -44,11 +48,11 @@ public EndpointResponse uri(String uri) { return this; } - @ApiModelProperty(example = "https://abc.com/token", required = true, value = "") + @ApiModelProperty(example = "https://myextension.com/token", required = true, value = "HTTPS URI of the endpoint.") @JsonProperty("uri") @Valid @NotNull(message = "Property uri cannot be null.") - @Pattern(regexp="^https?://.+") + @Pattern(regexp="^https?://.+") public String getUri() { return uri; } 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/EndpointUpdateModel.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/EndpointUpdateModel.java index 59d7572931..231b690b9c 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/EndpointUpdateModel.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/EndpointUpdateModel.java @@ -25,18 +25,22 @@ import org.wso2.carbon.identity.api.server.action.management.v1.AuthenticationType; import javax.validation.constraints.*; +/** + * Updating endpoint configurations of the action. + **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; - +@ApiModel(description = "Updating endpoint configurations of the action.") public class EndpointUpdateModel { private String uri; private AuthenticationType authentication; /** + * Updating HTTPS URI of the endpoint. **/ public EndpointUpdateModel uri(String uri) { @@ -44,7 +48,7 @@ public EndpointUpdateModel uri(String uri) { return this; } - @ApiModelProperty(example = "https://abc.com/token", value = "") + @ApiModelProperty(example = "https://myextension.com/token", value = "Updating HTTPS URI of the endpoint.") @JsonProperty("uri") @Valid @Pattern(regexp="^https?://.+") public String getUri() { 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 index 37ed6a1882..db93b4e14c 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/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 @@ -25,14 +25,14 @@ import javax.validation.constraints.*; /** - * Expressions in the rule. + * Represents a single logical condition or comparison within a rule. An expression defines a field, an operator, and a value that is evaluated. **/ import io.swagger.annotations.*; import java.util.Objects; import javax.validation.Valid; import javax.xml.bind.annotation.*; -@ApiModel(description = "Expressions in the rule.") +@ApiModel(description = "Represents a single logical condition or comparison within a rule. An expression defines a field, an operator, and a value that is evaluated.") public class Expression { private String field; @@ -40,6 +40,7 @@ public class Expression { private String value; /** + * The field or attribute of the entity being evaluated (e.g.,application, role). **/ public Expression field(String field) { @@ -47,7 +48,7 @@ public Expression field(String field) { return this; } - @ApiModelProperty(example = "application", required = true, value = "") + @ApiModelProperty(example = "application", required = true, value = "The field or attribute of the entity being evaluated (e.g.,application, role).") @JsonProperty("field") @Valid @NotNull(message = "Property field cannot be null.") @@ -60,6 +61,7 @@ public void setField(String field) { } /** + * The comparison operator used to evaluate the field and value. Common operators include \"equals\", \"contains\", \"startsWith\", etc. **/ public Expression operator(String operator) { @@ -67,7 +69,7 @@ public Expression operator(String operator) { return this; } - @ApiModelProperty(example = "equals", required = true, value = "") + @ApiModelProperty(example = "equals", required = true, value = "The comparison operator used to evaluate the field and value. Common operators include \"equals\", \"contains\", \"startsWith\", etc.") @JsonProperty("operator") @Valid @NotNull(message = "Property operator cannot be null.") @@ -80,6 +82,7 @@ public void setOperator(String operator) { } /** + * The value that the field is compared against based on the operator. **/ public Expression value(String value) { @@ -87,7 +90,7 @@ public Expression value(String value) { return this; } - @ApiModelProperty(example = "myapp", required = true, value = "") + @ApiModelProperty(example = "myapp", required = true, value = "The value that the field is compared against based on the operator.") @JsonProperty("value") @Valid @NotNull(message = "Property value cannot be null.") 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 index 42afa6827c..6ec36aaf22 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/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 @@ -28,14 +28,14 @@ import javax.validation.constraints.*; /** - * Rule configuration for the action. Combined with OR condition. + * Represents a rule configuration that combines multiple sub-rules with an OR condition. If any of the sub-rules evaluate to true, the ORRule is considered satisfied. **/ 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.") +@ApiModel(description = "Represents a rule configuration that combines multiple sub-rules with an OR condition. If any of the sub-rules evaluate to true, the ORRule is considered satisfied.") public class ORRule { @@ -76,6 +76,7 @@ public static ConditionEnum fromValue(String value) { /** + * The logical condition for combining the sub-rules. For ORRule, the value must always be \"OR\". **/ public ORRule condition(ConditionEnum condition) { @@ -83,7 +84,7 @@ public ORRule condition(ConditionEnum condition) { return this; } - @ApiModelProperty(value = "") + @ApiModelProperty(value = "The logical condition for combining the sub-rules. For ORRule, the value must always be \"OR\".") @JsonProperty("condition") @Valid public ConditionEnum getCondition() { 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 index 9f7ee026de..c79cb66c6e 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/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 @@ -94,6 +94,7 @@ public void setCondition(ConditionEnum condition) { } /** + * A list of sub-rules that are combined using the OR condition. Each sub-rule is an ANDRule. **/ public ORRuleResponse rules(List rules) { @@ -101,7 +102,7 @@ public ORRuleResponse rules(List rules) { return this; } - @ApiModelProperty(value = "") + @ApiModelProperty(value = "A list of sub-rules that are combined using the OR condition. Each sub-rule is an ANDRule.") @JsonProperty("rules") @Valid @Size(min=1) public List getRules() { 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 337a40f0c3..7412950829 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 @@ -1,34 +1,33 @@ openapi: 3.0.0 info: - description: > - This document specifies an **Action Management RESTful API** for **WSO2 - Identity Server**. version: v1 title: WSO2 Identity Server - Action Management Rest API - termsOfService: 'http://swagger.io/terms/' - contact: - name: WSO2 - url: 'http://wso2.com/products/identity-server/' - email: architecture@wso2.org - license: - name: Apache 2.0 - url: 'http://www.apache.org/licenses/LICENSE-2.0.html' + description: > + The Action Management REST API provides a comprehensive interface to manage actions + within the WSO2 Identity Server. Actions enable the extension of product functionality + across various workflows, such as access token issuance, password updates, and profile updates. + This API helps developers and administrators to define and manage actions to meet specific + business needs. +servers: + - url: 'https://{server-url}/t/{tenant-domain}/api/server/v1' + variables: + server-url: + default: "localhost:9443" + tenant-domain: + default: carbon.super security: - - OAuth2: [] - BasicAuth: [] + - OAuth2: [] paths: /actions/types: get: tags: - - Actions + - Action Types + summary: List Action Types + description: "This API returns the detailed summary of the action types.\n\n + Scope (Permission) required: ``internal_action_mgt_view``\n\n" operationId: getActionTypes - summary: | - Detailed summary of the Action Types - description: | - This API provides the capability to retrieve the detailed summary of the action types.
- Scope required:
- * internal_action_mgt_view responses: '200': description: OK @@ -36,47 +35,30 @@ paths: application/json: schema: $ref: '#/components/schemas/ActionTypesResponse' - '400': - description: Bad Request - content: - application/json: - schema: - $ref: '#/components/schemas/Error' '401': description: Unauthorized '403': description: Forbidden - '404': - description: Not Found - content: - application/json: - schema: - $ref: '#/components/schemas/Error' '500': description: Server Error content: application/json: schema: $ref: '#/components/schemas/Error' - '501': - description: Not Implemented - content: - application/json: - schema: - $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location 'https://localhost:9443/api/server/v1/actions/types' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' /actions/{actionType}: post: tags: - Actions - summary: | - Add action + summary: Add Action + description: "This API creates an action and returns the action details along with the action's unique ID.\n\n + Scope (Permission) required: ``internal_action_mgt_create``\n\n" operationId: createAction - description: > - This API provides the capability to store the action information - that is provided by users.
- Scope required:
- * internal_action_mgt_create parameters: - name: actionType in: path @@ -93,11 +75,11 @@ paths: application/json: schema: $ref: '#/components/schemas/ActionModel' - description: This represents the action to be created. + description: This represents the information of the action to be created. required: true responses: '201': - description: Successful response. + description: Action Created content: application/json: schema: @@ -112,12 +94,6 @@ paths: description: Unauthorized '403': description: Forbidden - '409': - description: Conflict - content: - application/json: - schema: - $ref: '#/components/schemas/Error' '500': description: Server Error content: @@ -130,17 +106,35 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location 'https://localhost:9443/api/server/v1/actions/{actionType}' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' \ + -H 'Content-Type: application/json' \ + -d '{ + "name": "Access Token Pre Issue", + "description": "This is the configuration of pre-action for issuing access token.", + "endpoint": { + "uri": "https://myextension.com/token", + "authentication": { + "properties": { + "username": "auth_username", + "password": "auth_password" + }, + "type": "BASIC" + } + } + }' + x-codegen-request-body-name: body get: tags: - Actions + summary: List Actions + description: "This API returns actions according to the action type. \n\n + Scope (Permission) required: ``internal_action_mgt_view``\n\n" operationId: getActionsByActionType - summary: | - List action - description: | - This API provides the capability to retrieve the action by action type.
- Scope required:
- * internal_action_mgt_view parameters: - name: actionType in: path @@ -187,18 +181,20 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location 'https://localhost:9443/api/server/v1/actions/{actionType}' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' /actions/{actionType}/{actionId}: get: tags: - Actions operationId: getActionByActionId - summary: | - Retrieve Action information by given Id. - description: | - This API provides the capability to retrieve the action by action Id.
- Scope required:
- * internal_action_mgt_view + summary: Retrieve Action by ID + description: "This API provides the capability to retrieve the action by action Id. \n\n + Scope (Permission) required: ``internal_action_mgt_view``\n\n" parameters: - name: actionType in: path @@ -212,7 +208,7 @@ paths: - preRegistration - name: actionId in: path - description: Id of the Action. + description: Unique identifier of the action. required: true schema: type: string @@ -251,16 +247,18 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location 'https://localhost:9443/api/server/v1/actions/{actionType}/{actionId}' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' patch: tags: - Actions - summary: | - Update Action information by given Id. + summary: Update Action + description: "This API updates an action and return the updated action. \n\n + Scope (Permission) required: ``internal_action_mgt_update``\n\n" operationId: updateAction - description: | - This API provides the capability to update Action information by given Id.
- Scope required:
- * internal_action_mgt_update parameters: - name: actionType in: path @@ -274,7 +272,7 @@ paths: - preRegistration - name: actionId in: path - description: Id of the Action. + description: Unique identifier of the action. required: true schema: type: string @@ -283,11 +281,11 @@ paths: application/json: schema: $ref: '#/components/schemas/ActionUpdateModel' - description: This represents the action information to be updated. + description: This represents the action to be updated. required: true responses: '200': - description: OK + description: Action Updated content: application/json: schema: @@ -314,17 +312,42 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + '501': + description: Not Implemented + content: + application/json: + schema: + $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location --request PATCH 'https://localhost:9443/api/server/v1/actions/{actionType}/{actionId}' \ + -H 'Content-Type: application/json' \ + -H 'Accept: application/json' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' \ + -d '{ + "name": "Access Token Pre Issue action", + "description": "This is the configuration of pre-action for issuing access token from myextensions.com.", + "endpoint": { + "uri": "http://myextensions.com/access-token", + "authentication": { + "type": "API_KEY", + "properties": { + "header": "sample_header", + "value": "sample_value" + } + } + } + }' + x-codegen-request-body-name: body delete: tags: - Actions - summary: | - Delete action by action type and action id. + summary: Delete Action + description: "This API deletes an action using the action's type and unique ID. \n\n + Scope (Permission) required: ``internal_action_mgt_delete``\n\n" operationId: deleteAction - description: | - This API provides the capability to delete an action by action type.
- Scope required:
- * internal_action_mgt_delete parameters: - name: actionType in: path @@ -338,13 +361,13 @@ paths: - preRegistration - name: actionId in: path - description: Id of the Action. + description: Unique identifier of the action. required: true schema: type: string responses: '204': - description: Successfully Deleted + description: Action Deleted '400': description: Bad Request content: @@ -361,18 +384,26 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + '501': + description: Not Implemented + content: + application/json: + schema: + $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location --request DELETE 'https://localhost:9443/api/server/v1/actions/{actionType}/{actionId}' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' /actions/{actionType}/{actionId}/activate: post: tags: - Actions - summary: | - Activates the action by given Id. + summary: Activate Action + description: "This API activates an action using the action's type and unique ID. \n\n + Scope (Permission) required: ``internal_action_mgt_update``\n\n" operationId: activateAction - description: | - This API provides the capability to activate an action by action Id.
- Scope required:
- * internal_action_mgt_update parameters: - name: actionType in: path @@ -386,13 +417,13 @@ paths: - preRegistration - name: actionId in: path - description: Id of the Action. + description: Unique identifier of the action. required: true schema: type: string responses: '200': - description: OK + description: Action Activated content: application/json: schema: @@ -419,18 +450,26 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + '501': + description: Not Implemented + content: + application/json: + schema: + $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location --request POST 'https://localhost:9443/api/server/v1/actions/{actionType}/{actionId}/activate' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' /actions/{actionType}/{actionId}/deactivate: post: tags: - Actions - summary: | - Deactivates the action by given Id. + summary: Deactivate Action + description: "This API deactivates an action using the action's type and unique ID. \n\n + Scope (Permission) required: ``internal_action_mgt_update``\n\n" operationId: deactivateAction - description: | - This API provides the capability to deactivate an action by action Id.
- Scope required:
- * internal_action_mgt_update parameters: - name: actionType in: path @@ -444,17 +483,27 @@ paths: - preRegistration - name: actionId in: path - description: Id of the Action. + description: Unique identifier of the action. required: true schema: type: string responses: '200': - description: OK + description: Action Deactivated content: application/json: schema: $ref: '#/components/schemas/ActionBasicResponse' + example: + id: "24f64d17-9824-4e28-8413-de45728d8e84" + type: "PRE_ISSUE_ACCESS_TOKEN" + name: "Access Token Pre Issue" + description: "This action is executed before issuing an access token." + status: "INACTIVE" + links: + - href: "/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84" + method: GET + rel: self '400': description: Bad Request content: @@ -477,6 +526,17 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + '501': + description: Not Implemented + content: + application/json: + schema: + $ref: '#/components/schemas/Error' + x-codeSamples: + - lang: Curl + source: | + curl --location --request POST 'https://localhost:9443/api/server/v1/actions/{actionType}/{actionId}/deactivate' \ + -H 'Authorization: Basic YWRtaW46YWRtaW4=' components: securitySchemes: @@ -488,12 +548,17 @@ components: flows: authorizationCode: authorizationUrl: 'https://localhost:9443/oauth2/authorize' - tokenUrl: 'http://localhost:9763/oauth2/token' - scopes: {} + tokenUrl: 'http://localhost:9443/oauth2/token' + scopes: + read: internal_action_mgt_view + write: internal_action_mgt_create + update: internal_action_mgt_update + delete: internal_action_mgt_delete schemas: ActionType: type: string + description: Action types supported. As of now only 'PRE_ISSUE_ACCESS_TOKEN' is implemented. enum: - PRE_ISSUE_ACCESS_TOKEN - PRE_UPDATE_PASSWORD @@ -507,13 +572,15 @@ components: properties: name: type: string - example: Access Token Pre Issue minLength: 1 maxLength: 255 + description: Name of the action. + example: Pre Issue Access Token Action description: type: string - example: This is the configuration of pre-action for issuing access token. maxLength: 255 + description: Description of the action. + example: This action invokes before issuing an access token. endpoint: $ref: '#/components/schemas/Endpoint' rule: @@ -521,27 +588,31 @@ components: Endpoint: type: object + description: Endpoint configurations of the action. required: - uri - authentication properties: uri: type: string - example: https://abc.com/token + description: HTTPS URI of the endpoint. pattern: '^https?://.+' + example: https://myextension.com/token authentication: $ref: '#/components/schemas/AuthenticationType' EndpointResponse: type: object + description: Endpoint configurations of the action. required: - uri - authentication properties: uri: type: string - example: https://abc.com/token + description: HTTPS URI of the endpoint. pattern: '^https?://.+' + example: https://myextension.com/token authentication: $ref: '#/components/schemas/AuthenticationTypeResponse' @@ -551,22 +622,27 @@ components: id: type: string example: '24f64d17-9824-4e28-8413-de45728d8e84' + description: Unique identifier of the action. type: $ref: '#/components/schemas/ActionType' name: type: string - example: Access Token Pre Issue minLength: 1 maxLength: 255 + description: Name of the action. + example: Access Token Pre Issue description: type: string - example: This is the configuration of pre-action for issuing access token. maxLength: 255 + description: Description of the action. + example: This action invokes before issuing an access token. status: type: string enum: - ACTIVE - INACTIVE + description: Status of the action. + example: ACTIVE endpoint: $ref: '#/components/schemas/EndpointResponse' rule: @@ -578,28 +654,32 @@ components: id: type: string example: '24f64d17-9824-4e28-8413-de45728d8e84' + description: Unique identifier of the action. type: $ref: '#/components/schemas/ActionType' name: type: string - example: Access Token Pre Issue minLength: 1 maxLength: 255 + description: Name of the action. + example: Access Token Pre Issue description: type: string - example: This is the configuration of pre-action for issuing access token. maxLength: 255 + description: Description of the action. + example: This action invokes before issuing an access token. status: type: string enum: - ACTIVE - INACTIVE + description: Status of the action. links: type: array items: $ref: '#/components/schemas/Link' example: - - href: "/t/wso2.com/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84" + - href: "/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84" method: GET rel: self @@ -635,22 +715,58 @@ components: $ref: '#/components/schemas/ActionType' displayName: type: string + description: "Display name of the action type." example: "Pre Issue Access Token." description: type: string + description: "Description of the action type." example: "Extension point configuration for Pre Issue Access Token." count: type: integer - example: 2 + description: "Number of actions configured under the action type." + example: 1 self: type: string - example: "/t/wso2.com/api/server/v1/actions/preIssueAccessToken" + description: "API endpoint referring to the location of the given action type." + example: "/api/server/v1/actions/preIssueAccessToken/24f64d17-9824-4e28-8413-de45728d8e84" AuthenticationType: type: object + description: > + The type of authentication required by the action's endpoint. The following options are supported: + + - NONE: No authentication is required.
+ ``{ + "type": "NONE" + }`` + + - BASIC: Basic authentication with a username and password.
+ ``{ + "type": "BASIC", + "properties": { + "username": "auth_username", + "password": "auth_password" + } + }`` + + - API_KEY: API key-based authentication, where the key is provided in an HTTP header.
+ ``{ + "type": "API_KEY", + "properties": { + "header": "X-API-Key", + "value": "12345-abcde-67890" + } + }`` + + - BEARER: Bearer token-based authentication.
+ ``{ + "type": "BEARER", + "properties": { + "accessToken": "0d6fed02-eac0-332b-8998-213a543139a0" + } + }`` required: - type - - properties properties: type: type: string @@ -662,13 +778,17 @@ components: example: BASIC properties: type: object + description: Authentication properties specific to the selected type. additionalProperties: true - example: - username: "auth_username" - password: "auth_password" + example: + type: BASIC + properties: + username: "auth_username" + password: "auth_password" AuthenticationTypeResponse: type: object + description: Authentication configurations of the action. required: - type properties: @@ -679,6 +799,7 @@ components: - BEARER - API_KEY - BASIC + description: Type of the authentication. example: BASIC ActionUpdateModel: @@ -686,13 +807,15 @@ components: properties: name: type: string - example: Access Token Pre Issue minLength: 1 maxLength: 255 + description: Updating name of the action. + example: Pre Issue Access Token Action description: type: string - example: This is the configuration of pre-action for issuing access token. maxLength: 255 + description: Updating description of the action. + example: This action invokes before issuing an access token. endpoint: $ref: '#/components/schemas/EndpointUpdateModel' rule: @@ -700,20 +823,26 @@ components: EndpointUpdateModel: type: object + description: Updating endpoint configurations of the action. properties: uri: type: string - example: https://abc.com/token pattern: '^https?://.+' + description: Updating HTTPS URI of the endpoint. + example: https://myextension.com/token + authentication: $ref: '#/components/schemas/AuthenticationType' ORRule: type: object - description: Rule configuration for the action. Combined with OR condition. + description: Represents a rule configuration that combines multiple sub-rules with an OR condition. + If any of the sub-rules evaluate to true, the ORRule is considered satisfied. properties: condition: type: string + description: The logical condition for combining the sub-rules. For ORRule, the value + must always be "OR". enum: ["OR"] rules: type: array @@ -732,11 +861,12 @@ components: type: array items: $ref: '#/components/schemas/ANDRuleResponse' + description: A list of sub-rules that are combined using the OR condition. Each sub-rule is an ANDRule. minItems: 1 ANDRule: type: object - description: Expressions combined with AND condition. + description: A sub-rule that combines expressions with AND condition. required: - condition - expressions @@ -744,28 +874,32 @@ components: condition: type: string enum: ["AND"] + description: The logical condition for combining the expressions. For ANDRule, the value must always be "AND". expressions: type: array items: $ref: '#/components/schemas/Expression' minItems: 1 + description: A list of expressions that are combined using the AND condition. All expressions must evaluate to true for the ANDRule to pass. ANDRuleResponse: type: object - description: Expressions combined with AND condition. + description: Represents a rule configuration that combines multiple expressions with an AND condition. All expressions in the ANDRule must evaluate to true for the rule to be satisfied. properties: condition: type: string enum: ["AND"] + description: The logical condition for combining the expressions. For ANDRule, the value must always be "AND". expressions: type: array items: $ref: '#/components/schemas/ExpressionResponse' minItems: 1 + description: A list of expressions that are combined using the AND condition. All expressions must evaluate to true for the ANDRule to pass. Expression: type: object - description: Expressions in the rule. + description: Represents a single logical condition or comparison within a rule. An expression defines a field, an operator, and a value that is evaluated. required: - field - operator @@ -773,12 +907,15 @@ components: properties: field: type: string + description: The field or attribute of the entity being evaluated (e.g.,application, role). example: application operator: type: string + description: The comparison operator used to evaluate the field and value. Common operators include "equals", "contains", "startsWith", etc. example: equals value: type: string + description: The value that the field is compared against based on the operator. example: myapp ExpressionResponse: @@ -810,11 +947,3 @@ components: traceId: type: string example: e0fbcfeb-3617-43c4-8dd0-7b7d38e13047 - -servers: - - url: 'https://{server-url}/t/{tenant-domain}/api/server/v1' - variables: - tenant-domain: - default: "carbon.super" - server-url: - default: "localhost:9443" 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 161e519cc0..460cef243f 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.21-SNAPSHOT + 1.3.25-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 fbbe6dd977..50b7e36595 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.21-SNAPSHOT + 1.3.25-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 89a875b63d..7241621495 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.21-SNAPSHOT + 1.3.25-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 12fcbb74f7..23573106c4 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.21-SNAPSHOT + 1.3.25-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 9795b3dedf..303a23e422 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.21-SNAPSHOT + 1.3.25-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 978f1c2c93..09ab057622 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.21-SNAPSHOT + 1.3.25-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 8b2a13ba38..37820b9b27 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.21-SNAPSHOT + 1.3.25-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 e60d6b7193..f97aa59849 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.21-SNAPSHOT + 1.3.25-SNAPSHOT ../pom.xml org.wso2.carbon.identity.api.server.application.management.common - 1.3.21-SNAPSHOT + 1.3.25-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 737c609eef..fbb080b5b6 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.21-SNAPSHOT + 1.3.25-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.21-SNAPSHOT + 1.3.25-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 d900c5c800..978bc23423 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.21-SNAPSHOT + 1.3.25-SNAPSHOT ../../pom.xml org.wso2.carbon.identity.api.server.application.management - 1.3.21-SNAPSHOT + 1.3.25-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 8d7d9df0cd..212bc66ff9 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.21-SNAPSHOT + 1.3.25-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 59df1a4a77..4283d7119a 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.21-SNAPSHOT + 1.3.25-SNAPSHOT org.wso2.carbon.identity.api.server.authenticators.v1 diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java index e85e279f2d..ee6d4d47b0 100644 --- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java +++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/LocalAuthenticatorConfigBuilderFactory.java @@ -59,6 +59,8 @@ public static Authenticator build(UserDefinedLocalAuthenticatorConfig config) { authenticator.setName(config.getName()); authenticator.setId(authenticatorId); authenticator.setDisplayName(config.getDisplayName()); + authenticator.setImage(config.getImageUrl()); + authenticator.description(config.getDescription()); authenticator.setIsEnabled(config.isEnabled()); authenticator.setDefinedBy(Authenticator.DefinedByEnum.USER); authenticator.setType(Authenticator.TypeEnum.LOCAL); @@ -87,6 +89,8 @@ public static UserDefinedLocalAuthenticatorConfig build(UserDefinedLocalAuthenti AuthenticatorPropertyConstants.AuthenticationType.valueOf(authenticationType)); authConfig.setName(config.getName()); authConfig.setDisplayName(config.getDisplayName()); + authConfig.setImageUrl(config.getImage()); + authConfig.setDescription(config.getDescription()); authConfig.setEnabled(config.getIsEnabled()); authConfig.setEndpointConfig(buildEndpointConfig(config.getEndpoint())); @@ -108,6 +112,8 @@ public static UserDefinedLocalAuthenticatorConfig build(UserDefinedLocalAuthenti resolveAuthenticationType(existingConfig)); authConfig.setName(existingConfig.getName()); authConfig.setDisplayName(config.getDisplayName()); + authConfig.setImageUrl(config.getImage()); + authConfig.setDescription(config.getDescription()); authConfig.setEnabled(config.getIsEnabled()); authConfig.setEndpointConfig(buildEndpointConfig(config.getEndpoint())); 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 044c8eabf6..a37fc53925 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.21-SNAPSHOT + 1.3.25-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 c46ac4d6f7..65bac09f91 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.21-SNAPSHOT + 1.3.25-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 3b44068771..f442a6738b 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.21-SNAPSHOT + 1.3.25-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 1ffb23cba3..dda5d8292e 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.21-SNAPSHOT + 1.3.25-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 fbb05f23bf..93fcad069c 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.21-SNAPSHOT + 1.3.25-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.api.server.claim.management.common/src/main/java/org/wso2/carbon/identity/api/server/claim/management/common/Constant.java b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/src/main/java/org/wso2/carbon/identity/api/server/claim/management/common/Constant.java index b12bcd1022..f11486543a 100644 --- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/src/main/java/org/wso2/carbon/identity/api/server/claim/management/common/Constant.java +++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/src/main/java/org/wso2/carbon/identity/api/server/claim/management/common/Constant.java @@ -206,7 +206,12 @@ public enum ErrorMessage { "allowed for this organization.", "Unable to execute the requested organization claim " + "management task."), ERROR_CODE_ERROR_RESOLVING_ORGANIZATION("CMT-60008", "Error resolving organization", - "Unable to resolve organization."); + "Unable to resolve organization."), + ERROR_CODE_UNAUTHORIZED_ORG_FOR_CLAIM_PROPERTY_UPDATE("CMT-60009", "Claim property update is not " + + "allowed for this organization.", "Unable to update the claim properties."), + ERROR_CODE_UNAUTHORIZED_ORG_FOR_ATTRIBUTE_MAPPING_UPDATE("CMT-60010", + "Unable to update attribute mappings.", + "Updating the mapped attribute for userstore: %s is not allowed for this organization"); private final String code; private final String message; 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 51e9b10de5..645f38763b 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.21-SNAPSHOT + 1.3.25-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/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java index 1f2846847e..61af60e610 100644 --- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java @@ -1,5 +1,5 @@ /* - * Copyright (c) (2019-2023), WSO2 LLC. (http://www.wso2.org). + * Copyright (c) (2019-2025), WSO2 LLC. (http://www.wso2.org). * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,6 +46,7 @@ import org.wso2.carbon.identity.claim.metadata.mgt.util.ClaimConstants; import org.wso2.carbon.identity.core.util.IdentityUtil; import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException; +import org.wso2.carbon.identity.organization.management.service.util.OrganizationManagementUtil; import org.wso2.carbon.identity.rest.api.server.claim.management.v1.dto.AttributeMappingDTO; import org.wso2.carbon.identity.rest.api.server.claim.management.v1.dto.ClaimDialectReqDTO; import org.wso2.carbon.identity.rest.api.server.claim.management.v1.dto.ClaimDialectResDTO; @@ -79,6 +80,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; import javax.ws.rs.core.Response; @@ -119,7 +122,9 @@ import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_LOCAL_CLAIM_NOT_FOUND; import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_PAGINATION_NOT_IMPLEMENTED; import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_SORTING_NOT_IMPLEMENTED; +import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_UNAUTHORIZED_ORG_FOR_ATTRIBUTE_MAPPING_UPDATE; import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_UNAUTHORIZED_ORG_FOR_CLAIM_MANAGEMENT; +import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_UNAUTHORIZED_ORG_FOR_CLAIM_PROPERTY_UPDATE; import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.ErrorMessage.ERROR_CODE_USERSTORE_NOT_SPECIFIED_IN_MAPPINGS; import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.LOCAL_DIALECT; import static org.wso2.carbon.identity.api.server.claim.management.common.Constant.LOCAL_DIALECT_PATH; @@ -166,6 +171,8 @@ public class ServerClaimManagementService { ClaimConstants.ErrorMessage.ERROR_CODE_NO_DELETE_SYSTEM_CLAIM.getCode() ); + public static final String FALSE = "false"; + /** * Add a claim dialect. * @@ -358,7 +365,6 @@ public String addLocalClaim(LocalClaimReqDTO localClaimReqDTO) { */ public void deleteLocalClaim(String claimId) { - String claimURI; try { validateClaimModificationEligibility(); @@ -444,7 +450,14 @@ public List getLocalClaims(Boolean excludeIdentityClaims, Stri public void updateLocalClaim(String claimId, LocalClaimReqDTO localClaimReqDTO) { try { - validateClaimModificationEligibility(); + if (isSubOrganizationContext()) { + /* + * For sub organizations, only attribute mappings are allowed to be updated. Updating any other + * claim properties are restricted. + */ + validateAttributeMappingUpdate(claimId, createLocalClaim(localClaimReqDTO)); + } + if (!StringUtils.equals(base64DecodeId(claimId), localClaimReqDTO.getClaimURI())) { throw handleClaimManagementClientError(ERROR_CODE_LOCAL_CLAIM_CONFLICT, CONFLICT, base64DecodeId(claimId)); @@ -969,6 +982,12 @@ private List getExternalClaimResDTOs(List ex return externalClaimResDTOList; } + /** + * Builds the LocalClaimResDTO and handles default values for mandatory properties. + * If any new properties are added and default value handling logic is updated in this method, + * {@link #populateDefaultProperties(LocalClaim)} should be updated accordingly as well. + * + */ private LocalClaimResDTO getLocalClaimResDTO(LocalClaim localClaim) { LocalClaimResDTO localClaimResDTO = new LocalClaimResDTO(); @@ -1128,6 +1147,7 @@ public String importClaimDialectFromFile(InputStream fileInputStream, Attachment throw handleClaimManagementException(e, Constant.ErrorMessage.ERROR_CODE_ERROR_IMPORTING_CLAIM_DIALECT); } } + private void importExternalClaims(String dialectID, List externalClaimReqDTOList) { List errors = new ArrayList<>(); @@ -1531,4 +1551,55 @@ private void validateClaimModificationEligibility() throws ClaimMetadataClientEx } } + + private boolean isSubOrganizationContext() throws ClaimMetadataClientException { + + try { + return OrganizationManagementUtil.isOrganization(ContextLoader.getTenantDomainFromContext()); + } catch (OrganizationManagementException e) { + throw new ClaimMetadataClientException(Constant.ErrorMessage.ERROR_CODE_ERROR_RESOLVING_ORGANIZATION. + getCode(), Constant.ErrorMessage.ERROR_CODE_ERROR_RESOLVING_ORGANIZATION.getDescription()); + } + } + + private void validateAttributeMappingUpdate(String claimID, LocalClaim incomingLocalClaim) + throws ClaimMetadataException { + + Optional + existingLocalClaim = getClaimMetadataManagementService().getLocalClaim(base64DecodeId(claimID), + ContextLoader.getTenantDomainFromContext()); + + if (!existingLocalClaim.isPresent()) { + throw handleClaimManagementClientError(ERROR_CODE_LOCAL_CLAIM_NOT_FOUND, BAD_REQUEST, claimID); + } + + populateDefaultProperties(existingLocalClaim.get()); + if (Objects.hash(existingLocalClaim.get().getClaimProperties().entrySet()) != + Objects.hash(incomingLocalClaim.getClaimProperties().entrySet())) { + throw handleClaimManagementClientError(ERROR_CODE_UNAUTHORIZED_ORG_FOR_CLAIM_PROPERTY_UPDATE, FORBIDDEN); + } + + for (AttributeMapping existingMapping : existingLocalClaim.get().getMappedAttributes()) { + if (IdentityUtil.getPrimaryDomainName().equals(existingMapping.getUserStoreDomain())) { + Optional incomingAttributeMapping = incomingLocalClaim.getMappedAttributes().stream() + .filter(mapping -> IdentityUtil.getPrimaryDomainName().equals(mapping.getUserStoreDomain())) + .findFirst(); + // Not allowing to update the primary userstore attribute mapping for sub-orgs. + if (incomingAttributeMapping.isPresent() && !StringUtils.equals(existingMapping.getAttributeName(), + incomingAttributeMapping.get().getAttributeName())) { + throw handleClaimManagementClientError(ERROR_CODE_UNAUTHORIZED_ORG_FOR_ATTRIBUTE_MAPPING_UPDATE, + FORBIDDEN, existingMapping.getUserStoreDomain()); + } + } + } + } + + private void populateDefaultProperties(LocalClaim localClaim) { + + localClaim.getClaimProperties().putIfAbsent(PROP_DESCRIPTION, StringUtils.EMPTY); + localClaim.getClaimProperties().putIfAbsent(PROP_DISPLAY_ORDER, "0"); + localClaim.getClaimProperties().putIfAbsent(PROP_READ_ONLY, FALSE); + localClaim.getClaimProperties().putIfAbsent(PROP_REQUIRED, FALSE); + localClaim.getClaimProperties().putIfAbsent(PROP_SUPPORTED_BY_DEFAULT, FALSE); + } } 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 a49ae98a57..64719e851b 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.21-SNAPSHOT + 1.3.25-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 92e6bef8fc..5abe401e49 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.21-SNAPSHOT + 1.3.25-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 d58d0b1a8f..d6155bcc9f 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.21-SNAPSHOT + 1.3.25-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 732d40b118..97a192ff60 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.21-SNAPSHOT + 1.3.25-SNAPSHOT org.wso2.carbon.identity.api.server.configs.v1 diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/Authenticator.java b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/Authenticator.java index 10df96afa5..8309228fdf 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/Authenticator.java +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/Authenticator.java @@ -37,6 +37,8 @@ public class Authenticator { private String id; private String name; private String displayName; + private String description; + private String image; private Boolean isEnabled = true; @XmlType(name="DefinedByEnum") @@ -171,6 +173,42 @@ public void setDisplayName(String displayName) { this.displayName = displayName; } + /** + **/ + public Authenticator description(String description) { + + this.description = description; + return this; + } + + @ApiModelProperty(example = "Description for user defined local authenticator configuration.", value = "") + @JsonProperty("description") + @Valid + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + /** + **/ + public Authenticator image(String image) { + + this.image = image; + return this; + } + + @ApiModelProperty(example = "https://example.com/logo/my-logo.png", value = "") + @JsonProperty("image") + @Valid + public String getImage() { + return image; + } + public void setImage(String image) { + this.image = image; + } + /** **/ public Authenticator isEnabled(Boolean isEnabled) { @@ -318,6 +356,8 @@ public boolean equals(java.lang.Object o) { return Objects.equals(this.id, authenticator.id) && Objects.equals(this.name, authenticator.name) && Objects.equals(this.displayName, authenticator.displayName) && + Objects.equals(this.description, authenticator.description) && + Objects.equals(this.image, authenticator.image) && Objects.equals(this.isEnabled, authenticator.isEnabled) && Objects.equals(this.definedBy, authenticator.definedBy) && Objects.equals(this.type, authenticator.type) && @@ -328,7 +368,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(id, name, displayName, isEnabled, definedBy, type, tags, properties, endpoint); + return Objects.hash(id, name, displayName, description, image, isEnabled, definedBy, type, tags, properties, endpoint); } @Override @@ -340,6 +380,8 @@ public String toString() { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); + sb.append(" description: ").append(toIndentedString(description)).append("\n"); + sb.append(" image: ").append(toIndentedString(image)).append("\n"); sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n"); sb.append(" definedBy: ").append(toIndentedString(definedBy)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/AuthenticatorListItem.java b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/AuthenticatorListItem.java index ba26a797e4..59f54b8149 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/AuthenticatorListItem.java +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/configs/v1/model/AuthenticatorListItem.java @@ -35,6 +35,8 @@ public class AuthenticatorListItem { private String id; private String name; private String displayName; + private String description; + private String image; private Boolean isEnabled = true; @XmlType(name="DefinedByEnum") @@ -162,6 +164,42 @@ public void setDisplayName(String displayName) { this.displayName = displayName; } + /** + **/ + public AuthenticatorListItem description(String description) { + + this.description = description; + return this; + } + + @ApiModelProperty(example = "Description for user defined local authenticator configuration.", value = "") + @JsonProperty("description") + @Valid + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } + + /** + **/ + public AuthenticatorListItem image(String image) { + + this.image = image; + return this; + } + + @ApiModelProperty(example = "https://example.com/logo/my-logo.png", value = "") + @JsonProperty("image") + @Valid + public String getImage() { + return image; + } + public void setImage(String image) { + this.image = image; + } + /** **/ public AuthenticatorListItem isEnabled(Boolean isEnabled) { @@ -275,6 +313,8 @@ public boolean equals(java.lang.Object o) { return Objects.equals(this.id, authenticatorListItem.id) && Objects.equals(this.name, authenticatorListItem.name) && Objects.equals(this.displayName, authenticatorListItem.displayName) && + Objects.equals(this.description, authenticatorListItem.description) && + Objects.equals(this.image, authenticatorListItem.image) && Objects.equals(this.isEnabled, authenticatorListItem.isEnabled) && Objects.equals(this.definedBy, authenticatorListItem.definedBy) && Objects.equals(this.type, authenticatorListItem.type) && @@ -284,7 +324,7 @@ public boolean equals(java.lang.Object o) { @Override public int hashCode() { - return Objects.hash(id, name, displayName, isEnabled, definedBy, type, tags, self); + return Objects.hash(id, name, displayName, description, image, isEnabled, definedBy, type, tags, self); } @Override @@ -296,6 +336,8 @@ public String toString() { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); + sb.append(" description: ").append(toIndentedString(description)).append("\n"); + sb.append(" image: ").append(toIndentedString(image)).append("\n"); sb.append(" isEnabled: ").append(toIndentedString(isEnabled)).append("\n"); sb.append(" definedBy: ").append(toIndentedString(definedBy)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java index ba128ee179..1de5f72992 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java @@ -698,7 +698,8 @@ private RemoteServerLoggerData getRemoteServerLoggerData(RemoteLoggingConfig rem } private List buildAuthenticatorListResponse( - LocalAuthenticatorConfig[] localConfigs, RequestPathAuthenticatorConfig[] requestPathConfigs) { + LocalAuthenticatorConfig[] localConfigs, RequestPathAuthenticatorConfig[] requestPathConfigs) + throws IdentityApplicationManagementServerException { List authenticatorListItems = new ArrayList<>(); if (localConfigs != null) { @@ -712,6 +713,11 @@ private List buildAuthenticatorListResponse( authenticatorListItem.setType(AuthenticatorListItem.TypeEnum.LOCAL); authenticatorListItem.setDefinedBy( AuthenticatorListItem.DefinedByEnum.valueOf(config.getDefinedByType().toString())); + if (AuthenticatorPropertyConstants.DefinedByType.USER == config.getDefinedByType()) { + UserDefinedLocalAuthenticatorConfig userDefinedConfig = castToUserDefinedConfig(config); + authenticatorListItem.setImage(userDefinedConfig.getImageUrl()); + authenticatorListItem.setDescription(userDefinedConfig.getDescription()); + } String[] tags = config.getTags(); if (ArrayUtils.isNotEmpty(tags)) { authenticatorListItem.setTags(Arrays.asList(tags)); @@ -789,7 +795,10 @@ private Authenticator buildAuthenticatorResponse(LocalAuthenticatorConfig config authenticator.setType(Authenticator.TypeEnum.LOCAL); if (AuthenticatorPropertyConstants.DefinedByType.USER == config.getDefinedByType()) { authenticator.setDefinedBy(Authenticator.DefinedByEnum.USER); - resolveEndpointConfiguration(authenticator, config); + UserDefinedLocalAuthenticatorConfig userDefinedConfig = castToUserDefinedConfig(config); + authenticator.setImage(userDefinedConfig.getImageUrl()); + authenticator.setDescription(userDefinedConfig.getDescription()); + resolveEndpointConfiguration(authenticator, userDefinedConfig); } else { authenticator.setDefinedBy(Authenticator.DefinedByEnum.SYSTEM); setAuthenticatorProperties(config, authenticator); @@ -802,30 +811,34 @@ private Authenticator buildAuthenticatorResponse(LocalAuthenticatorConfig config return authenticator; } - private void resolveEndpointConfiguration(Authenticator authenticator, LocalAuthenticatorConfig config) + private UserDefinedLocalAuthenticatorConfig castToUserDefinedConfig(LocalAuthenticatorConfig config) throws IdentityApplicationManagementServerException { try { - UserDefinedLocalAuthenticatorConfig userDefinedConfig = (UserDefinedLocalAuthenticatorConfig) config; - UserDefinedAuthenticatorEndpointConfig endpointConfig = userDefinedConfig.getEndpointConfig(); - - AuthenticationType authenticationType = new AuthenticationType(); - authenticationType.setType(AuthenticationType.TypeEnum.fromValue( - endpointConfig.getAuthenticatorEndpointAuthenticationType())); - authenticationType.setProperties(new HashMap<>( - endpointConfig.getAuthenticatorEndpointAuthenticationProperties())); - - Endpoint endpoint = new Endpoint(); - endpoint.setAuthentication(authenticationType); - endpoint.setUri(endpointConfig.getAuthenticatorEndpointUri()); - authenticator.addEndpointItem(endpoint); + return (UserDefinedLocalAuthenticatorConfig) config; } catch (ClassCastException e) { throw new IdentityApplicationManagementServerException(String.format("For authenticator: %s of " + - "definedBy: USER, the authenticator config must be an instance of " + - "UserDefinedAuthenticatorEndpointConfig", config.getName()) , e); + "definedBy: USER, the authenticator config must be an instance of " + + "UserDefinedLocalAuthenticatorConfig", config.getName()) , e); } } + private void resolveEndpointConfiguration(Authenticator authenticator, UserDefinedLocalAuthenticatorConfig config) { + + UserDefinedAuthenticatorEndpointConfig endpointConfig = config.getEndpointConfig(); + + AuthenticationType authenticationType = new AuthenticationType(); + authenticationType.setType(AuthenticationType.TypeEnum.fromValue( + endpointConfig.getAuthenticatorEndpointAuthenticationType())); + authenticationType.setProperties(new HashMap<>( + endpointConfig.getAuthenticatorEndpointAuthenticationProperties())); + + Endpoint endpoint = new Endpoint(); + endpoint.setAuthentication(authenticationType); + endpoint.setUri(endpointConfig.getAuthenticatorEndpointUri()); + authenticator.addEndpointItem(endpoint); + } + private void setAuthenticatorProperties(LocalAuthenticatorConfig config, Authenticator authenticator) { List authenticatorProperties = Arrays.stream(config.getProperties()) diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/resources/configs.yaml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/resources/configs.yaml index 9170160492..b5705fa4f0 100644 --- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/resources/configs.yaml +++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/src/main/resources/configs.yaml @@ -1183,6 +1183,12 @@ components: displayName: type: string example: basic + description: + type: string + example: "Description for user defined local authenticator configuration." + image: + type: string + example: "https://example.com/logo/my-logo.png" isEnabled: type: boolean default: true @@ -1219,6 +1225,12 @@ components: displayName: type: string example: basic + description: + type: string + example: "Description for user defined local authenticator configuration." + image: + type: string + example: "https://example.com/logo/my-logo.png" isEnabled: type: boolean default: true 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 a6d93815ea..16fc8a4f1a 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.21-SNAPSHOT + 1.3.25-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 65a2dd00df..f7045e6572 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.21-SNAPSHOT + 1.3.25-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 08ae71bf25..b6f11d1733 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.21-SNAPSHOT + 1.3.25-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 981ccf24fe..0da4f95252 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.21-SNAPSHOT + 1.3.25-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 ed1d78ebbc..46c1c84381 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.21-SNAPSHOT + 1.3.25-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 15103f02f4..fabbf0d9c6 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.21-SNAPSHOT + 1.3.25-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 8804cdc590..73c3a4f07b 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.21-SNAPSHOT + 1.3.25-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 1b8f97d675..dfe4641466 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.21-SNAPSHOT + 1.3.25-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 50ff65ddc7..595c85a3c2 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.21-SNAPSHOT + 1.3.25-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 9085e8ca74..9a5756c560 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.21-SNAPSHOT + 1.3.25-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 a112bbeb9a..34009d2c99 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.21-SNAPSHOT + 1.3.25-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 0908e4e45e..cdf80a4e48 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.21-SNAPSHOT + 1.3.25-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 2567d76f04..0ed298ed89 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.21-SNAPSHOT + 1.3.25-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 8f3aa81628..b534fa2d7e 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.21-SNAPSHOT + 1.3.25-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 ff14158c2d..a8523d7484 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.21-SNAPSHOT + 1.3.25-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 d482e64c6e..2aa92fee3e 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.21-SNAPSHOT + 1.3.25-SNAPSHOT 4.0.0 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 71aaf633e5..c6eeda2378 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.21-SNAPSHOT + 1.3.25-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 eac3e5c1af..367b760c80 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.21-SNAPSHOT + 1.3.25-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 a3cb0e6e18..be7c8d0101 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.21-SNAPSHOT + 1.3.25-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 9f52e98977..b8fa925b75 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.21-SNAPSHOT + 1.3.25-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 d35959ce0b..320a21af53 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.21-SNAPSHOT + 1.3.25-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 525198bdcf..ee0b3477c9 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.21-SNAPSHOT + 1.3.25-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.21-SNAPSHOT + 1.3.25-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 21bb965e16..b36a1de30b 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.21-SNAPSHOT + 1.3.25-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 ecb984a628..9d6d983a4d 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.21-SNAPSHOT + 1.3.25-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 ecb802f17f..e30555df87 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.21-SNAPSHOT + 1.3.25-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 5fd783038c..cf2cbedd15 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.21-SNAPSHOT + 1.3.25-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 75be997635..731fc411a3 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.21-SNAPSHOT + 1.3.25-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 0137597eec..15f767bda0 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.21-SNAPSHOT + 1.3.25-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 3ad46319dd..03e958d2c6 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.21-SNAPSHOT + 1.3.25-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 99435c4f99..f234cc6a85 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.21-SNAPSHOT + 1.3.25-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 dc44c76e79..e1eece653c 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.21-SNAPSHOT + 1.3.25-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 93d8b9c7bb..92e2d90485 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.21-SNAPSHOT + 1.3.25-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 ac4835762f..cf87cee02f 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.21-SNAPSHOT + 1.3.25-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 b7d0205af3..88374e2dea 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.21-SNAPSHOT + 1.3.25-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 756a284267..30bdfb9cf5 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.21-SNAPSHOT + 1.3.25-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 b22bff513d..8d881a75e8 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.21-SNAPSHOT + 1.3.25-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 849d3cf44e..4a5fe6f0d1 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.21-SNAPSHOT + 1.3.25-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 d3c4aaa17e..293dd04308 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.21-SNAPSHOT + 1.3.25-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 602aa3c82d..3faa83160a 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.21-SNAPSHOT + 1.3.25-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 a429995739..4f6a09b456 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.21-SNAPSHOT + 1.3.25-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 7eac505e69..cf2bae32fa 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.21-SNAPSHOT + 1.3.25-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 d0a400c28e..edd90b59b8 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.21-SNAPSHOT + 1.3.25-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 1d4b9f5436..4081373548 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.21-SNAPSHOT + 1.3.25-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 272e782500..3e69ffbfdf 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.21-SNAPSHOT + 1.3.25-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 163108bfc7..709a918c4e 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.21-SNAPSHOT + 1.3.25-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 24e33431e5..3e06fbd01d 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.21-SNAPSHOT + 1.3.25-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 ed7761b11f..5f8fe0740a 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.21-SNAPSHOT + 1.3.25-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 924cc2ce22..7835b637d4 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.21-SNAPSHOT + 1.3.25-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 0130a7fbcf..2f09348675 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.21-SNAPSHOT + 1.3.25-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 e2f82b454f..27f361ccee 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.21-SNAPSHOT + 1.3.25-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 f263460bab..b9ea8ef3b5 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.21-SNAPSHOT + 1.3.25-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 6e6a12b301..4ea5ef72ff 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.21-SNAPSHOT + 1.3.25-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 a40f058868..e41e5546c7 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.21-SNAPSHOT + 1.3.25-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 fb77c95645..b018caf74f 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.21-SNAPSHOT + 1.3.25-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 53fc1e56ed..6fde43ac31 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.21-SNAPSHOT + 1.3.25-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 522194153a..7733a8ed05 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.21-SNAPSHOT + 1.3.25-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 29a836fbaa..65dc86f2ba 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.21-SNAPSHOT + 1.3.25-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 36372600b2..21c8d827f9 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.21-SNAPSHOT + 1.3.25-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 b10e94ea35..d985aa2dcf 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.21-SNAPSHOT + 1.3.25-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 fcb233a122..2dd2ee16e0 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.21-SNAPSHOT + 1.3.25-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 71a2575272..6a76f5fd7d 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.21-SNAPSHOT + 1.3.25-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 2ca2e1ab54..ff2c4ac605 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.21-SNAPSHOT + 1.3.25-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 59748f7aeb..55b81800d2 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.21-SNAPSHOT + 1.3.25-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 0bb337b3f3..b0524ab2f5 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.21-SNAPSHOT + 1.3.25-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 a15d6a67cd..d7ae406d32 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.21-SNAPSHOT + 1.3.25-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 d5de05a0cf..6964442aac 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.21-SNAPSHOT + 1.3.25-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 7bb7673c89..d36b558172 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.21-SNAPSHOT + 1.3.25-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 a804e62b9e..870cc063cc 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.21-SNAPSHOT + 1.3.25-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 473f4f6ee5..77ffb95235 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.0.0 identity-api-server pom - 1.3.21-SNAPSHOT + 1.3.25-SNAPSHOT WSO2 Identity Server - Server API Module @@ -821,7 +821,7 @@ 1.4 1.2.4 1.11.27 - 7.7.85 + 7.7.95 3.0.5 1.12.0 **/gen/**/*