From 4bb96b00095abaa08290847a70734d4806c5ac6a Mon Sep 17 00:00:00 2001 From: Thamindu Aluthwala Date: Thu, 12 Sep 2024 12:06:24 +0530 Subject: [PATCH 01/22] Fix unexpected session expiry --- .../wso2/carbon/identity/oauth/OAuthUtil.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java index 521d1300c4..741b1a2570 100755 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java @@ -94,6 +94,7 @@ import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.CURRENT_SESSION_IDENTIFIER; import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.CURRENT_TOKEN_IDENTIFIER; import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.Config.PRESERVE_LOGGED_IN_SESSION_AT_PASSWORD_UPDATE; +import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.OAUTH2; import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.ORGANIZATION_LOGIN_HOME_REALM_IDENTIFIER; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.DEFAULT_VALUE_FOR_PREVENT_TOKEN_REUSE; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.ENABLE_TOKEN_REUSE; @@ -822,6 +823,27 @@ private static Set getClientIdsOfAssociatedApplications(Role role, Authe return clientIds; } + private static Set filterClientIdsWithOrganizationAudience(List clientIds, String tenantDomain) { + + Set clientIdsWithOrganizationAudience = new HashSet<>(); + ApplicationManagementService applicationManagementService = + OAuthComponentServiceHolder.getInstance().getApplicationManagementService(); + for (String clientId : clientIds) { + try { + String applicationId = applicationManagementService.getApplicationResourceIDByInboundKey(clientId, + OAUTH2, tenantDomain); + String audience = applicationManagementService.getAllowedAudienceForRoleAssociation(applicationId, + tenantDomain); + if (RoleConstants.ORGANIZATION.equalsIgnoreCase(audience)) { + clientIdsWithOrganizationAudience.add(clientId); + } + } catch (IdentityApplicationManagementException e) { + LOG.error("Error occurred while retrieving application information for client id: " + clientId, e); + } + } + return clientIdsWithOrganizationAudience; + } + /** * This method will retrieve the role details of the given role id. * @param roleId Role Id. @@ -991,7 +1013,7 @@ public static boolean revokeTokens(String username, UserStoreManager userStoreMa // Get details about the role to identify the audience and associated applications. Set clientIds = null; - Role role; + Role role = null; boolean getClientIdsFromUser = false; if (roleId != null) { role = getRole(roleId, IdentityTenantUtil.getTenantDomain(userStoreManager.getTenantId())); @@ -1009,6 +1031,7 @@ public static boolean revokeTokens(String username, UserStoreManager userStoreMa "an organization role: " + role.getName()); } getClientIdsFromUser = true; + } } else { // Get all the distinct client Ids authorized by this user since no role is specified. @@ -1022,7 +1045,12 @@ public static boolean revokeTokens(String username, UserStoreManager userStoreMa } try { clientIds = OAuthTokenPersistenceFactory.getInstance() - .getTokenManagementDAO().getAllTimeAuthorizedClientIds(authenticatedUser); + .getTokenManagementDAO().getAllTimeAuthorizedClientIds(authenticatedUser); + + if (role != null && RoleConstants.ORGANIZATION.equals(role.getAudience())) { + clientIds = filterClientIdsWithOrganizationAudience(new ArrayList<>(clientIds), tenantDomain); + } + } catch (IdentityOAuth2Exception e) { LOG.error("Error occurred while retrieving apps authorized by User ID : " + authenticatedUser, e); throw new UserStoreException(e); From 98c32babd5c4bbef0f7a788ab22ecb95f006963d Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Fri, 11 Oct 2024 15:30:46 +0530 Subject: [PATCH 02/22] Replace usages of auth config with app version. --- .../identity/oauth/common/OAuthConstants.java | 2 - .../src/main/resources/OAuthAdminService.wsdl | 1 - .../identity/oauth/OAuthAdminServiceImpl.java | 43 ++++++++++++------- .../wso2/carbon/identity/oauth/OAuthUtil.java | 1 - .../PreIssueAccessTokenRequestBuilder.java | 1 + .../identity/oauth/dao/OAuthAppDAO.java | 21 --------- .../carbon/identity/oauth/dao/OAuthAppDO.java | 11 ----- .../oauth/dto/OAuthConsumerAppDTO.java | 11 ----- .../identity/oauth2/util/OAuth2Util.java | 26 +++++++++-- .../openidconnect/util/ClaimHandlerUtil.java | 28 +++++++++++- 10 files changed, 77 insertions(+), 68 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java b/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java index 2984f0bd82..7ee3e18fa1 100644 --- a/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java +++ b/components/org.wso2.carbon.identity.oauth.common/src/main/java/org/wso2/carbon/identity/oauth/common/OAuthConstants.java @@ -643,8 +643,6 @@ public static class OIDCConfigProperties { public static final String IS_SUBJECT_TOKEN_ENABLED = "isSubjectTokenEnabled"; public static final String SUBJECT_TOKEN_EXPIRY_TIME = "subjectTokenExpiryTime"; public static final int SUBJECT_TOKEN_EXPIRY_TIME_VALUE = 180; - public static final String IS_ACCESS_TOKEN_CLAIMS_SEPARATION_ENABLED = - "isAccessTokenClaimsSeparationEnabled"; public static final String PREVENT_TOKEN_REUSE = "PreventTokenReuse"; public static final boolean DEFAULT_VALUE_FOR_PREVENT_TOKEN_REUSE = true; // Name of the {@code JWTClientAuthenticatorConfig} resource type in the Configuration Management API. diff --git a/components/org.wso2.carbon.identity.oauth.stub/src/main/resources/OAuthAdminService.wsdl b/components/org.wso2.carbon.identity.oauth.stub/src/main/resources/OAuthAdminService.wsdl index 60767786e0..89f6009d95 100755 --- a/components/org.wso2.carbon.identity.oauth.stub/src/main/resources/OAuthAdminService.wsdl +++ b/components/org.wso2.carbon.identity.oauth.stub/src/main/resources/OAuthAdminService.wsdl @@ -395,7 +395,6 @@ - diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java index 878c0450c9..1dbf1fa01b 100755 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java @@ -232,7 +232,7 @@ public OAuthConsumerAppDTO getOAuthApplicationData(String consumerKey, String te OAuthAppDO app = getOAuthApp(consumerKey, tenantDomain); if (app != null) { if (isAccessTokenClaimsSeparationFeatureEnabled() && - !app.isAccessTokenClaimsSeparationEnabled()) { + !isAccessTokenClaimsSeparationEnabledForApp(consumerKey, tenantDomain)) { // Add requested claims as access token claims if the app is not in the new access token // claims feature. addAccessTokenClaims(app, tenantDomain); @@ -536,7 +536,6 @@ OAuthConsumerAppDTO registerAndRetrieveOAuthApplicationData(OAuthConsumerAppDTO if (isAccessTokenClaimsSeparationFeatureEnabled()) { validateAccessTokenClaims(application, tenantDomain); app.setAccessTokenClaims(application.getAccessTokenClaims()); - app.setAccessTokenClaimsSeparationEnabled(true); } } dao.addOAuthApplication(app); @@ -977,27 +976,32 @@ void updateConsumerApplication(OAuthConsumerAppDTO consumerAppDTO, boolean enabl if (isAccessTokenClaimsSeparationFeatureEnabled()) { // We check if the AT claims separation enabled at server level and // the app level. If both are enabled, we validate the claims and update the app. - if (oAuthAppDO.isAccessTokenClaimsSeparationEnabled()) { - validateAccessTokenClaims(consumerAppDTO, tenantDomain); - oAuthAppDO.setAccessTokenClaims(consumerAppDTO.getAccessTokenClaims()); + try { + if (isAccessTokenClaimsSeparationEnabledForApp(oAuthAppDO.getOauthConsumerKey(), tenantDomain)) { + validateAccessTokenClaims(consumerAppDTO, tenantDomain); + oAuthAppDO.setAccessTokenClaims(consumerAppDTO.getAccessTokenClaims()); + } + } catch (IdentityOAuth2Exception e) { + throw new IdentityOAuthAdminException("Error while updating existing OAuth application to " + + "the new JWT access token OIDC claims separation model. Application : " + + oAuthAppDO.getApplicationName() + " Tenant : " + tenantDomain, e); } // We only trigger the access token claims migration if the following conditions are met. // 1. The AT claims separation is enabled at server level. // 2. The AT claims separation is not enabled at app level. - // 3. User tries to enable AT claims separation at app level with update app. - if (!oAuthAppDO.isAccessTokenClaimsSeparationEnabled() && - consumerAppDTO.isAccessTokenClaimsSeparationEnabled()) { - // Add requested claims as access token claims. - try { + // 3. The access token claims are empty. + try { + if (!isAccessTokenClaimsSeparationEnabledForApp(oAuthAppDO.getOauthConsumerKey(), + tenantDomain) && oAuthAppDO.getAccessTokenClaims().length == 0) { + // Add requested claims as access token claims. addAccessTokenClaims(oAuthAppDO, tenantDomain); - } catch (IdentityOAuth2Exception e) { - throw new IdentityOAuthAdminException("Error while updating existing OAuth application to " + - "the new JWT access token OIDC claims separation model. Application : " + - oAuthAppDO.getApplicationName() + " Tenant : " + tenantDomain, e); } + + } catch (IdentityOAuth2Exception e) { + throw new IdentityOAuthAdminException("Error while updating existing OAuth application to " + + "the new JWT access token OIDC claims separation model. Application : " + + oAuthAppDO.getApplicationName() + " Tenant : " + tenantDomain, e); } - oAuthAppDO.setAccessTokenClaimsSeparationEnabled(consumerAppDTO - .isAccessTokenClaimsSeparationEnabled()); } } dao.updateConsumerApplication(oAuthAppDO); @@ -2867,4 +2871,11 @@ private boolean isAccessTokenClaimsSeparationFeatureEnabled() { return Boolean.parseBoolean(IdentityUtil.getProperty(ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN)); } + + private boolean isAccessTokenClaimsSeparationEnabledForApp(String consumerKey, String tenantDomain) + throws IdentityOAuth2Exception { + + ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(consumerKey, tenantDomain); + return OAuth2Util.isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), "v2.0.0"); + } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java index 521d1300c4..f69ee36d17 100755 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthUtil.java @@ -562,7 +562,6 @@ public static OAuthConsumerAppDTO buildConsumerAppDTO(OAuthAppDO appDO) { dto.setSubjectTokenEnabled(appDO.isSubjectTokenEnabled()); dto.setSubjectTokenExpiryTime(appDO.getSubjectTokenExpiryTime()); dto.setAccessTokenClaims(appDO.getAccessTokenClaims()); - dto.setAccessTokenClaimsSeparationEnabled(appDO.isAccessTokenClaimsSeparationEnabled()); return dto; } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java index 9f88024419..a164e3a76f 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java @@ -282,6 +282,7 @@ private Map getAdditionalClaimsToAddToToken(OAuthTokenReqMessage } try { + String tenantDomain = tokenMessageContext.getOauth2AccessTokenReqDTO().getTenantDomain(); CustomClaimsCallbackHandler claimsCallBackHandler = ClaimHandlerUtil.getClaimsCallbackHandler(getAppInformation(tokenMessageContext)); JWTClaimsSet claimsSet = diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java index f11815a74a..bfd3b2b64a 100755 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDAO.java @@ -85,7 +85,6 @@ import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.ID_TOKEN_ENCRYPTION_ALGORITHM; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.ID_TOKEN_ENCRYPTION_METHOD; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.ID_TOKEN_SIGNATURE_ALGORITHM; -import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.IS_ACCESS_TOKEN_CLAIMS_SEPARATION_ENABLED; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.IS_CERTIFICATE_BOUND_ACCESS_TOKEN; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.IS_FAPI_CONFORMANT_APP; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.OIDCConfigProperties.IS_PUSH_AUTH; @@ -1044,13 +1043,6 @@ private void addOrUpdateOIDCSpProperty(OAuthAppDO oauthAppDO, SUBJECT_TOKEN_EXPIRY_TIME, String.valueOf(oauthAppDO.getSubjectTokenExpiryTime()), prepStatementForPropertyAdd, preparedStatementForPropertyUpdate); - if (isAccessTokenClaimsSeparationFeatureEnabled()) { - addOrUpdateOIDCSpProperty(preprocessedClientId, spTenantId, spOIDCProperties, - IS_ACCESS_TOKEN_CLAIMS_SEPARATION_ENABLED, - String.valueOf(oauthAppDO.isAccessTokenClaimsSeparationEnabled()), - prepStatementForPropertyAdd, preparedStatementForPropertyUpdate); - } - addOrUpdateOIDCSpProperty(preprocessedClientId, spTenantId, spOIDCProperties, HYBRID_FLOW_ENABLED, String.valueOf(oauthAppDO.isHybridFlowEnabled()), prepStatementForPropertyAdd, preparedStatementForPropertyUpdate); @@ -1779,12 +1771,6 @@ private void addServiceProviderOIDCProperties(Connection connection, addToBatchForOIDCPropertyAdd(processedClientId, spTenantId, prepStmtAddOIDCProperty, SUBJECT_TOKEN_EXPIRY_TIME, String.valueOf(consumerAppDO.getSubjectTokenExpiryTime())); - if (isAccessTokenClaimsSeparationFeatureEnabled()) { - addToBatchForOIDCPropertyAdd(processedClientId, spTenantId, prepStmtAddOIDCProperty, - IS_ACCESS_TOKEN_CLAIMS_SEPARATION_ENABLED, - String.valueOf(consumerAppDO.isAccessTokenClaimsSeparationEnabled())); - } - addToBatchForOIDCPropertyAdd(processedClientId, spTenantId, prepStmtAddOIDCProperty, HYBRID_FLOW_ENABLED, String.valueOf(consumerAppDO.isHybridFlowEnabled())); @@ -1965,13 +1951,6 @@ private void setSpOIDCProperties(Map> spOIDCProperties, OAu oauthApp.setSubjectTokenExpiryTime(Integer.parseInt(subjectTokenExpiryTime)); } - String isAccessTokenClaimsSeparationEnabled = getFirstPropertyValue(spOIDCProperties, - IS_ACCESS_TOKEN_CLAIMS_SEPARATION_ENABLED); - if (isAccessTokenClaimsSeparationEnabled != null) { - oauthApp.setAccessTokenClaimsSeparationEnabled( - Boolean.parseBoolean(isAccessTokenClaimsSeparationEnabled)); - } - boolean hybridFlowEnabled = Boolean.parseBoolean(getFirstPropertyValue(spOIDCProperties, HYBRID_FLOW_ENABLED)); oauthApp.setHybridFlowEnabled(hybridFlowEnabled); diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDO.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDO.java index 773c8b484f..1d676bee02 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDO.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dao/OAuthAppDO.java @@ -96,7 +96,6 @@ public class OAuthAppDO extends InboundConfigurationProtocol implements Serializ private boolean subjectTokenEnabled; private int subjectTokenExpiryTime; private String[] accessTokenClaims; - private boolean accessTokenClaimsSeparationEnabled; public AuthenticatedUser getAppOwner() { @@ -535,14 +534,4 @@ public void setAccessTokenClaims(String[] accessTokenClaims) { this.accessTokenClaims = accessTokenClaims; } - - public boolean isAccessTokenClaimsSeparationEnabled() { - - return accessTokenClaimsSeparationEnabled; - } - - public void setAccessTokenClaimsSeparationEnabled(boolean accessTokenClaimsSeparationEnabled) { - - this.accessTokenClaimsSeparationEnabled = accessTokenClaimsSeparationEnabled; - } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dto/OAuthConsumerAppDTO.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dto/OAuthConsumerAppDTO.java index fb4e4f2d79..4784b822ad 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dto/OAuthConsumerAppDTO.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/dto/OAuthConsumerAppDTO.java @@ -81,7 +81,6 @@ public class OAuthConsumerAppDTO implements InboundProtocolConfigurationDTO { private boolean subjectTokenEnabled; private int subjectTokenExpiryTime; private String[] accessTokenClaims; - private boolean accessTokenClaimsSeparationEnabled; // CORS origin related properties. This will be used by the CORS management service @IgnoreNullElement @@ -540,15 +539,5 @@ public void setAccessTokenClaims(String[] accessTokenClaims) { this.accessTokenClaims = accessTokenClaims; } - - public boolean isAccessTokenClaimsSeparationEnabled() { - - return accessTokenClaimsSeparationEnabled; - } - - public void setAccessTokenClaimsSeparationEnabled(boolean accessTokenClaimsSeparationEnabled) { - - this.accessTokenClaimsSeparationEnabled = accessTokenClaimsSeparationEnabled; - } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java index 52e1855fdb..73a0529e81 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java @@ -393,8 +393,6 @@ public class OAuth2Util { ApplicationConstants.MY_ACCOUNT_APPLICATION_CLIENT_ID, ApplicationConstants.CONSOLE_APPLICATION_CLIENT_ID); - public static final String ALLOWED_VERSION_TO_STOP_USING_APP_OWNER_FOR_TOKEN_IDENTIFICATION = "v1.0.0"; - private OAuth2Util() { } @@ -5634,10 +5632,11 @@ public static boolean isPairwiseSubEnabledForAccessTokens() { * @param appVersion App version. * @return True if the app version is greater than or equal to the allowed minimum version. */ + @Deprecated public static boolean isAllowedToStopUsingAppOwnerForTokenIdentification(String appVersion) { String[] appVersionDigits = appVersion.substring(1).split("\\."); - String[] allowedVersionDigits = ALLOWED_VERSION_TO_STOP_USING_APP_OWNER_FOR_TOKEN_IDENTIFICATION.substring(1) + String[] allowedVersionDigits = ApplicationConstants.ApplicationVersion.APP_VERSION_V1.substring(1) .split("\\."); for (int i = 0; i < appVersionDigits.length; i++) { @@ -5649,4 +5648,25 @@ public static boolean isAllowedToStopUsingAppOwnerForTokenIdentification(String } return true; } + + /** + * Compare the app version with allowed minimum app version. + * + * @param appVersion App version. + * @return True if the app version is greater than or equal to the allowed minimum app version. + */ + public static boolean isGivenAppVersionAllowed(String appVersion, String allowedAppVersion) { + + String[] appVersionDigits = appVersion.substring(1).split("\\."); + String[] allowedVersionDigits = allowedAppVersion.substring(1).split("\\."); + + for (int i = 0; i < appVersionDigits.length; i++) { + if (appVersionDigits[i].equals(allowedVersionDigits[i])) { + continue; + } else { + return Integer.parseInt(appVersionDigits[i]) >= Integer.parseInt(allowedVersionDigits[i]); + } + } + return true; + } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java index 0428536266..910c06a1ee 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java @@ -18,9 +18,13 @@ package org.wso2.carbon.identity.openidconnect.util; +import org.wso2.carbon.identity.application.common.model.ServiceProvider; +import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.core.util.IdentityUtil; import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration; import org.wso2.carbon.identity.oauth.dao.OAuthAppDO; +import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception; +import org.wso2.carbon.identity.oauth2.util.OAuth2Util; import org.wso2.carbon.identity.openidconnect.CustomClaimsCallbackHandler; import static org.wso2.carbon.identity.oauth.common.OAuthConstants.ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN; @@ -30,11 +34,21 @@ */ public class ClaimHandlerUtil { - public static CustomClaimsCallbackHandler getClaimsCallbackHandler(OAuthAppDO oAuthAppDO) { + /** + * Get the claims callback handler based on the application configuration. + * + * @param oAuthAppDO OAuth application data object. + * @return CustomClaimsCallbackHandler. + */ + public static CustomClaimsCallbackHandler getClaimsCallbackHandler(OAuthAppDO oAuthAppDO) + throws IdentityOAuth2Exception { // If JWT access token OIDC claims separation is enabled and the application is configured to separate OIDC // claims, use the JWTAccessTokenOIDCClaimsHandler to handle custom claims. - if (isAccessTokenClaimsSeparationFeatureEnabled() && oAuthAppDO.isAccessTokenClaimsSeparationEnabled()) { + int appTenantId = IdentityTenantUtil.getLoginTenantId(); + String tenantDomain = IdentityTenantUtil.getTenantDomain(appTenantId); + if (isAccessTokenClaimsSeparationFeatureEnabled() && + isAccessTokenClaimsSeparationEnabledForApp(oAuthAppDO, tenantDomain)) { return OAuthServerConfiguration.getInstance().getJWTAccessTokenOIDCClaimsHandler(); } return OAuthServerConfiguration.getInstance().getOpenIDConnectCustomClaimsCallbackHandler(); @@ -44,4 +58,14 @@ private static boolean isAccessTokenClaimsSeparationFeatureEnabled() { return Boolean.parseBoolean(IdentityUtil.getProperty(ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN)); } + + private static boolean isAccessTokenClaimsSeparationEnabledForApp(OAuthAppDO oAuthAppDO, String tenantDomain) + throws IdentityOAuth2Exception { + + ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(oAuthAppDO.getOauthConsumerKey(), tenantDomain); + String appVersion = serviceProvider.getApplicationVersion(); + + // Todo change to constant. + return OAuth2Util.isGivenAppVersionAllowed(appVersion, "v2.0.0"); + } } From cb298cb4caf1def3ca2c9f2f7d1de28b719db759 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Wed, 16 Oct 2024 15:10:32 +0530 Subject: [PATCH 03/22] Change the method and usages. --- .../oauth2/token/AccessTokenIssuer.java | 6 +++-- .../identity/oauth2/util/OAuth2Util.java | 23 ------------------- .../validators/TokenValidationHandler.java | 4 +++- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java index c77aa70598..5d069421d3 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java @@ -34,6 +34,7 @@ import org.wso2.carbon.identity.application.common.model.ServiceProvider; import org.wso2.carbon.identity.application.common.model.ServiceProviderProperty; import org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants; +import org.wso2.carbon.identity.application.mgt.ApplicationConstants; import org.wso2.carbon.identity.base.IdentityConstants; import org.wso2.carbon.identity.base.IdentityException; import org.wso2.carbon.identity.central.log.mgt.utils.LogConstants; @@ -459,8 +460,9 @@ private OAuth2AccessTokenRespDTO validateGrantAndIssueToken(OAuth2AccessTokenReq ServiceProvider serviceProvider = getServiceProvider(tokReqMsgCtx.getOauth2AccessTokenReqDTO()); boolean useClientIdAsSubClaimForAppTokensEnabledServerConfig = OAuthServerConfiguration.getInstance() .isUseClientIdAsSubClaimForAppTokensEnabled(); - boolean useClientIdAsSubClaimForAppTokensEnabled = OAuth2Util - .isAllowedToStopUsingAppOwnerForTokenIdentification(serviceProvider.getApplicationVersion()); + boolean useClientIdAsSubClaimForAppTokensEnabled = + OAuth2Util.isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), + ApplicationConstants.ApplicationVersion.APP_VERSION_V1); if (authorizedUser.getAuthenticatedSubjectIdentifier() == null) { if ((!isOfTypeApplicationUser && (useClientIdAsSubClaimForAppTokensEnabled || useClientIdAsSubClaimForAppTokensEnabledServerConfig))) { diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java index 73a0529e81..d31b52f1c8 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java @@ -5626,29 +5626,6 @@ public static boolean isPairwiseSubEnabledForAccessTokens() { return Boolean.parseBoolean(IdentityUtil.getProperty(ENABLE_PPID_FOR_ACCESS_TOKENS)); } - /** - * Compare the app version with allowed minimum version. - * - * @param appVersion App version. - * @return True if the app version is greater than or equal to the allowed minimum version. - */ - @Deprecated - public static boolean isAllowedToStopUsingAppOwnerForTokenIdentification(String appVersion) { - - String[] appVersionDigits = appVersion.substring(1).split("\\."); - String[] allowedVersionDigits = ApplicationConstants.ApplicationVersion.APP_VERSION_V1.substring(1) - .split("\\."); - - for (int i = 0; i < appVersionDigits.length; i++) { - if (appVersionDigits[i].equals(allowedVersionDigits[i])) { - continue; - } else { - return Integer.parseInt(appVersionDigits[i]) >= Integer.parseInt(allowedVersionDigits[i]); - } - } - return true; - } - /** * Compare the app version with allowed minimum app version. * diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java index 1915185e21..9496ae148d 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java @@ -27,6 +27,7 @@ import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser; import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException; import org.wso2.carbon.identity.application.common.model.ServiceProvider; +import org.wso2.carbon.identity.application.mgt.ApplicationConstants; import org.wso2.carbon.identity.central.log.mgt.utils.LogConstants; import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; @@ -578,7 +579,8 @@ private OAuth2IntrospectionResponseDTO validateAccessToken(OAuth2TokenValidation String consumerKey = accessTokenDO.getConsumerKey(); ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(consumerKey, appResidentTenantDomain); boolean removeUsernameFromAppTokenEnabled = OAuth2Util - .isAllowedToStopUsingAppOwnerForTokenIdentification(serviceProvider.getApplicationVersion()); + .isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), + ApplicationConstants.ApplicationVersion.APP_VERSION_V1); boolean isAppTokenType = StringUtils.equals(OAuthConstants.UserType.APPLICATION, tokenType); // should be in seconds From 207e8c6cfd454218e911a9fcdcb2a0bbe7a99a45 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Wed, 16 Oct 2024 15:10:49 +0530 Subject: [PATCH 04/22] Replace jwt claim usages with app version. --- .../org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java | 3 ++- .../carbon/identity/openidconnect/util/ClaimHandlerUtil.java | 4 ++-- pom.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java index 1dbf1fa01b..1e841971b2 100755 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java @@ -2876,6 +2876,7 @@ private boolean isAccessTokenClaimsSeparationEnabledForApp(String consumerKey, S throws IdentityOAuth2Exception { ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(consumerKey, tenantDomain); - return OAuth2Util.isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), "v2.0.0"); + return OAuth2Util.isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), + ApplicationConstants.ApplicationVersion.APP_VERSION_V2); } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java index 910c06a1ee..3ba8192cc8 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java @@ -19,6 +19,7 @@ package org.wso2.carbon.identity.openidconnect.util; import org.wso2.carbon.identity.application.common.model.ServiceProvider; +import org.wso2.carbon.identity.application.mgt.ApplicationConstants; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.core.util.IdentityUtil; import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration; @@ -65,7 +66,6 @@ private static boolean isAccessTokenClaimsSeparationEnabledForApp(OAuthAppDO oAu ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(oAuthAppDO.getOauthConsumerKey(), tenantDomain); String appVersion = serviceProvider.getApplicationVersion(); - // Todo change to constant. - return OAuth2Util.isGivenAppVersionAllowed(appVersion, "v2.0.0"); + return OAuth2Util.isGivenAppVersionAllowed(appVersion, ApplicationConstants.ApplicationVersion.APP_VERSION_V2); } } diff --git a/pom.xml b/pom.xml index 59a86c6f6c..ee0dff678f 100644 --- a/pom.xml +++ b/pom.xml @@ -932,7 +932,7 @@ [1.0.1, 2.0.0) - 7.5.64 + 7.5.66 [5.25.234, 8.0.0) From 49ed7df33aadc715204bb04ff558177e3a777a72 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Tue, 22 Oct 2024 09:53:22 +0530 Subject: [PATCH 05/22] Refactor method name. --- .../org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java | 2 +- .../wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java | 2 +- .../java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java | 2 +- .../identity/oauth2/validators/TokenValidationHandler.java | 2 +- .../carbon/identity/openidconnect/util/ClaimHandlerUtil.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java index 1e841971b2..1d75ab5aa3 100755 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImpl.java @@ -2876,7 +2876,7 @@ private boolean isAccessTokenClaimsSeparationEnabledForApp(String consumerKey, S throws IdentityOAuth2Exception { ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(consumerKey, tenantDomain); - return OAuth2Util.isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), + return OAuth2Util.isAppVersionAllowed(serviceProvider.getApplicationVersion(), ApplicationConstants.ApplicationVersion.APP_VERSION_V2); } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java index 5d069421d3..16f539f4ec 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/token/AccessTokenIssuer.java @@ -461,7 +461,7 @@ private OAuth2AccessTokenRespDTO validateGrantAndIssueToken(OAuth2AccessTokenReq boolean useClientIdAsSubClaimForAppTokensEnabledServerConfig = OAuthServerConfiguration.getInstance() .isUseClientIdAsSubClaimForAppTokensEnabled(); boolean useClientIdAsSubClaimForAppTokensEnabled = - OAuth2Util.isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), + OAuth2Util.isAppVersionAllowed(serviceProvider.getApplicationVersion(), ApplicationConstants.ApplicationVersion.APP_VERSION_V1); if (authorizedUser.getAuthenticatedSubjectIdentifier() == null) { if ((!isOfTypeApplicationUser && (useClientIdAsSubClaimForAppTokensEnabled diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java index d31b52f1c8..f2a46773f6 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/util/OAuth2Util.java @@ -5632,7 +5632,7 @@ public static boolean isPairwiseSubEnabledForAccessTokens() { * @param appVersion App version. * @return True if the app version is greater than or equal to the allowed minimum app version. */ - public static boolean isGivenAppVersionAllowed(String appVersion, String allowedAppVersion) { + public static boolean isAppVersionAllowed(String appVersion, String allowedAppVersion) { String[] appVersionDigits = appVersion.substring(1).split("\\."); String[] allowedVersionDigits = allowedAppVersion.substring(1).split("\\."); diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java index 9496ae148d..fabb785dbb 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/validators/TokenValidationHandler.java @@ -579,7 +579,7 @@ private OAuth2IntrospectionResponseDTO validateAccessToken(OAuth2TokenValidation String consumerKey = accessTokenDO.getConsumerKey(); ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(consumerKey, appResidentTenantDomain); boolean removeUsernameFromAppTokenEnabled = OAuth2Util - .isGivenAppVersionAllowed(serviceProvider.getApplicationVersion(), + .isAppVersionAllowed(serviceProvider.getApplicationVersion(), ApplicationConstants.ApplicationVersion.APP_VERSION_V1); boolean isAppTokenType = StringUtils.equals(OAuthConstants.UserType.APPLICATION, tokenType); diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java index 3ba8192cc8..2f2eab51d0 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtil.java @@ -66,6 +66,6 @@ private static boolean isAccessTokenClaimsSeparationEnabledForApp(OAuthAppDO oAu ServiceProvider serviceProvider = OAuth2Util.getServiceProvider(oAuthAppDO.getOauthConsumerKey(), tenantDomain); String appVersion = serviceProvider.getApplicationVersion(); - return OAuth2Util.isGivenAppVersionAllowed(appVersion, ApplicationConstants.ApplicationVersion.APP_VERSION_V2); + return OAuth2Util.isAppVersionAllowed(appVersion, ApplicationConstants.ApplicationVersion.APP_VERSION_V2); } } From 01062b3e0d84a84c2d78f1402fdd947d04900400 Mon Sep 17 00:00:00 2001 From: osandamaleesha Date: Tue, 22 Oct 2024 14:26:15 +0530 Subject: [PATCH 06/22] Add diagnostics Logs --- .../PreIssueAccessTokenResponseProcessor.java | 27 ++++++++++++++++++- pom.xml | 2 +- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java index c174599c8c..2b6d915718 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.identity.action.execution.ActionExecutionLogConstants; import org.wso2.carbon.identity.action.execution.ActionExecutionResponseProcessor; import org.wso2.carbon.identity.action.execution.exception.ActionExecutionResponseProcessorException; import org.wso2.carbon.identity.action.execution.model.ActionExecutionStatus; @@ -31,11 +32,13 @@ import org.wso2.carbon.identity.action.execution.model.ActionType; import org.wso2.carbon.identity.action.execution.model.Event; import org.wso2.carbon.identity.action.execution.model.PerformableOperation; +import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; import org.wso2.carbon.identity.oauth.action.model.AccessToken; import org.wso2.carbon.identity.oauth.action.model.ClaimPathInfo; import org.wso2.carbon.identity.oauth.action.model.OperationExecutionResult; import org.wso2.carbon.identity.oauth.action.model.PreIssueAccessTokenEvent; import org.wso2.carbon.identity.oauth2.token.OAuthTokenReqMessageContext; +import org.wso2.carbon.utils.DiagnosticLog; import java.util.ArrayList; import java.util.Collections; @@ -113,7 +116,29 @@ public ActionExecutionStatus processSuccessResponse(Map eventCon private void logOperationExecutionResults(ActionType actionType, List operationExecutionResultList) { - //todo: need to add to diagnostic logs + if (LoggerUtils.isDiagnosticLogsEnabled()) { + + List> operationDetailsList = new ArrayList<>(); + operationExecutionResultList.forEach(performedOperation -> { + operationDetailsList.add(Map.of( + "operation", performedOperation.getOperation().getOp() + " path: " + + performedOperation.getOperation().getPath(), + "status", performedOperation.getStatus().toString(), + "message", performedOperation.getMessage() + )); + }); + + DiagnosticLog.DiagnosticLogBuilder diagLogBuilder = new DiagnosticLog.DiagnosticLogBuilder( + ActionExecutionLogConstants.ACTION_EXECUTION_COMPONENT_ID, + ActionExecutionLogConstants.ActionIDs.EXECUTE_ACTION_OPERATIONS); + diagLogBuilder + .inputParam("executed operations", operationDetailsList.isEmpty() ? "empty" : operationDetailsList) + .resultMessage("Allowed operations are executed for " + actionType + " action.") + .logDetailLevel(DiagnosticLog.LogDetailLevel.APPLICATION) + .resultStatus(DiagnosticLog.ResultStatus.SUCCESS) + .build(); + LoggerUtils.triggerDiagnosticLogEvent(diagLogBuilder); + } if (LOG.isDebugEnabled()) { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); diff --git a/pom.xml b/pom.xml index b797a5ab7a..9271eda10a 100644 --- a/pom.xml +++ b/pom.xml @@ -939,7 +939,7 @@ [1.0.1, 2.0.0) - 7.5.71 + 7.5.75 [5.25.234, 8.0.0) From 23f8d8437703614a13e2587cdda15fc266c5f4ca Mon Sep 17 00:00:00 2001 From: osandamaleesha Date: Tue, 22 Oct 2024 15:06:54 +0530 Subject: [PATCH 07/22] Increase test coverage --- .../oauth/action/PreIssueAccessTokenRequestBuilderTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilderTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilderTest.java index 559c7a2599..ff9f8bfc0b 100644 --- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilderTest.java +++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilderTest.java @@ -34,6 +34,7 @@ import org.wso2.carbon.identity.action.execution.model.Param; import org.wso2.carbon.identity.action.execution.model.Tenant; import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser; +import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; import org.wso2.carbon.identity.oauth.action.model.AccessToken; import org.wso2.carbon.identity.oauth.action.model.PreIssueAccessTokenEvent; @@ -72,6 +73,7 @@ public class PreIssueAccessTokenRequestBuilderTest { private MockedStatic oAuthServerConfiguration; private MockedStatic identityTenantUtilMockedStatic; private MockedStatic oAuth2UtilMockedStatic; + private MockedStatic loggerUtils; private static final String CLIENT_ID_TEST = "test-client-id"; private static final String CLIENT_SECRET_TEST = "test-client-secret"; @@ -115,6 +117,9 @@ public void setUp() { identityTenantUtilMockedStatic.when(() -> IdentityTenantUtil.getTenantId(TENANT_DOMAIN_TEST)) .thenReturn(TENANT_ID_TEST); + loggerUtils = mockStatic(LoggerUtils.class); + loggerUtils.when(() -> LoggerUtils.isDiagnosticLogsEnabled()).thenReturn(true); + AuthorizationGrantHandler authorizationGrantHandler = mock(AuthorizationGrantHandler.class); Map mockGrantTypesMap = new HashMap<>(); mockGrantTypesMap.put(GRANT_TYPE_TEST, authorizationGrantHandler); @@ -131,6 +136,7 @@ public void tearDown() { oAuthServerConfiguration.close(); claimHandlerUtilMockedStatic.close(); identityTenantUtilMockedStatic.close(); + loggerUtils.close(); } @Test From 4970c8a278228f3861549f4e1ba007c970a1e03a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Oct 2024 13:44:41 +0000 Subject: [PATCH 08/22] [WSO2 Release] [Jenkins #5078] [Release 7.0.172] prepare release v7.0.172 --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 70a01bd8b7..4826b67035 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172-SNAPSHOT + 7.0.172 ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.172-SNAPSHOT + 7.0.172 WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index a7a7136e9b..6d8055ec5f 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172-SNAPSHOT + 7.0.172 ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.172-SNAPSHOT + 7.0.172 WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index cab9f0f474..4e9d1d7016 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172-SNAPSHOT + 7.0.172 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index f74ac89c8e..63be620a0e 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index 6dfcf4459d..ec76eae834 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.172-SNAPSHOT + 7.0.172 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index 401416ce19..57e56c5e7b 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index b99ba570b3..fe727a1f05 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index a81156df28..ccd028c024 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index e4ba42821e..c82de2d8f4 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 4d1a3f134e..64ad8d2ae5 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index e096d1cffa..32715f5cc3 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.172-SNAPSHOT + 7.0.172 ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index fffff4ec31..cb31a97d0c 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index c5b7d4a77b..2adae8f5e8 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index e5ed87247b..912b6201fb 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 39a1dbde62..82c8c2d1d3 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index 0986688ea5..dc11667fcc 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index 4314658b65..f8fe35af7d 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index 0effdc0705..eaba3ff5b3 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index 2abee38548..5f5f628c41 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index 5a6de9854c..d90fb3fe7c 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index 0b90900729..cea4e2afe1 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index 9dbdc1c502..a236fccdf6 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index af38afe98f..f92f3e209c 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index 27256f8868..d107c4f26c 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 diff --git a/pom.xml b/pom.xml index 9271eda10a..ebaf6a0dc4 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172-SNAPSHOT + 7.0.172 pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - HEAD + v7.0.172 diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index ab07fd0cec..8416d18513 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172-SNAPSHOT + 7.0.172 ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index a89e6db156..3ece555639 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172-SNAPSHOT + 7.0.172 4.0.0 From 1f2b348acff3f6ded51af0ac2216a4137f668fad Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 22 Oct 2024 13:44:43 +0000 Subject: [PATCH 09/22] [WSO2 Release] [Jenkins #5078] [Release 7.0.172] prepare for next development iteration --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 4826b67035..117417ae74 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172 + 7.0.173-SNAPSHOT ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.172 + 7.0.173-SNAPSHOT WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index 6d8055ec5f..72d2f71959 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172 + 7.0.173-SNAPSHOT ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.172 + 7.0.173-SNAPSHOT WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index 4e9d1d7016..9d04310e80 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172 + 7.0.173-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index 63be620a0e..24697d8596 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index ec76eae834..64e758372d 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.172 + 7.0.173-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index 57e56c5e7b..3f2ac57623 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index fe727a1f05..1abfd54487 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index ccd028c024..7bf68f87e0 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index c82de2d8f4..aba3b0a37a 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 64ad8d2ae5..69e14b9b33 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index 32715f5cc3..ffbf78c77d 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.172 + 7.0.173-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index cb31a97d0c..57607a1ebe 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index 2adae8f5e8..4fca7f2759 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index 912b6201fb..612516f084 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 82c8c2d1d3..2ca29b86aa 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index dc11667fcc..a51c59e128 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index f8fe35af7d..968b58f365 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index eaba3ff5b3..e7d34043fa 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index 5f5f628c41..a04ff06a2f 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index d90fb3fe7c..9c699d66df 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index cea4e2afe1..26e85815d7 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index a236fccdf6..2eb8500f4b 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index f92f3e209c..d2759b7ae3 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index d107c4f26c..010f98de7d 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index ebaf6a0dc4..4b08c66a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172 + 7.0.173-SNAPSHOT pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - v7.0.172 + HEAD diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index 8416d18513..a03a839016 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.172 + 7.0.173-SNAPSHOT ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index 3ece555639..825f5a6cb9 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.172 + 7.0.173-SNAPSHOT 4.0.0 From f014f16b856cb1659ade5f7a3f096ba6fb81f7a0 Mon Sep 17 00:00:00 2001 From: osandamaleesha Date: Thu, 24 Oct 2024 12:32:41 +0530 Subject: [PATCH 10/22] Resolve consistency for action type name --- .../oauth/action/PreIssueAccessTokenResponseProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java index 2b6d915718..f56fa00b26 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenResponseProcessor.java @@ -133,7 +133,7 @@ private void logOperationExecutionResults(ActionType actionType, ActionExecutionLogConstants.ActionIDs.EXECUTE_ACTION_OPERATIONS); diagLogBuilder .inputParam("executed operations", operationDetailsList.isEmpty() ? "empty" : operationDetailsList) - .resultMessage("Allowed operations are executed for " + actionType + " action.") + .resultMessage("Allowed operations are executed for " + actionType.getDisplayName() + " action.") .logDetailLevel(DiagnosticLog.LogDetailLevel.APPLICATION) .resultStatus(DiagnosticLog.ResultStatus.SUCCESS) .build(); From 6e74ff89d11d6cb0d7350d1699f1dfe8135bfdd5 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri <47152272+mpmadhavig@users.noreply.github.com> Date: Thu, 24 Oct 2024 14:44:39 +0530 Subject: [PATCH 11/22] Bump framework version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b08c66a4e..3cbd9ca23c 100644 --- a/pom.xml +++ b/pom.xml @@ -939,7 +939,7 @@ [1.0.1, 2.0.0) - 7.5.75 + 7.5.83 [5.25.234, 8.0.0) From 43ec7123c78841c29b64d95323ec85657891e35a Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri <47152272+mpmadhavig@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:24:30 +0530 Subject: [PATCH 12/22] Bump framework version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3cbd9ca23c..a4dabd75e4 100644 --- a/pom.xml +++ b/pom.xml @@ -939,7 +939,7 @@ [1.0.1, 2.0.0) - 7.5.83 + 7.5.84 [5.25.234, 8.0.0) From b39e65050d24a3cc128af8dc648127a67aba00e3 Mon Sep 17 00:00:00 2001 From: osandamaleesha Date: Thu, 24 Oct 2024 19:09:44 +0530 Subject: [PATCH 13/22] Bump carbon identity framework version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9271eda10a..0b7cab4436 100644 --- a/pom.xml +++ b/pom.xml @@ -939,7 +939,7 @@ [1.0.1, 2.0.0) - 7.5.75 + 7.5.86 [5.25.234, 8.0.0) From 3dc4359f5ef8955d8305565c96c1d5f20db31571 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 24 Oct 2024 19:27:35 +0000 Subject: [PATCH 14/22] [WSO2 Release] [Jenkins #5080] [Release 7.0.173] prepare release v7.0.173 --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 117417ae74..9287e35018 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173-SNAPSHOT + 7.0.173 ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.173-SNAPSHOT + 7.0.173 WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index 72d2f71959..6f5329f016 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173-SNAPSHOT + 7.0.173 ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.173-SNAPSHOT + 7.0.173 WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index 9d04310e80..b08199dfed 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173-SNAPSHOT + 7.0.173 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index 24697d8596..923febc8c0 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index 64e758372d..4917185c7b 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.173-SNAPSHOT + 7.0.173 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index 3f2ac57623..3a1de38b88 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index 1abfd54487..31b51171be 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index 7bf68f87e0..f6f475b147 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index aba3b0a37a..14e3955012 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 69e14b9b33..c9e1a8916b 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index ffbf78c77d..76a6af3794 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.173-SNAPSHOT + 7.0.173 ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index 57607a1ebe..e9448a9c9a 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index 4fca7f2759..811fc0b72c 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index 612516f084..feb9534e5a 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 2ca29b86aa..6d148aedc0 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index a51c59e128..a1398652cd 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index 968b58f365..b17beafc8b 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index e7d34043fa..e1c0bcb9b7 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index a04ff06a2f..1df560e9c3 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index 9c699d66df..79b84e4f7e 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index 26e85815d7..ddf218f5f9 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index 2eb8500f4b..a09fbfeeba 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index d2759b7ae3..2d85a05421 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index 010f98de7d..2b19120922 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 diff --git a/pom.xml b/pom.xml index 33a011c436..05a990e518 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173-SNAPSHOT + 7.0.173 pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - HEAD + v7.0.173 diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index a03a839016..51c8270440 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173-SNAPSHOT + 7.0.173 ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index 825f5a6cb9..9c3c9681af 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173-SNAPSHOT + 7.0.173 4.0.0 From afd5acb1b96dd542443440c87acb8a95d0cece30 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 24 Oct 2024 19:27:37 +0000 Subject: [PATCH 15/22] [WSO2 Release] [Jenkins #5080] [Release 7.0.173] prepare for next development iteration --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 9287e35018..01d48f3ec2 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173 + 7.0.174-SNAPSHOT ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.173 + 7.0.174-SNAPSHOT WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index 6f5329f016..1285bb91f9 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173 + 7.0.174-SNAPSHOT ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.173 + 7.0.174-SNAPSHOT WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index b08199dfed..75f39170a5 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173 + 7.0.174-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index 923febc8c0..a0124468cd 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index 4917185c7b..e92c09286d 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.173 + 7.0.174-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index 3a1de38b88..dc9edc70b3 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index 31b51171be..b965602020 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index f6f475b147..33cfdc1435 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index 14e3955012..07f853c300 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index c9e1a8916b..7ef872e72b 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index 76a6af3794..16cb9c3403 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.173 + 7.0.174-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index e9448a9c9a..98b524d817 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index 811fc0b72c..61b0314cde 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index feb9534e5a..fa88a92820 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 6d148aedc0..2f7206613a 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index a1398652cd..f5ecc8301c 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index b17beafc8b..6660f0fb3c 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index e1c0bcb9b7..ffa10f50a0 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index 1df560e9c3..355dc7f57e 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index 79b84e4f7e..3cbf9f5d3d 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index ddf218f5f9..925600154c 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index a09fbfeeba..f809c1761b 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index 2d85a05421..6dcae3c655 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index 2b19120922..2aaedb4f18 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 05a990e518..c5abec5a11 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173 + 7.0.174-SNAPSHOT pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - v7.0.173 + HEAD diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index 51c8270440..ac8c4a8241 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.173 + 7.0.174-SNAPSHOT ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index 9c3c9681af..c85483e6fe 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.173 + 7.0.174-SNAPSHOT 4.0.0 From 6dae5870534a11cb494d9a9b0268e64ac16c23e2 Mon Sep 17 00:00:00 2001 From: Thumimku Date: Fri, 25 Oct 2024 14:06:49 +0530 Subject: [PATCH 16/22] improve device code not exists error description --- .../identity/oauth2/device/errorcodes/DeviceErrorCodes.java | 1 + .../carbon/identity/oauth2/device/grant/DeviceFlowGrant.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/errorcodes/DeviceErrorCodes.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/errorcodes/DeviceErrorCodes.java index 277e1a92c9..64180640fa 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/errorcodes/DeviceErrorCodes.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/errorcodes/DeviceErrorCodes.java @@ -50,6 +50,7 @@ public static class SubDeviceErrorCodesDescriptions { public static final String SLOW_DOWN = "Forbidden"; public static final String AUTHORIZATION_PENDING = "Precondition required"; public static final String EXPIRED_TOKEN = "Forbidden"; + public static final String NOT_EXIST = "The provided device code is not registered or is invalid."; } } diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/grant/DeviceFlowGrant.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/grant/DeviceFlowGrant.java index 4d780bf57e..c1439c4c74 100644 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/grant/DeviceFlowGrant.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth2/device/grant/DeviceFlowGrant.java @@ -100,7 +100,8 @@ private void handleInvalidRequests(String deviceStatus, DeviceFlowDO deviceFlowD Date date = new Date(); if (Constants.NOT_EXIST.equals(deviceStatus)) { - throw new IdentityOAuth2Exception(DeviceErrorCodes.INVALID_REQUEST, DeviceErrorCodes.INVALID_REQUEST); + throw new IdentityOAuth2Exception(DeviceErrorCodes.INVALID_REQUEST, + DeviceErrorCodes.SubDeviceErrorCodesDescriptions.NOT_EXIST); } else if (Constants.EXPIRED.equals(deviceStatus) || isExpiredDeviceCode(deviceFlowDO, date)) { throw new IdentityOAuth2Exception(DeviceErrorCodes.SubDeviceErrorCodes.EXPIRED_TOKEN, DeviceErrorCodes.SubDeviceErrorCodesDescriptions.EXPIRED_TOKEN); From e5ecb3772c2fd96907b0d0d90d48aa38280c58fd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 25 Oct 2024 11:25:49 +0000 Subject: [PATCH 17/22] [WSO2 Release] [Jenkins #5082] [Release 7.0.174] prepare release v7.0.174 --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 01d48f3ec2..a2f35c3ce5 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174-SNAPSHOT + 7.0.174 ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.174-SNAPSHOT + 7.0.174 WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index 1285bb91f9..199d32a2f1 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174-SNAPSHOT + 7.0.174 ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.174-SNAPSHOT + 7.0.174 WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index 75f39170a5..f257da6bb7 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174-SNAPSHOT + 7.0.174 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index a0124468cd..a31adddfee 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index e92c09286d..7466a33148 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.174-SNAPSHOT + 7.0.174 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index dc9edc70b3..a9a46eaf8b 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index b965602020..dd8f797b68 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index 33cfdc1435..244b8f474e 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index 07f853c300..a69702562c 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 7ef872e72b..2672b77943 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index 16cb9c3403..8944021eb7 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.174-SNAPSHOT + 7.0.174 ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index 98b524d817..18a5792254 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index 61b0314cde..29bfdf8ca0 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index fa88a92820..90cccef4cf 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 2f7206613a..53af1fb090 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index f5ecc8301c..325e7dd473 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index 6660f0fb3c..e4adb56072 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index ffa10f50a0..585cb8893f 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index 355dc7f57e..d60d267421 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index 3cbf9f5d3d..ecec76bab5 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index 925600154c..7ccbd4bf4f 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index f809c1761b..9a3dcb1399 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index 6dcae3c655..3091165e1e 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index 2aaedb4f18..4624aa63a8 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 diff --git a/pom.xml b/pom.xml index c5abec5a11..ef805d9021 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174-SNAPSHOT + 7.0.174 pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - HEAD + v7.0.174 diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index ac8c4a8241..e6189f5475 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174-SNAPSHOT + 7.0.174 ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index c85483e6fe..aa84f7c052 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174-SNAPSHOT + 7.0.174 4.0.0 From 9594830ff87cdf62b06e0df68cffc2b17b1243c7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 25 Oct 2024 11:25:51 +0000 Subject: [PATCH 18/22] [WSO2 Release] [Jenkins #5082] [Release 7.0.174] prepare for next development iteration --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index a2f35c3ce5..169e6900c9 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174 + 7.0.175-SNAPSHOT ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.174 + 7.0.175-SNAPSHOT WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index 199d32a2f1..860a85c11f 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174 + 7.0.175-SNAPSHOT ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.174 + 7.0.175-SNAPSHOT WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index f257da6bb7..ed8cbefe0e 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174 + 7.0.175-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index a31adddfee..67045a0b5c 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index 7466a33148..a928dc17ce 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.174 + 7.0.175-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index a9a46eaf8b..874e6ea578 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index dd8f797b68..4af674ae80 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index 244b8f474e..1b2f0845be 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index a69702562c..c8b65122ed 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 2672b77943..76c3ade406 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index 8944021eb7..fa9eaa95d7 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.174 + 7.0.175-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index 18a5792254..6db503dc49 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index 29bfdf8ca0..b3b969b650 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index 90cccef4cf..a47ffcb95c 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 53af1fb090..4319c206f9 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index 325e7dd473..e3daea89f1 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index e4adb56072..2f1a94ed7e 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index 585cb8893f..ec0d785a6d 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index d60d267421..361394e0f3 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index ecec76bab5..717758b980 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index 7ccbd4bf4f..9c090d3366 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index 9a3dcb1399..ed483c6e42 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index 3091165e1e..c1954b1c8c 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index 4624aa63a8..8966a46e8e 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index ef805d9021..72491e5cd3 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174 + 7.0.175-SNAPSHOT pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - v7.0.174 + HEAD diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index e6189f5475..4c39c66023 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.174 + 7.0.175-SNAPSHOT ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index aa84f7c052..ecff06e201 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.174 + 7.0.175-SNAPSHOT 4.0.0 From fc4da9f3ee73cf7ffe7b0c5abbc840edf000a976 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 27 Oct 2024 07:00:44 +0000 Subject: [PATCH 19/22] [maven-release-plugin] prepare release v7.0.175 --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 169e6900c9..9daa33e38a 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175-SNAPSHOT + 7.0.175 ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.175-SNAPSHOT + 7.0.175 WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index 860a85c11f..b7a9883909 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175-SNAPSHOT + 7.0.175 ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.175-SNAPSHOT + 7.0.175 WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index ed8cbefe0e..db6a156999 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175-SNAPSHOT + 7.0.175 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index 67045a0b5c..ed9043b765 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index a928dc17ce..e17ce8767b 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.175-SNAPSHOT + 7.0.175 ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index 874e6ea578..b4c061d073 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index 4af674ae80..63056ca7fc 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index 1b2f0845be..b90178dd98 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index c8b65122ed..96afe25597 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 76c3ade406..85accab24a 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index fa9eaa95d7..4c700bc99b 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.175-SNAPSHOT + 7.0.175 ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index 6db503dc49..1d70209532 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index b3b969b650..b7937756ad 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index a47ffcb95c..e9e9873271 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index 4319c206f9..ecdefd1545 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index e3daea89f1..884d946646 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index 2f1a94ed7e..7404145c57 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index ec0d785a6d..66394c671e 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index 361394e0f3..305a8b54bf 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index 717758b980..3730e64be7 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index 9c090d3366..8132a09fc2 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index ed483c6e42..e60b2f55e0 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index c1954b1c8c..237964e313 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index 8966a46e8e..ead3e6b085 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 diff --git a/pom.xml b/pom.xml index 72491e5cd3..3a62e7155c 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175-SNAPSHOT + 7.0.175 pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - HEAD + v7.0.175 diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index 4c39c66023..b8e5f0db7c 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175-SNAPSHOT + 7.0.175 ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index ecff06e201..b6e920e879 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175-SNAPSHOT + 7.0.175 4.0.0 From b013e4e38f3ef0b97004e2b1d633aff359786c8b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 27 Oct 2024 07:00:46 +0000 Subject: [PATCH 20/22] [maven-release-plugin] prepare for next development iteration --- components/org.wso2.carbon.identity.api.server.dcr/pom.xml | 4 ++-- .../org.wso2.carbon.identity.api.server.oauth.scope/pom.xml | 4 ++-- .../pom.xml | 2 +- components/org.wso2.carbon.identity.discovery/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ciba/pom.xml | 2 +- .../pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.common/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.extension/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.par/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.stub/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth.ui/pom.xml | 2 +- components/org.wso2.carbon.identity.oauth/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.dcr/pom.xml | 2 +- components/org.wso2.carbon.identity.oidc.session/pom.xml | 2 +- components/org.wso2.carbon.identity.webfinger/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.feature/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.server.feature/pom.xml | 2 +- features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml | 2 +- pom.xml | 4 ++-- service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml | 2 +- .../org.wso2.carbon.identity.oauth.common.testng/pom.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml index 9daa33e38a..3c0eb92277 100644 --- a/components/org.wso2.carbon.identity.api.server.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.dcr/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175 + 7.0.176-SNAPSHOT ../../pom.xml org.wso2.carbon.identity.api.server.dcr - 7.0.175 + 7.0.176-SNAPSHOT WSO2 Carbon - User DCR Rest API WSO2 Carbon - User DCR Rest API diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml index b7a9883909..d6780dfc82 100644 --- a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml +++ b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml @@ -23,12 +23,12 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175 + 7.0.176-SNAPSHOT ../.. org.wso2.carbon.identity.api.server.oauth.scope - 7.0.175 + 7.0.176-SNAPSHOT WSO2 Carbon - Identity OAuth 2.0 Scope Rest APIs Rest APIs for OAuth 2.0 Scope Handling diff --git a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml index db6a156999..ff3dfa37ff 100644 --- a/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml +++ b/components/org.wso2.carbon.identity.client.attestation.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175 + 7.0.176-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.discovery/pom.xml b/components/org.wso2.carbon.identity.discovery/pom.xml index ed9043b765..a356be41fb 100644 --- a/components/org.wso2.carbon.identity.discovery/pom.xml +++ b/components/org.wso2.carbon.identity.discovery/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml index e17ce8767b..ce0183489f 100644 --- a/components/org.wso2.carbon.identity.oauth.ciba/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ciba/pom.xml @@ -20,7 +20,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.175 + 7.0.176-SNAPSHOT ../../pom.xml diff --git a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml index b4c061d073..3435c8c572 100644 --- a/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.client.authn.filter/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.common/pom.xml b/components/org.wso2.carbon.identity.oauth.common/pom.xml index 63056ca7fc..dc75c53f52 100644 --- a/components/org.wso2.carbon.identity.oauth.common/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.common/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml index b90178dd98..b263c7d1dc 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr.endpoint/pom.xml @@ -6,7 +6,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml index 96afe25597..dec9f22a22 100644 --- a/components/org.wso2.carbon.identity.oauth.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml index 85accab24a..5cd7f77645 100644 --- a/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.extension/pom.xml b/components/org.wso2.carbon.identity.oauth.extension/pom.xml index 4c700bc99b..7a113ef31f 100644 --- a/components/org.wso2.carbon.identity.oauth.extension/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.extension/pom.xml @@ -19,7 +19,7 @@ identity-inbound-auth-oauth org.wso2.carbon.identity.inbound.auth.oauth2 - 7.0.175 + 7.0.176-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.par/pom.xml b/components/org.wso2.carbon.identity.oauth.par/pom.xml index 1d70209532..923fa0291a 100644 --- a/components/org.wso2.carbon.identity.oauth.par/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.par/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml index b7937756ad..9fe29c5096 100644 --- a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.stub/pom.xml b/components/org.wso2.carbon.identity.oauth.stub/pom.xml index e9e9873271..6e8223f38c 100644 --- a/components/org.wso2.carbon.identity.oauth.stub/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.stub/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth.ui/pom.xml b/components/org.wso2.carbon.identity.oauth.ui/pom.xml index ecdefd1545..ef50119202 100644 --- a/components/org.wso2.carbon.identity.oauth.ui/pom.xml +++ b/components/org.wso2.carbon.identity.oauth.ui/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oauth/pom.xml b/components/org.wso2.carbon.identity.oauth/pom.xml index 884d946646..3a2cb073b1 100644 --- a/components/org.wso2.carbon.identity.oauth/pom.xml +++ b/components/org.wso2.carbon.identity.oauth/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml index 7404145c57..f6687a148a 100644 --- a/components/org.wso2.carbon.identity.oidc.dcr/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.dcr/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.oidc.session/pom.xml b/components/org.wso2.carbon.identity.oidc.session/pom.xml index 66394c671e..3014b38ada 100644 --- a/components/org.wso2.carbon.identity.oidc.session/pom.xml +++ b/components/org.wso2.carbon.identity.oidc.session/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/components/org.wso2.carbon.identity.webfinger/pom.xml b/components/org.wso2.carbon.identity.webfinger/pom.xml index 305a8b54bf..536d03b873 100644 --- a/components/org.wso2.carbon.identity.webfinger/pom.xml +++ b/components/org.wso2.carbon.identity.webfinger/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml index 3730e64be7..b5f2926578 100644 --- a/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.common.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml index 8132a09fc2..376809fe91 100644 --- a/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.dcr.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.feature/pom.xml index e60b2f55e0..5e4b91affa 100644 --- a/features/org.wso2.carbon.identity.oauth.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml index 237964e313..489d009d6c 100644 --- a/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.server.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml index ead3e6b085..5b4ed6d19b 100644 --- a/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml +++ b/features/org.wso2.carbon.identity.oauth.ui.feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 3a62e7155c..264f6907ae 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175 + 7.0.176-SNAPSHOT pom WSO2 Carbon OAuth module http://wso2.org @@ -37,7 +37,7 @@ https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git scm:git:https://github.com/wso2-extensions/identity-inbound-auth-oauth.git - v7.0.175 + HEAD diff --git a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml index b8e5f0db7c..f15a112adb 100644 --- a/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml +++ b/service-stubs/org.wso2.carbon.claim.metadata.mgt.stub/pom.xml @@ -21,7 +21,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth - 7.0.175 + 7.0.176-SNAPSHOT ../../pom.xml diff --git a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml index b6e920e879..68978fceeb 100644 --- a/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml +++ b/test-utils/org.wso2.carbon.identity.oauth.common.testng/pom.xml @@ -23,7 +23,7 @@ org.wso2.carbon.identity.inbound.auth.oauth2 identity-inbound-auth-oauth ../../pom.xml - 7.0.175 + 7.0.176-SNAPSHOT 4.0.0 From e102c331841e5ae93fdec9720272d018aff31819 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Sun, 27 Oct 2024 23:19:33 +0530 Subject: [PATCH 21/22] Add unit tests. --- .../PreIssueAccessTokenRequestBuilder.java | 1 - .../oauth/OAuthAdminServiceImplTest.java | 266 ++++++++++++------ .../util/ClaimHandlerUtilTest.java | 165 +++++++++++ .../src/test/resources/testng.xml | 5 +- 4 files changed, 342 insertions(+), 95 deletions(-) mode change 100644 => 100755 components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java create mode 100755 components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtilTest.java mode change 100644 => 100755 components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml diff --git a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java old mode 100644 new mode 100755 index a164e3a76f..9f88024419 --- a/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java +++ b/components/org.wso2.carbon.identity.oauth/src/main/java/org/wso2/carbon/identity/oauth/action/PreIssueAccessTokenRequestBuilder.java @@ -282,7 +282,6 @@ private Map getAdditionalClaimsToAddToToken(OAuthTokenReqMessage } try { - String tenantDomain = tokenMessageContext.getOauth2AccessTokenReqDTO().getTenantDomain(); CustomClaimsCallbackHandler claimsCallBackHandler = ClaimHandlerUtil.getClaimsCallbackHandler(getAppInformation(tokenMessageContext)); JWTClaimsSet claimsSet = diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImplTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImplTest.java index 643bad39f0..b1dedc37d1 100755 --- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImplTest.java +++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth/OAuthAdminServiceImplTest.java @@ -35,6 +35,7 @@ import org.testng.annotations.Test; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser; +import org.wso2.carbon.identity.application.common.model.ServiceProvider; import org.wso2.carbon.identity.application.mgt.ApplicationManagementService; import org.wso2.carbon.identity.core.internal.IdentityCoreServiceComponent; import org.wso2.carbon.identity.core.util.IdentityTenantUtil; @@ -42,6 +43,7 @@ import org.wso2.carbon.identity.oauth.common.OAuth2ErrorCodes; import org.wso2.carbon.identity.oauth.common.OAuthConstants; import org.wso2.carbon.identity.oauth.common.exception.InvalidOAuthClientException; +import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration; import org.wso2.carbon.identity.oauth.dao.OAuthAppDAO; import org.wso2.carbon.identity.oauth.dao.OAuthAppDO; import org.wso2.carbon.identity.oauth.dto.OAuthAppRevocationRequestDTO; @@ -56,6 +58,7 @@ import org.wso2.carbon.identity.oauth2.dao.TokenManagementDAOImpl; import org.wso2.carbon.identity.oauth2.internal.OAuth2ServiceComponentHolder; import org.wso2.carbon.identity.oauth2.model.AccessTokenDO; +import org.wso2.carbon.identity.oauth2.util.OAuth2Util; import org.wso2.carbon.user.api.RealmConfiguration; import org.wso2.carbon.user.api.Tenant; import org.wso2.carbon.user.api.UserRealm; @@ -87,11 +90,13 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; +import static org.wso2.carbon.identity.oauth.common.OAuthConstants.ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN; public class OAuthAdminServiceImplTest { @@ -120,9 +125,10 @@ public class OAuthAdminServiceImplTest { AbstractUserStoreManager mockAbstractUserStoreManager; @Mock OAuthComponentServiceHolder mockOAuthComponentServiceHolder; - @Mock - ObjectMapper objectMapper; + ServiceProvider mockServiceProvider; + @Mock + OAuthServerConfiguration mockOAuthServerConfiguration; private MockedStatic identityTenantUtil; @@ -335,23 +341,65 @@ public void testGetAllOAuthApplicationDataException() throws Exception { } } - @Test - public void testGetOAuthApplicationData() throws Exception { + @DataProvider(name = "setAccessTokenClaims") + public Object[][] getOAuthApplicationData() { - String consumerKey = "some-consumer-key"; - Mockito.when(tenantManager.getTenantId(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) - .thenReturn(MultitenantConstants.SUPER_TENANT_ID); + return new Object[][] { + { "v0.0.0", true }, + { "v1.0.0", true }, + { "v2.0.0", true }, + { "v0.0.0", false }, + { "v1.0.0", false }, + { "v2.0.0", false } + }; + } - OAuthAppDO app = buildDummyOAuthAppDO("some-user-name"); - try (MockedConstruction mockedConstruction = Mockito.mockConstruction(OAuthAppDAO.class, - (mock, context) -> { - when(mock.getAppInformation(consumerKey, MultitenantConstants.SUPER_TENANT_ID)).thenReturn(app); - })) { + @Test(dataProvider = "setAccessTokenClaims") + public void testGetOAuthApplicationData(String appVersion, boolean claimSeparationFeatureEnabled) throws Exception { - OAuthAdminServiceImpl oAuthAdminServiceImpl = new OAuthAdminServiceImpl(); - OAuthConsumerAppDTO oAuthConsumerApp = oAuthAdminServiceImpl.getOAuthApplicationData(consumerKey, - MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); - assertAllAttributesOfConsumerAppDTO(oAuthConsumerApp, app); + try (MockedStatic oAuthServerConfigurationMockedStatic = mockStatic( + OAuthServerConfiguration.class);) { + // Mock and initialize the OAuthServerConfiguration. + mockOAuthServerConfiguration = mock(OAuthServerConfiguration.class); + oAuthServerConfigurationMockedStatic.when(OAuthServerConfiguration::getInstance) + .thenReturn(mockOAuthServerConfiguration); + lenient().when(mockOAuthServerConfiguration.getTimeStampSkewInSeconds()).thenReturn(300L); + + try (MockedStatic identityUtil = mockStatic(IdentityUtil.class); + MockedStatic oAuth2Util = mockStatic(OAuth2Util.class);) { + + String consumerKey = "some-consumer-key"; + Mockito.when(tenantManager.getTenantId(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) + .thenReturn(MultitenantConstants.SUPER_TENANT_ID); + + identityUtil.when(() -> IdentityUtil.getProperty(ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN)) + .thenReturn(claimSeparationFeatureEnabled ? "true" : "false"); + + mockServiceProvider = mock(ServiceProvider.class); + oAuth2Util.when(() -> OAuth2Util.getServiceProvider(anyString(), anyString())) + .thenReturn(mockServiceProvider); + when(mockServiceProvider.getApplicationVersion()).thenReturn(appVersion); + + OAuthAppDO app = buildDummyOAuthAppDO("some-user-name"); + try (MockedConstruction mockedConstruction = Mockito.mockConstruction(OAuthAppDAO.class, + (mock, context) -> { + when(mock.getAppInformation(consumerKey, MultitenantConstants.SUPER_TENANT_ID)) + .thenReturn(app); + })) { + + ApplicationManagementService appMgtService = mock(ApplicationManagementService.class); + OAuth2ServiceComponentHolder.setApplicationMgtService(appMgtService); + when(appMgtService.getServiceProvider(consumerKey, MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) + .thenReturn(mockServiceProvider); + + OAuthAdminServiceImpl oAuthAdminServiceImpl = new OAuthAdminServiceImpl(); + OAuthConsumerAppDTO oAuthConsumerApp = oAuthAdminServiceImpl.getOAuthApplicationData(consumerKey, + MultitenantConstants.SUPER_TENANT_DOMAIN_NAME); + oAuthConsumerApp.setUsername(app.getUser().toString()); + + assertAllAttributesOfConsumerAppDTO(oAuthConsumerApp, app); + } + } } } @@ -506,10 +554,16 @@ public Object[][] getUpdateConsumerAppTestData() { return new Object[][]{ // Logged In user , App Owner in Request , App Owner in request exists, Excepted App Owner after update - {"admin@carbon.super", "H2/new-app-owner@carbon.super", false, "original-app-owner@wso2.com"}, - {"admin@carbon.super", "H2/new-app-owner@carbon.super", true, "H2/new-app-owner@carbon.super"}, - {"admin@wso2.com", "H2/new-app-owner@wso2.com", false, "original-app-owner@wso2.com"}, - {"admin@wso2.com", "H2/new-app-owner@wso2.com", true, "H2/new-app-owner@wso2.com"} + {"admin@carbon.super", "H2/new-app-owner@carbon.super", false, "original-app-owner@wso2.com", + true, "v2.0.0"}, + {"admin@carbon.super", "H2/new-app-owner@carbon.super", true, "H2/new-app-owner@carbon.super", + true, "v2.0.0"}, + {"admin@wso2.com", "H2/new-app-owner@wso2.com", false, "original-app-owner@wso2.com", + true, "v2.0.0"}, + {"admin@wso2.com", "H2/new-app-owner@wso2.com", true, "H2/new-app-owner@wso2.com", + true, "v2.0.0"}, + {"admin@carbon.super", "H2/new-app-owner@carbon.super", false, "original-app-owner@wso2.com", + false, "v2.0.0"}, }; } @@ -532,80 +586,108 @@ private AuthenticatedUser buildUser(String fullQualifiedUsername) { public void testUpdateConsumerApplication(String loggedInUsername, String appOwnerInRequest, boolean appOwnerInRequestExists, - String expectedAppOwnerAfterUpdate) throws Exception { - - try (MockedStatic identityUtil = mockStatic(IdentityUtil.class); - MockedStatic oAuthComponentServiceHolder = - mockStatic(OAuthComponentServiceHolder.class);) { - - AuthenticatedUser loggedInUser = buildUser(loggedInUsername); - identityUtil.when(() -> IdentityUtil.isUserStoreCaseSensitive(anyString(), anyInt())).thenReturn(true); - identityUtil.when(() -> IdentityUtil.addDomainToName(anyString(), anyString())).thenCallRealMethod(); - - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(loggedInUser.getTenantDomain()); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId( - IdentityTenantUtil.getTenantId(loggedInUser.getTenantDomain())); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(loggedInUser.getUserName()); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setUserRealm(userRealm); - - AuthenticatedUser appOwner = buildUser(appOwnerInRequest); - String tenantAwareUsernameOfAppOwner = - MultitenantUtils.getTenantAwareUsername(appOwner.toFullQualifiedUsername()); - - when(userStoreManager.isExistingUser(tenantAwareUsernameOfAppOwner)).thenReturn(appOwnerInRequestExists); - - String consumerKey = UUID.randomUUID().toString(); - OAuthAppDO app = buildDummyOAuthAppDO("original-app-owner"); - AuthenticatedUser originalOwner = app.getAppOwner(); - - try (MockedConstruction mockedConstruction = Mockito.mockConstruction(OAuthAppDAO.class, - (mock, context) -> { - when(mock.getAppInformation(consumerKey, - IdentityTenantUtil.getTenantId(loggedInUser.getTenantDomain()))) - .thenReturn(app); - })) { + String expectedAppOwnerAfterUpdate, + boolean claimSeparationFeatureEnabled, String appVersion) + throws Exception { - OAuthAdminServiceImpl oAuthAdminServiceImpl = new OAuthAdminServiceImpl(); - OAuthConsumerAppDTO consumerAppDTO = new OAuthConsumerAppDTO(); - consumerAppDTO.setApplicationName("new-application-name"); - consumerAppDTO.setCallbackUrl("http://new-call-back-url.com"); - consumerAppDTO.setOauthConsumerKey(consumerKey); - consumerAppDTO.setOauthConsumerSecret("some-consumer-secret"); - consumerAppDTO.setOAuthVersion("new-oauth-version"); - consumerAppDTO.setUsername(appOwner.toFullQualifiedUsername()); - - mockOAuthComponentServiceHolder(oAuthComponentServiceHolder); - - String tenantDomain = MultitenantUtils.getTenantDomain(appOwnerInRequest); - String userStoreDomain = UserCoreUtil.extractDomainFromName(appOwnerInRequest); - String domainFreeName = UserCoreUtil.removeDomainFromName(appOwnerInRequest); - String username = MultitenantUtils.getTenantAwareUsername(domainFreeName); - - org.wso2.carbon.user.core.common.User user = new org.wso2.carbon.user.core.common.User(); - user.setUsername(username); - user.setTenantDomain(tenantDomain); - user.setUserStoreDomain(userStoreDomain); - Mockito.when(mockAbstractUserStoreManager.getUser(any(), anyString())).thenReturn(user); - Mockito.when(mockAbstractUserStoreManager.isExistingUser(anyString())) - .thenReturn(appOwnerInRequestExists); - - oAuthAdminServiceImpl.updateConsumerApplication(consumerAppDTO); - OAuthConsumerAppDTO updatedOAuthConsumerApp = oAuthAdminServiceImpl.getOAuthApplicationData(consumerKey, - tenantDomain); - Assert.assertEquals(updatedOAuthConsumerApp.getApplicationName(), consumerAppDTO.getApplicationName(), - "Updated Application name should be same as the application name in consumerAppDTO " + - "data object."); - Assert.assertEquals(updatedOAuthConsumerApp.getCallbackUrl(), consumerAppDTO.getCallbackUrl(), - "Updated Application callbackUrl should be same as the callbackUrl in consumerAppDTO " + - "data object."); - - if (appOwnerInRequestExists) { - // Application update should change the app owner if the app owner sent in the request is a - // valid user. - Assert.assertNotEquals(updatedOAuthConsumerApp.getUsername(), - originalOwner.toFullQualifiedUsername()); + try (MockedStatic oAuthServerConfigurationMockedStatic = mockStatic( + OAuthServerConfiguration.class);) { + // Mock and initialize the OAuthServerConfiguration. + mockOAuthServerConfiguration = mock(OAuthServerConfiguration.class); + oAuthServerConfigurationMockedStatic.when(OAuthServerConfiguration::getInstance) + .thenReturn(mockOAuthServerConfiguration); + lenient().when(mockOAuthServerConfiguration.getTimeStampSkewInSeconds()).thenReturn(300L); + + try (MockedStatic identityUtil = mockStatic(IdentityUtil.class); + MockedStatic oAuthComponentServiceHolder = + mockStatic(OAuthComponentServiceHolder.class); + MockedStatic oAuth2Util = mockStatic(OAuth2Util.class)) { + + identityUtil.when(() -> IdentityUtil.getProperty(ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN)) + .thenReturn(claimSeparationFeatureEnabled ? "true" : "false"); + + oAuth2Util.when(() -> OAuth2Util.getServiceProvider(anyString(), anyString())) + .thenReturn(mockServiceProvider); + when(mockServiceProvider.getApplicationVersion()).thenReturn(appVersion); + + AuthenticatedUser loggedInUser = buildUser(loggedInUsername); + identityUtil.when(() -> IdentityUtil.isUserStoreCaseSensitive(anyString(), anyInt())).thenReturn(true); + identityUtil.when(() -> IdentityUtil.addDomainToName(anyString(), anyString())).thenCallRealMethod(); + + PrivilegedCarbonContext.startTenantFlow(); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(loggedInUser.getTenantDomain()); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId( + IdentityTenantUtil.getTenantId(loggedInUser.getTenantDomain())); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(loggedInUser.getUserName()); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setUserRealm(userRealm); + + AuthenticatedUser appOwner = buildUser(appOwnerInRequest); + String tenantAwareUsernameOfAppOwner = + MultitenantUtils.getTenantAwareUsername(appOwner.toFullQualifiedUsername()); + + when(userStoreManager.isExistingUser(tenantAwareUsernameOfAppOwner)).thenReturn( + appOwnerInRequestExists); + + String consumerKey = UUID.randomUUID().toString(); + OAuthAppDO app = buildDummyOAuthAppDO("original-app-owner"); + AuthenticatedUser originalOwner = app.getAppOwner(); + + try (MockedConstruction mockedConstruction = Mockito.mockConstruction(OAuthAppDAO.class, + (mock, context) -> { + when(mock.getAppInformation(consumerKey, + IdentityTenantUtil.getTenantId(loggedInUser.getTenantDomain()))) + .thenReturn(app); + })) { + + ApplicationManagementService appMgtService = mock(ApplicationManagementService.class); + OAuth2ServiceComponentHolder.setApplicationMgtService(appMgtService); + when(appMgtService.getServiceProvider(consumerKey, MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) + .thenReturn(mockServiceProvider); + + OAuthAdminServiceImpl oAuthAdminServiceImpl = new OAuthAdminServiceImpl(); + OAuthConsumerAppDTO consumerAppDTO = new OAuthConsumerAppDTO(); + consumerAppDTO.setApplicationName("new-application-name"); + consumerAppDTO.setCallbackUrl("http://new-call-back-url.com"); + consumerAppDTO.setOauthConsumerKey(consumerKey); + consumerAppDTO.setOauthConsumerSecret("some-consumer-secret"); + consumerAppDTO.setOAuthVersion("new-oauth-version"); + consumerAppDTO.setUsername(appOwner.toFullQualifiedUsername()); + + mockOAuthComponentServiceHolder(oAuthComponentServiceHolder); + + String tenantDomain = MultitenantUtils.getTenantDomain(appOwnerInRequest); + String userStoreDomain = UserCoreUtil.extractDomainFromName(appOwnerInRequest); + String domainFreeName = UserCoreUtil.removeDomainFromName(appOwnerInRequest); + String username = MultitenantUtils.getTenantAwareUsername(domainFreeName); + + org.wso2.carbon.user.core.common.User user = new org.wso2.carbon.user.core.common.User(); + user.setUsername(username); + user.setTenantDomain(tenantDomain); + user.setUserStoreDomain(userStoreDomain); + Mockito.when(mockAbstractUserStoreManager.getUser(any(), anyString())).thenReturn(user); + Mockito.when(mockAbstractUserStoreManager.isExistingUser(anyString())) + .thenReturn(appOwnerInRequestExists); + + oAuthAdminServiceImpl.updateConsumerApplication(consumerAppDTO); + OAuthConsumerAppDTO updatedOAuthConsumerApp = + oAuthAdminServiceImpl.getOAuthApplicationData(consumerKey, + tenantDomain); + Assert.assertEquals(updatedOAuthConsumerApp.getApplicationName(), + consumerAppDTO.getApplicationName(), + "Updated Application name should be same as the application name in consumerAppDTO " + + "data object."); + Assert.assertEquals(updatedOAuthConsumerApp.getCallbackUrl(), consumerAppDTO.getCallbackUrl(), + "Updated Application callbackUrl should be same as the callbackUrl in consumerAppDTO " + + "data object."); + + if (appOwnerInRequestExists) { + // Application update should change the app owner if the app owner sent in the request is a + // valid user. + Assert.assertNotEquals(updatedOAuthConsumerApp.getUsername(), + originalOwner.toFullQualifiedUsername()); + } + Assert.assertEquals(updatedOAuthConsumerApp.getUsername(), expectedAppOwnerAfterUpdate); } - Assert.assertEquals(updatedOAuthConsumerApp.getUsername(), expectedAppOwnerAfterUpdate); } } } diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtilTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtilTest.java new file mode 100755 index 0000000000..0102094ae8 --- /dev/null +++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/openidconnect/util/ClaimHandlerUtilTest.java @@ -0,0 +1,165 @@ +/* + * 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.openidconnect.util; + +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.testng.MockitoTestNGListener; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; +import org.wso2.carbon.base.MultitenantConstants; +import org.wso2.carbon.identity.application.common.model.ServiceProvider; +import org.wso2.carbon.identity.application.mgt.ApplicationConstants; +import org.wso2.carbon.identity.core.util.IdentityTenantUtil; +import org.wso2.carbon.identity.core.util.IdentityUtil; +import org.wso2.carbon.identity.oauth.config.OAuthServerConfiguration; +import org.wso2.carbon.identity.oauth.dao.OAuthAppDO; +import org.wso2.carbon.identity.oauth2.IdentityOAuth2Exception; +import org.wso2.carbon.identity.oauth2.util.OAuth2Util; +import org.wso2.carbon.identity.openidconnect.CustomClaimsCallbackHandler; + +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.testng.AssertJUnit.assertEquals; +import static org.wso2.carbon.base.MultitenantConstants.SUPER_TENANT_DOMAIN_NAME; +import static org.wso2.carbon.identity.oauth.common.OAuthConstants.ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN; + +@Listeners(MockitoTestNGListener.class) +public class ClaimHandlerUtilTest { + + @Mock + private OAuthAppDO mockOAuthAppDO; + @Mock + private CustomClaimsCallbackHandler mockJWTAccessTokenOIDCClaimsHandler; + @Mock + private CustomClaimsCallbackHandler mockOpenIDConnectCustomClaimsCallbackHandler; + @Mock + private OAuthServerConfiguration mockOAuthServerConfiguration; + + MockedStatic oAuthServerConfigurationMockedStatic; + MockedStatic identityTenantUtilMockedStatic; + MockedStatic identityUtilMockedStatic; + MockedStatic oAuth2UtilMockedStatic; + + private final String openIDConnectIDTokenCustomClaimsHandlerClassName = "SAMLAssertionClaimsCallback"; + private final String jwtAccessTokenOIDCClaimsHandlerClassName = "JWTAccessTokenOIDCClaimsHandler"; + + @BeforeMethod + public void setUp() throws Exception { + + // Mock and initialize the OAuthServerConfiguration. + oAuthServerConfigurationMockedStatic = mockStatic(OAuthServerConfiguration.class); + mockOAuthServerConfiguration = mock(OAuthServerConfiguration.class); + oAuthServerConfigurationMockedStatic.when(OAuthServerConfiguration::getInstance) + .thenReturn(mockOAuthServerConfiguration); + lenient().when(mockOAuthServerConfiguration.getTimeStampSkewInSeconds()).thenReturn(300L); + + // Initialize the static mocks. + identityTenantUtilMockedStatic = mockStatic(IdentityTenantUtil.class); + identityUtilMockedStatic = mockStatic(IdentityUtil.class); + oAuth2UtilMockedStatic = mockStatic(OAuth2Util.class); + + // Initialize the mocks. + String openIDConnectIDTokenPackageName = "org.wso2.carbon.identity.openidconnect."; + mockOAuthAppDO = mock(OAuthAppDO.class); + mockJWTAccessTokenOIDCClaimsHandler = mock(openIDConnectIDTokenPackageName + + jwtAccessTokenOIDCClaimsHandlerClassName); + mockOpenIDConnectCustomClaimsCallbackHandler = mock(openIDConnectIDTokenPackageName + + openIDConnectIDTokenCustomClaimsHandlerClassName); + + // Mock login tenant utils. + identityTenantUtilMockedStatic.when(IdentityTenantUtil::getLoginTenantId) + .thenReturn(MultitenantConstants.SUPER_TENANT_ID); + identityTenantUtilMockedStatic.when(() -> IdentityTenantUtil.getTenantDomain(-1234)) + .thenReturn(SUPER_TENANT_DOMAIN_NAME); + + // Mock the JWTAccessTokenOIDCClaimsHandler and OpenIDConnectCustomClaimsCallbackHandler. + lenient().when(mockOAuthServerConfiguration.getJWTAccessTokenOIDCClaimsHandler()) + .thenReturn(mockJWTAccessTokenOIDCClaimsHandler); + lenient().when(mockOAuthServerConfiguration.getOpenIDConnectCustomClaimsCallbackHandler()) + .thenReturn(mockOpenIDConnectCustomClaimsCallbackHandler); + } + + @AfterMethod + public void tearDown() { + + oAuthServerConfigurationMockedStatic.close(); + identityTenantUtilMockedStatic.close(); + identityUtilMockedStatic.close(); + oAuth2UtilMockedStatic.close(); + } + + @DataProvider(name = "getClaimsCallbackHandlerDataProvider") + public Object[][] getClaimsCallbackHandlerDataProvider() { + + return new Object[][] { + {true, "v0.0.0", openIDConnectIDTokenCustomClaimsHandlerClassName, false}, + {true, "v1.0.0", openIDConnectIDTokenCustomClaimsHandlerClassName, false}, + {true, "v2.0.0", jwtAccessTokenOIDCClaimsHandlerClassName, true}, + {false, "v0.0.0", openIDConnectIDTokenCustomClaimsHandlerClassName, false}, + {false, "v1.0.0", openIDConnectIDTokenCustomClaimsHandlerClassName, false}, + {false, "v2.0.0", openIDConnectIDTokenCustomClaimsHandlerClassName, true} + }; + } + + @Test(dataProvider = "getClaimsCallbackHandlerDataProvider") + public void testGetClaimsCallbackHandler(boolean isServerConfigEnabled, String appVersion, String className, + boolean isAllowed) + throws IdentityOAuth2Exception { + + // Mock the configuration for claims separation enabled on demand. + identityUtilMockedStatic.when(() -> IdentityUtil.getProperty(ENABLE_CLAIMS_SEPARATION_FOR_ACCESS_TOKEN)) + .thenReturn(isServerConfigEnabled ? "true" : "false"); + + // Mock the service provider and app version. + lenient().when(mockOAuthAppDO.getOauthConsumerKey()).thenReturn("testConsumerKey"); + ServiceProvider serviceProvider = new ServiceProvider(); + serviceProvider.setApplicationVersion(appVersion); + oAuth2UtilMockedStatic.when(() -> OAuth2Util.getServiceProvider(anyString(), anyString())) + .thenReturn(serviceProvider); + oAuth2UtilMockedStatic.when(() -> OAuth2Util.isAppVersionAllowed( + appVersion, ApplicationConstants.ApplicationVersion.APP_VERSION_V2)) + .thenReturn(isAllowed); + + CustomClaimsCallbackHandler result = ClaimHandlerUtil.getClaimsCallbackHandler(mockOAuthAppDO); + String extractedClassName = extractClassName(result.toString()); + assertEquals(extractedClassName, className); + } + + private String extractClassName(String mockClassName) { + + if (mockClassName == null || mockClassName.isEmpty()) { + return ""; + } + int lastDotIndex = mockClassName.lastIndexOf('.'); + if (lastDotIndex != -1) { + mockClassName = mockClassName.substring(lastDotIndex + 1); + } + int dollarIndex = mockClassName.indexOf('$'); + if (dollarIndex != -1) { + return mockClassName.substring(0, dollarIndex); + } + return mockClassName; + } +} diff --git a/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml b/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml old mode 100644 new mode 100755 index a0d2df47c2..91398cee77 --- a/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml +++ b/components/org.wso2.carbon.identity.oauth/src/test/resources/testng.xml @@ -108,7 +108,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -197,6 +197,7 @@ + From e69efc6ebd4cf7f7a93db5b4e8c40a2e86295065 Mon Sep 17 00:00:00 2001 From: Madhavi Gayathri Date: Mon, 28 Oct 2024 00:14:39 +0530 Subject: [PATCH 22/22] Add new unit tests. --- .../identity/oauth2/util/OAuth2UtilTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/util/OAuth2UtilTest.java b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/util/OAuth2UtilTest.java index e2fb35e256..8ee514e70d 100644 --- a/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/util/OAuth2UtilTest.java +++ b/components/org.wso2.carbon.identity.oauth/src/test/java/org/wso2/carbon/identity/oauth2/util/OAuth2UtilTest.java @@ -2838,6 +2838,25 @@ public void getSupportedTokenBindingTypes() { Assert.assertEquals(supportedTokenBindingTypes.size(), 3); } + @DataProvider(name = "isAppVersionAllowedDataProvider") + public Object[][] isAppVersionAllowedDataProvider() { + + return new Object[][]{ + {"v0.0.0", "v1.0.0", false}, + {"v1.0.0", "v1.0.0", true}, + {"v2.0.0", "v1.0.0", true}, + {"v0.0.0", "v2.0.0", false}, + {"v1.0.0", "v2.0.0", false}, + {"v2.0.0", "v2.0.0", true}, + }; + } + + @Test(dataProvider = "isAppVersionAllowedDataProvider") + public void testIsAppVersionAllowed(String appVersion, String allowedVersions, boolean expected) { + + assertEquals(OAuth2Util.isAppVersionAllowed(appVersion, allowedVersions), expected); + } + private void setPrivateField(Object object, String fieldName, Object value) throws Exception { Field field = object.getClass().getDeclaredField(fieldName);