diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml index 5a1a77d4e5f..7994b618cf5 100644 --- a/modules/api-resources/api-resources-full/pom.xml +++ b/modules/api-resources/api-resources-full/pom.xml @@ -23,12 +23,12 @@ org.wso2.is api-resources - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml api-resources-full - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT war WSO2 Identity Server - All Rest API diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml index 9f52293756a..d4b65e33b53 100644 --- a/modules/api-resources/pom.xml +++ b/modules/api-resources/pom.xml @@ -23,12 +23,12 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml api-resources - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT pom WSO2 Identity Server - Rest API diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml index 70b99e7daa7..92a58d7c3bd 100644 --- a/modules/authenticators/pom.xml +++ b/modules/authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml index c06d2575543..d5604580868 100644 --- a/modules/callhome/pom.xml +++ b/modules/callhome/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml index d2bc8ef22aa..9f23a3275dc 100644 --- a/modules/connectors/pom.xml +++ b/modules/connectors/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 12f1d98802b..d04b456ed81 100755 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml index aa6da25eb1b..b2dc4653433 100644 --- a/modules/features/org.wso2.identity.styles.feature/pom.xml +++ b/modules/features/org.wso2.identity.styles.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml index 2dfd43062e9..dc3ffb90f8d 100644 --- a/modules/features/org.wso2.identity.ui.feature/pom.xml +++ b/modules/features/org.wso2.identity.ui.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml index 02ecf5df78a..8353eb964e0 100644 --- a/modules/features/org.wso2.identity.utils.feature/pom.xml +++ b/modules/features/org.wso2.identity.utils.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-features - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 98e49477e2b..1c8f90dd252 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -17,7 +17,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e27048cbc42..d77e8c2c1f5 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index 2f63787fb30..6317b159d21 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml index 7e7f7bd549d..2a89d48248c 100644 --- a/modules/integration/tests-common/extensions/pom.xml +++ b/modules/integration/tests-common/extensions/pom.xml @@ -22,7 +22,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml index 0270b418463..694bd7ea1e4 100644 --- a/modules/integration/tests-common/integration-test-utils/pom.xml +++ b/modules/integration/tests-common/integration-test-utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml index 9d2a15fca06..17d3b08cadd 100644 --- a/modules/integration/tests-common/pom.xml +++ b/modules/integration/tests-common/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml index e3a55746a82..97f7d5dd9c3 100644 --- a/modules/integration/tests-common/ui-pages/pom.xml +++ b/modules/integration/tests-common/ui-pages/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml index 18358dc7872..69da5c97df5 100644 --- a/modules/integration/tests-integration/pom.xml +++ b/modules/integration/tests-integration/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml index f3bf49f5623..3b182b9b51c 100644 --- a/modules/integration/tests-integration/tests-backend/pom.xml +++ b/modules/integration/tests-integration/tests-backend/pom.xml @@ -18,7 +18,7 @@ org.wso2.is identity-integration-tests - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/export/UserInfoExportTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/export/UserInfoExportTestCase.java index 7b5be0134e8..57ca37dce9a 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/export/UserInfoExportTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/user/export/UserInfoExportTestCase.java @@ -51,11 +51,10 @@ public class UserInfoExportTestCase extends ISIntegrationTest { private static final String PI_INFO = "pi-info/"; private static final String ME = "me"; private static final String RESOURCE_PATH = "/api/identity/user/v1.0/"; - private static final String USERNAME_CLAIM_URI = "http://wso2.org/claims/username"; + private static final String GROUPS_ATTRIBUTE = "groups"; private HttpClient client; private String username; - private String tenantAwareUsername; private String password; private String tenant; @@ -64,7 +63,6 @@ public UserInfoExportTestCase(TestUserMode userMode) throws Exception { AutomationContext context = new AutomationContext("IDENTITY", userMode); this.username = context.getContextTenant().getTenantAdmin().getUserName(); - this.tenantAwareUsername = context.getContextTenant().getTenantAdmin().getUserNameWithoutDomain(); this.password = context.getContextTenant().getTenantAdmin().getPassword(); this.tenant = context.getContextTenant().getDomain(); } @@ -97,14 +95,13 @@ public void testExportUserInfo() throws IOException { Object responseObj = JSONValue.parse(rd); EntityUtils.consume(response.getEntity()); - Object basicObj = ((JSONObject) responseObj).get("basic"); - if (basicObj == null) { + Object userProfileObj = ((JSONObject) responseObj).get("user_profile"); + if (userProfileObj == null) { Assert.fail(); } else { - JSONObject basic = (JSONObject) basicObj; - String username = basic.get(USERNAME_CLAIM_URI).toString(); - //TODO tenant aware username is coming. is this okay? - Assert.assertEquals(username, this.tenantAwareUsername); + JSONObject userProfile = (JSONObject) userProfileObj; + String groups = userProfile.get(GROUPS_ATTRIBUTE).toString(); + Assert.assertNotNull(groups); } } @@ -121,10 +118,9 @@ public void testExportUserInfoMe() throws IOException { Object responseObj = JSONValue.parse(rd); EntityUtils.consume(response.getEntity()); - JSONObject basic = (JSONObject)((JSONObject) responseObj).get("basic"); - String username = basic.get(USERNAME_CLAIM_URI).toString(); - //TODO tenant aware username is coming. is this okay? - Assert.assertEquals(username, this.tenantAwareUsername); + JSONObject userProfile = (JSONObject)((JSONObject) responseObj).get("user_profile"); + String groups = userProfile.get(GROUPS_ATTRIBUTE).toString(); + Assert.assertNotNull(groups); } private String getPiInfoPath() { diff --git a/modules/local-authenticators/pom.xml b/modules/local-authenticators/pom.xml index cdf9819982a..26cc21f13d0 100644 --- a/modules/local-authenticators/pom.xml +++ b/modules/local-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/oauth2-grant-types/pom.xml b/modules/oauth2-grant-types/pom.xml index 9ef314ad2af..5d0bf3b19a4 100644 --- a/modules/oauth2-grant-types/pom.xml +++ b/modules/oauth2-grant-types/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml index 1cc6b1b06c0..1f3ae282cf1 100644 --- a/modules/p2-profile-gen/pom.xml +++ b/modules/p2-profile-gen/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/provisioning-connectors/pom.xml b/modules/provisioning-connectors/pom.xml index 3e270853ad4..2585b6f42d3 100644 --- a/modules/provisioning-connectors/pom.xml +++ b/modules/provisioning-connectors/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/social-authenticators/pom.xml b/modules/social-authenticators/pom.xml index 2b25c10ccac..8702ccba81c 100644 --- a/modules/social-authenticators/pom.xml +++ b/modules/social-authenticators/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml index 20b6a7e1086..a766ebdc295 100644 --- a/modules/styles/pom.xml +++ b/modules/styles/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml index d90dae35ed4..a4f477bb0fe 100644 --- a/modules/styles/product/pom.xml +++ b/modules/styles/product/pom.xml @@ -20,7 +20,7 @@ org.wso2.is identity-server-styles-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/admin-services/pom.xml b/modules/tests-utils/admin-services/pom.xml index 2899b6ffabc..66c28bb6491 100644 --- a/modules/tests-utils/admin-services/pom.xml +++ b/modules/tests-utils/admin-services/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-integration-tests-utils - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/admin-stubs/pom.xml b/modules/tests-utils/admin-stubs/pom.xml index 8fa75534440..29c02b2dfde 100644 --- a/modules/tests-utils/admin-stubs/pom.xml +++ b/modules/tests-utils/admin-stubs/pom.xml @@ -21,7 +21,7 @@ org.wso2.is identity-integration-tests-utils - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../pom.xml diff --git a/modules/tests-utils/pom.xml b/modules/tests-utils/pom.xml index be631d45714..e2347883afc 100644 --- a/modules/tests-utils/pom.xml +++ b/modules/tests-utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.is identity-server-parent - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index a95293db5bc..286c38c19ac 100755 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ identity-server-parent pom WSO2 Identity Server - 7.0.0-m3-SNAPSHOT + 7.0.0-m4-SNAPSHOT WSO2 Identity Server http://wso2.org/projects/identity @@ -2292,7 +2292,7 @@ - 5.25.358 + 5.25.361 [5.14.67, 6.0.0]