From 00556f53b3994478248b387693340e482678507e Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Wed, 29 Nov 2023 11:55:04 +0530 Subject: [PATCH 1/3] bump governance version --- .../src/main/webapp/WEB-INF/beans.xml | 3 -- .../tests-common/admin-clients/pom.xml | 8 +++ ...ory-QWNjb3VudCBNYW5hZ2VtZW50-response.json | 54 ------------------- .../src/test/resources/testng.xml | 6 ++- pom.xml | 7 +-- 5 files changed, 13 insertions(+), 65 deletions(-) diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml index 73dd2f07ec5..87041ec2408 100644 --- a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml +++ b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml @@ -395,10 +395,7 @@ - - - diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml index d6c1745a413..3b228e5ec28 100644 --- a/modules/integration/tests-common/admin-clients/pom.xml +++ b/modules/integration/tests-common/admin-clients/pom.xml @@ -134,9 +134,17 @@ org.wso2.carbon.identity.framework org.wso2.carbon.identity.governance.stub + org.wso2.carbon.identity.governance org.wso2.carbon.identity.recovery.stub + 1.8.87 + compile org.wso2.carbon.registry diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/identity/governance/v1/get-category-QWNjb3VudCBNYW5hZ2VtZW50-response.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/identity/governance/v1/get-category-QWNjb3VudCBNYW5hZ2VtZW50-response.json index 0ee959428ec..511b4238072 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/identity/governance/v1/get-category-QWNjb3VudCBNYW5hZ2VtZW50-response.json +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/identity/governance/v1/get-category-QWNjb3VudCBNYW5hZ2VtZW50-response.json @@ -71,42 +71,6 @@ "displayName": "Enable reCaptcha for password recovery", "description": "" }, - { - "name": "Recovery.Question.Password.Enable", - "value": "false", - "displayName": "Security question based password recovery", - "description": "" - }, - { - "name": "Recovery.Question.Password.MinAnswers", - "value": "2", - "displayName": "Number of questions required for password recovery", - "description": "" - }, - { - "name": "Recovery.Question.Answer.Regex", - "value": ".*", - "displayName": "Security question answer regex", - "description": "Security question answer regex" - }, - { - "name": "Recovery.Question.Answer.Uniqueness", - "value": "false", - "displayName": "Enforce security question answer uniqueness", - "description": "Enforce security question answer uniqueness" - }, - { - "name": "Recovery.Question.Password.ReCaptcha.Enable", - "value": "true", - "displayName": "Enable reCaptcha for security questions based password recovery", - "description": "Prompt reCaptcha for security question based password recovery" - }, - { - "name": "Recovery.Question.Password.ReCaptcha.MaxFailedAttempts", - "value": "2", - "displayName": "Max failed attempts for reCaptcha", - "description": "" - }, { "name": "Recovery.Notification.Username.Enable", "value": "false", @@ -131,12 +95,6 @@ "displayName": "Notify when recovery success", "description": "" }, - { - "name": "Recovery.Question.Password.NotifyStart", - "value": "false", - "displayName": "Notify when security questions based recovery starts", - "description": "" - }, { "name": "Recovery.ExpiryTime", "value": "1440", @@ -149,18 +107,6 @@ "displayName": "SMS OTP expiry time", "description": "Expiration time of the SMS OTP code for password recovery" }, - { - "name": "Recovery.Question.Password.Forced.Enable", - "value": "false", - "displayName": "Enable forced security questions", - "description": "Force users to provide answers to security questions during sign in" - }, - { - "name": "Recovery.Question.MinQuestionsToAnswer", - "value": "", - "displayName": "Minimum number of forced security questions to be answered", - "description": "Force users to provide answers to security questions during sign in if user has answered lesser than this value" - }, { "name": "Recovery.CallbackRegex", "value": ".*", diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml index 32f35c05823..89779ebcda7 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml @@ -50,7 +50,8 @@ - + + @@ -118,7 +119,8 @@ - + + diff --git a/pom.xml b/pom.xml index 71d94f11dbc..8b79e4499ea 100755 --- a/pom.xml +++ b/pom.xml @@ -1175,11 +1175,6 @@ org.wso2.carbon.identity.recovery ${identity.governance.version} - - org.wso2.carbon.identity.governance - org.wso2.carbon.identity.recovery.stub - ${identity.governance.version} - org.wso2.carbon.deployment org.wso2.carbon.service.mgt.stub @@ -2299,7 +2294,7 @@ 2.5.2 - 1.8.87 + 1.8.90 5.8.5 From ba30a94f00be975ccedd9cce4967d62d606b0496 Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Wed, 29 Nov 2023 12:58:40 +0530 Subject: [PATCH 2/3] bump api user version --- modules/api-resources/api-resources-full/pom.xml | 8 -------- .../src/main/webapp/WEB-INF/beans.xml | 5 ----- modules/api-resources/pom.xml | 10 ---------- .../src/repository/resources/conf/catalina.properties | 1 - .../tests-backend/src/test/resources/testng.xml | 5 +++-- pom.xml | 2 +- 6 files changed, 4 insertions(+), 27 deletions(-) diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml index c6e277eaeaf..36fe4d414e4 100644 --- a/modules/api-resources/api-resources-full/pom.xml +++ b/modules/api-resources/api-resources-full/pom.xml @@ -105,14 +105,6 @@ org.wso2.carbon.identity.user.api org.wso2.carbon.identity.api.user.common - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.rest.api.user.challenge.v1 - - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.api.user.challenge.common - org.wso2.carbon.identity.user.api org.wso2.carbon.identity.rest.api.user.association.v1 diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml index 87041ec2408..7a7822d2d77 100644 --- a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml +++ b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml @@ -21,7 +21,6 @@ xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" xmlns:cxf="http://cxf.apache.org/core" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd"> - @@ -205,8 +204,6 @@ - - @@ -245,8 +242,6 @@ - - diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml index e25fc71bb5f..57eac3a08a6 100644 --- a/modules/api-resources/pom.xml +++ b/modules/api-resources/pom.xml @@ -53,16 +53,6 @@ org.wso2.carbon.identity.api.user.common ${identity.user.api.version} - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.api.user.challenge.common - ${identity.user.api.version} - - - org.wso2.carbon.identity.user.api - org.wso2.carbon.identity.rest.api.user.challenge.v1 - ${identity.user.api.version} - org.wso2.carbon.identity.user.api org.wso2.carbon.identity.rest.api.user.association.v1 diff --git a/modules/distribution/src/repository/resources/conf/catalina.properties b/modules/distribution/src/repository/resources/conf/catalina.properties index b8e8a08dcb1..f918adcb184 100644 --- a/modules/distribution/src/repository/resources/conf/catalina.properties +++ b/modules/distribution/src/repository/resources/conf/catalina.properties @@ -104,7 +104,6 @@ org.wso2.carbon.bootstrap-*.jar,\ org.wso2.carbon.identity.api.server.claim.management.common-*.jar,\ org.wso2.carbon.identity.api.server.common-*.jar,\ org.wso2.carbon.identity.api.user.approval.common-*.jar,\ -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,\ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml index 89779ebcda7..4e041e3a590 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml @@ -140,8 +140,9 @@ - - + + + diff --git a/pom.xml b/pom.xml index 8b79e4499ea..8a6a2d8bdf0 100755 --- a/pom.xml +++ b/pom.xml @@ -2404,7 +2404,7 @@ 2.0.13 - 1.3.27 + 1.3.28 1.2.130 5.5.9 From 056e642cfb4ed6b96c1db871e787805f7dad4af9 Mon Sep 17 00:00:00 2001 From: asha15 <165079T@uom.lk> Date: Wed, 29 Nov 2023 22:31:08 +0530 Subject: [PATCH 3/3] remove challenge questions related tests --- .../OAuth2ServiceAbstractIntegrationTest.java | 8 ------ ...hCodeGrantOpenIdRequestObjectTestCase.java | 25 ------------------- 2 files changed, 33 deletions(-) diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAbstractIntegrationTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAbstractIntegrationTest.java index b31f69e04ac..be642e53fa3 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAbstractIntegrationTest.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAbstractIntegrationTest.java @@ -81,8 +81,6 @@ public class OAuth2ServiceAbstractIntegrationTest extends ISIntegrationTest { protected static final String EMAIL_CLAIM_URI = "http://wso2.org/claims/emailaddress"; private static final String GIVEN_NAME_CLAIM_URI = "http://wso2.org/claims/givenname"; protected static final String COUNTRY_CLAIM_URI = "http://wso2.org/claims/country"; - private static final String customClaimURI1 = "http://wso2.org/claims/challengeQuestion1"; - private static final String customClaimURI2 = "http://wso2.org/claims/challengeQuestion2"; private static final String GRANT_TYPE_PASSWORD = "password"; private static final String SCOPE_PRODUCTION = "PRODUCTION"; public static final String OIDC = "oidc"; @@ -355,12 +353,6 @@ private ClaimConfiguration getClaimConfigurations() { claimConfiguration.addClaimMappingsItem(getClaimMapping(COUNTRY_CLAIM_URI)); claimConfiguration.addRequestedClaimsItem(getRequestedClaim(COUNTRY_CLAIM_URI)); - claimConfiguration.addClaimMappingsItem(getClaimMapping(customClaimURI1)); - claimConfiguration.addRequestedClaimsItem(getRequestedClaim(customClaimURI1)); - - claimConfiguration.addClaimMappingsItem(getClaimMapping(customClaimURI2)); - claimConfiguration.addRequestedClaimsItem(getRequestedClaim(customClaimURI2)); - return claimConfiguration; } diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase.java index 485f70104fd..875c20df138 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/oauth2/OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase.java @@ -47,8 +47,6 @@ import org.wso2.carbon.integration.common.utils.mgt.ServerConfigurationManager; import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.ApplicationResponseModel; import org.wso2.identity.integration.test.rest.api.server.application.management.v1.model.OpenIDConnectConfiguration; -import org.wso2.identity.integration.test.rest.api.server.challenge.v1.model.ServerChallengeModel.Questions; -import org.wso2.identity.integration.test.rest.api.server.challenge.v1.model.UserChallengeAnswer; import org.wso2.identity.integration.test.rest.api.server.claim.management.v1.model.ExternalClaimReq; import org.wso2.identity.integration.test.rest.api.user.common.model.Email; import org.wso2.identity.integration.test.rest.api.user.common.model.ListObject; @@ -57,7 +55,6 @@ import org.wso2.identity.integration.test.rest.api.user.common.model.RoleItemAddGroupobj; import org.wso2.identity.integration.test.rest.api.user.common.model.ScimSchemaExtensionEnterprise; import org.wso2.identity.integration.test.rest.api.user.common.model.UserObject; -import org.wso2.identity.integration.test.restclients.ChallengeQuestionsRestClient; import org.wso2.identity.integration.test.restclients.ClaimManagementRestClient; import org.wso2.identity.integration.test.restclients.SCIM2RestClient; import org.wso2.identity.integration.test.util.Utils; @@ -79,10 +76,6 @@ public class OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase extends OAuth public static final String ENCODED_OIDC_CLAIM_DIALECT = "aHR0cDovL3dzbzIub3JnL29pZGMvY2xhaW0"; private static final String USERS_PATH = "users"; - private static final String CHALLENGE_QUESTION_SET_ID1 = "challengeQuestion1"; - private static final String CHALLENGE_QUESTION_SET_ID2 = "challengeQuestion2"; - private static final String CHALLENGE_QUESTION_SET1_Q1 = "City where you were born ?"; - private static final String CHALLENGE_QUESTION_SET2_Q1 = "Model of your first car ?"; private static final String LOCALE = "en_US"; private ServerConfigurationManager serverConfigurationManager; @@ -104,8 +97,6 @@ public class OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase extends OAuth private static final String emailClaimURI = "http://wso2.org/claims/emailaddress"; private static final String givenNameClaimURI = "http://wso2.org/claims/givenname"; private static final String countryClaimURI = "http://wso2.org/claims/country"; - private static final String customClaimURI1 = "http://wso2.org/claims/challengeQuestion1"; - private static final String customClaimURI2 = "http://wso2.org/claims/challengeQuestion2"; private static final String externalClaimURI1 = "externalClaim1"; private static final String externalClaimURI2 = "externalClaim2"; private static final String USER_EMAIL = "abcrqo@wso2.com"; @@ -126,7 +117,6 @@ public class OAuth2ServiceAuthCodeGrantOpenIdRequestObjectTestCase extends OAuth private SCIM2RestClient scim2RestClient; private ClaimManagementRestClient claimManagementRestClient; - private ChallengeQuestionsRestClient challengeQuestionsRestClient; private String applicationId; private String userId; @@ -165,12 +155,9 @@ public void testInit() throws Exception { setSystemproperties(); scim2RestClient = new SCIM2RestClient(serverURL, tenantInfo); - challengeQuestionsRestClient = new ChallengeQuestionsRestClient(serverURL, tenantInfo); claimManagementRestClient = new ClaimManagementRestClient(serverURL, tenantInfo); addAdminUser(); - claimId1 = addOIDCClaims(externalClaimURI1, customClaimURI1); - claimId2 = addOIDCClaims(externalClaimURI2, customClaimURI2); } @@ -195,7 +182,6 @@ public void atEnd() throws Exception { restClient.closeHttpClient(); scim2RestClient.closeHttpClient(); claimManagementRestClient.closeHttpClient(); - challengeQuestionsRestClient.closeHttpClient(); client.close(); } @@ -448,16 +434,5 @@ private void addAdminUser() throws Exception { patchRoleItem.addValue(new ListObject().value(userId)); scim2RestClient.updateUserRole(new PatchOperationRequestObject().addOperations(patchRoleItem), roleId); - - setChallengeQuestion(CHALLENGE_QUESTION_SET_ID1, CHALLENGE_QUESTION_SET1_Q1, CUSTOM_CLAIM1); - setChallengeQuestion(CHALLENGE_QUESTION_SET_ID2, CHALLENGE_QUESTION_SET2_Q1, CUSTOM_CLAIM2); - } - - private void setChallengeQuestion(String questionSetId, String question, String answer) throws Exception { - UserChallengeAnswer challengeQuestionObj = new UserChallengeAnswer(); - challengeQuestionObj.setChallengeQuestion(new Questions(LOCALE, question, null)); - challengeQuestionObj.setAnswer(answer); - - challengeQuestionsRestClient.setChallengeQuestionAnswer(userId, questionSetId, challengeQuestionObj); } }