Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/wso2/product-is into mast…
Browse files Browse the repository at this point in the history
…er_add_DCR_FAPI_tests
  • Loading branch information
SachiniSiriwardene committed Nov 13, 2023
2 parents 64c1c9a + aa2e557 commit 8c085e4
Show file tree
Hide file tree
Showing 114 changed files with 1,719 additions and 1,147 deletions.
1,768 changes: 884 additions & 884 deletions LICENSE.txt

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/api-resources/api-resources-full/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>api-resources-full</artifactId>
<version>7.0.0-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-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
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>api-resources</artifactId>
<version>7.0.0-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<packaging>pom</packaging>

<name>WSO2 Identity Server - Rest API</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/authenticators/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/callhome/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/connectors/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/distribution/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ org.wso2.carbon.identity.api.user.challenge.common-*.jar,\
org.wso2.carbon.identity.api.user.common-*.jar,\
org.wso2.carbon.identity.api.user.session.common-*.jar,\
org.wso2.carbon.identity.application.authentication.endpoint.util-*.jar,\
org.wso2.carbon.identity.client.attestation.filter-*.jar,\
org.wso2.carbon.identity.oauth.client.authn.filter-*.jar,\
org.wso2.carbon.identity.rest.api.server.challenge.*.jar,\
org.wso2.carbon.identity.rest.api.server.claim.management.*.jar,\
Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.styles.feature/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.ui.feature/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.utils.feature/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/admin-clients/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/extensions/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/ui-pages/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@
<users>
<user key="user1">
<userName>testuser11</userName>
<password>testuser11</password>
<password>Wso2_test11</password>
</user>
<user key="user2">
<userName>testuser21</userName>
<password>testuser21</password>
<password>Wso2_test21</password>
</user>
</users>
</tenant>
Expand All @@ -148,11 +148,11 @@
<users>
<user key="user1">
<userName>testuser11</userName>
<password>testuser11</password>
<password>Wso2_test11</password>
</user>
<user key="user2">
<userName>testuser21</userName>
<password>testuser21</password>
<password>Wso2_test21</password>
</user>
</users>
</tenant>
Expand All @@ -166,11 +166,11 @@
<users>
<user key="user1">
<userName>testuser11</userName>
<password>testuser11</password>
<password>Wso2_test11</password>
</user>
<user key="user2">
<userName>testuser21</userName>
<password>testuser21</password>
<password>Wso2_test21</password>
</user>
</users>
</tenant>
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/pom.xml
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
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-alpha2-SNAPSHOT</version>
<version>7.0.0-beta-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,9 @@ private ClaimValue[] getUserClaims() {
public static TestConfig[][] testConfigProvider(){

return new TestConfig[][] {
{new TestConfig(TestUserMode.SUPER_TENANT_ADMIN, "testuser1", "testuser1",
{new TestConfig(TestUserMode.SUPER_TENANT_ADMIN, "testuser1", "Wso2@test1",
"carbon.super", "testuser1", "[email protected]", "travelocity.com")},
{new TestConfig(TestUserMode.TENANT_ADMIN, "[email protected]", "testuser2",
{new TestConfig(TestUserMode.TENANT_ADMIN, "[email protected]", "Wso2@test2",
"wso2.com", "testuser2", "[email protected]", "travelocity.com-saml-tenantwithoutsigning")}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ protected enum ClaimType {

protected enum User {

SUPER_TENANT_USER("samlAnalyticsuser1", "samlAnalyticsuser1", "carbon.super", "samlAnalyticsuser1", "[email protected]",
SUPER_TENANT_USER("samlAnalyticsuser1", "samlAnalyticsuser@1", "carbon.super", "samlAnalyticsuser1", "[email protected]",
"samlnickuser1"),
TENANT_USER("[email protected]", "samlAnalyticsuser2", "wso2.com", "samlAnalyticsuser2", "[email protected]",
TENANT_USER("[email protected]", "samlAnalyticsuser@2", "wso2.com", "samlAnalyticsuser2", "[email protected]",
"samlnickuser2");

private String username;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public class ApplicationAuthzTenantTestCase extends AbstractApplicationAuthzTest
private static final String AZ_TEST_TENANT_ROLE = "Internal/azTestTenantRole";
private static final String HTTP_REDIRECT = "HTTP-Redirect";
private static final String AZ_TEST_TENANT_USER = "azTestTenantUser";
private static final String AZ_TEST_TENANT_USER_PW = "azTest123";
private static final String AZ_TEST_TENANT_USER_PW = "azTest@123";
private static final String NON_AZ_TEST_TENANT_USER = "nonAzTestTenantUser";
private static final String NON_AZ_TEST_TENANT_USER_PW = "nonAzTest123";
private static final String NON_AZ_TEST_TENANT_USER_PW = "nonAzTest@123";
private static final Log log = LogFactory.getLog(ApplicationAuthzTenantTestCase.class);
private static final String APPLICATION_NAME = "travelocity.com-saml-tenantwithoutsigning";
private static final String POLICY_ID = "spTenantAuthPolicy";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public class ApplicationAuthzTestCase extends AbstractApplicationAuthzTestCase {
private static final String AZ_TEST_ROLE = "Internal/azTestRole";
private static final String HTTP_REDIRECT = "HTTP-Redirect";
private static final String AZ_TEST_USER = "azTestUser";
private static final String AZ_TEST_USER_PW = "azTest123";
private static final String AZ_TEST_USER_PW = "azTest@123";
private static final String NON_AZ_TEST_USER = "nonAzTestUser";
private static final String NON_AZ_TEST_USER_PW = "nonAzTest123";
private static final String NON_AZ_TEST_USER_PW = "nonAzTest@123";
private static final Log log = LogFactory.getLog(ApplicationAuthzTestCase.class);
private static final String APPLICATION_NAME = "travelocity.com";
private static final String POLICY_ID = "spAuthPolicy";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ public class SecondaryStoreUserLoginTestCase extends OIDCAbstractIntegrationTest
public static final String PLAYGROUND_APP_CALLBACK_URI = "http://localhost:" + TOMCAT_PORT +
"/playground.app/oauth2client";
private static final String PRIMARY_USERNAME = "primaryUsername";
private static final String PRIMARY_PASSWORD = "primaryPassword";
private static final String PRIMARY_PASSWORD = "Wso2@testPrimary123";
private static final String SECONDARY_USERNAME = "secondaryUsername";
private static final String SECONDARY_PASSWORD = "secondaryPassword";
private static final String SECONDARY_PASSWORD = "Wso2@testSecondary123";
private static final String PERMISSION_LOGIN = "/permission/admin/login";
private static final String DOMAIN_ID = "WSO2TEST.COM";
private static final String PRIMARY_USER_GROUP = "jdbcUserStoreGroup";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class ReadOnlyUserStoreInitializerTestCase extends ISIntegrationTest {
private AuthenticatorClient authenticatorClient;
private String newUserName = "ReadOnlyLDAPUserName";
private String newUserRole = "ReadOnlyLDAPUserRole";
private String newUserPassword = "ReadOnlyLDAPUserPass";
private String newUserPassword = "ReadOnlyLDAPUserPass@123";

@BeforeTest(alwaysRun = true)
public void initUserStoreConfig() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class ChallengeQuestionManagementAdminServiceTestCase extends ISIntegrati
private static final String PROFILE_NAME = "default";

private static final String BOB_USERNAME = "Bob";
private static final String BOB_PASSWORD = "Bob@123";
private static final String BOB_PASSWORD = "Bob@1234";
private static final String BOB_LOCALE = "xx_YY";
private static final String LOGIN_ROLE = "loginRole";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class EntitlementJSONSupportMultiDecisionProfileTestCase extends ISIntegr
private EntitlementPolicyServiceClient entitlementPolicyClient;
private RemoteUserStoreManagerServiceClient remoteUserStoreManagerServiceClient;
private final static String ENDPOINT_ADDRESS = "https://localhost:9853/api/identity/entitlement/decision";
private final static String PASSWORD = "abc123";
private final static String PASSWORD = "Wso2@test123";
private final static String ROLE = "admin";


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ public class AccountLockEnabledTestCase extends ISIntegrationTest {
private static final Log log = LogFactory.getLog(AccountLockEnabledTestCase.class.getName());
private static final String DEFAULT_LOCALITY_CLAIM_VALUE = "en_US";
private static final String TEST_LOCK_USER_1 = "TestLockUser1";
private static final String TEST_LOCK_USER_1_PASSWORD = "TestLockUser1Password";
private static final String TEST_LOCK_USER_1_WRONG_PASSWORD = "TestLockUser1WrongPassword";
private static final String TEST_LOCK_USER_1_PASSWORD = "TestLockUser1@Password";
private static final String TEST_LOCK_USER_1_WRONG_PASSWORD = "TestLockUser1Wrong@Password";
private static final String TEST_LOCK_USER_2 = "TestLockUser2";
private static final String TEST_LOCK_USER_2_PASSWORD = "TestLockUser2Password";
private static final String TEST_LOCK_USER_2_PASSWORD = "TestLockUser2@Password";
private static final String TEST_LOCK_USER_3 = "TestLockUser3";
private static final String TEST_LOCK_USER_3_PASSWORD = "TestLockUser3Password";
private static final String TEST_LOCK_USER_3_PASSWORD = "TestLockUser3@Password";

private static final String ACCOUNT_LOCK_TEMPLATE_WHEN_USER_EXCEEDS_FAILED_ATTEMPTS = "accountlockfailedattempt";
private static final String ACCOUNT_LOCK_TEMPLATE_WHEN_ADMIN_TRIGGERED = "accountlockadmin";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class AccountLockWhileCaseInsensitiveUserFalseTestCase extends ISIntegrat

private static final String TEST_USER_1 = "testDemo";
private static final String TEST_USER_2 = "TestDemo";
private static final String TEST_USER_1_PASSWORD = "testDemoPass";
private static final String TEST_USER_1_PASSWORD = "testDemo@Pass123";
private static final String USERS_PATH = "users";
private ServerConfigurationManager configurationManager;
private SCIM2RestClient scim2RestClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class IDENTITY6777OAuth2TokenExpiryTestCase extends OAuth2ServiceAbstract

private static final String USER_EMAIL = "[email protected]";
private static final String USERNAME = "authcodegrantuser";
private static final String PASSWORD = "pass123";
private static final String PASSWORD = "Pass@123";

@BeforeClass(alwaysRun = true)
public void testInit() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public class OAuth2BackChannelLogoutTestCase extends OAuth2ServiceAbstractIntegr

private static final String USER_EMAIL = "[email protected]";
private static final String USERNAME = "testUser";
private static final String PASSWORD = "pass123";
private static final String PASSWORD = "Pass@123";
private String applicationId;
private SCIM2RestClient scim2RestClient;
private String userId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class OAuth2RoleClaimTestCase extends OAuth2ServiceAbstractIntegrationTes
private static final String WORK_ATTRIBUTE = "work";
private static final String WORK_EMAIL = "[email protected]";
private static final String USER_USERNAME = "testuser99";
private static final String USER_PASSWORD = "testuser@123";
private static final String USER_PASSWORD = "Testuser@123";
private static final String EMPLOYEE_NUMBER = "Abc123";
private static final String MANAGER_NAME = "wso2TestManage";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public class OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase extends OAuth
private static final String externalClaimURI2 = "externalClaim2";
private static final String USER_EMAIL = "[email protected]";
private static final String USERNAME = "authcodegrantreqobjuser";
private static final String PASSWORD = "pass123";
private static final String PASSWORD = "Pass@123";
private static final String GIVEN_NAME = "TestName";
private static final String COUNTRY = "Country";
private static final String CUSTOM_CLAIM1 = "customVal1";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class OAuth2ServiceAuthCodeGrantOpenIdTestCase extends OAuth2ServiceAbstr
private static final String USERS_PATH = "users";
private static final String USER_EMAIL = "[email protected]";
private static final String USERNAME = "authcodegrantuser";
private static final String PASSWORD = "pass123";
private static final String PASSWORD = "Pass@123";

private final List<NameValuePair> consentParameters = new ArrayList<>();
private final CookieStore cookieStore = new BasicCookieStore();
Expand Down
Loading

0 comments on commit 8c085e4

Please sign in to comment.