Skip to content

Commit

Permalink
Merge pull request #7865 from maheswaras/release-1.2.3.1
Browse files Browse the repository at this point in the history
[MOSIP-39004] cleanup testdata changes from release-1.2.3.1 branch of mosip-config repo
  • Loading branch information
ckesiraju authored Jan 16, 2025
2 parents 1453be5 + 2d0972c commit 535b775
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 876 deletions.
4 changes: 2 additions & 2 deletions application-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ mosip.registration.processor.notification.types=EMAIL
mosip.notificationtype=SMS|EMAIL
mosip.kernel.sms.proxy-sms=false
mosip.kernel.auth.proxy-otp=true
mosip.kernel.auth.proxy-email=false
mosip.kernel.auth.proxy-email=true
## Notification lanugage types: either PRIMARY or BOTH
mosip.notification.language-type=BOTH

Expand Down Expand Up @@ -418,7 +418,7 @@ websub.publish.url=${mosip.websub.url}/hub/
mosip.mandatory-languages=eng
## Leave blank if no optional langauges
mosip.optional-languages=ara,fra
mosip.min-languages.count=1
mosip.min-languages.count=2
mosip.max-languages.count=3

# These are default languages used for sending notifications
Expand Down
463 changes: 0 additions & 463 deletions application-new.properties

This file was deleted.

6 changes: 3 additions & 3 deletions esignet-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,11 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': ${mosip.esignet.auth-challenge.OTP.max-length}, \
'password.regex': '^.{8,20}$', \
'password.max-length': ${mosip.esignet.auth-challenge.PWD.max-length}, \
'username.regex': '(^\\d{6}\\/\\d{2}\\/\\d{1}\\@nrcid$)|(^\\d{10}$)|(^\\d{16}$)|(^\\d{9}\\@phonenumber$)|(^[a-zA-Z0-9._%+-]+\\@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}\\@email$)',\
'username.regex': '^[0-9]{10,30}$',\
'username.prefix': '', \
'username.postfix': '', \
'username.max-length': 30, \
'username.input-type': 'text', 'wallet.config': ${mosip.esignet.ui.wallet.config}, \'signup.config': ${mosip.esignet.ui.signup.config}, \
'username.max-length': 16, \
'username.input-type': 'number', 'wallet.config': ${mosip.esignet.ui.wallet.config}, \'signup.config': ${mosip.esignet.ui.signup.config}, \
'forgot-password.config': ${mosip.esignet.ui.forgot-password.config}, \
'error.banner.close-timer': 10,\
'auth.factor.kba.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}',\
Expand Down
3 changes: 1 addition & 2 deletions id-authentication-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,7 @@ mosip.ida.vci.supported.cred.types=VerifiableCredential,MOSIPVerifiableCredentia

# Regex to validate handles with provided key as the postfix
# if the input handle is +855345353453@phone then the provided regex is used to validate the input.
#mosip.ida.handle-types.regex={ '@phone' : '^\\+91[1-9][0-9]{7,9}@phone$' }
mosip.ida.handle-types.regex={ '@email' : '.*@email$', '@nrcid' : '.*@nrcid$', '@phonenumber' : '.*@phonenumber$' }
mosip.ida.handle-types.regex={ '@phone' : '^\\+91[1-9][0-9]{7,9}@phone$' }

#-------------------------------- Authentication error eventing-------------------------------
#It enable and disable the bean init of kafka and Authentication error eventing
Expand Down
5 changes: 2 additions & 3 deletions id-repository-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
# Enabling below property will start logging performance logs in identity and vid service
mosip.idrepo.aspect-logging.enabled=false

auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client,mpartner-default-print,mosip-idrepo-client,mpartner-default-auth,mosip-syncdata-client,mosip-masterdata-client,mosip-idrepo-client,mosip-pms-client,mosip-hotlist-client,opencrvs-partner,mpartner-default-digitalcard,mpartner-default-mobile,mosip-signup-client,mosip-testrig-client
auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client,mpartner-default-print,mosip-idrepo-client,mpartner-default-auth,mosip-syncdata-client,mosip-masterdata-client,mosip-idrepo-client,mosip-pms-client,mosip-hotlist-client,opencrvs-partner,mpartner-default-digitalcard,mpartner-default-mobile,mosip-signup-client
#openapi properties to sort tag and operations of id-repository services
springdoc.swagger-ui.tagsSorter=alpha
springdoc.swagger-ui.operationsSorter=alpha
Expand Down Expand Up @@ -448,8 +448,7 @@ mosip.idrepo.credential-request-v2.rest.timeout=100
mosip.idrepo.identity.disable-uin-based-credential-request=false
# Field Id as in the identity schema will be the key and value is the actual postfix to append. Empty values are also supported.
# This configuration is considered only when mentioned fieldId is marked to be a handle in the identity schema and it is one of the selectedHandle in the ID-object.
#mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
mosip.identity.fieldid.handle-postfix.mapping={'email':'@email', 'nrcId':'@nrcid', 'phoneNumber':'@phonenumber'}
mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
mosip.idrepo.identity.max-request-time-deviation-seconds=60
#Enable this property only when to check cache log
#logging.level.org.springframework.cache=TRACE
Expand Down
55 changes: 37 additions & 18 deletions identity-mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"value" : "selectedHandles"
},
"name": {
"value": "firstName,lastName"
"value": "fullName"
},
"gender": {
"value": "gender"
Expand All @@ -31,10 +31,10 @@
"value": "introducerName"
},
"phone": {
"value": "phoneNumber"
"value": "phone"
},
"phoneNumber": {
"value": "phoneNumber"
"value": "phone"
},
"email": {
"value": "email"
Expand Down Expand Up @@ -73,19 +73,31 @@
"value": "zone,postalCode"
},
"addressLine1": {
"value": "addressLine"
"value": "addressLine1"
},
"addressLine2": {
"value": "addressLine2"
},
"addressLine3": {
"value": "addressLine3"
},
"location1": {
"value": "province"
"value": "city"
},
"location2": {
"value": "district"
"value": "region"
},
"location3": {
"value": "constituency"
"value": "province"
},
"postalCode": {
"value": "postalCode"
},
"location4": {
"value": "zone"
},
"fullAddress": {
"value": "addressLine,province,district,constituency"
"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
},
"bestTwoFingers": {
"value": "bestTwoFingers"
Expand All @@ -96,29 +108,36 @@
"picture": {
"value": "face"
},
"address": {
"value": "addressLine,province,district,constituency"
},

"phone_number": {
"value": "phoneNumber"
"value": "phone"
},
"postal_code": {
"value": "postalCode"
"address": {
"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
},
"individual_id": {
"value": "individual_id"
},
"attributes": {
"value": "fln,ad1,ad2,ad3,cit,reg,pro,poc,cph,em,ph,gen,dob"
},
"street_address": {
"value": "addressLine1,addressLine2,addressLine3"
},
"locality": {
"value": "constituency"
"value": "city"
},
"region": {
"value": "district"
"value": "region"
},
"postal_code": {
"value": "postalCode"
},
"country": {
"value": "province"
},
"password": {
"value": "password"
}
},
"metaInfo": {
Expand All @@ -145,8 +164,8 @@
}
},
"attributeUpdateCountLimit": {
"firstName": 2,
"gender": 4,
"fullName": 5,
"gender": 2,
"dateOfBirth": 3
}
}
10 changes: 5 additions & 5 deletions kernel-default.properties
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ mosip.kernel.sms.password=dummy
mosip.kernel.sms.route=mock

## Email notification
mosip.kernel.notification.email.from=mosipcollab@gmail.com
mosip.kernel.notification.email.from=do-not-reply@mosip.io
spring.mail.host=${smtp.host}
spring.mail.username=${smtp.username}
spring.mail.password=${smtp.secret}
spring.mail.port=${smtp.port}
spring.mail.properties.mail.transport.protocol=smtp
spring.mail.properties.mail.smtp.starttls.required=true
spring.mail.properties.mail.smtp.starttls.enable=true
spring.mail.properties.mail.smtp.auth=true
spring.mail.properties.mail.smtp.starttls.required=false
spring.mail.properties.mail.smtp.starttls.enable=false
spring.mail.properties.mail.smtp.auth=false
spring.mail.debug=false
spring.servlet.multipart.enabled=true
spring.servlet.multipart.max-file-size=5MB
Expand Down Expand Up @@ -431,7 +431,7 @@ scheduling.job.cron=0 0 2 * * ?
#To fetch user details based on user id and user name in zone API's
zone.user.details.url=${mosip.kernel.authmanager.url}/v1/authmanager/userdetails

auth.server.admin.allowed.audience=mosip-toolkit-android-client,mosip-toolkit-client,mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client,mpartner-default-print,mosip-idrepo-client,mpartner-default-auth,mosip-syncdata-client,mosip-masterdata-client,mosip-idrepo-client,mosip-pms-client,mosip-hotlist-client,mobileid_newlogic,opencrvs-partner,mosip-deployment-client,mpartner-default-digitalcard,mpartner-default-mobile,mosip-signup-client,mosip-testrig-client
auth.server.admin.allowed.audience=mosip-toolkit-android-client,mosip-toolkit-client,mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client,mpartner-default-print,mosip-idrepo-client,mpartner-default-auth,mosip-syncdata-client,mosip-masterdata-client,mosip-idrepo-client,mosip-pms-client,mosip-hotlist-client,mobileid_newlogic,opencrvs-partner,mosip-deployment-client,mpartner-default-digitalcard,mpartner-default-mobile,mosip-signup-client
mosip.iam.adapter.appid=admin
mosip.iam.adapter.clientid=mosip-admin-client
mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
Expand Down
Loading

0 comments on commit 535b775

Please sign in to comment.