Merge pull request #28 from ase-101/release-1.x.x

ES-379
mosip · Jan 23, 2024 · 22ba35d · 22ba35d
2 parents 6d289cb + 61a8f01
commit 22ba35d
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 39 deletions.
diff --git a/docs/postman-collections/signup_001.postman_collection.json b/docs/postman-collections/signup_001.postman_collection.json
@@ -384,14 +384,12 @@
 					}
 				],
 				"url": {
-					"raw": "https://api-internal.camdgc-dev.mosip.net/v1/signup/settings",
-					"protocol": "https",
+					"raw": "http://localhost:8088/v1/signup/settings",
+					"protocol": "http",
 					"host": [
-						"api-internal",
-						"camdgc-dev",
-						"mosip",
-						"net"
+						"localhost"
 					],
+					"port": "8088",
 					"path": [
 						"v1",
 						"signup",

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.mosip.signup</groupId>
 	<artifactId>signup-parent</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>esignet-signup</name>
 	<description>Parent project of MOSIP e-Signet</description>

diff --git a/signup-service/pom.xml b/signup-service/pom.xml
@@ -15,7 +15,7 @@
 
 	<groupId>io.mosip.signup</groupId>
 	<artifactId>signup-service</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0.0-SNAPSHOT</version>
 	<name>signup-service</name>
 	<description>Sign Up Service</description>
 	<url>https://github.com/DGTDept/esignet-signup</url>
@@ -115,7 +115,7 @@
 		<dependency>
 			<groupId>io.mosip.esignet</groupId>
 			<artifactId>esignet-core</artifactId>
-			<version>1.1.0</version>
+			<version>1.3.0-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework.boot</groupId>
@@ -151,12 +151,12 @@
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-core</artifactId>
-			<version>1.2.0.1-B1</version>
+			<version>1.2.0.1-B2</version>
 		</dependency>
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-logger-logback</artifactId>
-			<version>1.2.0.1-B1</version>
+			<version>1.2.0.1-B2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>io.mosip.kernel</groupId>
@@ -172,7 +172,7 @@
 		<dependency>
 			<groupId>io.mosip.esignet</groupId>
 			<artifactId>esignet-integration-api</artifactId>
-			<version>1.1.0</version>
+			<version>1.3.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>

diff --git a/signup-service/src/main/resources/application-default.properties b/signup-service/src/main/resources/application-default.properties
@@ -8,17 +8,7 @@ mosip.signup.password.pattern=^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[\\x5F\\W])
 mosip.signup.password.max-length=20
 mosip.signup.generate-challenge.blocked.timeout=300
 mosip.signup.challenge.timeout=60
-
 mosip.signup.audit.description.max-length=2048
-
-## Application Name
-spring.application.name=signup
-
-server.port=8088
-server.servlet.path=/
-spring.mvc.servlet.path=${server.servlet.path}
-server.servlet.context-path=/v1/signup
-server.env.url=https://api-internal.camdgc-dev.mosip.net
 mosip.signup.password.min-length=8
 mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]{1,30}$
 
