Skip to content

Commit

Permalink
Merge branch 'master' into thamindu-clientId
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThaminduDilshan
ThaminduDilshan authored Oct 3, 2023
2 parents 3408448 + e7cb492 commit e0d653f
Show file tree
Hide file tree
Showing 30 changed files with 41 additions and 45 deletions.
4 changes: 2 additions & 2 deletions modules/api-resources/api-resources-full/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>api-resources</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>api-resources-full</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<packaging>war</packaging>

<name>WSO2 Identity Server - All Rest API</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/api-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>api-resources</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<packaging>pom</packaging>

<name>WSO2 Identity Server - Rest API</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/callhome/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.styles.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-features</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-features</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.utils.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-features</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/admin-clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/integration-test-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/ui-pages/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/tests-backend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
22 changes: 9 additions & 13 deletions .../src/test/java/org/wso2/identity/integration/test/user/export/UserInfoExportTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
}
Expand Down Expand Up @@ -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);
}
}

Expand All @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion modules/local-authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/oauth2-grant-types/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/p2-profile-gen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/provisioning-connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/social-authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/styles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/styles/product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-styles-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/tests-utils/admin-services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests-utils</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/tests-utils/admin-stubs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests-utils</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/tests-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<artifactId>identity-server-parent</artifactId>
<packaging>pom</packaging>
<description>WSO2 Identity Server</description>
<version>7.0.0-m3-SNAPSHOT</version>
<version>7.0.0-m4-SNAPSHOT</version>
<name>WSO2 Identity Server</name>
<url>http://wso2.org/projects/identity</url>

Expand Down Expand Up @@ -2292,7 +2292,7 @@
<properties>

<!--Carbon Identity Framework Version-->
<carbon.identity.framework.version>5.25.358</carbon.identity.framework.version>
<carbon.identity.framework.version>5.25.361</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>

<!--SAML Common Utils Version-->
Expand Down

0 comments on commit e0d653f

Please sign in to comment.