Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ES-379 #28

Merged
merged 2 commits into from
Jan 23, 2024
Merged

ES-379 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e4d0d9
Version changed to 1.0.0
ase-101 Jan 23, 2024
61a8f01
Removed camdgc reference
ase-101 Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions docs/postman-collections/signup_001.postman_collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions signup-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
18 changes: 4 additions & 14 deletions signup-service/src/main/resources/application-default.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}$

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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, \
Expand Down
2 changes: 1 addition & 1 deletion signup-service/src/test/java/io/mosip/signup/controllers/SignUpControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
26 changes: 14 additions & 12 deletions signup-service/src/test/resources/application-test.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Loading