@@ -70,9 +60,9 @@ mosip.esignet.cache.expire-in-seconds={'challenge_generated': ${mosip.signup.una
   'key_alias' : ${mosip.signup.verified.txn.timeout} }
 
 ## ------------------------------------- Auth adapter ------------------------------------------------------------------
-mosip.api.internal.url=https://api-internal.camdgc-dev.mosip.net
-keycloak.external.url=https://iam.camdgc-dev.mosip.net
-keycloak.internal.url=https://iam.camdgc-dev.mosip.net
+mosip.api.internal.url=https://api-internal.dev.mosip.net
+keycloak.external.url=https://iam.dev.mosip.net
+keycloak.internal.url=https://iam.dev.mosip.net
 auth.server.validate.url=${mosip.api.internal.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
@@ -135,7 +125,7 @@ mosip.signup.ui.config.key-values={\
 'status.request.delay': ${mosip.signup.status.request.delay}, \
 'status.request.limit': ${mosip.signup.status.request.limit}, \
 'popup.timeout': 10, \
-'signin.redirect-url': 'https://esignet.camdgc-dev.mosip.net/authorize', \
+'signin.redirect-url': 'https://esignet.dev.mosip.net/authorize', \
 'identifier.allowed.characters': '^[0-9]+', \
 'identifier.length.min': 8, \
 'identifier.length.max': 9, \

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
@@ -70,7 +70,7 @@ public void getSignupSettings_thenPass () throws Exception {
                 .andExpect(jsonPath("$['response']['configs']['fullname.pattern']").value("^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]{1,30}$"))
                 .andExpect(jsonPath("$['response']['configs']['status.request.delay']").value(20))
                 .andExpect(jsonPath("$['response']['configs']['status.request.limit']").value(10))
-                .andExpect(jsonPath("$['response']['configs']['signin.redirect-url']").value("https://esignet.camdgc-dev.mosip.net/authorize"))
+                .andExpect(jsonPath("$['response']['configs']['signin.redirect-url']").value("https://esignet.dev.mosip.net/authorize"))
                 .andExpect(jsonPath("$.errors").isEmpty());
     }
 

diff --git a/signup-service/src/test/resources/application-test.properties b/signup-service/src/test/resources/application-test.properties
@@ -79,9 +79,9 @@ mosip.esignet.cache.expire-in-seconds={'challenge_generated': ${mosip.signup.una
   'key_alias' : ${mosip.signup.verified.txn.timeout} }
 
 ## ------------------------------------- Auth adapter ------------------------------------------------------------------
-mosip.kernel.authmanager.url=https://api-internal.camdgc-dev.mosip.net
-keycloak.external.url=https://iam.camdgc-dev.mosip.net
-keycloak.internal.url=https://iam.camdgc-dev.mosip.net
+mosip.kernel.authmanager.url=https://api-internal.dev.mosip.net
+keycloak.external.url=https://iam.dev.mosip.net
+keycloak.internal.url=https://iam.dev.mosip.net
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
@@ -106,10 +106,10 @@ mosip.service.exclude.auth.allowed.method=GET,POST
 
 ## -------------------------- External endpoints -----------------------------------------------------------------------
 mosip.signup.generate-challenge.endpoint=${mosip.kernel.authmanager.url}/v1/otpmanager/otp/generate
-mosip.signup.add-identity.endpoint=https://api-internal.camdgc-dev.mosip.net/idrepository/v1/identity/
-mosip.signup.generate-hash.endpoint=https://api-internal.camdgc-dev.mosip.net/v1/keymanager/generateArgon2Hash
-mosip.signup.get-uin.endpoint=https://api-internal.camdgc-dev.mosip.net/v1/idgenerator/uin
-mosip.signup.send-notification.endpoint=https://api-internal.camdgc-dev.mosip.net/v1/notifier/sms/send
+mosip.signup.add-identity.endpoint=https://api-internal.dev.mosip.net/idrepository/v1/identity/
+mosip.signup.generate-hash.endpoint=https://api-internal.dev.mosip.net/v1/keymanager/generateArgon2Hash
+mosip.signup.get-uin.endpoint=https://api-internal.dev.mosip.net/v1/idgenerator/uin
+mosip.signup.send-notification.endpoint=https://api-internal.dev.mosip.net/v1/notifier/sms/send
 mosip.signup.add-identity.request.id=mosip.id.create
 mosip.signup.add-identity.request.version=v1
 
@@ -135,13 +135,15 @@ mosip.signup.ui.config.key-values={\
 'fullname.pattern': '${mosip.signup.fullname.pattern}', \
 'status.request.delay': '${mosip.signup.status.request.delay}', \
 'status.request.limit': '${mosip.signup.status.request.limit}', \
-'signin.redirect-url': 'https://esignet.camdgc-dev.mosip.net/authorize' \
+'signin.redirect-url': 'https://esignet.dev.mosip.net/authorize' \
 }
 ## ----------------------------- SMS-message -----------------------------------------------------------------------------
-mosip.signup.otp-registration.sms.khm=ប្រើ XXXXXX ដើម្បីផ្ទៀងផ្ទាត់គណនី KhID របស់អ្នក។
-mosip.signup.otp-registration.sms.eng=Use XXXXXX to verify your KhID account.
-mosip.signup.successfully.registration.sms.khm=ប្រើ XXXXXX ដើម្បីផ្ទៀងផ្ទាត់គណនី KhID របស់អ្នក។ 
-mosip.signup.successfully.registration.sms.eng=Use XXXXXX to verify your KhID account.
+mosip.signup.sms-notification-template.send-otp.khm=4Z6U4Z+S4Z6a4Z6+IHtjaGFsbGVuZ2V9IOGeiuGevuGemOGfkuGelOGeuOGeleGfkuGekeGfgOGehOGeleGfkuGekeGetuGej+Gfi+GeguGejuGek+GeuCBLaElEIOGemuGelOGen+Gfi+GeouGfkuGek+GegOGflA==
+mosip.signup.sms-notification-template.send-otp.eng=Use {challenge} to verify your KhID account.
+mosip.signup.sms-notification-template.registration.khm=4Z6i4Z+S4Z6T4Z6A4Z6U4Z624Z6T4Z6F4Z674Z+H4Z6I4Z+S4Z6Y4Z+E4Z+H4Z6C4Z6O4Z6T4Z64IEtoSUQg4Z6K4Z+E4Z6Z4Z6H4Z+E4Z6C4Z6H4Z+Q4Z6Z4Z+U
+mosip.signup.sms-notification-template.registration.eng=You successfully registered to KhID account.
+mosip.signup.sms-notification-template.forgot-passsword.khm=4Z6i4Z+S4Z6T4Z6A4Z6U4Z624Z6T4Z6V4Z+S4Z6b4Z624Z6f4Z+L4Z6U4Z+S4Z6K4Z684Z6a4Z6W4Z624Z6A4Z+S4Z6Z4Z6f4Z6Y4Z+S4Z6E4Z624Z6P4Z+LIEtoSUQg4Z6K4Z+E4Z6Z4Z6H4Z+E4Z6C4Z6H4Z+Q4Z6Z4Z+U
+mosip.signup.sms-notification-template.forgot-passsword.eng=You successfully changed KhID password.
 #------------------------------------------ Others ---------------------------------------------------------------------
 logging.level.io.mosip.signup=DEBUG