diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml index 40c6cd1dfaf4..c76e59a67777 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework action-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml @@ -41,6 +41,10 @@ org.wso2.carbon.identity.framework org.wso2.carbon.identity.action.management + + org.wso2.carbon.identity.framework + org.wso2.carbon.identity.central.log.mgt + com.fasterxml.jackson.core jackson-databind @@ -77,9 +81,13 @@ ${project.artifactId} org.wso2.carbon.identity.action.execution.internal, + org.wso2.carbon.identity.action.execution.impl, + org.wso2.carbon.identity.action.execution.util, !org.wso2.carbon.identity.action.execution.internal, + !org.wso2.carbon.identity.action.execution.impl, + !org.wso2.carbon.identity.action.execution.util, org.wso2.carbon.identity.action.execution.*; version="${carbon.identity.package.export.version}" @@ -100,7 +108,9 @@ org.apache.http.impl.conn; version="${httpcomponents-httpclient.imp.pkg.version.range}", org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}", org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}", + org.wso2.carbon.identity.central.log.mgt.utils; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.identity.core.util; version="${carbon.identity.package.import.version.range}", + org.wso2.carbon.identity.core; version="${carbon.identity.package.import.version.range}", org.wso2.carbon.utils; version="${carbon.kernel.package.import.version.range}", com.fasterxml.jackson.core.*; version="${com.fasterxml.jackson.annotation.version.range}", com.fasterxml.jackson.databind.*; diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionLogConstants.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionLogConstants.java new file mode 100644 index 000000000000..8df84605466b --- /dev/null +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionLogConstants.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.action.execution; + +/** + * Diagnostics Logs Constants for Action execution service. + */ +public class ActionExecutionLogConstants { + + private ActionExecutionLogConstants() {} + + public static final String ACTION_EXECUTION_COMPONENT_ID = "action-execution"; + + /** + * Action IDs. + */ + public static class ActionIDs { + + public static final String EXECUTE_ACTION = "execute-action"; + public static final String PROCESS_ACTION_REQUEST = "process-action-request"; + public static final String SEND_ACTION_REQUEST = "send-action-request"; + public static final String RECEIVE_ACTION_RESPONSE = "receive-action-response"; + public static final String VALIDATE_ACTION_OPERATIONS = "validate-action-response"; + public static final String EXECUTE_ACTION_OPERATIONS = "process-action-response"; + } +} diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionRequestBuilderFactory.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionRequestBuilderFactory.java similarity index 93% rename from components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionRequestBuilderFactory.java rename to components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionRequestBuilderFactory.java index 196362691724..75b91b5b6444 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionRequestBuilderFactory.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionRequestBuilderFactory.java @@ -16,8 +16,9 @@ * under the License. */ -package org.wso2.carbon.identity.action.execution; +package org.wso2.carbon.identity.action.execution.impl; +import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder; import org.wso2.carbon.identity.action.execution.model.ActionExecutionRequest; import org.wso2.carbon.identity.action.execution.model.ActionType; diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactory.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactory.java similarity index 94% rename from components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactory.java rename to components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactory.java index 3ab416a1238e..9165fae9ef23 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactory.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactory.java @@ -16,8 +16,9 @@ * under the License. */ -package org.wso2.carbon.identity.action.execution; +package org.wso2.carbon.identity.action.execution.impl; +import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor; import org.wso2.carbon.identity.action.execution.model.ActionType; import java.util.HashMap; diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImpl.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImpl.java similarity index 87% rename from components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImpl.java rename to components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImpl.java index 1dbcd4731ae6..37e96bc29ad1 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImpl.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImpl.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.identity.action.execution; +package org.wso2.carbon.identity.action.execution.impl; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; @@ -24,6 +24,9 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder; +import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor; +import org.wso2.carbon.identity.action.execution.ActionExecutorService; import org.wso2.carbon.identity.action.execution.exception.ActionExecutionException; import org.wso2.carbon.identity.action.execution.exception.ActionExecutionRequestBuilderException; import org.wso2.carbon.identity.action.execution.exception.ActionExecutionResponseProcessorException; @@ -40,6 +43,7 @@ import org.wso2.carbon.identity.action.execution.model.PerformableOperation; import org.wso2.carbon.identity.action.execution.model.Request; import org.wso2.carbon.identity.action.execution.util.APIClient; +import org.wso2.carbon.identity.action.execution.util.ActionExecutionDiagnosticLogger; import org.wso2.carbon.identity.action.execution.util.ActionExecutorConfig; import org.wso2.carbon.identity.action.execution.util.AuthMethods; import org.wso2.carbon.identity.action.execution.util.OperationComparator; @@ -48,6 +52,8 @@ import org.wso2.carbon.identity.action.management.model.Action; import org.wso2.carbon.identity.action.management.model.AuthProperty; import org.wso2.carbon.identity.action.management.model.Authentication; +import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; +import org.wso2.carbon.identity.core.ThreadLocalAwareExecutors; import java.util.ArrayList; import java.util.List; @@ -55,6 +61,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; import java.util.stream.Collectors; /** @@ -66,8 +73,11 @@ public class ActionExecutorServiceImpl implements ActionExecutorService { private static final Log LOG = LogFactory.getLog(ActionExecutorServiceImpl.class); + private static final int THREAD_POOL_SIZE = Runtime.getRuntime().availableProcessors() * 2; private static final ActionExecutorServiceImpl INSTANCE = new ActionExecutorServiceImpl(); + private static final ActionExecutionDiagnosticLogger DIAGNOSTIC_LOGGER = new ActionExecutionDiagnosticLogger(); private final APIClient apiClient; + private final ExecutorService executorService = ThreadLocalAwareExecutors.newFixedThreadPool(THREAD_POOL_SIZE); private ActionExecutorServiceImpl() { @@ -101,9 +111,10 @@ public ActionExecutionStatus execute(ActionType actionType, Map validateActions(actions, actionType); // As of now only one action is allowed. Action action = actions.get(0); + DIAGNOSTIC_LOGGER.logActionInitiation(action); return execute(action, eventContext); } catch (ActionExecutionRuntimeException e) { - // todo: add to diagnostics + DIAGNOSTIC_LOGGER.logSkippedActionExecution(actionType); LOG.debug("Skip executing actions for action type: " + actionType.name(), e); return new ActionExecutionStatus(ActionExecutionStatus.Status.FAILED, eventContext); } @@ -123,10 +134,11 @@ public ActionExecutionStatus execute(ActionType actionType, String[] actionIdLis validateActionIdList(actionType, actionIdList); Action action = getActionByActionId(actionType, actionIdList[0], tenantDomain); + DIAGNOSTIC_LOGGER.logActionInitiation(action); try { return execute(action, eventContext); } catch (ActionExecutionRuntimeException e) { - // todo: add to diagnostics + DIAGNOSTIC_LOGGER.logSkippedActionExecution(actionType); LOG.debug("Skip executing actions for action type: " + actionType.name(), e); return new ActionExecutionStatus(ActionExecutionStatus.Status.FAILED, eventContext); } @@ -259,7 +271,7 @@ private ActionInvocationResponse executeActionAsynchronously(Action action, String apiEndpoint = action.getEndpoint().getUri(); CompletableFuture actionExecutor = CompletableFuture.supplyAsync( - () -> apiClient.callAPI(apiEndpoint, authenticationMethod, payload)); + () -> apiClient.callAPI(apiEndpoint, authenticationMethod, payload), executorService); try { return actionExecutor.get(); } catch (InterruptedException | ExecutionException e) { @@ -270,7 +282,7 @@ private ActionInvocationResponse executeActionAsynchronously(Action action, private void logActionRequest(Action action, String payload) { - //todo: Add to diagnostics + DIAGNOSTIC_LOGGER.logActionRequest(action); if (LOG.isDebugEnabled()) { LOG.debug(String.format( "Calling API: %s for action type: %s action id: %s with authentication: %s payload: %s", @@ -315,13 +327,10 @@ private ActionExecutionStatus processSuccessResponse(Action action, actionExecutionResponseProcessor) throws ActionExecutionResponseProcessorException { - if (LOG.isDebugEnabled()) { - // todo: add to diagnostic logs - logSuccessResponse(action, successResponse); - } + logSuccessResponse(action, successResponse); List allowedPerformableOperations = - validatePerformableOperations(actionRequest, successResponse); + validatePerformableOperations(actionRequest, successResponse, action); ActionInvocationSuccessResponse.Builder successResponseBuilder = new ActionInvocationSuccessResponse.Builder().actionStatus(ActionInvocationResponse.Status.SUCCESS) .operations(allowedPerformableOperations); @@ -357,26 +366,29 @@ private ActionExecutionStatus processFailureResponse(Action action, private void logSuccessResponse(Action action, ActionInvocationSuccessResponse successResponse) { - try { - String responseBody = serializeSuccessResponse(successResponse); - LOG.debug(String.format( - "Received success response from API: %s for action type: %s action id: %s with authentication: %s. " - + "Response: %s", - action.getEndpoint().getUri(), - action.getType().getActionType(), - action.getId(), - action.getEndpoint().getAuthentication().getType(), - responseBody)); - } catch (JsonProcessingException e) { - LOG.error("Error occurred while deserializing the success response for action: " + - action.getId() + " for action type: " + action.getType().getActionType(), e); + DIAGNOSTIC_LOGGER.logSuccessResponse(action); + if (LOG.isDebugEnabled()) { + try { + String responseBody = serializeSuccessResponse(successResponse); + LOG.debug(String.format( + "Received success response from API: %s for action type: %s action id: %s with " + + "authentication: %s. Response: %s", + action.getEndpoint().getUri(), + action.getType().getActionType(), + action.getId(), + action.getEndpoint().getAuthentication().getType(), + responseBody)); + } catch (JsonProcessingException e) { + LOG.error("Error occurred while deserializing the success response for action: " + + action.getId() + " for action type: " + action.getType().getActionType(), e); + } } } private void logErrorResponse(Action action, ActionInvocationErrorResponse errorResponse) { + DIAGNOSTIC_LOGGER.logErrorResponse(action); if (LOG.isDebugEnabled()) { - // todo: add to diagnostic logs try { String responseBody = serializeErrorResponse(errorResponse); LOG.debug(String.format( @@ -396,8 +408,8 @@ private void logErrorResponse(Action action, ActionInvocationErrorResponse error private void logFailureResponse(Action action, ActionInvocationFailureResponse failureResponse) { + DIAGNOSTIC_LOGGER.logFailureResponse(action); if (LOG.isDebugEnabled()) { - // todo: add to diagnostic logs try { String responseBody = serializeFailureResponse(failureResponse); LOG.debug(String.format( @@ -416,7 +428,8 @@ private void logFailureResponse(Action action, ActionInvocationFailureResponse f } private void logErrorResponse(Action action, ActionInvocationResponse actionInvocationResponse) { - // todo: add to diagnostic logs + + DIAGNOSTIC_LOGGER.logErrorResponse(action, actionInvocationResponse); if (LOG.isDebugEnabled()) { LOG.debug(String.format( "Failed to call API: %s for action type: %s action id: %s with authentication: %s. Error: %s", @@ -455,8 +468,8 @@ private String serializeFailureResponse(ActionInvocationFailureResponse response return objectMapper.writeValueAsString(response); } - private List validatePerformableOperations(ActionExecutionRequest request, - ActionInvocationSuccessResponse response) { + private List validatePerformableOperations( + ActionExecutionRequest request, ActionInvocationSuccessResponse response, Action action) { List allowedOperations = request.getAllowedOperations(); @@ -466,22 +479,24 @@ private List validatePerformableOperations(ActionExecution performableOperation))) .collect(Collectors.toList()); - if (LOG.isDebugEnabled()) { - // todo: add to diagnostics - List allowedOps = new ArrayList<>(); - List notAllowedOps = new ArrayList<>(); - - response.getOperations().forEach(operation -> { - String operationDetails = "Operation: " + operation.getOp() + " with path: " + operation.getPath(); - if (allowedPerformableOperations.contains(operation)) { - allowedOps.add(operationDetails); - } else { - notAllowedOps.add(operationDetails); + if (LOG.isDebugEnabled() || LoggerUtils.isDiagnosticLogsEnabled()) { + List allowedOps = new ArrayList<>(); + List notAllowedOps = new ArrayList<>(); + + response.getOperations().forEach(operation -> { + String operationDetails = "Operation: " + operation.getOp() + " Path: " + operation.getPath(); + if (allowedPerformableOperations.contains(operation)) { + allowedOps.add(operationDetails); + } else { + notAllowedOps.add(operationDetails); + } + }); + DIAGNOSTIC_LOGGER.logPerformableOperations(action, allowedOps, notAllowedOps); + if (LOG.isDebugEnabled()) { + LOG.debug("Allowed Operations: " + String.join(", ", allowedOps) + + ". Not Allowed Operations: " + String.join(", ", notAllowedOps)); } - }); - LOG.debug("Allowed Operations: " + String.join(", ", allowedOps) + - ". Not Allowed Operations: " + String.join(", ", notAllowedOps)); - } + } return allowedPerformableOperations; } diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/internal/ActionExecutionServiceComponent.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/internal/ActionExecutionServiceComponent.java index 3615860846b1..02e3efc2a81d 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/internal/ActionExecutionServiceComponent.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/internal/ActionExecutionServiceComponent.java @@ -29,11 +29,11 @@ import org.osgi.service.component.annotations.ReferenceCardinality; import org.osgi.service.component.annotations.ReferencePolicy; import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder; -import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilderFactory; import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor; -import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessorFactory; import org.wso2.carbon.identity.action.execution.ActionExecutorService; -import org.wso2.carbon.identity.action.execution.ActionExecutorServiceImpl; +import org.wso2.carbon.identity.action.execution.impl.ActionExecutionRequestBuilderFactory; +import org.wso2.carbon.identity.action.execution.impl.ActionExecutionResponseProcessorFactory; +import org.wso2.carbon.identity.action.execution.impl.ActionExecutorServiceImpl; import org.wso2.carbon.identity.action.management.ActionManagementService; /** diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/APIClient.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/APIClient.java index 9d6e39263049..d533f7c9f913 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/APIClient.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/APIClient.java @@ -48,6 +48,7 @@ public class APIClient { private static final Log LOG = LogFactory.getLog(APIClient.class); + private static final ActionExecutionDiagnosticLogger DIAGNOSTIC_LOGGER = new ActionExecutionDiagnosticLogger(); private final CloseableHttpClient httpClient; public APIClient() { @@ -103,15 +104,15 @@ private ActionInvocationResponse executeRequest(HttpPost request) { if (!actionInvocationResponse.isError() || !actionInvocationResponse.isRetry()) { return actionInvocationResponse; } - //todo: add to diagnostic logs - LOG.warn("API: " + request.getURI() + " seems to be unavailable. Retrying the request. Attempt " + + DIAGNOSTIC_LOGGER.logAPICallRetry(request, attempts, retryCount); + LOG.debug("API: " + request.getURI() + " seems to be unavailable. Retrying the request. Attempt " + (attempts + 1) + " of " + retryCount); } catch (ConnectTimeoutException | SocketTimeoutException e) { - //todo: add to diagnostic logs - LOG.warn("Request for API: " + request.getURI() + " timed out. Retrying the request. Attempt " + + DIAGNOSTIC_LOGGER.logAPICallTimeout(request, retryCount, attempts); + LOG.debug("Request for API: " + request.getURI() + " timed out. Retrying the request. Attempt " + (attempts + 1) + " of " + retryCount); } catch (Exception e) { - //todo: add to diagnostic logs + DIAGNOSTIC_LOGGER.logAPICallError(request); LOG.error("Request for API: " + request.getURI() + " failed due to an error.", e); break; } finally { @@ -147,11 +148,12 @@ private ActionInvocationResponse handleResponse(HttpResponse response) { case HttpStatus.SC_SERVICE_UNAVAILABLE: case HttpStatus.SC_GATEWAY_TIMEOUT: actionInvocationResponseBuilder.errorLog( - "Failed to execute the action request. Received: " + statusCode); + "Failed to execute the action request. Received status code: " + statusCode + "."); actionInvocationResponseBuilder.retry(true); break; default: - actionInvocationResponseBuilder.errorLog("Unexpected response status code: " + statusCode); + actionInvocationResponseBuilder.errorLog("Unexpected response received with status code: " + statusCode + + "."); break; } @@ -174,13 +176,13 @@ private void handleClientError(ActionInvocationResponse.Builder builder, HttpEnt if (errorResponse != null) { builder.response(errorResponse); } else { - builder.errorLog("Failed to execute the action request. Received: " + statusCode); + builder.errorLog("Failed to execute the action request. Received status code: " + statusCode + "."); } } catch (ActionInvocationException e) { - //todo: add to diagnostic logs LOG.debug("JSON payload received for status code: " + statusCode + " is not of the expected error response format. ", e); - builder.errorLog("Failed to execute the action request. Received: " + statusCode); + builder.errorLog("Unexpected error response received for the status code: " + statusCode + ". " + + e.getMessage()); } } @@ -191,14 +193,14 @@ private void handleServerError(ActionInvocationResponse.Builder builder, HttpEnt if (errorResponse != null) { builder.response(errorResponse); } else { - builder.errorLog("Failed to execute the action request. Received: " + statusCode); + builder.errorLog("Failed to execute the action request. Received status code: " + statusCode + "."); builder.retry(true); } } catch (ActionInvocationException e) { - //todo: add to diagnostic logs LOG.debug("JSON payload received for status code: " + statusCode + " is not of the expected error response format. ", e); - builder.errorLog("Failed to execute the action request. Received: " + statusCode); + builder.errorLog("Unexpected error response received for the status code: " + statusCode + ". " + + e.getMessage()); builder.retry(true); } } diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/ActionExecutionDiagnosticLogger.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/ActionExecutionDiagnosticLogger.java new file mode 100644 index 000000000000..31c7fe6fd892 --- /dev/null +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/main/java/org/wso2/carbon/identity/action/execution/util/ActionExecutionDiagnosticLogger.java @@ -0,0 +1,223 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.action.execution.util; + +import org.apache.http.client.methods.HttpPost; +import org.wso2.carbon.identity.action.execution.ActionExecutionLogConstants; +import org.wso2.carbon.identity.action.execution.model.ActionInvocationResponse; +import org.wso2.carbon.identity.action.execution.model.ActionType; +import org.wso2.carbon.identity.action.management.model.Action; +import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; +import org.wso2.carbon.utils.DiagnosticLog; + +import java.util.List; + +/** + * This utility class is for generating and printing diagnostic logs related to + * action execution + */ +public class ActionExecutionDiagnosticLogger { + + public void logActionInitiation(Action action) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + + triggerLogEvent( + initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.EXECUTE_ACTION, + action.getType().getDisplayName() + " action execution is initiated.", + DiagnosticLog.ResultStatus.SUCCESS)); + } + + public void logSkippedActionExecution(ActionType actionType) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + + triggerLogEvent( + initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.EXECUTE_ACTION, + "Skip executing action for " + actionType + " type.", + DiagnosticLog.ResultStatus.FAILED)); + } + + public void logActionRequest(Action action) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.PROCESS_ACTION_REQUEST, + "Call external service endpoint " + action.getEndpoint().getUri() + " for " + + action.getType().getDisplayName() + " action.", + DiagnosticLog.ResultStatus.SUCCESS); + + triggerLogEvent(addActionConfigParams(diagnosticLogBuilder, action)); + } + + public void logSuccessResponse(Action action) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.RECEIVE_ACTION_RESPONSE, + "Received success response from external endpoint " + + action.getEndpoint().getUri() + " for " + + action.getType().getDisplayName() + " action.", + DiagnosticLog.ResultStatus.SUCCESS); + triggerLogEvent(addActionConfigParams(diagnosticLogBuilder, action)); + } + + public void logErrorResponse(Action action) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.RECEIVE_ACTION_RESPONSE, + "Received error response from external endpoint " + + action.getEndpoint().getUri() + " for " + + action.getType().getDisplayName() + " action.", + DiagnosticLog.ResultStatus.FAILED); + triggerLogEvent(addActionConfigParams(diagnosticLogBuilder, action)); + } + + public void logFailureResponse(Action action) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.RECEIVE_ACTION_RESPONSE, + "Received failure response from external endpoint " + + action.getEndpoint().getUri() + " for " + + action.getType().getDisplayName() + " action.", + DiagnosticLog.ResultStatus.FAILED); + triggerLogEvent(addActionConfigParams(diagnosticLogBuilder, action)); + } + + public void logErrorResponse(Action action, ActionInvocationResponse actionInvocationResponse) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.RECEIVE_ACTION_RESPONSE, + "Failed to call external endpoint for " + action.getType().getDisplayName() + + " action. " + + (actionInvocationResponse.getErrorLog() != null ? + actionInvocationResponse.getErrorLog() : "Unknown error occured."), + DiagnosticLog.ResultStatus.FAILED); + triggerLogEvent(addActionConfigParams(diagnosticLogBuilder, action)); + } + + public void logPerformableOperations(Action action, List allowedOps, List notAllowedOps) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder = initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.VALIDATE_ACTION_OPERATIONS, + "Validated operations to perform on " + action.getType().getDisplayName() + " action.", + DiagnosticLog.ResultStatus.SUCCESS); + triggerLogEvent( + addActionConfigParams(diagnosticLogBuilder, action) + .configParam("allowed operations", allowedOps.isEmpty() ? "empty" : allowedOps) + .configParam("not allowed operations", notAllowedOps.isEmpty() ? "empty" : notAllowedOps)); + } + + public void logAPICallRetry(HttpPost request, int attempts, int retryCount) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + + triggerLogEvent( + initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.SEND_ACTION_REQUEST, + "External endpoint " + request.getURI() + " for action " + + "execution seems to be unavailable. Retrying API call attempt " + + (attempts + 1) + " of " + retryCount + ".", + DiagnosticLog.ResultStatus.SUCCESS)); + } + + public void logAPICallTimeout(HttpPost request, int attempts, int retryCount) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + + triggerLogEvent( + initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.SEND_ACTION_REQUEST, + "Request for external endpont " + request.getURI() + " for action is " + + "timed out. Retrying API call attempt " + (attempts + 1) + " of " + + retryCount + ".", + DiagnosticLog.ResultStatus.SUCCESS)); + } + + public void logAPICallError(HttpPost request) { + + if (!LoggerUtils.isDiagnosticLogsEnabled()) { + return; + } + + triggerLogEvent( + initializeDiagnosticLogBuilder( + ActionExecutionLogConstants.ActionIDs.SEND_ACTION_REQUEST, + "Request for external endpoint " + request.getURI() + " for action failed" + + " due to an error.", + DiagnosticLog.ResultStatus.FAILED)); + } + + private DiagnosticLog.DiagnosticLogBuilder addActionConfigParams( + DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder, Action action) { + + return diagnosticLogBuilder + .configParam("action id", action.getId()) + .configParam("action type", action.getType().getDisplayName()) + .configParam("action endpoint", action.getEndpoint().getUri()) + .configParam("action endpoint authentication type", + action.getEndpoint().getAuthentication().getType().getName()); + + } + + private DiagnosticLog.DiagnosticLogBuilder initializeDiagnosticLogBuilder(String actionID, String message, + DiagnosticLog.ResultStatus resultStatus) { + + DiagnosticLog.DiagnosticLogBuilder diagLogBuilder = new DiagnosticLog.DiagnosticLogBuilder( + ActionExecutionLogConstants.ACTION_EXECUTION_COMPONENT_ID, + actionID); + diagLogBuilder + .resultMessage(message) + .logDetailLevel(DiagnosticLog.LogDetailLevel.APPLICATION) + .resultStatus(resultStatus); + return diagLogBuilder; + } + + private void triggerLogEvent(DiagnosticLog.DiagnosticLogBuilder diagnosticLogBuilder) { + + LoggerUtils.triggerDiagnosticLogEvent(diagnosticLogBuilder); + } +} diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutionRequestBuilderFactoryTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionRequestBuilderFactoryTest.java similarity index 94% rename from components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutionRequestBuilderFactoryTest.java rename to components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionRequestBuilderFactoryTest.java index 488ae2905832..2b00143b4ed1 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutionRequestBuilderFactoryTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionRequestBuilderFactoryTest.java @@ -16,12 +16,13 @@ * under the License. */ -package org.wso2.carbon.identity.action.execution; +package org.wso2.carbon.identity.action.execution.impl; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder; import org.wso2.carbon.identity.action.execution.model.ActionType; import static org.mockito.Mockito.when; diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactoryTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactoryTest.java similarity index 94% rename from components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactoryTest.java rename to components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactoryTest.java index a51ee0844ebe..cf37447f86d7 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactoryTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactoryTest.java @@ -16,12 +16,13 @@ * under the License. */ -package org.wso2.carbon.identity.action.execution; +package org.wso2.carbon.identity.action.execution.impl; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor; import org.wso2.carbon.identity.action.execution.model.ActionType; import static org.mockito.Mockito.when; diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImplTest.java similarity index 98% rename from components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java rename to components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImplTest.java index 694c6d5dabaf..bdf4b13993ae 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImplTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImplTest.java @@ -16,7 +16,7 @@ * under the License. */ -package org.wso2.carbon.identity.action.execution; +package org.wso2.carbon.identity.action.execution.impl; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; @@ -28,6 +28,8 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.wso2.carbon.identity.action.execution.ActionExecutionRequestBuilder; +import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor; import org.wso2.carbon.identity.action.execution.exception.ActionExecutionException; import org.wso2.carbon.identity.action.execution.exception.ActionExecutionRequestBuilderException; import org.wso2.carbon.identity.action.execution.internal.ActionExecutionServiceComponentHolder; @@ -57,6 +59,7 @@ import org.wso2.carbon.identity.action.management.model.Action; import org.wso2.carbon.identity.action.management.model.Authentication; import org.wso2.carbon.identity.action.management.model.EndpointConfig; +import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; import java.lang.reflect.Field; import java.util.ArrayList; @@ -90,6 +93,7 @@ public class ActionExecutorServiceImplTest { private MockedStatic actionExecutorConfigStatic; private MockedStatic requestFilter; + private MockedStatic loggerUtils; private MockedStatic actionExecutionRequestBuilderFactory; private MockedStatic actionExecutionResponseProcessorFactory; @@ -108,6 +112,8 @@ public void setUp() throws Exception { setField(actionExecutorService, "apiClient", apiClient); requestFilter = mockStatic(RequestFilter.class); + loggerUtils = mockStatic(LoggerUtils.class); + loggerUtils.when(() -> LoggerUtils.isDiagnosticLogsEnabled()).thenReturn(true); actionExecutionRequestBuilderFactory = mockStatic(ActionExecutionRequestBuilderFactory.class); actionExecutionResponseProcessorFactory = mockStatic(ActionExecutionResponseProcessorFactory.class); } @@ -116,6 +122,7 @@ public void setUp() throws Exception { public void tearDown() { requestFilter.close(); + loggerUtils.close(); actionExecutionRequestBuilderFactory.close(); actionExecutionResponseProcessorFactory.close(); actionExecutorConfigStatic.close(); diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/APIClientTest.java b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/APIClientTest.java index b017853a2e5c..086680beb8e9 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/APIClientTest.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/java/org/wso2/carbon/identity/action/execution/util/APIClientTest.java @@ -40,6 +40,7 @@ import org.wso2.carbon.identity.action.execution.model.ActionInvocationResponse; import org.wso2.carbon.identity.action.execution.model.ActionInvocationSuccessResponse; import org.wso2.carbon.identity.action.execution.model.Operation; +import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; import java.io.ByteArrayInputStream; import java.lang.reflect.Field; @@ -71,6 +72,7 @@ public class APIClientTest { private StatusLine statusLine; private MockedStatic actionExecutorConfigStatic; + private MockedStatic loggerUtils; @InjectMocks private APIClient apiClient; @@ -79,6 +81,8 @@ public class APIClientTest { public void setUp() throws Exception { actionExecutorConfigStatic = mockStatic(ActionExecutorConfig.class); + loggerUtils = mockStatic(LoggerUtils.class); + loggerUtils.when(() -> LoggerUtils.isDiagnosticLogsEnabled()).thenReturn(true); ActionExecutorConfig actionExecutorConfig = mock(ActionExecutorConfig.class); actionExecutorConfigStatic.when(ActionExecutorConfig::getInstance).thenReturn(actionExecutorConfig); when(actionExecutorConfig.getHttpConnectionPoolSize()).thenReturn(20); @@ -91,6 +95,7 @@ public void setUp() throws Exception { public void tearDown() { actionExecutorConfigStatic.close(); + loggerUtils.close(); } @Test @@ -186,19 +191,23 @@ public Object[][] unexpectedErrorResponses() { return new Object[][]{ {HttpStatus.SC_BAD_REQUEST, ContentType.DEFAULT_TEXT.getMimeType(), - "", "Failed to execute the action request. Received: 400"}, + "", "Failed to execute the action request. Received status code: 400."}, {HttpStatus.SC_UNAUTHORIZED, ContentType.APPLICATION_JSON.getMimeType(), - "{}", "Failed to execute the action request. Received: 401"}, + "{}", "Unexpected error response received for the status code: 401. " + + "Parsing JSON response failed."}, {HttpStatus.SC_BAD_REQUEST, ContentType.APPLICATION_JSON.getMimeType(), - "{\"actionStatus\":\"ERROR\"}", "Failed to execute the action request. Received: 400"}, + "{\"actionStatus\":\"ERROR\"}", "Unexpected error response received for the status " + + "code: 400. Parsing JSON response failed."}, {HttpStatus.SC_UNAUTHORIZED, ContentType.APPLICATION_JSON.getMimeType(), - "{\"actionStatus\":\"SUCCESS\"}", "Failed to execute the action request. Received: 401"}, + "{\"actionStatus\":\"SUCCESS\"}", "Unexpected error response received for the status " + + "code: 401. Parsing JSON response failed."}, {HttpStatus.SC_INTERNAL_SERVER_ERROR, ContentType.APPLICATION_JSON.getMimeType(), - "server_error", "Failed to execute the action request. Received: 500"}, + "server_error", "Unexpected error response received for the status " + + "code: 500. Parsing JSON response failed."}, {HttpStatus.SC_BAD_GATEWAY, ContentType.DEFAULT_TEXT.getMimeType(), - "", "Failed to execute the action request. Received: 502"}, + "", "Failed to execute the action request. Received status code: 502."}, {HttpStatus.SC_CONFLICT, ContentType.DEFAULT_TEXT.getMimeType(), - "", "Unexpected response status code: 409"} + "", "Unexpected response received with status code: 409."} }; } diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/resources/testng.xml b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/resources/testng.xml index 8f0ff3dbf90a..42de8030d39c 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/resources/testng.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.execution/src/test/resources/testng.xml @@ -30,13 +30,13 @@ - - + + - + diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml index 02c0a994c547..3c6f6b3d9602 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework action-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/model/Action.java b/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/model/Action.java index ab7d694d34fe..99fa95aee93d 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/model/Action.java +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/src/main/java/org/wso2/carbon/identity/action/management/model/Action.java @@ -18,6 +18,8 @@ package org.wso2.carbon.identity.action.management.model; +import java.util.Arrays; + /** * Action. */ @@ -31,41 +33,48 @@ public enum ActionTypes { PRE_ISSUE_ACCESS_TOKEN( "preIssueAccessToken", "PRE_ISSUE_ACCESS_TOKEN", - "Pre Issue Access Token.", - "Configure an extension point for modifying access token via a custom service."), + "Pre Issue Access Token", + "Configure an extension point for modifying access token via a custom service.", + Category.PRE_POST), PRE_UPDATE_PASSWORD( "preUpdatePassword", "PRE_UPDATE_PASSWORD", - "Pre Update Password.", - "Configure an extension point for modifying user " + - "password via a custom service."), + "Pre Update Password", + "Configure an extension point for modifying user password via a custom service.", + Category.PRE_POST), PRE_UPDATE_PROFILE( "preUpdateProfile", "PRE_UPDATE_PROFILE", - "Pre Update Profile.", - "Configure an extension point for modifying user profile via a custom service."), + "Pre Update Profile", + "Configure an extension point for modifying user profile via a custom service.", + Category.PRE_POST), PRE_REGISTRATION( "preRegistration", "PRE_REGISTRATION", - "Pre Registration.", - "Configure an extension point for modifying user registration via a custom service."), + "Pre Registration", + "Configure an extension point for modifying user registration via a custom service.", + Category.PRE_POST), AUTHENTICATION( "authentication", "AUTHENTICATION", - "Authentication.", - "Configure an extension point for user authentication via a custom service."); + "Authentication", + "Configure an extension point for user authentication via a custom service.", + Category.IN_FLOW); private final String pathParam; private final String actionType; private final String displayName; private final String description; - ActionTypes(String pathParam, String actionType, String displayName, String description) { + private final Category category; + + ActionTypes(String pathParam, String actionType, String displayName, String description, Category category) { this.pathParam = pathParam; this.actionType = actionType; this.displayName = displayName; this.description = description; + this.category = category; } public String getPathParam() { @@ -87,6 +96,27 @@ public String getDescription() { return description; } + + public Category getCategory() { + + return category; + } + + public static ActionTypes[] filterByCategory(Category category) { + + return Arrays.stream(ActionTypes.values()) + .filter(actionType -> actionType.category.equals(category)) + .toArray(ActionTypes[]::new); + } + + /** + * Category Enum. + * Defines the category of the action types. + */ + public enum Category { + PRE_POST, + IN_FLOW; + } } /** diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/java/org/wso2/carbon/identity/action/management/model/ActionTypesTest.java b/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/java/org/wso2/carbon/identity/action/management/model/ActionTypesTest.java new file mode 100644 index 000000000000..aa9235210b83 --- /dev/null +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/java/org/wso2/carbon/identity/action/management/model/ActionTypesTest.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.action.management.model; + +import org.testng.Assert; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +/** + * Test class for ActionTypes. + */ +public class ActionTypesTest { + + @DataProvider + public Object[][] actionTypesProvider() { + + return new Object[][]{ + {Action.ActionTypes.PRE_ISSUE_ACCESS_TOKEN, "preIssueAccessToken", "PRE_ISSUE_ACCESS_TOKEN", + "Pre Issue Access Token", + "Configure an extension point for modifying access token via a custom service.", + Action.ActionTypes.Category.PRE_POST}, + {Action.ActionTypes.PRE_UPDATE_PASSWORD, "preUpdatePassword", "PRE_UPDATE_PASSWORD", + "Pre Update Password", + "Configure an extension point for modifying user password via a custom service.", + Action.ActionTypes.Category.PRE_POST}, + {Action.ActionTypes.PRE_UPDATE_PROFILE, "preUpdateProfile", "PRE_UPDATE_PROFILE", "Pre Update Profile", + "Configure an extension point for modifying user profile via a custom service.", + Action.ActionTypes.Category.PRE_POST}, + {Action.ActionTypes.PRE_REGISTRATION, "preRegistration", "PRE_REGISTRATION", "Pre Registration", + "Configure an extension point for modifying user registration via a custom service.", + Action.ActionTypes.Category.PRE_POST}, + {Action.ActionTypes.AUTHENTICATION, "authentication", "AUTHENTICATION", "Authentication", + "Configure an extension point for user authentication via a custom service.", + Action.ActionTypes.Category.IN_FLOW} + }; + } + + @Test(dataProvider = "actionTypesProvider") + public void testActionTypes(Action.ActionTypes actionType, String expectedPathParam, String expectedActionType, + String expectedDisplayName, String expectedDescription, + Action.ActionTypes.Category expectedCategory) { + + Assert.assertEquals(actionType.getPathParam(), expectedPathParam); + Assert.assertEquals(actionType.getActionType(), expectedActionType); + Assert.assertEquals(actionType.getDisplayName(), expectedDisplayName); + Assert.assertEquals(actionType.getDescription(), expectedDescription); + Assert.assertEquals(actionType.getCategory(), expectedCategory); + } + + @DataProvider + public Object[][] filterByCategoryProvider() { + + return new Object[][]{ + {Action.ActionTypes.Category.PRE_POST, + new Action.ActionTypes[]{Action.ActionTypes.PRE_ISSUE_ACCESS_TOKEN, + Action.ActionTypes.PRE_UPDATE_PASSWORD, Action.ActionTypes.PRE_UPDATE_PROFILE, + Action.ActionTypes.PRE_REGISTRATION}}, + {Action.ActionTypes.Category.IN_FLOW, new Action.ActionTypes[]{Action.ActionTypes.AUTHENTICATION}} + }; + } + + @Test(dataProvider = "filterByCategoryProvider") + public void testFilterByCategory(Action.ActionTypes.Category category, Action.ActionTypes[] expectedActionTypes) { + + Assert.assertEquals(Action.ActionTypes.filterByCategory(category), expectedActionTypes); + } +} + diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/dbscripts/h2.sql b/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/dbscripts/h2.sql index 4dc871f5af93..27aeb29ea26a 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/dbscripts/h2.sql +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/dbscripts/h2.sql @@ -605,6 +605,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/testng.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/testng.xml index ee23603f343b..60acc4cb2749 100644 --- a/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/testng.xml +++ b/components/action-mgt/org.wso2.carbon.identity.action.management/src/test/resources/testng.xml @@ -24,6 +24,7 @@ + diff --git a/components/action-mgt/pom.xml b/components/action-mgt/pom.xml index 3c073b86233e..1c87d3a0a08f 100644 --- a/components/action-mgt/pom.xml +++ b/components/action-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml index 7459d1f1c9b1..ecbd9935fb76 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml index a4567a47f5ef..9e3bd93e9a96 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml org.wso2.carbon.identity.api.resource.mgt diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/dao/impl/APIResourceManagementDAOImpl.java b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/dao/impl/APIResourceManagementDAOImpl.java index 30756faaf818..f69704d0abdd 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/dao/impl/APIResourceManagementDAOImpl.java +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/dao/impl/APIResourceManagementDAOImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com). + * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -273,6 +273,11 @@ public void updateAPIResource(APIResource apiResource, List addedScopes, preparedStatement.setString(4, apiResource.getId()); preparedStatement.executeUpdate(); + // If the API resource is a system API, set the tenant id to 0 since they are not tenant specific. + if (APIResourceManagementUtil.isSystemAPI(apiResource.getType())) { + tenantId = 0; + } + if (CollectionUtils.isNotEmpty(removedScopes)) { // Delete Scopes. deleteScopes(dbConnection, removedScopes, tenantId); diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/java/org/wso2/carbon/identity/api/resource/mgt/dao/APIResourceManagementDAOImplTest.java b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/java/org/wso2/carbon/identity/api/resource/mgt/dao/APIResourceManagementDAOImplTest.java index 9e29ca8fa7e2..bb8cad66fd6b 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/java/org/wso2/carbon/identity/api/resource/mgt/dao/APIResourceManagementDAOImplTest.java +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/java/org/wso2/carbon/identity/api/resource/mgt/dao/APIResourceManagementDAOImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com). + * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -27,6 +27,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import org.wso2.carbon.identity.api.resource.mgt.constant.APIResourceManagementConstants; import org.wso2.carbon.identity.api.resource.mgt.dao.impl.APIResourceManagementDAOImpl; import org.wso2.carbon.identity.application.common.model.APIResource; import org.wso2.carbon.identity.application.common.model.Scope; @@ -39,6 +40,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -54,6 +56,9 @@ public class APIResourceManagementDAOImplTest { private static final String DB_NAME = "api_resource_mgt_dao_db"; public static final String APIRESOURCE_IDENTIFIER = "testAPIResource identifier "; public static final String TEST_SCOPE_1 = "testScope1 "; + private static final String TENANT_TYPE = "TENANT"; + private static final String ORGANIZATION_TYPE = "ORGANIZATION"; + private static final String CONSOLE_ORG_LEVEL_TYPE = "CONSOLE_ORG_LEVEL"; private static final Map dataSourceMap = new HashMap<>(); private APIResourceManagementDAOImpl daoImpl; @@ -393,6 +398,51 @@ public void testDeleteScope() throws Exception { } + @DataProvider + public Object[][] updateAPIResourceScopeAddition() { + + return new Object[][]{ + {APIResourceManagementConstants.BUSINESS_TYPE}, + {APIResourceManagementConstants.SYSTEM_TYPE}, + {ORGANIZATION_TYPE}, + {TENANT_TYPE}, + {CONSOLE_ORG_LEVEL_TYPE} + }; + } + + @Test(dataProvider = "updateAPIResourceScopeAddition", priority = 14) + public void testUpdateAPIResourceScopeAddition(String type) throws Exception { + + // Add API resource to database. + String apiNamePostFix = "update-scope-addition-test"; + List scopes = new ArrayList<>(); + scopes.add(createScope("test_scope_1_" + apiNamePostFix)); + scopes.add(createScope("test_scope_2_" + apiNamePostFix)); + APIResource apiResource = addAPIResourceToDB(apiNamePostFix, scopes, type, getConnection(), TENANT_ID); + + // Validate scopes count before update. + validateScopesCount(apiResource.getId(), 2); + + try (MockedStatic identityDatabaseUtil = mockStatic(IdentityDatabaseUtil.class)) { + identityDatabaseUtil.when(() -> IdentityDatabaseUtil.getDBConnection(anyBoolean())) + .thenReturn(getConnection()); + Scope newScope = createScope("test_scope_3_" + apiNamePostFix); + apiResource.getScopes().add(newScope); + + List addedScopes = new ArrayList<>(); + addedScopes.add(newScope); + + // Update API resource with a new scope. + daoImpl.updateAPIResource(apiResource, addedScopes, Collections.emptyList(), TENANT_ID); + } + + // Validate updated scopes count. + validateScopesCount(apiResource.getId(), 3); + + // Delete API resource from database. + deleteAPIResourceFromDB(apiResource.getId(), TENANT_ID); + } + /** * Create scope with the given name. * @@ -431,6 +481,26 @@ private static APIResource createAPIResource(String postFix) { return apiResourceBuilder.build(); } + /** + * Create API resource with the given postfix, scopes and type. + * + * @param postFix Postfix to be appended to each API resource and scope information. + * @param scopes List of scopes. + * @param type API resource type. + * @return API resource. + */ + private static APIResource createAPIResource(String postFix, List scopes, String type) { + + APIResource.APIResourceBuilder apiResourceBuilder = new APIResource.APIResourceBuilder() + .name("Test API Resource Name " + postFix) + .identifier("/test/api/path/" + postFix) + .description("Test API Resource Description " + postFix) + .type(type) + .requiresAuthorization(true) + .scopes(scopes); + return apiResourceBuilder.build(); + } + /** * Add API resource to the database. * @@ -470,6 +540,74 @@ private APIResource addAPIResourceToDB(String namePostFix, Connection connection return daoImpl.addAPIResource(apiResource, tenantId); } + /** + * Add API resource to the database. + * + * @param namePostFix Postfix to be appended to each API resource and scope information. + * @param scopes List of scopes. + * @param type API resource type. + * @param connection Database connection. + * @param tenantId Tenant ID. + * @return API resource. + * @throws Exception Error when adding API resource. + */ + private APIResource addAPIResourceToDB(String namePostFix, List scopes, String type, Connection connection, + int tenantId) throws Exception { + + try (MockedStatic identityDatabaseUtil = mockStatic(IdentityDatabaseUtil.class)) { + APIResource apiResource = createAPIResource(namePostFix, scopes, type); + identityDatabaseUtil.when(() -> IdentityDatabaseUtil.getDBConnection(anyBoolean())).thenReturn(connection); + identityDatabaseUtil.when(() -> IdentityDatabaseUtil.commitTransaction(any(Connection.class))) + .thenAnswer((Answer) invocation -> { + connection.commit(); + return null; + }); + return daoImpl.addAPIResource(apiResource, tenantId); + } + + } + + /** + * Delete API resource from the database. + * + * @param apiId API resource ID. + * @param tenantId Tenant ID. + * @throws Exception Error when deleting API resource. + */ + private void deleteAPIResourceFromDB(String apiId, int tenantId) throws Exception { + + try (MockedStatic identityDatabaseUtil = mockStatic(IdentityDatabaseUtil.class)) { + Connection connection = getConnection(); + identityDatabaseUtil.when(() -> IdentityDatabaseUtil.getDBConnection(anyBoolean())).thenReturn(connection); + + identityDatabaseUtil.when(() -> IdentityDatabaseUtil.commitTransaction(any(Connection.class))) + .thenAnswer((Answer) invocation -> { + connection.commit(); + return null; + }); + daoImpl.deleteAPIResourceById(apiId, tenantId); + } + } + + /** + * Method to validate the number of scopes for a given API. + * + * @param apiId API resource ID. + * @param expectedNumberOfScopes Expected number of scopes. + * @throws Exception Error when validating scopes count. + */ + private void validateScopesCount(String apiId, int expectedNumberOfScopes) throws Exception { + + try (MockedStatic identityDatabaseUtil = mockStatic(IdentityDatabaseUtil.class)) { + identityDatabaseUtil.when(() -> IdentityDatabaseUtil.getDBConnection(anyBoolean())) + .thenReturn(getConnection()); + + List scopesList = daoImpl.getScopesByAPI(apiId, TENANT_ID); + Assert.assertNotNull(scopesList); + Assert.assertEquals(scopesList.size(), expectedNumberOfScopes); + } + } + private static Connection getConnection() throws SQLException { if (dataSourceMap.get(DB_NAME) != null) { diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/resources/dbscripts/h2.sql b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/resources/dbscripts/h2.sql index 66edbc6db4c3..2a4d6f774f6f 100644 --- a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/resources/dbscripts/h2.sql +++ b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/src/test/resources/dbscripts/h2.sql @@ -590,6 +590,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/components/api-resource-mgt/pom.xml b/components/api-resource-mgt/pom.xml index 0f2899fb2f2c..25af1d2154f3 100644 --- a/components/api-resource-mgt/pom.xml +++ b/components/api-resource-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml index 7a6fdba6af55..787e1f449dfb 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/FederatedAuthenticatorConfig.java b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/FederatedAuthenticatorConfig.java index 40ad2fb904b5..7805ecfd177f 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/FederatedAuthenticatorConfig.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/FederatedAuthenticatorConfig.java @@ -22,6 +22,7 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import java.io.Serializable; import java.util.ArrayList; @@ -63,6 +64,9 @@ public class FederatedAuthenticatorConfig implements Serializable { @XmlElement(name = "Tags") protected String[] tags; + @XmlElement(name = "DefinedBy") + protected DefinedByType definedByType; + public static FederatedAuthenticatorConfig build(OMElement federatedAuthenticatorConfigOM) { if (federatedAuthenticatorConfigOM == null) { @@ -101,9 +105,15 @@ public static FederatedAuthenticatorConfig build(OMElement federatedAuthenticato Property[] propertiesArr = propertiesArrList.toArray(new Property[propertiesArrList.size()]); federatedAuthenticatorConfig.setProperties(propertiesArr); } + } else if ("DefinedBy".equals(elementName)) { + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.valueOf(element.getText())); } } + if (federatedAuthenticatorConfig.getDefinedByType() == null) { + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); + } + return federatedAuthenticatorConfig; } @@ -230,4 +240,24 @@ public void setTags(String[] tagList) { tags = tagList; } + + /** + * Get the defined by type of the federated authenticator config. + * + * @return DefinedByType + */ + public DefinedByType getDefinedByType() { + + return definedByType; + } + + /** + * Set the defined by type of the federated authenticator config. + * + * @param type The defined by type of the federated authenticator config. + */ + public void setDefinedByType(DefinedByType type) { + + definedByType = type; + } } diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/LocalAuthenticatorConfig.java b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/LocalAuthenticatorConfig.java index cfe369a544e3..89e09a467774 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/LocalAuthenticatorConfig.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/LocalAuthenticatorConfig.java @@ -22,6 +22,7 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.base.IdentityConstants; import java.io.Serializable; @@ -63,6 +64,9 @@ public class LocalAuthenticatorConfig implements Serializable { @XmlElement(name = "Tags") protected String[] tags; + @XmlElement(name = "DefinedBy") + protected DefinedByType definedByType; + /* * * @@ -111,8 +115,15 @@ public static LocalAuthenticatorConfig build(OMElement localAuthenticatorConfigO Property[] propertiesArr = propertiesArrList.toArray(new Property[0]); localAuthenticatorConfig.setProperties(propertiesArr); } + } else if ("DefinedBy".equals(member.getLocalName())) { + localAuthenticatorConfig.setDefinedByType(DefinedByType.valueOf(member.getText())); } } + + if (localAuthenticatorConfig.getDefinedByType() == null) { + localAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); + } + return localAuthenticatorConfig; } @@ -224,4 +235,24 @@ public void setTags(String[] tagList) { tags = tagList; } + + /** + * Get the defined by type of the Local authenticator config. + * + * @return DefinedByType + */ + public DefinedByType getDefinedByType() { + + return definedByType; + } + + /** + * Set the defined by type of the Local authenticator config. + * + * @param type The defined by type of the local authenticator config. + */ + public void setDefinedByType(DefinedByType type) { + + definedByType = type; + } } diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/RequestPathAuthenticatorConfig.java b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/RequestPathAuthenticatorConfig.java index 0da3dc5a37a1..6e56cf90bade 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/RequestPathAuthenticatorConfig.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.common/src/main/java/org/wso2/carbon/identity/application/common/model/RequestPathAuthenticatorConfig.java @@ -20,6 +20,7 @@ import org.apache.axiom.om.OMElement; import org.apache.commons.collections.CollectionUtils; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants; import java.util.ArrayList; import java.util.Iterator; @@ -74,6 +75,10 @@ public static RequestPathAuthenticatorConfig build(OMElement requestPathAuthenti } } } + + // Since custom request path authenticators are not allowed, the definedBy type will always be set to SYSTEM. + requestPathAuthenticatorConfig.setDefinedByType(AuthenticatorPropertyConstants.DefinedByType.SYSTEM); + return requestPathAuthenticatorConfig; } diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml index 23f9b741be7b..ba380adf845c 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml index bdcbba767e25..a81f10f753fe 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml org.wso2.carbon.identity.application.mgt diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationConstants.java b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationConstants.java index 9ed1349fb742..727a4f3e4b54 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationConstants.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationConstants.java @@ -50,6 +50,7 @@ private ApplicationConstants() { public static final String IDP_NAME = "idpName"; public static final String IDP_AUTHENTICATOR_NAME = "authenticatorName"; public static final String IDP_AUTHENTICATOR_DISPLAY_NAME = "authenticatorDisplayName"; + public static final String IDP_AUTHENTICATOR_DEFINED_BY_TYPE = "definedByType"; public static final String APPLICATION_DOMAIN = "Application"; // Regex for validating application name. public static final String APP_NAME_VALIDATING_REGEX = "^[a-zA-Z0-9 ._-]*$"; diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationMgtDBQueries.java b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationMgtDBQueries.java index 70ffca50df7d..665a1423daef 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationMgtDBQueries.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/ApplicationMgtDBQueries.java @@ -289,7 +289,8 @@ public class ApplicationMgtDBQueries { "B.DISPLAY_NAME FROM IDP A JOIN IDP_AUTHENTICATOR B ON A.ID = B.IDP_ID WHERE B.ID =? AND ((A.TENANT_ID =?" + " AND B.TENANT_ID =?) OR (A.TENANT_ID=? AND A.NAME LIKE 'SHARED_%' AND B.TENANT_ID=?))"; public static final String STORE_LOCAL_AUTHENTICATOR = "INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME," + - "IS_ENABLED, DISPLAY_NAME) VALUES (?, (SELECT ID FROM IDP WHERE IDP.NAME=? AND IDP.TENANT_ID =?), ?, ?, ?)"; + "IS_ENABLED, DISPLAY_NAME, DEFINED_BY) " + + "VALUES (?, (SELECT ID FROM IDP WHERE IDP.NAME=? AND IDP.TENANT_ID =?), ?, ?, ?, ?)"; public static final String GET_SP_METADATA_BY_SP_ID = "SELECT ID, NAME, VALUE, DISPLAY_NAME FROM SP_METADATA " + "WHERE SP_ID = ?"; diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java index 94f128adbbbb..d1a2b0fa9b5b 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationDAOImpl.java @@ -77,6 +77,7 @@ import org.wso2.carbon.identity.application.mgt.dao.PaginatableFilterableApplicationDAO; import org.wso2.carbon.identity.application.mgt.internal.ApplicationManagementServiceComponent; import org.wso2.carbon.identity.application.mgt.internal.ApplicationManagementServiceComponentHolder; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.base.IdentityException; import org.wso2.carbon.identity.base.IdentityRuntimeException; import org.wso2.carbon.identity.core.CertificateRetrievingException; @@ -1571,7 +1572,8 @@ private void updateLocalAndOutboundAuthenticationConfiguration(int applicationId authenticatorId = addAuthenticator(connection, tenantID, ApplicationConstants.LOCAL_IDP_NAME, lclAuthenticator.getName(), - lclAuthenticator.getDisplayName()); + lclAuthenticator.getDisplayName(), + DefinedByType.SYSTEM.toString()); } if (authenticatorId > 0) { // ID, TENANT_ID, AUTHENTICATOR_ID @@ -3134,6 +3136,8 @@ private LocalAndOutboundAuthenticationConfig getLocalAndOutboundAuthenticationCo .get(ApplicationConstants.IDP_AUTHENTICATOR_NAME)); localAuthenticator.setDisplayName(authenticatorInfo .get(ApplicationConstants.IDP_AUTHENTICATOR_DISPLAY_NAME)); + localAuthenticator.setDefinedByType(DefinedByType.valueOf( + authenticatorInfo.get(ApplicationConstants.IDP_AUTHENTICATOR_DEFINED_BY_TYPE))); stepLocalAuth.get(step).add(localAuthenticator); } else { Map> stepFedIdps = stepFedIdPAuthenticators @@ -3152,6 +3156,8 @@ private LocalAndOutboundAuthenticationConfig getLocalAndOutboundAuthenticationCo .get(ApplicationConstants.IDP_AUTHENTICATOR_NAME)); fedAuthenticator.setDisplayName(authenticatorInfo .get(ApplicationConstants.IDP_AUTHENTICATOR_DISPLAY_NAME)); + fedAuthenticator.setDefinedByType(DefinedByType.valueOf( + authenticatorInfo.get(ApplicationConstants.IDP_AUTHENTICATOR_DEFINED_BY_TYPE))); idpAuths.add(fedAuthenticator); } @@ -5098,6 +5104,7 @@ private Map getAuthenticatorInfo(Connection conn, int tenantId, returnData.put(ApplicationConstants.IDP_AUTHENTICATOR_NAME, rs.getString(2)); returnData .put(ApplicationConstants.IDP_AUTHENTICATOR_DISPLAY_NAME, rs.getString(3)); + returnData.put(ApplicationConstants.IDP_AUTHENTICATOR_DEFINED_BY_TYPE, rs.getString(4)); } } finally { IdentityApplicationManagementUtil.closeStatement(prepStmt); @@ -5114,13 +5121,12 @@ private Map getAuthenticatorInfo(Connection conn, int tenantId, * @return * @throws SQLException */ - private int addAuthenticator(Connection conn, int tenantId, String idpName, - String authenticatorName, String authenticatorDispalyName) throws SQLException { + private int addAuthenticator(Connection conn, int tenantId, String idpName, String authenticatorName, + String authenticatorDispalyName, String definedByType) throws SQLException { int authenticatorId = -1; PreparedStatement prepStmt = null; ResultSet rs = null; - // TENANT_ID, IDP_ID, NAME,IS_ENABLED, DISPLAY_NAME String sqlStmt = ApplicationMgtDBQueries.STORE_LOCAL_AUTHENTICATOR; try { String dbProductName = conn.getMetaData().getDatabaseProductName(); @@ -5132,6 +5138,7 @@ private int addAuthenticator(Connection conn, int tenantId, String idpName, prepStmt.setString(4, authenticatorName); prepStmt.setString(5, "1"); prepStmt.setString(6, authenticatorDispalyName); + prepStmt.setString(7, definedByType); prepStmt.execute(); rs = prepStmt.getGeneratedKeys(); if (rs.next()) { diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationMgtDBQueries.java b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationMgtDBQueries.java index f59a91d5c78e..5cac2cfaffdd 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationMgtDBQueries.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/main/java/org/wso2/carbon/identity/application/mgt/dao/impl/ApplicationMgtDBQueries.java @@ -293,11 +293,12 @@ public class ApplicationMgtDBQueries { public static final String LOAD_IDP_AUTHENTICATOR_ID = "SELECT A.ID FROM IDP_AUTHENTICATOR A JOIN IDP B ON A" + ".IDP_ID= B.ID WHERE A.NAME =? AND B.NAME=? AND ((A.TENANT_ID =? AND B.TENANT_ID =?) OR (B.TENANT_ID=? " + "AND B.NAME LIKE 'SHARED_%'))"; - public static final String LOAD_IDP_AND_AUTHENTICATOR_NAMES = "SELECT A.NAME, B.NAME, " + - "B.DISPLAY_NAME FROM IDP A JOIN IDP_AUTHENTICATOR B ON A.ID = B.IDP_ID WHERE B.ID =? AND ((A.TENANT_ID =?" + + public static final String LOAD_IDP_AND_AUTHENTICATOR_NAMES = "SELECT A.NAME, B.NAME, B.DISPLAY_NAME," + + " B.DEFINED_BY FROM IDP A JOIN IDP_AUTHENTICATOR B ON A.ID = B.IDP_ID WHERE B.ID =? AND ((A.TENANT_ID =?" + " AND B.TENANT_ID =?) OR (A.TENANT_ID=? AND A.NAME LIKE 'SHARED_%' AND B.TENANT_ID=?))"; public static final String STORE_LOCAL_AUTHENTICATOR = "INSERT INTO IDP_AUTHENTICATOR (TENANT_ID, IDP_ID, NAME," + - "IS_ENABLED, DISPLAY_NAME) VALUES (?, (SELECT ID FROM IDP WHERE IDP.NAME=? AND IDP.TENANT_ID =?), ?, ?, ?)"; + "IS_ENABLED, DISPLAY_NAME, DEFINED_BY) VALUES " + + "(?, (SELECT ID FROM IDP WHERE IDP.NAME=? AND IDP.TENANT_ID =?), ?, ?, ?, ?)"; public static final String GET_SP_METADATA_BY_SP_ID = "SELECT ID, NAME, VALUE, DISPLAY_NAME FROM SP_METADATA " + "WHERE SP_ID = ?"; diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java index ee8bde5b7c0a..6b6d14fe6489 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/java/org/wso2/carbon/identity/application/mgt/ApplicationManagementServiceImplTest.java @@ -63,6 +63,7 @@ import org.wso2.carbon.identity.application.mgt.internal.ApplicationManagementServiceComponentHolder; import org.wso2.carbon.identity.application.mgt.provider.ApplicationPermissionProvider; import org.wso2.carbon.identity.application.mgt.provider.RegistryBasedApplicationPermissionProvider; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.common.testng.WithH2Database; import org.wso2.carbon.identity.common.testng.realm.InMemoryRealmService; import org.wso2.carbon.identity.common.testng.realm.MockUserStoreManager; @@ -105,6 +106,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.when; import static org.wso2.carbon.CarbonConstants.REGISTRY_SYSTEM_USERNAME; import static org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants.PlatformType; @@ -186,6 +188,8 @@ public void setup() throws RegistryException, UserStoreException, SecretManageme SecretDAO secretDAO = new SecretDAOImpl(); SecretManagerComponentDataHolder.getInstance().setSecretDAOS(Collections.singletonList(secretDAO)); CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME = false; + MockedStatic definedByType = mockStatic(DefinedByType.class); + definedByType.when(() -> DefinedByType.valueOf(anyString())).thenReturn(DefinedByType.SYSTEM); } @DataProvider(name = "addApplicationDataProvider") @@ -1335,10 +1339,12 @@ private void addApplicationConfigurations(ServiceProvider serviceProvider) { identityProvider.setIdentityProviderName(IDP_NAME_1); FederatedAuthenticatorConfig federatedAuthenticatorConfig = new FederatedAuthenticatorConfig(); federatedAuthenticatorConfig.setName("Federated authenticator"); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); identityProvider.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[] {federatedAuthenticatorConfig}); authenticationStep.setFederatedIdentityProviders(new IdentityProvider[]{identityProvider}); LocalAuthenticatorConfig localAuthenticatorConfig = new LocalAuthenticatorConfig(); + localAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); localAuthenticatorConfig.setName("Local authenticator"); authenticationStep.setLocalAuthenticatorConfigs(new LocalAuthenticatorConfig[]{localAuthenticatorConfig}); authenticationConfig.setAuthenticationSteps(new AuthenticationStep[]{authenticationStep}); @@ -1347,6 +1353,7 @@ private void addApplicationConfigurations(ServiceProvider serviceProvider) { // Request Path Authenticator Configuration. RequestPathAuthenticatorConfig requestPathAuthenticatorConfig = new RequestPathAuthenticatorConfig(); requestPathAuthenticatorConfig.setName("Request path authenticator"); + requestPathAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); serviceProvider.setRequestPathAuthenticatorConfigs(new RequestPathAuthenticatorConfig[]{ requestPathAuthenticatorConfig}); diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/resources/dbscripts/identity.sql b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/resources/dbscripts/identity.sql index 054399b42288..d3ab99469cbf 100644 --- a/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/resources/dbscripts/identity.sql +++ b/components/application-mgt/org.wso2.carbon.identity.application.mgt/src/test/resources/dbscripts/identity.sql @@ -603,6 +603,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index 22ae9d948c99..b0b6de343198 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml index db4d32b7a8f7..17daf23bdd93 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework authentication-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint/README.md b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint/README.md index f6fb12a1ea0c..1e19ad88e9f5 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint/README.md +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.endpoint/README.md @@ -1,5 +1,5 @@ # Source of the authenticationendpoint webapp is moved to the identity-apps repository. authenticationendpoint webapp related source is moved to the https://github.com/wso2/identity-apps repository and - the new source location is https://github.com/wso2/identity-apps/tree/master/java/apps/authentication-portal - \ No newline at end of file + the new source location is https://github.com/wso2/identity-apps/tree/master/identity-apps-core/apps/authentication-portal + diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml index 131fcfb50dd6..24b32fc91a43 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework authentication-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/ApplicationAuthenticator.java b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/ApplicationAuthenticator.java index 6c974a31d83b..fe89fd929b3d 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/ApplicationAuthenticator.java +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/ApplicationAuthenticator.java @@ -24,6 +24,7 @@ import org.wso2.carbon.identity.application.authentication.framework.exception.LogoutFailedException; import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatorData; import org.wso2.carbon.identity.application.common.model.Property; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import java.io.Serializable; import java.util.List; @@ -171,4 +172,13 @@ default String getI18nKey() { return StringUtils.EMPTY; } + /** + * Get the authenticator type. Default value will be SYSTEM. + * + * @return Authenticator Type. + */ + default DefinedByType getDefinedByType() { + + return DefinedByType.SYSTEM; + } } diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java index c781132f5f08..42ecadb98176 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/main/java/org/wso2/carbon/identity/application/authentication/framework/internal/FrameworkServiceComponent.java @@ -99,6 +99,7 @@ import org.wso2.carbon.identity.application.common.model.Property; import org.wso2.carbon.identity.application.common.model.RequestPathAuthenticatorConfig; import org.wso2.carbon.identity.application.mgt.ApplicationManagementService; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService; import org.wso2.carbon.identity.configuration.mgt.core.ConfigurationManager; import org.wso2.carbon.identity.core.handler.HandlerComparator; @@ -508,6 +509,7 @@ protected void setAuthenticator(ApplicationAuthenticator authenticator) { localAuthenticatorConfig.setTags(getTags(authenticator)); AuthenticatorConfig fileBasedConfig = getAuthenticatorConfig(authenticator.getName()); localAuthenticatorConfig.setEnabled(fileBasedConfig.isEnabled()); + localAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); ApplicationAuthenticatorService.getInstance().addLocalAuthenticator(localAuthenticatorConfig); } else if (authenticator instanceof FederatedApplicationAuthenticator) { FederatedAuthenticatorConfig federatedAuthenticatorConfig = new FederatedAuthenticatorConfig(); @@ -515,6 +517,7 @@ protected void setAuthenticator(ApplicationAuthenticator authenticator) { federatedAuthenticatorConfig.setProperties(configProperties); federatedAuthenticatorConfig.setDisplayName(authenticator.getFriendlyName()); federatedAuthenticatorConfig.setTags(getTags(authenticator)); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); ApplicationAuthenticatorService.getInstance().addFederatedAuthenticator(federatedAuthenticatorConfig); } else if (authenticator instanceof RequestPathApplicationAuthenticator) { RequestPathAuthenticatorConfig reqPathAuthenticatorConfig = new RequestPathAuthenticatorConfig(); @@ -524,6 +527,7 @@ protected void setAuthenticator(ApplicationAuthenticator authenticator) { reqPathAuthenticatorConfig.setTags(getTags(authenticator)); AuthenticatorConfig fileBasedConfig = getAuthenticatorConfig(authenticator.getName()); reqPathAuthenticatorConfig.setEnabled(fileBasedConfig.isEnabled()); + reqPathAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); ApplicationAuthenticatorService.getInstance().addRequestPathAuthenticator(reqPathAuthenticatorConfig); } diff --git a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/test/resources/dbScripts/h2.sql b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/test/resources/dbScripts/h2.sql index f985ed495cff..969862bd0bed 100644 --- a/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/test/resources/dbScripts/h2.sql +++ b/components/authentication-framework/org.wso2.carbon.identity.application.authentication.framework/src/test/resources/dbScripts/h2.sql @@ -571,6 +571,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/components/authentication-framework/pom.xml b/components/authentication-framework/pom.xml index bf219b262394..db4c9c39198b 100644 --- a/components/authentication-framework/pom.xml +++ b/components/authentication-framework/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml index 84c59523a93b..53d75c986a74 100644 --- a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml +++ b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework captcha-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/captcha-mgt/pom.xml b/components/captcha-mgt/pom.xml index c74a141bfcfe..0c330cf487b6 100644 --- a/components/captcha-mgt/pom.xml +++ b/components/captcha-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/carbon-authenticators/pom.xml b/components/carbon-authenticators/pom.xml index 2b1f990bc102..8adab43bdf9b 100644 --- a/components/carbon-authenticators/pom.xml +++ b/components/carbon-authenticators/pom.xml @@ -17,7 +17,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml b/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml index 2280871a5dd8..d247464b2eaf 100644 --- a/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml +++ b/components/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework thrift-authenticator - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/carbon-authenticators/thrift-authenticator/pom.xml b/components/carbon-authenticators/thrift-authenticator/pom.xml index 744ecc759501..fb4e49a6bbba 100644 --- a/components/carbon-authenticators/thrift-authenticator/pom.xml +++ b/components/carbon-authenticators/thrift-authenticator/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework carbon-authenticators - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml index 0fbacb0664ac..280ea8019842 100644 --- a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml +++ b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml @@ -21,7 +21,7 @@ central-logger org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/central-logger/pom.xml b/components/central-logger/pom.xml index 63cb834034b5..7af787332cb6 100644 --- a/components/central-logger/pom.xml +++ b/components/central-logger/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml index 5f2ac8be4ee4..b6ace0214018 100644 --- a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml index 59921c081eb3..0c3e8845a27d 100644 --- a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml index c807fada9353..fc226191b2e0 100644 --- a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml index 8b37b3d35159..71c98761fd54 100644 --- a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml +++ b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework claim-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/claim-mgt/pom.xml b/components/claim-mgt/pom.xml index 87281d0fa50a..742a4e0277d9 100644 --- a/components/claim-mgt/pom.xml +++ b/components/claim-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml index f30a6f981a07..47c6e61b8c06 100644 --- a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml +++ b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework client-attestation-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/client-attestation-mgt/pom.xml b/components/client-attestation-mgt/pom.xml index 2f6b10e1400e..bd4283d0c6a4 100644 --- a/components/client-attestation-mgt/pom.xml +++ b/components/client-attestation-mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml index ef85c4994f46..8d10ba8e428c 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml @@ -23,11 +23,11 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT org.wso2.carbon.identity.api.server.configuration.mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT jar WSO2 Carbon - Configuration Management API Identity Configuration Management API diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml index 5f4eb27eb2ba..13e6e6c71bd0 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml index 1470e6652f4a..2d23a95caac7 100644 --- a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml +++ b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/configuration-mgt/pom.xml b/components/configuration-mgt/pom.xml index ab1be96b5c5a..e4abfec46f48 100644 --- a/components/configuration-mgt/pom.xml +++ b/components/configuration-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml index 70e4e42b18bb..418b05fb3952 100644 --- a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml +++ b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/consent-mgt/pom.xml b/components/consent-mgt/pom.xml index 7da35388c3c5..9b4399b0de86 100644 --- a/components/consent-mgt/pom.xml +++ b/components/consent-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml b/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml index fd54b2ef639b..7933702f722d 100644 --- a/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml +++ b/components/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-server-configs-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/consent-server-configs-mgt/pom.xml b/components/consent-server-configs-mgt/pom.xml index c6469d7c78d2..f567f785a8c5 100644 --- a/components/consent-server-configs-mgt/pom.xml +++ b/components/consent-server-configs-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml b/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml index 37e0a48f8e65..0e103fc7b746 100644 --- a/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml +++ b/components/cors-mgt/org.wso2.carbon.identity.cors.mgt.core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework cors-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/cors-mgt/pom.xml b/components/cors-mgt/pom.xml index dda09527558c..a4b4189c3464 100644 --- a/components/cors-mgt/pom.xml +++ b/components/cors-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml index 0bc8c71f9bca..170f63a90c4d 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml index 3f401e1e9862..27fffaef4660 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml b/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml index 8a2155685552..9654961d0798 100644 --- a/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml +++ b/components/directory-server-manager/org.wso2.carbon.directory.server.manager/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/directory-server-manager/pom.xml b/components/directory-server-manager/pom.xml index 9016f116fb2a..cf29f8ba1c15 100644 --- a/components/directory-server-manager/pom.xml +++ b/components/directory-server-manager/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/entitlement/org.wso2.carbon.identity.api.server.entitlement/pom.xml b/components/entitlement/org.wso2.carbon.identity.api.server.entitlement/pom.xml index ce57298f263d..50091c324474 100644 --- a/components/entitlement/org.wso2.carbon.identity.api.server.entitlement/pom.xml +++ b/components/entitlement/org.wso2.carbon.identity.api.server.entitlement/pom.xml @@ -23,11 +23,11 @@ org.wso2.carbon.identity.framework entitlement - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT org.wso2.carbon.identity.api.server.entitlement - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT WSO2 Carbon - Entitlement REST API jar diff --git a/components/entitlement/org.wso2.carbon.identity.entitlement.common/pom.xml b/components/entitlement/org.wso2.carbon.identity.entitlement.common/pom.xml index 39eef0ed1a66..070f167609df 100644 --- a/components/entitlement/org.wso2.carbon.identity.entitlement.common/pom.xml +++ b/components/entitlement/org.wso2.carbon.identity.entitlement.common/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework entitlement - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/entitlement/org.wso2.carbon.identity.entitlement.endpoint/pom.xml b/components/entitlement/org.wso2.carbon.identity.entitlement.endpoint/pom.xml index 06abd2705351..25536e977d8b 100644 --- a/components/entitlement/org.wso2.carbon.identity.entitlement.endpoint/pom.xml +++ b/components/entitlement/org.wso2.carbon.identity.entitlement.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework entitlement ../pom.xml - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT org.wso2.carbon.identity.entitlement.endpoint diff --git a/components/entitlement/org.wso2.carbon.identity.entitlement.ui/pom.xml b/components/entitlement/org.wso2.carbon.identity.entitlement.ui/pom.xml index 1f39b666ae91..c11ffa8e77af 100644 --- a/components/entitlement/org.wso2.carbon.identity.entitlement.ui/pom.xml +++ b/components/entitlement/org.wso2.carbon.identity.entitlement.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework entitlement - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/entitlement/org.wso2.carbon.identity.entitlement/pom.xml b/components/entitlement/org.wso2.carbon.identity.entitlement/pom.xml index cbbe2e5730ba..f6f27a15f10e 100644 --- a/components/entitlement/org.wso2.carbon.identity.entitlement/pom.xml +++ b/components/entitlement/org.wso2.carbon.identity.entitlement/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework entitlement - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/entitlement/org.wso2.carbon.identity.entitlement/src/test/resources/dbscripts/h2.sql b/components/entitlement/org.wso2.carbon.identity.entitlement/src/test/resources/dbscripts/h2.sql index aa0c8893b4f6..c0c91f9af429 100644 --- a/components/entitlement/org.wso2.carbon.identity.entitlement/src/test/resources/dbscripts/h2.sql +++ b/components/entitlement/org.wso2.carbon.identity.entitlement/src/test/resources/dbscripts/h2.sql @@ -593,6 +593,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/components/entitlement/pom.xml b/components/entitlement/pom.xml index 5394ce283fde..0251793b05b4 100644 --- a/components/entitlement/pom.xml +++ b/components/entitlement/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml b/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml index 8f3f7fb9418a..d85054593e9d 100644 --- a/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml +++ b/components/extension-mgt/org.wso2.carbon.identity.extension.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework extension-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/extension-mgt/pom.xml b/components/extension-mgt/pom.xml index 6755d74e1b56..94d6aac073a6 100644 --- a/components/extension-mgt/pom.xml +++ b/components/extension-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml index bbfa013ae0dd..b2ecd6498768 100644 --- a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml +++ b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui/pom.xml @@ -21,7 +21,7 @@ functions-library-mgt org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml index 546dcf4c6fd0..e8969e995290 100644 --- a/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml +++ b/components/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt/pom.xml @@ -21,7 +21,7 @@ functions-library-mgt org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/functions-library-mgt/pom.xml b/components/functions-library-mgt/pom.xml index f00ce9671ef3..659f4a1a5e94 100644 --- a/components/functions-library-mgt/pom.xml +++ b/components/functions-library-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.base/pom.xml b/components/identity-core/org.wso2.carbon.identity.base/pom.xml index 78466dc6b381..ac40dfda8c84 100644 --- a/components/identity-core/org.wso2.carbon.identity.base/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.base/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-core - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.base/src/main/java/org/wso2/carbon/identity/base/AuthenticatorPropertyConstants.java b/components/identity-core/org.wso2.carbon.identity.base/src/main/java/org/wso2/carbon/identity/base/AuthenticatorPropertyConstants.java new file mode 100644 index 000000000000..ccae8236b777 --- /dev/null +++ b/components/identity-core/org.wso2.carbon.identity.base/src/main/java/org/wso2/carbon/identity/base/AuthenticatorPropertyConstants.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.wso2.carbon.identity.base; + +public class AuthenticatorPropertyConstants { + + /** + * The Defined by Types - SYSTEM: system define authenticator, USER: user defined authentication extension. + */ + public static enum DefinedByType { + + SYSTEM, + USER + } +} diff --git a/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml b/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml index ac05dd3a579f..8bc2885cf2f6 100644 --- a/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.core.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-core/org.wso2.carbon.identity.core/pom.xml b/components/identity-core/org.wso2.carbon.identity.core/pom.xml index d3e2b9dca2a8..94e7931d0072 100644 --- a/components/identity-core/org.wso2.carbon.identity.core/pom.xml +++ b/components/identity-core/org.wso2.carbon.identity.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-core - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-core/pom.xml b/components/identity-core/pom.xml index f2c17f6f5d42..9909b3213ee5 100644 --- a/components/identity-core/pom.xml +++ b/components/identity-core/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/identity-event/org.wso2.carbon.identity.event/pom.xml b/components/identity-event/org.wso2.carbon.identity.event/pom.xml index e432b9661229..980af9b47136 100644 --- a/components/identity-event/org.wso2.carbon.identity.event/pom.xml +++ b/components/identity-event/org.wso2.carbon.identity.event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-event/pom.xml b/components/identity-event/pom.xml index 6090301fc7b0..ae99804015ed 100644 --- a/components/identity-event/pom.xml +++ b/components/identity-event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml index 4663432ca757..c9734a1f6960 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.endpoint.util/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml index 60c5b33ce647..4af639d2268d 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt.ui/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml b/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml index 7783dd5cd5ca..fa3df9ae123e 100644 --- a/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml +++ b/components/identity-mgt/org.wso2.carbon.identity.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/identity-mgt/pom.xml b/components/identity-mgt/pom.xml index e6d389873275..09d38f714ef3 100644 --- a/components/identity-mgt/pom.xml +++ b/components/identity-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml index cbb6f241bd93..a5d682f1d035 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml index 2470c3ecc03a..2ac841056825 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-provider-management - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/IdentityProviderManager.java b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/IdentityProviderManager.java index c383da9a34ff..19734a66cc28 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/IdentityProviderManager.java +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/IdentityProviderManager.java @@ -18,15 +18,12 @@ package org.wso2.carbon.idp.mgt; -import org.apache.axiom.om.util.Base64; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.wso2.carbon.context.PrivilegedCarbonContext; -import org.wso2.carbon.core.util.KeyStoreManager; import org.wso2.carbon.identity.application.common.ApplicationAuthenticatorService; import org.wso2.carbon.identity.application.common.ProvisioningConnectorService; import org.wso2.carbon.identity.application.common.model.ClaimConfig; @@ -43,10 +40,9 @@ import org.wso2.carbon.identity.application.common.model.SubProperty; import org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants; import org.wso2.carbon.identity.application.common.util.IdentityApplicationManagementUtil; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.base.IdentityConstants; import org.wso2.carbon.identity.base.IdentityException; -import org.wso2.carbon.identity.core.ServiceURLBuilder; -import org.wso2.carbon.identity.core.URLBuilderException; import org.wso2.carbon.identity.core.model.ExpressionNode; import org.wso2.carbon.identity.core.model.FilterTreeBuilder; import org.wso2.carbon.identity.core.model.Node; @@ -70,15 +66,8 @@ import org.wso2.carbon.user.api.UserStoreManager; import org.wso2.carbon.user.core.UserCoreConstants; import org.wso2.carbon.utils.multitenancy.MultitenantConstants; -import org.wso2.carbon.utils.security.KeystoreUtils; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.security.KeyStore; -import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; import java.sql.Connection; import java.util.ArrayList; import java.util.Arrays; @@ -89,7 +78,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; import javax.xml.stream.XMLStreamException; @@ -171,6 +159,7 @@ public void addResidentIdP(IdentityProvider identityProvider, String tenantDomai if (saml2SSOResidentAuthenticatorConfig == null) { saml2SSOResidentAuthenticatorConfig = new FederatedAuthenticatorConfig(); saml2SSOResidentAuthenticatorConfig.setName(IdentityApplicationConstants.Authenticator.SAML2SSO.NAME); + saml2SSOResidentAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); } if (saml2SSOResidentAuthenticatorConfig.getProperties() == null) { saml2SSOResidentAuthenticatorConfig.setProperties(new Property[0]); @@ -255,6 +244,7 @@ public void addResidentIdP(IdentityProvider identityProvider, String tenantDomai FederatedAuthenticatorConfig oidcAuthenticationConfig = new FederatedAuthenticatorConfig(); oidcAuthenticationConfig.setProperties(new Property[]{oidcProperty}); oidcAuthenticationConfig.setName(IdentityApplicationConstants.Authenticator.OIDC.NAME); + oidcAuthenticationConfig.setDefinedByType(DefinedByType.SYSTEM); Property passiveStsProperty = new Property(); passiveStsProperty.setName(IdentityApplicationConstants.Authenticator.PassiveSTS.IDENTITY_PROVIDER_ENTITY_ID); @@ -263,6 +253,7 @@ public void addResidentIdP(IdentityProvider identityProvider, String tenantDomai FederatedAuthenticatorConfig passiveStsAuthenticationConfig = new FederatedAuthenticatorConfig(); passiveStsAuthenticationConfig.setProperties(new Property[]{passiveStsProperty}); passiveStsAuthenticationConfig.setName(IdentityApplicationConstants.Authenticator.PassiveSTS.NAME); + passiveStsAuthenticationConfig.setDefinedByType(DefinedByType.SYSTEM); FederatedAuthenticatorConfig[] federatedAuthenticatorConfigs = {saml2SSOResidentAuthenticatorConfig, passiveStsAuthenticationConfig, oidcAuthenticationConfig}; @@ -1532,6 +1523,7 @@ public IdentityProvider addIdPWithResourceId(IdentityProvider identityProvider, } handleMetadata(tenantId, identityProvider); + resolveAuthenticatorDefinedByProperty(identityProvider, true); String resourceId = dao.addIdP(identityProvider, tenantId, tenantDomain); identityProvider = dao.getIdPByResourceId(resourceId, tenantId, tenantDomain); @@ -1881,6 +1873,7 @@ private void updateIDP(IdentityProvider currentIdentityProvider, IdentityProvide validateIdPIssuerName(currentIdentityProvider, newIdentityProvider, tenantId, tenantDomain); handleMetadata(tenantId, newIdentityProvider); + resolveAuthenticatorDefinedByProperty(newIdentityProvider, false); dao.updateIdP(newIdentityProvider, currentIdentityProvider, tenantId, tenantDomain); } @@ -2666,4 +2659,28 @@ private boolean isAnOTPLengthConfig(IdentityProviderProperty property) { } return false; } + + private void resolveAuthenticatorDefinedByProperty(IdentityProvider idp, boolean isNewFederatedAuthenticator) { + + /* For new federated authenticators: If 'definedByType' is null, set it to default to SYSTEM. */ + if (isNewFederatedAuthenticator) { + for (FederatedAuthenticatorConfig federatedAuthConfig : idp.getFederatedAuthenticatorConfigs()) { + if (federatedAuthConfig.getDefinedByType() == null) { + federatedAuthConfig.setDefinedByType(DefinedByType.SYSTEM); + } + } + } + + /* For existing federated authenticators, disregard any value provided in the request payload. + Instead, resolve and retrieve the 'definedBy' type of the corresponding existing authenticator. + If the authenticator config is present in the ApplicationAuthenticatorService list, return its type, + if not return USER. */ + for (FederatedAuthenticatorConfig federatedAuthConfig : idp.getFederatedAuthenticatorConfigs()) { + if (federatedAuthConfig.getDefinedByType() == null) { + FederatedAuthenticatorConfig authenticatorConfig = ApplicationAuthenticatorService.getInstance() + .getFederatedAuthenticatorByName(federatedAuthConfig.getName()); + federatedAuthConfig.setDefinedByType(authenticatorConfig.getDefinedByType()); + } + } + } } diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAO.java b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAO.java index 3c382c249765..a6ee6a7b45c2 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAO.java +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAO.java @@ -44,6 +44,7 @@ import org.wso2.carbon.identity.application.common.model.RoleMapping; import org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants; import org.wso2.carbon.identity.application.common.util.IdentityApplicationManagementUtil; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.base.IdentityConstants; import org.wso2.carbon.identity.core.ConnectorConfig; import org.wso2.carbon.identity.core.ConnectorException; @@ -1148,6 +1149,7 @@ private FederatedAuthenticatorConfig[] getFederatedAuthenticatorConfigs( } authnConfig.setDisplayName(rs.getString("DISPLAY_NAME")); + authnConfig.setDefinedByType(DefinedByType.valueOf(rs.getString("DEFINED_BY"))); if (defaultAuthName != null && authnConfig.getName().equals(defaultAuthName)) { federatedIdp.getDefaultAuthenticatorConfig().setDisplayName(authnConfig.getDisplayName()); @@ -1424,6 +1426,7 @@ public void addFederatedAuthenticatorConfig(FederatedAuthenticatorConfig authnCo } prepStmt1.setString(4, authnConfig.getName()); prepStmt1.setString(5, authnConfig.getDisplayName()); + prepStmt1.setString(6, authnConfig.getDefinedByType().toString()); prepStmt1.execute(); int authnId = getAuthenticatorIdentifier(dbConnection, idpId, authnConfig.getName()); @@ -2330,6 +2333,7 @@ private FederatedAuthenticatorConfig buildSAMLProperties(IdentityProvider identi if (samlFederatedAuthConfig == null) { samlFederatedAuthConfig = new FederatedAuthenticatorConfig(); samlFederatedAuthConfig.setName(IdentityApplicationConstants.Authenticator.SAML2SSO.NAME); + samlFederatedAuthConfig.setDefinedByType(DefinedByType.SYSTEM); } List propertiesList = new ArrayList<>(); @@ -2713,6 +2717,7 @@ private void fillResidentIdpProperties(IdentityProvider identityProvider, String if (openIdFedAuthn == null) { openIdFedAuthn = new FederatedAuthenticatorConfig(); openIdFedAuthn.setName(IdentityApplicationConstants.Authenticator.OpenID.NAME); + openIdFedAuthn.setDefinedByType(DefinedByType.SYSTEM); } propertiesList = new ArrayList<>(Arrays.asList(openIdFedAuthn.getProperties())); if (IdentityApplicationManagementUtil.getProperty(openIdFedAuthn.getProperties(), @@ -2735,6 +2740,7 @@ private void fillResidentIdpProperties(IdentityProvider identityProvider, String if (oauth1FedAuthn == null) { oauth1FedAuthn = new FederatedAuthenticatorConfig(); oauth1FedAuthn.setName(IdentityApplicationConstants.OAuth10A.NAME); + oauth1FedAuthn.setDefinedByType(DefinedByType.SYSTEM); } propertiesList = new ArrayList<>(Arrays.asList(oauth1FedAuthn.getProperties())); if (IdentityApplicationManagementUtil.getProperty(oauth1FedAuthn.getProperties(), @@ -2770,6 +2776,7 @@ private void fillResidentIdpProperties(IdentityProvider identityProvider, String if (oidcFedAuthn == null) { oidcFedAuthn = new FederatedAuthenticatorConfig(); oidcFedAuthn.setName(IdentityApplicationConstants.Authenticator.OIDC.NAME); + oidcFedAuthn.setDefinedByType(DefinedByType.SYSTEM); } propertiesList = new ArrayList<>(); @@ -2841,6 +2848,7 @@ private void fillResidentIdpProperties(IdentityProvider identityProvider, String if (passiveSTSFedAuthn == null) { passiveSTSFedAuthn = new FederatedAuthenticatorConfig(); passiveSTSFedAuthn.setName(IdentityApplicationConstants.Authenticator.PassiveSTS.NAME); + passiveSTSFedAuthn.setDefinedByType(DefinedByType.SYSTEM); } propertiesList = new ArrayList<>(); @@ -2880,6 +2888,7 @@ private void fillResidentIdpProperties(IdentityProvider identityProvider, String if (stsFedAuthn == null) { stsFedAuthn = new FederatedAuthenticatorConfig(); stsFedAuthn.setName(IdentityApplicationConstants.Authenticator.WSTrust.NAME); + stsFedAuthn.setDefinedByType(DefinedByType.SYSTEM); } propertiesList = new ArrayList<>(Arrays.asList(stsFedAuthn.getProperties())); if (IdentityApplicationManagementUtil.getProperty(stsFedAuthn.getProperties(), @@ -2894,6 +2903,7 @@ private void fillResidentIdpProperties(IdentityProvider identityProvider, String FederatedAuthenticatorConfig sessionTimeoutConfig = new FederatedAuthenticatorConfig(); sessionTimeoutConfig.setName(IdentityApplicationConstants.NAME); + sessionTimeoutConfig.setDefinedByType(DefinedByType.SYSTEM); propertiesList = new ArrayList<>(Arrays.asList(sessionTimeoutConfig.getProperties())); @@ -3409,6 +3419,7 @@ public IdentityProvider getIdPByAuthenticatorPropertyValue(Connection dbConnecti String roleClaimUri = rs.getString("ROLE_CLAIM_URI"); String defaultAuthenticatorName = rs.getString("DEFAULT_AUTHENTICATOR_NAME"); + String defaultAuthenticatorDefinedByType = rs.getString("DEFINED_BY"); String defaultProvisioningConnectorConfigName = rs.getString("DEFAULT_PRO_CONNECTOR_NAME"); federatedIdp.setIdentityProviderDescription(rs.getString("DESCRIPTION")); @@ -3443,6 +3454,8 @@ public IdentityProvider getIdPByAuthenticatorPropertyValue(Connection dbConnecti if (defaultAuthenticatorName != null) { FederatedAuthenticatorConfig defaultAuthenticator = new FederatedAuthenticatorConfig(); defaultAuthenticator.setName(defaultAuthenticatorName); + defaultAuthenticator.setDefinedByType(DefinedByType.valueOf( + defaultAuthenticatorDefinedByType)); federatedIdp.setDefaultAuthenticatorConfig(defaultAuthenticator); } diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/util/IdPManagementConstants.java b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/util/IdPManagementConstants.java index 0cfbadd94eac..16123d426568 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/util/IdPManagementConstants.java +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/main/java/org/wso2/carbon/idp/mgt/util/IdPManagementConstants.java @@ -235,7 +235,7 @@ public static class SQLQueries { public static final String GET_IDP_ID_BY_NAME_SQL = "SELECT ID " + "FROM IDP WHERE TENANT_ID=? AND NAME=?"; - public static final String GET_ALL_IDP_AUTH_SQL = "SELECT ID, NAME, IS_ENABLED, DISPLAY_NAME FROM " + + public static final String GET_ALL_IDP_AUTH_SQL = "SELECT ID, NAME, IS_ENABLED, DISPLAY_NAME, DEFINED_BY FROM " + "IDP_AUTHENTICATOR WHERE IDP_ID = ?"; public static final String GET_IDP_AUTH_SQL = "SELECT ID FROM IDP_AUTHENTICATOR WHERE IDP_ID = ? AND NAME = ?"; @@ -357,7 +357,7 @@ public static class SQLQueries { public static final String TRUSTED_TOKEN_ISSUER_FILTER_SQL = "IDP_METADATA.\"VALUE\" = 'true' AND "; public static final String ADD_IDP_AUTH_SQL = "INSERT INTO IDP_AUTHENTICATOR " + - "(IDP_ID, TENANT_ID, IS_ENABLED, NAME, DISPLAY_NAME) VALUES (?,?,?,?,?)"; + "(IDP_ID, TENANT_ID, IS_ENABLED, NAME, DISPLAY_NAME, DEFINED_BY) VALUES (?,?,?,?,?,?)"; public static final String DELETE_IDP_AUTH_SQL = "DELETE FROM IDP_AUTHENTICATOR WHERE IDP_ID=? AND NAME=?"; @@ -448,7 +448,8 @@ public static class SQLQueries { "idp.ROLE_CLAIM_URI, idp.DEFAULT_AUTHENTICATOR_NAME, idp.DEFAULT_PRO_CONNECTOR_NAME, " + "idp.DESCRIPTION, " + "idp.IS_FEDERATION_HUB, idp.IS_LOCAL_CLAIM_DIALECT, idp.PROVISIONING_ROLE, idp.IS_ENABLED, " + - "idp.DISPLAY_NAME " + + "idp.DISPLAY_NAME, " + + "idp_auth.DEFINED_BY " + "FROM IDP idp INNER JOIN IDP_AUTHENTICATOR idp_auth ON idp.ID = idp_auth.IDP_ID INNER JOIN " + "IDP_AUTHENTICATOR_PROPERTY idp_auth_pro ON idp_auth.ID = idp_auth_pro.AUTHENTICATOR_ID " + "WHERE idp_auth_pro.PROPERTY_KEY =? AND idp_auth_pro.PROPERTY_VALUE = ? AND idp_auth_pro.TENANT_ID =?"; @@ -460,7 +461,8 @@ public static class SQLQueries { "idp.ROLE_CLAIM_URI, idp.DEFAULT_AUTHENTICATOR_NAME, idp.DEFAULT_PRO_CONNECTOR_NAME, " + "idp.DESCRIPTION, " + "idp.IS_FEDERATION_HUB, idp.IS_LOCAL_CLAIM_DIALECT, idp.PROVISIONING_ROLE, idp.IS_ENABLED, " + - "idp.DISPLAY_NAME " + + "idp.DISPLAY_NAME, " + + "idp_auth.DEFINED_BY " + "FROM IDP idp INNER JOIN IDP_AUTHENTICATOR idp_auth ON idp.ID = idp_auth.IDP_ID INNER JOIN " + "IDP_AUTHENTICATOR_PROPERTY idp_auth_pro ON idp_auth.ID = idp_auth_pro.AUTHENTICATOR_ID " + "WHERE idp_auth_pro.PROPERTY_KEY =? AND idp_auth_pro.PROPERTY_VALUE = ? AND idp_auth_pro.TENANT_ID " + diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/IdentityProviderManagementServiceTest.java b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/IdentityProviderManagementServiceTest.java index a9c3a7926b21..1177c8f361e4 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/IdentityProviderManagementServiceTest.java +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/IdentityProviderManagementServiceTest.java @@ -37,6 +37,7 @@ import org.wso2.carbon.identity.application.common.model.ProvisioningConnectorConfig; import org.wso2.carbon.identity.application.common.model.RoleMapping; import org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementServiceImpl; import org.wso2.carbon.identity.claim.metadata.mgt.exception.ClaimMetadataException; import org.wso2.carbon.identity.claim.metadata.mgt.model.LocalClaim; @@ -132,6 +133,7 @@ public Object[][] addIdPData() { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); @@ -203,6 +205,9 @@ public void testAddIdP(Object identityProvider) throws Exception { identityProviderManagementService.addIdP(((IdentityProvider) identityProvider)); IdentityProvider idpFromDb = identityProviderManagementService.getIdPByName(idpName); + for (FederatedAuthenticatorConfig config: idpFromDb.getFederatedAuthenticatorConfigs()) { + Assert.assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } Assert.assertEquals(idpFromDb.getIdentityProviderName(), idpName); } @@ -252,6 +257,9 @@ public void testGetIdPByName(String idpName) throws Exception { addTestIdps(); IdentityProvider idpFromDb = identityProviderManagementService.getIdPByName(idpName); + for (FederatedAuthenticatorConfig config: idpFromDb.getFederatedAuthenticatorConfigs()) { + Assert.assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } Assert.assertEquals(idpFromDb.getIdentityProviderName(), idpName); } @@ -557,6 +565,7 @@ public Object[][] updateIdPData() { newFederatedAuthenticatorConfig.setDisplayName("DisplayName1New"); newFederatedAuthenticatorConfig.setName("Name"); newFederatedAuthenticatorConfig.setEnabled(true); + newFederatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property newProperty1 = new Property(); newProperty1.setName("Property1New"); newProperty1.setValue("value1New"); @@ -617,7 +626,11 @@ public void testUpdateIdP(String oldIdpName, Object newIdp) throws Exception { String newIdpName = ((IdentityProvider) newIdp).getIdentityProviderName(); Assert.assertNull(identityProviderManagementService.getIdPByName(oldIdpName)); - Assert.assertNotNull(identityProviderManagementService.getIdPByName(newIdpName)); + IdentityProvider newIdpFromDb = identityProviderManagementService.getIdPByName(newIdpName); + Assert.assertNotNull(newIdpFromDb); + for (FederatedAuthenticatorConfig config: newIdpFromDb.getFederatedAuthenticatorConfigs()) { + Assert.assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } } @Test(dataProvider = "updateIdPData") @@ -630,7 +643,11 @@ public void testUpdateIdPByResourceId(String oldIdpName, Object newIdp) throws E String newIdpName = ((IdentityProvider) newIdp).getIdentityProviderName(); Assert.assertNull(identityProviderManagementService.getIdPByName(oldIdpName)); - Assert.assertNotNull(identityProviderManagementService.getIdPByName(newIdpName)); + IdentityProvider newIdpFromDb = identityProviderManagementService.getIdPByName(newIdpName); + Assert.assertNotNull(newIdpFromDb); + for (FederatedAuthenticatorConfig config: newIdpFromDb.getFederatedAuthenticatorConfigs()) { + Assert.assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } } @DataProvider @@ -694,6 +711,7 @@ public void testGetAllFederatedAuthenticators() throws Exception { identityProviderManagementService.getAllFederatedAuthenticators(); Assert.assertEquals(allFederatedAuthenticators.length, 0); + FederatedAuthenticatorConfig federatedAuthenticatorConfig1 = mock(FederatedAuthenticatorConfig.class); federatedAuthenticatorConfig1.setDisplayName("DisplayName1"); federatedAuthenticatorConfig1.setName("Name1"); @@ -796,6 +814,7 @@ public Object[][] updateResidentIdPData() { facNew.setDisplayName("DisplayName1New"); facNew.setName("Name"); facNew.setEnabled(true); + facNew.setDefinedByType(DefinedByType.SYSTEM); idp2New.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[]{facNew}); // Initialize New Resident Identity Provider 3. @@ -893,6 +912,7 @@ public void testGetResidentIDPMetadata() throws Exception { facNew.setDisplayName("SAML2SSO"); facNew.setName("saml2sso"); facNew.setEnabled(true); + facNew.setDefinedByType(DefinedByType.SYSTEM); newIdp.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[]{facNew}); identityProviderManagementService.updateResidentIdP((IdentityProvider) newIdp); @@ -915,6 +935,7 @@ public void testGetResidentIDPMetadataException() throws Exception { facNew.setDisplayName("SAML2SSO"); facNew.setName("saml2sso"); facNew.setEnabled(true); + facNew.setDefinedByType(DefinedByType.SYSTEM); newIdp.setFederatedAuthenticatorConfigs(new FederatedAuthenticatorConfig[]{facNew}); identityProviderManagementService.updateResidentIdP((IdentityProvider) newIdp); @@ -950,6 +971,7 @@ private void addTestIdps() throws IdentityProviderManagementException { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); @@ -1103,6 +1125,7 @@ private IdentityProvider addIdPDataWithSameIdpEntityId(String idpName) { federatedAuthenticatorConfig.setDisplayName("DisplayName"); federatedAuthenticatorConfig.setName("SAMLSSOAuthenticator"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("SPEntityId"); property1.setValue("wso2-is"); diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/CacheBackedIdPMgtDAOTest.java b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/CacheBackedIdPMgtDAOTest.java index 853052a55842..6c5aad2fa985 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/CacheBackedIdPMgtDAOTest.java +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/CacheBackedIdPMgtDAOTest.java @@ -39,6 +39,7 @@ import org.wso2.carbon.identity.application.common.model.Property; import org.wso2.carbon.identity.application.common.model.ProvisioningConnectorConfig; import org.wso2.carbon.identity.application.common.model.RoleMapping; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.core.model.ExpressionNode; import org.wso2.carbon.identity.core.util.IdentityDatabaseUtil; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; @@ -47,7 +48,6 @@ import org.wso2.carbon.identity.secret.mgt.core.SecretsProcessor; import org.wso2.carbon.idp.mgt.IdentityProviderManagementClientException; import org.wso2.carbon.idp.mgt.IdentityProviderManagementException; -import org.wso2.carbon.idp.mgt.cache.IdPCacheByAuthProperty; import org.wso2.carbon.idp.mgt.cache.IdPCacheByHRI; import org.wso2.carbon.idp.mgt.cache.IdPCacheByMetadataProperty; import org.wso2.carbon.idp.mgt.cache.IdPCacheByName; @@ -742,6 +742,7 @@ public Object[][] addIdPData() { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); @@ -845,6 +846,7 @@ public Object[][] updateIdPData() { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); @@ -902,6 +904,7 @@ public Object[][] updateIdPData() { newFederatedAuthenticatorConfig.setDisplayName("DisplayName1New"); newFederatedAuthenticatorConfig.setName("Name"); newFederatedAuthenticatorConfig.setEnabled(true); + newFederatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1New = new Property(); property1New.setName("Property1New"); property1New.setValue("value1New"); @@ -1450,6 +1453,7 @@ private void addTestIdps() throws IdentityProviderManagementException { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAOTest.java b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAOTest.java index e7b93e916790..fe44bd1e2c0f 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAOTest.java +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/java/org/wso2/carbon/idp/mgt/dao/IdPManagementDAOTest.java @@ -40,6 +40,7 @@ import org.wso2.carbon.identity.application.common.model.Property; import org.wso2.carbon.identity.application.common.model.ProvisioningConnectorConfig; import org.wso2.carbon.identity.application.common.model.RoleMapping; +import org.wso2.carbon.identity.base.AuthenticatorPropertyConstants.DefinedByType; import org.wso2.carbon.identity.core.model.ExpressionNode; import org.wso2.carbon.identity.core.util.IdentityDatabaseUtil; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; @@ -588,6 +589,7 @@ public Object[][] addIdPData() { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); @@ -825,6 +827,9 @@ public void testGetIdPByName(String idpName, int tenantId, boolean isExist) thro IdentityProvider idpResult = idPManagementDAO.getIdPByName(connection, idpName, tenantId, TENANT_DOMAIN); if (isExist) { assertEquals(idpResult.getIdentityProviderName(), idpName, "'getIdPByName' method fails"); + for (FederatedAuthenticatorConfig config : idpResult.getFederatedAuthenticatorConfigs()) { + assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } } else { assertNull(idpResult, "'getIdPByName' method fails"); } @@ -854,6 +859,9 @@ public void testGetIdPById(String idpName, int idpId, int tenantId, boolean isEx IdentityProvider idpResult = idPManagementDAO.getIDPbyId(connection, idpId, tenantId, TENANT_DOMAIN); if (isExist) { assertEquals(idpResult.getIdentityProviderName(), idpName, "'getIDPbyId' method fails"); + for (FederatedAuthenticatorConfig config : idpResult.getFederatedAuthenticatorConfigs()) { + assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } } else { assertNull(idpResult, "'getIDPbyId' method fails"); } @@ -889,6 +897,9 @@ public void testGetIDPbyResourceId(String idpName, int tenantId, boolean isExist IdentityProvider idpResult = idPManagementDAO.getIDPbyResourceId(connection, uuid, tenantId, TENANT_DOMAIN); if (isExist) { assertEquals(idpResult.getIdentityProviderName(), idpName, "'getIDPbyResourceId' method fails"); + for (FederatedAuthenticatorConfig config : idpResult.getFederatedAuthenticatorConfigs()) { + assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } } else { assertNull(idpResult, "'getIDPbyResourceId' method fails"); } @@ -1161,6 +1172,7 @@ public Object[][] updateIdPData() { newFederatedAuthenticatorConfig.setDisplayName("DisplayName1New"); newFederatedAuthenticatorConfig.setName("Name"); newFederatedAuthenticatorConfig.setEnabled(true); + newFederatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1New = new Property(); property1New.setName("Property1New"); property1New.setValue("value1New"); @@ -1235,6 +1247,9 @@ public void testUpdateIdP(Object oldIdp, Object newIdp, int tenantId) throws Exc String newIdpName = ((IdentityProvider) newIdp).getIdentityProviderName(); IdentityProvider idpResult = idPManagementDAO.getIdPByName(connection, newIdpName, tenantId, TENANT_DOMAIN); + for (FederatedAuthenticatorConfig config : idpResult.getFederatedAuthenticatorConfigs()) { + assertEquals(config.getDefinedByType(), DefinedByType.SYSTEM); + } assertEquals(idpResult.getIdentityProviderName(), newIdpName); } } @@ -1733,6 +1748,7 @@ private void addTestIdps() throws IdentityProviderManagementException { federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); @@ -1864,6 +1880,7 @@ private void addTestTrustedTokenIssuers() throws IdentityProviderManagementExcep federatedAuthenticatorConfig.setDisplayName("DisplayName1"); federatedAuthenticatorConfig.setName("Name"); federatedAuthenticatorConfig.setEnabled(true); + federatedAuthenticatorConfig.setDefinedByType(DefinedByType.SYSTEM); Property property1 = new Property(); property1.setName("Property1"); property1.setValue("value1"); diff --git a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/resources/dbscripts/h2.sql b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/resources/dbscripts/h2.sql index 79494d2b9d30..2b747b20f91e 100644 --- a/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/resources/dbscripts/h2.sql +++ b/components/idp-mgt/org.wso2.carbon.idp.mgt/src/test/resources/dbscripts/h2.sql @@ -582,6 +582,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/components/idp-mgt/pom.xml b/components/idp-mgt/pom.xml index 409f5e3f4a10..9d1e864f9ee4 100644 --- a/components/idp-mgt/pom.xml +++ b/components/idp-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml b/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml index e03b8fe68990..e9ce62c398fd 100644 --- a/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml +++ b/components/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework input-validation-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/input-validation-mgt/pom.xml b/components/input-validation-mgt/pom.xml index e588028189ad..2394cf47b775 100644 --- a/components/input-validation-mgt/pom.xml +++ b/components/input-validation-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml b/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml index c983fe8d9f9a..638fb38a6011 100644 --- a/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml +++ b/components/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt/pom.xml @@ -21,7 +21,7 @@ multi-attribute-login org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml b/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml index 712f9c75ac47..e213b8b8ff22 100644 --- a/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml +++ b/components/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt/pom.xml @@ -21,7 +21,7 @@ multi-attribute-login org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/multi-attribute-login/pom.xml b/components/multi-attribute-login/pom.xml index 18c72781a9f3..206aaa90e999 100644 --- a/components/multi-attribute-login/pom.xml +++ b/components/multi-attribute-login/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml b/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml index eda6cf5cd66a..9c8e7750fdeb 100644 --- a/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml +++ b/components/notification-mgt/org.wso2.carbon.identity.notification.mgt/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework notification-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/notification-mgt/pom.xml b/components/notification-mgt/pom.xml index fc89f4e675f8..ee187ea0f1ba 100644 --- a/components/notification-mgt/pom.xml +++ b/components/notification-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/policy-editor/org.wso2.carbon.policyeditor.ui/pom.xml b/components/policy-editor/org.wso2.carbon.policyeditor.ui/pom.xml index cb9e8d68f1ed..87d8340ea3d7 100644 --- a/components/policy-editor/org.wso2.carbon.policyeditor.ui/pom.xml +++ b/components/policy-editor/org.wso2.carbon.policyeditor.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework policy-editor - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/policy-editor/org.wso2.carbon.policyeditor/pom.xml b/components/policy-editor/org.wso2.carbon.policyeditor/pom.xml index bd98b6313750..d737311f0612 100644 --- a/components/policy-editor/org.wso2.carbon.policyeditor/pom.xml +++ b/components/policy-editor/org.wso2.carbon.policyeditor/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework policy-editor - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/policy-editor/pom.xml b/components/policy-editor/pom.xml index 4d947d2e9b3f..7b990871925d 100644 --- a/components/policy-editor/pom.xml +++ b/components/policy-editor/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml b/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml index 8ac52ae77e90..fa06d5d6d8e6 100644 --- a/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml +++ b/components/provisioning/org.wso2.carbon.identity.provisioning/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework provisioning - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/provisioning/pom.xml b/components/provisioning/pom.xml index dca8661682c4..b2505e1d6565 100644 --- a/components/provisioning/pom.xml +++ b/components/provisioning/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml b/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml index 3b86c8131697..1d28ccb013e2 100644 --- a/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml +++ b/components/role-mgt/org.wso2.carbon.identity.role.mgt.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework role-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml b/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml index 4f30b6991af2..e6eb0793be62 100644 --- a/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml +++ b/components/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework role-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/role-mgt/pom.xml b/components/role-mgt/pom.xml index 993f7007758a..a72dbc5d6e1a 100644 --- a/components/role-mgt/pom.xml +++ b/components/role-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml b/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml index 04344ae7311e..590b1c3e8784 100644 --- a/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml +++ b/components/secret-mgt/org.wso2.carbon.identity.secret.mgt.core/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework secret-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT 4.0.0 diff --git a/components/secret-mgt/pom.xml b/components/secret-mgt/pom.xml index 3aeb9cd214dc..683453aa2396 100644 --- a/components/secret-mgt/pom.xml +++ b/components/secret-mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml index 2dffec590948..9219753778dc 100644 --- a/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml +++ b/components/security-mgt/org.wso2.carbon.security.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml index e34bcdf4c3b2..c47c5635cef4 100644 --- a/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml +++ b/components/security-mgt/org.wso2.carbon.security.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/security-mgt/pom.xml b/components/security-mgt/pom.xml index 553a72d19a8b..d452f6608c93 100644 --- a/components/security-mgt/pom.xml +++ b/components/security-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml index 26bad9bec5e3..a873dc6a6038 100644 --- a/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml +++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework template-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml index 057bbc88edfd..4ddfdea56969 100644 --- a/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml +++ b/components/template-mgt/org.wso2.carbon.identity.template.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework template-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/template-mgt/pom.xml b/components/template-mgt/pom.xml index e49c602875a4..316b51e73b2d 100644 --- a/components/template-mgt/pom.xml +++ b/components/template-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml b/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml index fe9ea52f1e19..1722d1f5e75e 100644 --- a/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml +++ b/components/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework trusted-app-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/trusted-app-mgt/pom.xml b/components/trusted-app-mgt/pom.xml index 374fdea815f3..7252b6533026 100644 --- a/components/trusted-app-mgt/pom.xml +++ b/components/trusted-app-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml b/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml index f44c73215794..b30f8fe0935c 100644 --- a/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml +++ b/components/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT 4.0.0 diff --git a/components/user-functionality-mgt/pom.xml b/components/user-functionality-mgt/pom.xml index 518592f4a6c0..f136b7e12278 100644 --- a/components/user-functionality-mgt/pom.xml +++ b/components/user-functionality-mgt/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml index 9fdf4347fd82..2e87a04ff0c5 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.profile.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml index cb0b603c2923..b56fdf11b17d 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.profile/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml b/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml index 9b566d98b3b7..8b4d022a3a9a 100644 --- a/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml +++ b/components/user-mgt/org.wso2.carbon.identity.user.registration/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml b/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml index cea717f30734..053c245fcb58 100644 --- a/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.role.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml index 9cced15a3ab1..fd82358a7286 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml index 0f935e6b008a..15e420772089 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml b/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml index 29cf183729af..fb6759c81bd2 100644 --- a/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml +++ b/components/user-mgt/org.wso2.carbon.user.mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-mgt/pom.xml b/components/user-mgt/pom.xml index 5aef63a0a541..49ab81c34c55 100644 --- a/components/user-mgt/pom.xml +++ b/components/user-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml index 00a95805428f..49c631c1d5da 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration.deployer/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml index 78d740e9852a..c8dbee3efe71 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration.ui/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml index b018bd51bbb9..c051990303ac 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.configuration/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml b/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml index 3007e9502d8a..7a6e1c0bf530 100644 --- a/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml +++ b/components/user-store/org.wso2.carbon.identity.user.store.count/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-store - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/components/user-store/pom.xml b/components/user-store/pom.xml index 041d1f48d427..f1a2ed68327c 100644 --- a/components/user-store/pom.xml +++ b/components/user-store/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml b/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml index fa0e45461d71..e337971ef0dc 100644 --- a/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml +++ b/features/action-mgt/org.wso2.carbon.identity.action.management.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework action-management-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/action-mgt/pom.xml b/features/action-mgt/pom.xml index ce4ac63fbc4c..d5c95b9378c8 100644 --- a/features/action-mgt/pom.xml +++ b/features/action-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml index 1968cc2013aa..2b6a096c15e6 100644 --- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml +++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework api-resource-management-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/api-resource-mgt/pom.xml b/features/api-resource-mgt/pom.xml index 779fb623fc91..fc915f01eb9a 100644 --- a/features/api-resource-mgt/pom.xml +++ b/features/api-resource-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml index e0fda44d199a..a2ed9b9e5339 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml index 8074538c847d..7e5c4bada0a4 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml index a60458b062d1..bcacccde1eb4 100644 --- a/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.identity.application.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework application-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index 6fdbe331f485..93215aedaf19 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml b/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml index 88fce1f28bfd..a197d7d53bda 100644 --- a/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml +++ b/features/authentication-framework/org.wso2.carbon.identity.application.authentication.framework.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework authentication-framework-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/authentication-framework/pom.xml b/features/authentication-framework/pom.xml index 5320a5aef15a..76de2e8739e1 100644 --- a/features/authentication-framework/pom.xml +++ b/features/authentication-framework/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/carbon-authenticators/pom.xml b/features/carbon-authenticators/pom.xml index aeb19758aa69..d697da14d533 100644 --- a/features/carbon-authenticators/pom.xml +++ b/features/carbon-authenticators/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml b/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml index b6343a8846d5..a22827e054d7 100644 --- a/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml +++ b/features/carbon-authenticators/thrift-authenticator/org.wso2.carbon.identity.thrift.authentication.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework thrift-authenticator-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/carbon-authenticators/thrift-authenticator/pom.xml b/features/carbon-authenticators/thrift-authenticator/pom.xml index 4c4b7b115a9d..573e2c3bbbfc 100644 --- a/features/carbon-authenticators/thrift-authenticator/pom.xml +++ b/features/carbon-authenticators/thrift-authenticator/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-authenticator-features - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/categories/authorization/pom.xml b/features/categories/authorization/pom.xml index 674c8e770cad..abb76021f7ca 100644 --- a/features/categories/authorization/pom.xml +++ b/features/categories/authorization/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/inbound-authentication/pom.xml b/features/categories/inbound-authentication/pom.xml index a3597f5bce87..5bdf9cb5d650 100644 --- a/features/categories/inbound-authentication/pom.xml +++ b/features/categories/inbound-authentication/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/inbound-provisioning/pom.xml b/features/categories/inbound-provisioning/pom.xml index cdb52c795189..1888c2a7191b 100644 --- a/features/categories/inbound-provisioning/pom.xml +++ b/features/categories/inbound-provisioning/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/keystore-mgt/pom.xml b/features/categories/keystore-mgt/pom.xml index 97e49e7cfc70..2d841b1366ac 100644 --- a/features/categories/keystore-mgt/pom.xml +++ b/features/categories/keystore-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/notification-mgt/pom.xml b/features/categories/notification-mgt/pom.xml index 5e845b49675c..cfeaa705efe3 100644 --- a/features/categories/notification-mgt/pom.xml +++ b/features/categories/notification-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/outbound-authentication/pom.xml b/features/categories/outbound-authentication/pom.xml index 6704231715fa..b46fa0ccf3f5 100644 --- a/features/categories/outbound-authentication/pom.xml +++ b/features/categories/outbound-authentication/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/outbound-provisioning/pom.xml b/features/categories/outbound-provisioning/pom.xml index efd8566ad58c..5d5675ba12b8 100644 --- a/features/categories/outbound-provisioning/pom.xml +++ b/features/categories/outbound-provisioning/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/categories/pom.xml b/features/categories/pom.xml index 1dc1d8dea826..b07ac7e391e3 100644 --- a/features/categories/pom.xml +++ b/features/categories/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/categories/user-mgt/pom.xml b/features/categories/user-mgt/pom.xml index 950a8387eaaf..b39bc999c29a 100644 --- a/features/categories/user-mgt/pom.xml +++ b/features/categories/user-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../../pom.xml diff --git a/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml b/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml index 061f48a0a95f..cbe3fc7ac86a 100644 --- a/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml +++ b/features/central-logger/org.wso2.carbon.identity.central.log.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework central-logger-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/central-logger/pom.xml b/features/central-logger/pom.xml index fe9614fba8c0..b6eff99bb602 100644 --- a/features/central-logger/pom.xml +++ b/features/central-logger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml index 8e611cef40ac..c5bc0fb46569 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml index 8a7586dc87bd..8170bba152d9 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml b/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml index 777874faa421..fbb32bde3890 100644 --- a/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml +++ b/features/claim-mgt/org.wso2.carbon.claim.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework claim-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/claim-mgt/pom.xml b/features/claim-mgt/pom.xml index dbf707dc4fb7..0dfa4c102c5e 100644 --- a/features/claim-mgt/pom.xml +++ b/features/claim-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml b/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml index 0af43607ed7b..2fcffba2ef73 100644 --- a/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml +++ b/features/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework client-attestation-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/client-attestation-mgt/pom.xml b/features/client-attestation-mgt/pom.xml index 33131e3c82d1..57a6c70a771d 100644 --- a/features/client-attestation-mgt/pom.xml +++ b/features/client-attestation-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml b/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml index 8e641980e8d3..ffd9bfb3d237 100644 --- a/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml +++ b/features/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework configuration-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/configuration-mgt/pom.xml b/features/configuration-mgt/pom.xml index 89ebf133ba29..5a4234d21e3b 100644 --- a/features/configuration-mgt/pom.xml +++ b/features/configuration-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml b/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml index 866de7486777..8796843a9f2f 100644 --- a/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml +++ b/features/consent-mgt/org.wso2.carbon.identity.consent.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-consent-mgt-aggregator - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/consent-mgt/pom.xml b/features/consent-mgt/pom.xml index fdd413f33a59..a41723be8091 100644 --- a/features/consent-mgt/pom.xml +++ b/features/consent-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml b/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml index a08b601a9f19..ae44ada7fcc7 100644 --- a/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml +++ b/features/consent-server-configs-mgt/org.wso2.carbon.identity.consent.server.configs.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework consent-server-configs-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/consent-server-configs-mgt/pom.xml b/features/consent-server-configs-mgt/pom.xml index 4a01035b5adc..7711efafa4cf 100644 --- a/features/consent-server-configs-mgt/pom.xml +++ b/features/consent-server-configs-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml b/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml index e749bfbea5de..e7b91b98b3ce 100644 --- a/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml +++ b/features/cors-mgt/org.wso2.carbon.identity.cors.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework cors-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/cors-mgt/pom.xml b/features/cors-mgt/pom.xml index 70bc398a6463..e1de7bd92467 100644 --- a/features/cors-mgt/pom.xml +++ b/features/cors-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml index e8d00efba790..2fb8fce89a82 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml index ec0e037302d0..06602a958811 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml index 7c30c2b17084..0b959002cbfd 100644 --- a/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml +++ b/features/directory-server-manager/org.wso2.carbon.directory.service.mgr.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework directory-server-manager-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/directory-server-manager/pom.xml b/features/directory-server-manager/pom.xml index 7e121df1af25..24c771185e6c 100644 --- a/features/directory-server-manager/pom.xml +++ b/features/directory-server-manager/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml index 9253343c30f9..cd9197bcee03 100644 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/pom.xml @@ -19,7 +19,7 @@ extension-management-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT org.wso2.carbon.identity.extension.mgt.feature diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/apple/metadata.json b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/apple/metadata.json index 269074ff43e2..ffaa140179ef 100755 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/apple/metadata.json +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/apple/metadata.json @@ -91,7 +91,7 @@ "value": "redirect_uri" } ], - "header": "Prerequites", + "header": "Prerequisites", "paragraphs": [ "Before you begin, create a Sign in With Apple enabled application on Apple Developer Portal with a Services ID and a Private Key." ], diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/facebook/metadata.json b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/facebook/metadata.json index 5b5d3c18b460..95ec0dab0322 100755 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/facebook/metadata.json +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/facebook/metadata.json @@ -66,7 +66,7 @@ "value": "redirect_uri" } ], - "header": "Prerequites", + "header": "Prerequisites", "paragraphs": [ "Before you begin, create an application on Facebook Developer Console, and obtain a App ID & secret." ], diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/github/metadata.json b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/github/metadata.json index de755338ff28..00ea5a416b1c 100755 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/github/metadata.json +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/github/metadata.json @@ -65,7 +65,7 @@ "value": "redirect_uri" } ], - "header": "Prerequites", + "header": "Prerequisites", "paragraphs": [ "Before you begin, create an OAuth application on GitHub, and obtain a client ID & secret." ], diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/google/metadata.json b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/google/metadata.json index 3928c3f8c9be..f40d6a4b3d14 100755 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/google/metadata.json +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/google/metadata.json @@ -61,7 +61,7 @@ "value": "redirect_uri" } ], - "header": "Prerequites", + "header": "Prerequisites", "paragraphs": [ "Before you begin, create an OAuth credential on the Google developer console, and obtain a Client ID & secret." ], "link": { diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/microsoft/metadata.json b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/microsoft/metadata.json index f9e30d9abe58..3e8101408d2d 100755 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/microsoft/metadata.json +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/microsoft/metadata.json @@ -61,7 +61,7 @@ "value": "redirect_uri" } ], - "header": "Prerequites", + "header": "Prerequisites", "paragraphs": [ "Before you begin, create an OAuth credential on the Microsoft Entra ID, and obtain a Client ID & secret." ], "link": { diff --git a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/swe/metadata.json b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/swe/metadata.json index c68ebe50c860..9652af5e62e6 100755 --- a/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/swe/metadata.json +++ b/features/extension-mgt/org.wso2.carbon.identity.extension.mgt.feature/resources/extensions/connections/swe/metadata.json @@ -66,7 +66,7 @@ "value": "redirect_uri" } ], - "header": "Prerequites", + "header": "Prerequisites", "paragraphs": [ "Before you begin, register an OIDC client using the OIDC client registration of oidc.signinwithethereum.org, and obtain a client ID & secret." ], diff --git a/features/extension-mgt/pom.xml b/features/extension-mgt/pom.xml index d2f0a7e0c464..b371b7940839 100644 --- a/features/extension-mgt/pom.xml +++ b/features/extension-mgt/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml index 40a61e03ef45..cefb99aa695d 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml index 54cbc4a5130b..e2f17bd71712 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml index 9f0bd5f9b965..c5f8fa7f934e 100644 --- a/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml +++ b/features/functions-library-mgt/org.wso2.carbon.identity.functions.library.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework functions-library-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/functions-library-mgt/pom.xml b/features/functions-library-mgt/pom.xml index aa1069cdeaa7..2d0003b5b5db 100644 --- a/features/functions-library-mgt/pom.xml +++ b/features/functions-library-mgt/pom.xml @@ -28,7 +28,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml index 8d8b1d2eb05e..c4920d8b9677 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml index ff9ecb8832fe..7aa4191df818 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql index ef4200b938e8..466bb4f1cbaf 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/db2.sql @@ -865,6 +865,7 @@ CREATE TABLE IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql index 7fd60965294e..bb4134aa316b 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/h2.sql @@ -606,6 +606,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql index ce4c4631d4c1..cc7b420ebcc1 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mssql.sql @@ -673,6 +673,7 @@ CREATE TABLE IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql index 0511e40494a5..31107047f000 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql-cluster.sql @@ -712,6 +712,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR(1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP (ID) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql index 995fadafde03..0952b7ade917 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/mysql.sql @@ -625,6 +625,7 @@ CREATE TABLE IF NOT EXISTS IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql index 8bc9a8a1b960..f68b62310e90 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle.sql @@ -1002,6 +1002,7 @@ CREATE TABLE IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql index dcb0f7115260..1f56da2c3c01 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/oracle_rac.sql @@ -884,6 +884,7 @@ CREATE TABLE IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE) diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql index f5606b329e2f..07c718bcf94a 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/dbscripts/postgresql.sql @@ -734,6 +734,7 @@ CREATE TABLE IDP_AUTHENTICATOR ( NAME VARCHAR(255) NOT NULL, IS_ENABLED CHAR (1) DEFAULT '1', DISPLAY_NAME VARCHAR(255), + DEFINED_BY VARCHAR(25) NOT NULL, PRIMARY KEY (ID), UNIQUE (TENANT_ID, IDP_ID, NAME), FOREIGN KEY (IDP_ID) REFERENCES IDP(ID) ON DELETE CASCADE); diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml index 7d452f3cc0f5..b36817dc3fd9 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml @@ -282,6 +282,8 @@ 0 true + + false true diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 index d83027b4da0a..da30f2e4a189 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/identity.xml.j2 @@ -435,6 +435,8 @@ {{oauth.timestamp_skew}} {{oauth.token_renewal.renew_refresh_token}} + + {{oauth.token_renewal.validate_authenticated_user_for_refresh_grant}} {{oauth.enable_password_grant_enhancements}} diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json index e84b37827729..e7f0bcccd5d8 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json +++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json @@ -65,6 +65,7 @@ "oauth.token_validation.refresh_token_validity": "1d", "oauth.timestamp_skew": "0m", "oauth.token_renewal.renew_refresh_token": true, + "oauth.token_renewal.validate_authenticated_user_for_refresh_grant": false, "oauth.enable_password_grant_enhancements": false, "oauth.token_renewal.extend_refresh_token_expiry_time_on_renewal": true, "oauth.token_renewal.renew_access_token_per_request": false, diff --git a/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml b/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml index a98c4e014d21..322b2e461a6a 100644 --- a/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml +++ b/features/identity-core/org.wso2.carbon.identity.core.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-core-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-core/pom.xml b/features/identity-core/pom.xml index 23cd235817c0..0afb9f3d3384 100644 --- a/features/identity-core/pom.xml +++ b/features/identity-core/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml b/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml index aae186825662..70ba81d0666a 100644 --- a/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml +++ b/features/identity-event/org.wso2.carbon.identity.event.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml b/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml index 9d1e859d33c2..fc66f1e4685e 100644 --- a/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml +++ b/features/identity-event/org.wso2.carbon.identity.event.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-event-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-event/pom.xml b/features/identity-event/pom.xml index c55886c5cc5b..478c871500ef 100644 --- a/features/identity-event/pom.xml +++ b/features/identity-event/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml index cc41947068a4..6fdf629c9e38 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml index 7562af62130d..f8757b6519d8 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml b/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml index df92ba536b34..7a5004677c1b 100644 --- a/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml +++ b/features/identity-mgt/org.wso2.carbon.identity.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/identity-mgt/pom.xml b/features/identity-mgt/pom.xml index 226ac8727492..810657e40896 100644 --- a/features/identity-mgt/pom.xml +++ b/features/identity-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml index f3f045701620..f5ffd826dd74 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml index 286c6c099c07..64a602fda8eb 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml b/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml index 687b721d443f..d8c0ed06dc93 100644 --- a/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml +++ b/features/idp-mgt/org.wso2.carbon.idp.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-provider-management-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/idp-mgt/pom.xml b/features/idp-mgt/pom.xml index 769d04420732..ad524c450d73 100644 --- a/features/idp-mgt/pom.xml +++ b/features/idp-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml b/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml index 504dd7db0a8d..b61ae528eff7 100644 --- a/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml +++ b/features/input-validation-mgt/org.wso2.carbon.identity.input.validation.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework input-validation-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/input-validation-mgt/pom.xml b/features/input-validation-mgt/pom.xml index a6321b8c8bbb..8c427951d44a 100644 --- a/features/input-validation-mgt/pom.xml +++ b/features/input-validation-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml b/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml index f1d2511fe5c4..f60b63e57b0b 100644 --- a/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml +++ b/features/multi-attribute-login/org.wso2.carbon.identity.multi.attribute.login.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ multi-attribute-login-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml b/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml index 2a2e99c733d1..3e1e94217a67 100644 --- a/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml +++ b/features/multi-attribute-login/org.wso2.carbon.identity.unique.claim.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ multi-attribute-login-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/multi-attribute-login/pom.xml b/features/multi-attribute-login/pom.xml index 4834722c6ebc..f0d09bb05683 100644 --- a/features/multi-attribute-login/pom.xml +++ b/features/multi-attribute-login/pom.xml @@ -20,7 +20,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml index 7a93a31449bb..bd18089182cf 100644 --- a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml +++ b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-notification-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml index 16206710d6c7..45516f111d13 100644 --- a/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml +++ b/features/notification-mgt/org.wso2.carbon.identity.notification.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-notification-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/notification-mgt/pom.xml b/features/notification-mgt/pom.xml index 77a18639a5f6..90427a0046f9 100644 --- a/features/notification-mgt/pom.xml +++ b/features/notification-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml b/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml index 48ecd31aab32..f6f8ab046e08 100644 --- a/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml +++ b/features/provisioning/org.wso2.carbon.identity.provisioning.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework provisioning-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/provisioning/pom.xml b/features/provisioning/pom.xml index 21b1c5ddad36..a2ed8210ed7e 100644 --- a/features/provisioning/pom.xml +++ b/features/provisioning/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml b/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml index e0b8d32df666..4440f02af2ed 100644 --- a/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml +++ b/features/role-mgt/org.wso2.carbon.identity.role.mgt.core.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework role-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml b/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml index 75b9f0b62780..1a3ff2427dda 100644 --- a/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml +++ b/features/role-mgt/org.wso2.carbon.identity.role.v2.mgt.core.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework role-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/role-mgt/pom.xml b/features/role-mgt/pom.xml index c43e815772ca..9b1fdbadc0c4 100644 --- a/features/role-mgt/pom.xml +++ b/features/role-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml b/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml index 85a8374310e0..26087bdb9511 100644 --- a/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml +++ b/features/secret-mgt/org.wso2.carbon.identity.secret.mgt.core.server.feature/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework secret-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT 4.0.0 diff --git a/features/secret-mgt/pom.xml b/features/secret-mgt/pom.xml index 704eb419bb96..859b95134e06 100644 --- a/features/secret-mgt/pom.xml +++ b/features/secret-mgt/pom.xml @@ -19,7 +19,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml index 28270930eab5..cad21aad7594 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml index fa868b922cb7..7ece462c0ee1 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml b/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml index 65c6bad2c8e8..fc9ab8db8f6a 100644 --- a/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml +++ b/features/security-mgt/org.wso2.carbon.security.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework security-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/security-mgt/pom.xml b/features/security-mgt/pom.xml index d10c863ccd58..70ebfa16ca6e 100644 --- a/features/security-mgt/pom.xml +++ b/features/security-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml index 0faace5a03c8..e45692a27d21 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml index 80a351e73902..e4af7e1ed66d 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml b/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml index 42acc77f3698..33e418c681d2 100644 --- a/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml +++ b/features/template-mgt/org.wso2.carbon.identity.template.mgt.ui.feature/pom.xml @@ -21,7 +21,7 @@ template-management-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/template-mgt/pom.xml b/features/template-mgt/pom.xml index 814924abc4ae..4fcdff67abea 100644 --- a/features/template-mgt/pom.xml +++ b/features/template-mgt/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml b/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml index 8d682285eddd..fcc9b078bb95 100644 --- a/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml +++ b/features/trusted-app-mgt/org.wso2.carbon.identity.trusted.app.mgt.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework trusted-app-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/trusted-app-mgt/pom.xml b/features/trusted-app-mgt/pom.xml index 8ca98cad5892..5f4adeebdfa0 100644 --- a/features/trusted-app-mgt/pom.xml +++ b/features/trusted-app-mgt/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml index ed22c4c6e555..3be89cfb2eda 100644 --- a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml +++ b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.feature/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml index 866e99df0541..f913aaaf8c30 100644 --- a/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml +++ b/features/user-functionality-mgt/org.wso2.carbon.identity.user.functionality.mgt.server.feature/pom.xml @@ -21,7 +21,7 @@ user-functionality-mgt-feature org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT 4.0.0 diff --git a/features/user-functionality-mgt/pom.xml b/features/user-functionality-mgt/pom.xml index cfda37426de9..60076821b2c8 100644 --- a/features/user-functionality-mgt/pom.xml +++ b/features/user-functionality-mgt/pom.xml @@ -21,7 +21,7 @@ identity-framework org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml index 27902866e249..2e80cb5f8176 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml index fd8b8ad95860..929d92ecb216 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml index 129f605437be..7ac25bb78708 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.profile.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml index 713591382f9d..423eb55ac43a 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml index e9ba9f2676c4..bdf4bee2e977 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml index fa6cbbd03c64..4433e988968c 100644 --- a/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.identity.user.registration.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml index 72be0d926b7d..8bba7fabd62d 100644 --- a/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.role.mgt.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml index 6d463bf352d0..702ccc04c477 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml index 78854ced4d9c..34a10f7ae9e6 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml b/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml index e210d74b6de0..15140c13a6c2 100644 --- a/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml +++ b/features/user-mgt/org.wso2.carbon.user.mgt.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.carbon.identity.framework user-mgt-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-mgt/pom.xml b/features/user-mgt/pom.xml index 6fcbe56d92c9..66e127bba8dd 100644 --- a/features/user-mgt/pom.xml +++ b/features/user-mgt/pom.xml @@ -17,7 +17,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml b/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml index bc61e8320483..6363860a3ac3 100644 --- a/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml +++ b/features/user-store/org.wso2.carbon.identity.user.store.configuration.server.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework user-store-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/user-store/pom.xml b/features/user-store/pom.xml index 618d0e5a6c2c..329c8474ede0 100644 --- a/features/user-store/pom.xml +++ b/features/user-store/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/features/xacml/org.wso2.carbon.identity.xacml.feature/pom.xml b/features/xacml/org.wso2.carbon.identity.xacml.feature/pom.xml index 443478999c65..9db2b2cd265e 100644 --- a/features/xacml/org.wso2.carbon.identity.xacml.feature/pom.xml +++ b/features/xacml/org.wso2.carbon.identity.xacml.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework xacml-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml b/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml index 864decc85c78..9bda39093f5a 100644 --- a/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml +++ b/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework xacml-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/xacml/org.wso2.carbon.identity.xacml.ui.feature/pom.xml b/features/xacml/org.wso2.carbon.identity.xacml.ui.feature/pom.xml index ac49bd36fa9f..90b1b1277a27 100644 --- a/features/xacml/org.wso2.carbon.identity.xacml.ui.feature/pom.xml +++ b/features/xacml/org.wso2.carbon.identity.xacml.ui.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework xacml-feature - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/features/xacml/pom.xml b/features/xacml/pom.xml index 2b6b30e08abc..687526c4074f 100644 --- a/features/xacml/pom.xml +++ b/features/xacml/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 232c8fac7185..b1de9c543601 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.framework identity-framework pom - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT WSO2 Carbon - Platform Aggregator Pom http://wso2.org diff --git a/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml index f3feedc7ad01..d4e8df4f128c 100644 --- a/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.claim.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml index b7251dcce6fd..a46b22a4aec2 100644 --- a/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.directory.server.manager.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml index de8f8421eb9e..87c9f0bdd6ff 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.authentication.framework.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml 4.0.0 diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml index d2c958c1171d..a00d9f953cc7 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.default.authentication.sequence.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml index 1990f399f720..48771ba874a8 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/src/main/resources/IdentityApplicationManagementService.wsdl b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/src/main/resources/IdentityApplicationManagementService.wsdl index deae0a7015ee..8363f3fe1f49 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/src/main/resources/IdentityApplicationManagementService.wsdl +++ b/service-stubs/identity/org.wso2.carbon.identity.application.mgt.stub/src/main/resources/IdentityApplicationManagementService.wsdl @@ -1,4 +1,4 @@ - + IdentityApplicationManagementService @@ -11,7 +11,7 @@ - + @@ -19,160 +19,162 @@ - + - + - + - + + - + - + - + - - + - + - + - + - + + - + - + - + - + - + - + - - - + - + - + - + - + - + - + + - + - + + + - + - + - + - - - + - + - + - + - + - + - + - + + + - + - + - + - + - + - + @@ -184,177 +186,176 @@ - + - + - - + - + - + - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + - - - - + - + - + - + - + - + - + - + - - + + - - - - - - + - + - + - + + + - + - + - + - + + + - + - + - + + - + - + - + + @@ -364,35 +365,35 @@ - + - - + + - - + + - + - - - - + + + + - + - + - + @@ -404,8 +405,8 @@ - - + + @@ -416,9 +417,9 @@ - + - + @@ -438,7 +439,7 @@ - + @@ -449,8 +450,8 @@ - - + + @@ -469,7 +470,7 @@ - + @@ -500,10 +501,10 @@ - - - - + + + + @@ -518,8 +519,8 @@ - - + + @@ -528,26 +529,26 @@ - - - - + + + + - - + + - + - + - - + + - + @@ -562,10 +563,11 @@ + - + @@ -575,7 +577,7 @@ - + @@ -602,7 +604,7 @@ - + @@ -617,8 +619,8 @@ - - + + @@ -628,7 +630,7 @@ - + @@ -640,10 +642,11 @@ + - + @@ -651,7 +654,7 @@ - + @@ -665,7 +668,7 @@ - + @@ -686,17 +689,10 @@ - - - - - - - - + @@ -709,6 +705,13 @@ + + + + + + + @@ -725,6 +728,14 @@ + + + + + + + + diff --git a/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml index 5ee71d9879c8..f4a3ddd3242e 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml index 2a2434c2e497..9dc41b6fc650 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.entitlement.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml index 89f1ea88b000..c638a078fa75 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.functions.library.mgt.stub/pom.xml @@ -21,7 +21,7 @@ carbon-service-stubs org.wso2.carbon.identity.framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT 4.0.0 diff --git a/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml index 9db6335dd1a2..813091414547 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.governance.stub/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml index a0e24e6f66e9..dd298206cc20 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml index 83e4e744b7d7..56a0c8155b53 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.profile.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml index faa013d71e82..82b38b406f77 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.registration.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml index 32064c137ce9..c3242070cce1 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.configuration.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml index aa562767f9a4..c411fb38f4ed 100644 --- a/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.identity.user.store.count.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml index ea9ad8953109..691b5aff9a7e 100644 --- a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/src/main/resources/IdentityProviderMgtService.wsdl b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/src/main/resources/IdentityProviderMgtService.wsdl index 03fcbc99e080..bae07979c6a1 100644 --- a/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/src/main/resources/IdentityProviderMgtService.wsdl +++ b/service-stubs/identity/org.wso2.carbon.idp.mgt.stub/src/main/resources/IdentityProviderMgtService.wsdl @@ -1,14 +1,78 @@ - - + IdentityProviderMgtService - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -26,7 +90,7 @@ - + @@ -52,74 +116,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -149,7 +150,7 @@ - + @@ -164,8 +165,8 @@ - - + + @@ -175,7 +176,7 @@ - + @@ -186,116 +187,80 @@ - + - + - - - - - - - - - - - - - + - + - + - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - + - + + - + - + - - + - + - + - + - + @@ -321,7 +286,7 @@ - + @@ -336,7 +301,7 @@ - + @@ -364,7 +329,7 @@ - + @@ -376,7 +341,7 @@ - + @@ -399,6 +364,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -406,12 +407,18 @@ + + + + + + - + - + @@ -1225,4 +1232,4 @@ - \ No newline at end of file + diff --git a/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml index d48d9f6074b7..c38870c4e636 100644 --- a/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.security.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml b/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml index c38557011ed8..c9b7a76875af 100644 --- a/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml +++ b/service-stubs/identity/org.wso2.carbon.user.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework carbon-service-stubs - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../pom.xml diff --git a/service-stubs/identity/pom.xml b/service-stubs/identity/pom.xml index a34ede13b3b3..7571d28c8856 100644 --- a/service-stubs/identity/pom.xml +++ b/service-stubs/identity/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.testutil/pom.xml b/test-utils/org.wso2.carbon.identity.testutil/pom.xml index 8bc2225ff5f4..7a4dca879273 100644 --- a/test-utils/org.wso2.carbon.identity.testutil/pom.xml +++ b/test-utils/org.wso2.carbon.identity.testutil/pom.xml @@ -18,7 +18,7 @@ org.wso2.carbon.identity.framework identity-framework - 7.5.70-SNAPSHOT + 7.5.78-SNAPSHOT ../../pom.xml