Merge pull request #13 from panharith-0118/ES-674

ES-674 fix password regex that does not match user story
mosip · Jan 22, 2024 · a8a5956 · a8a5956
2 parents 59137ed + fb791b4
commit a8a5956
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/signup-service/src/main/resources/application-default.properties b/signup-service/src/main/resources/application-default.properties
@@ -4,7 +4,7 @@ mosip.signup.id-schema.version=0.2
 mosip.signup.identifier.regex=^\\+855[1-9]\\d{7,8}$
 mosip.signup.identifier.prefix=+855
 mosip.signup.supported-languages={'khm','eng'}
-mosip.signup.password.pattern=^(?=.{8,20}$)(?=.*[A-Za-z])(?=.*\\d).*$
+mosip.signup.password.pattern=^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[\\x5F\\W])(?=.{8,20})[a-zA-Z0-9\\x5F\\W]{8,20}$
 mosip.signup.password.max-length=20
 mosip.signup.generate-challenge.blocked.timeout=300
 mosip.signup.challenge.timeout=60

diff --git a/signup-service/src/test/java/io/mosip/signup/controllers/SignUpControllerTest.java b/signup-service/src/test/java/io/mosip/signup/controllers/SignUpControllerTest.java
@@ -64,8 +64,7 @@ public void getSignupSettings_thenPass () throws Exception {
                 .andExpect(jsonPath("$['response']['configs']['identifier.prefix']").value("+855"))
                 .andExpect(jsonPath("$['response']['configs']['captcha.site.key']").value("6LcdIvsoAAAAAMq"))
                 .andExpect(jsonPath("$['response']['configs']['otp.length']").value(6))
-                .andExpect(jsonPath("$['response']['configs']['password.pattern']").value("^(?=.{8,20}$)(?=.*[A-Za-z])(?=.*\\d).*$"))
-                .andExpect(jsonPath("$['response']['configs']['challenge.timeout']").value(60))
+                .andExpect(jsonPath("$['response']['configs']['password.pattern']").value("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[\\x5F\\W])(?=.{8,20})[a-zA-Z0-9\\x5F\\W]{8,20}$"))                .andExpect(jsonPath("$['response']['configs']['challenge.timeout']").value(60))
                 .andExpect(jsonPath("$['response']['configs']['resend.attempts']").value(3))
                 .andExpect(jsonPath("$['response']['configs']['resend.delay']").value(60))
                 .andExpect(jsonPath("$['response']['configs']['fullname.pattern']").value("^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]{1,30}$"))

diff --git a/signup-service/src/test/resources/application-test.properties b/signup-service/src/test/resources/application-test.properties
@@ -27,7 +27,7 @@ mosip.signup.id-schema.version=0.2
 mosip.signup.identifier.regex=^\\+855[1-9]\\d{7,8}$
 mosip.signup.identifier.prefix=+855
 mosip.signup.supported-languages={'khm','eng'}
-mosip.signup.password.pattern=^(?=.{8,20}$)(?=.*[A-Za-z])(?=.*\\d).*$
+mosip.signup.password.pattern=^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[\\x5F\\W])(?=.{8,20})[a-zA-Z0-9\\x5F\\W]{8,20}$
 mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]{1,30}$
 mosip.signup.password.max-length=20
 mosip.signup.password.min-length=6