From beeaef7573e393d812861be0a4d0b684bfec6e1a Mon Sep 17 00:00:00 2001
From: Ajay1596 <44763643+Ajay1596@users.noreply.github.com>
Date: Tue, 2 Mar 2021 17:03:18 +0530
Subject: [PATCH 0001/1358] adding idschemaversion

---
 sandbox/pre-registration-demographic.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sandbox/pre-registration-demographic.json b/sandbox/pre-registration-demographic.json
index 6580384ab56..aba08a857ba 100644
--- a/sandbox/pre-registration-demographic.json
+++ b/sandbox/pre-registration-demographic.json
@@ -1,5 +1,16 @@
 {
    "identity":[
+      
+      {
+        "id": "IDSchemaVersion",
+        "description": "ID Schema Version",
+        "type": "number",
+        "controlType": null,
+        "fieldType": "default",
+        "inputRequired": false,
+        "validators": [],
+        "required": true
+       },
         {
            "id":"fullName",
            "description":"Enter Full Name",

From 1034cc68f46856dc62857c28c0f4af64d03abf36 Mon Sep 17 00:00:00 2001
From: M1022006 <sowmya.goudar@mindtree.com>
Date: Wed, 3 Mar 2021 11:06:03 +0530
Subject: [PATCH 0002/1358] updated PMS apis

---
 sandbox/data-share-mz.properties             | 2 +-
 sandbox/id-repository-mz.properties          | 4 ++--
 sandbox/registration-processor-mz.properties | 4 ++--
 sandbox/resident-mz.properties               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sandbox/data-share-mz.properties b/sandbox/data-share-mz.properties
index daebeac17bc..0cd6cc95616 100644
--- a/sandbox/data-share-mz.properties
+++ b/sandbox/data-share-mz.properties
@@ -4,7 +4,7 @@ mosip.data.share.service.version=1.0
 #--------------URI--------------------------
 CRYPTOMANAGER_ENCRYPT=http://kernel-keymanager-service/v1/keymanager/encrypt
 KEYMANAGER_JWTSIGN=http://kernel-keymanager-service/v1/keymanager/jwtSign
-PARTNER_POLICY=http://pms-policy-management-service/partnermanagement/v1/policies/policies/partnerId/{partnerId}/policyId/{policyId}
+PARTNER_POLICY=http://pms-policy-manager-service/v1/policymanager/policies/{policyId}/partner/{partnerId}
 KEYBASEDTOKENAPI=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
 
 #---------config-data-----------------------
diff --git a/sandbox/id-repository-mz.properties b/sandbox/id-repository-mz.properties
index da98f405902..a021ac75a93 100644
--- a/sandbox/id-repository-mz.properties
+++ b/sandbox/id-repository-mz.properties
@@ -298,8 +298,8 @@ KEYBASEDTOKENAPI=http://kernel-auth-service/v1/authmanager/authenticate/clientid
 KEYMANAGER_JWTSIGN=http://kernel-keymanager-service/v1/keymanager/jwtSign
 KEYMANAGER_ENCRYPT_PIN=http://kernel-keymanager-service/v1/keymanager/encryptWithPin
 KEYMANAGER_ENCRYPT_ZK=http://kernel-keymanager-service/v1/keymanager/zkEncrypt
-PARTNER_POLICY=http://pms-partner-service/partnermanagement/v1/partners/partners/partnerId/{partnerId}/credentialType/{credentialType}
-PARTNER_EXTRACTION_POLICY=http://pms-partner-service/partnermanagement/v1/partners/partners/partnerId/{partnerId}/policyId/{policyId}
+PARTNER_POLICY=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+PARTNER_EXTRACTION_POLICY=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
 credential.service.token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
 
 
diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index a55f9bda230..959f6515675 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -120,7 +120,7 @@ POSTALCODE=${MASTER}/locations/validate
 PROVINCE=${MASTER}/locations/validate
 USERDETAILS=${MASTER}/users
 TEMPLATES=${MASTER}/templates
-DEVICEVALIDATEHISTORY=http://pms-partner-service/partnermanagement/v1/partners/deviceprovidermanagement/validate
+DEVICEVALIDATEHISTORY=http://pms-partner-manager-service/v1/partnermanager/deviceprovidermanagement/validate
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
 
@@ -167,7 +167,7 @@ PACKETRECEIVER=${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/r
 SMSNOTIFIER=http://kernel-notification-service/v1/notifier/sms/send
 EMAILNOTIFIER=http://kernel-notification-service/v1/notifier/email/send
 
-PMS=http://pms-policy-management-service/partnermanagement/v1/policies/policies/partnerId
+PMS=http://pms-policy-manager-service/v1/policymanager/policies/{policyId}/partner/{partnerId}
 
 #---------Registration Status---------
 
diff --git a/sandbox/resident-mz.properties b/sandbox/resident-mz.properties
index e09a0a0a8b2..fd01880cba8 100644
--- a/sandbox/resident-mz.properties
+++ b/sandbox/resident-mz.properties
@@ -76,13 +76,13 @@ REGISTRATIONSTATUSSEARCH=${dmz.ingress.base.url}/registrationprocessor/v1/regist
 resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service
-POLICY_REQ_URL=http://pms-partner-service/partnermanagement/v1/partners/partners
+POLICY_REQ_URL=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 OTP_GEN_URL=http://ida-internal-service/idauthentication/v1/internal/otp
 CREDENTIAL_STATUS_URL=http://idrepo-credential-request-generator/v1/credentialrequest/get/
 CREDENTIAL_REQ_URL=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
 CREDENTIAL_CANCELREQ_URL=http://idrepo-credential-request-generator/v1/credentialrequest/cancel/
 CREDENTIAL_TYPES_URL=http://idrepo-credential-service/v1/credentialservice/types
-PARTNER_API_URL=http://pms-partner-service/partnermanagement/v1/partners/partners/
+PARTNER_API_URL=http://pms-partner-manager-service/v1/partnermanager/partners
 mosip.kernel.masterdata.audit-url=http://kernel-auditmanager-service/v1/auditmanager/audits
 
 #----------------------config data---------------------

From c79e0b7c9c6524358aaa3cc53135e5d5fe3b1f98 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
Date: Wed, 3 Mar 2021 12:00:20 +0530
Subject: [PATCH 0003/1358] Updated pms urls

---
 sandbox/id-authentication-mz.properties | 2 +-
 sandbox/id-repository-mz.properties     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sandbox/id-authentication-mz.properties b/sandbox/id-authentication-mz.properties
index 0d831d84288..84401290a82 100644
--- a/sandbox/id-authentication-mz.properties
+++ b/sandbox/id-authentication-mz.properties
@@ -183,7 +183,7 @@ auth-token-generator.rest.secretKey=${mosip.ida.auth.secretKey}
 auth-token-generator.rest.appId=${mosip.ida.auth.appId}
 
 # Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
-id-pmp-service.rest.uri=http://pms-partner-management-service/partnermanagement/v1/pmpartners/pmpartners/validatePartnerMisp/partnerId/{partner_id}/partnerApiKey/{partner_api_key}/mispLicenseKey/{misp_license_key}?needPartnerCert={need_partner_cert}
+id-pmp-service.rest.uri=http://pms-partner-management-service/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
 id-pmp-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-pmp-service.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/sandbox/id-repository-mz.properties b/sandbox/id-repository-mz.properties
index da98f405902..90e4365c1bb 100644
--- a/sandbox/id-repository-mz.properties
+++ b/sandbox/id-repository-mz.properties
@@ -178,7 +178,7 @@ mosip.idrepo.syncdata-service.rest.httpMethod=GET
 mosip.idrepo.syncdata-service.rest.headers.mediaType=application/json
 mosip.idrepo.syncdata-service.rest.timeout=100
 
-mosip.idrepo.pmp.partner.rest.uri=http://pms-partner-management-service/partnermanagement/v1/pmpartners/pmpartners?partnerType=Online_Verification_Partner
+mosip.idrepo.pmp.partner.rest.uri=http://pms-partner-management-service/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 mosip.idrepo.pmp.partner.rest.httpMethod=GET
 mosip.idrepo.pmp.partner.rest.headers.mediaType=application/json
 mosip.idrepo.pmp.partner.rest.timeout=10

From e6499cfac3473ed2fe2725e1b44c59d9cbee4fcc Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
Date: Wed, 3 Mar 2021 12:39:50 +0530
Subject: [PATCH 0004/1358] Corrected pms base url

---
 sandbox/id-authentication-mz.properties | 2 +-
 sandbox/id-repository-mz.properties     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sandbox/id-authentication-mz.properties b/sandbox/id-authentication-mz.properties
index 84401290a82..92b1eb41ac2 100644
--- a/sandbox/id-authentication-mz.properties
+++ b/sandbox/id-authentication-mz.properties
@@ -183,7 +183,7 @@ auth-token-generator.rest.secretKey=${mosip.ida.auth.secretKey}
 auth-token-generator.rest.appId=${mosip.ida.auth.appId}
 
 # Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
-id-pmp-service.rest.uri=http://pms-partner-management-service/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
+id-pmp-service.rest.uri=http://pms-partner-manager-service/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
 id-pmp-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-pmp-service.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/sandbox/id-repository-mz.properties b/sandbox/id-repository-mz.properties
index 90e4365c1bb..3446f9e5f56 100644
--- a/sandbox/id-repository-mz.properties
+++ b/sandbox/id-repository-mz.properties
@@ -178,7 +178,7 @@ mosip.idrepo.syncdata-service.rest.httpMethod=GET
 mosip.idrepo.syncdata-service.rest.headers.mediaType=application/json
 mosip.idrepo.syncdata-service.rest.timeout=100
 
-mosip.idrepo.pmp.partner.rest.uri=http://pms-partner-management-service/v1/partnermanager/partners?partnerType=Online_Verification_Partner
+mosip.idrepo.pmp.partner.rest.uri=http://pms-partner-manager-service/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 mosip.idrepo.pmp.partner.rest.httpMethod=GET
 mosip.idrepo.pmp.partner.rest.headers.mediaType=application/json
 mosip.idrepo.pmp.partner.rest.timeout=10

From f4feac860420f95e4f758aa7204482dd1952a182 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Wed, 3 Mar 2021 14:19:34 +0530
Subject: [PATCH 0005/1358] Update registration-processor-mz.properties

---
 sandbox/registration-processor-mz.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 959f6515675..75f3ab9120e 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -167,7 +167,7 @@ PACKETRECEIVER=${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/r
 SMSNOTIFIER=http://kernel-notification-service/v1/notifier/sms/send
 EMAILNOTIFIER=http://kernel-notification-service/v1/notifier/email/send
 
-PMS=http://pms-policy-manager-service/v1/policymanager/policies/{policyId}/partner/{partnerId}
+PMS=http://pms-policy-manager-service/v1/policymanager/policies
 
 #---------Registration Status---------
 

From d1189486deb8b94e7161788c839bab6df35e0cc5 Mon Sep 17 00:00:00 2001
From: Ajay1596 <44763643+Ajay1596@users.noreply.github.com>
Date: Fri, 5 Mar 2021 16:59:39 +0530
Subject: [PATCH 0006/1358] adding multi lang config prop

---
 sandbox/pre-registration-mz.properties | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sandbox/pre-registration-mz.properties b/sandbox/pre-registration-mz.properties
index 6263a2d6a76..3c10013f29c 100644
--- a/sandbox/pre-registration-mz.properties
+++ b/sandbox/pre-registration-mz.properties
@@ -444,8 +444,14 @@ mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.t
 
 
 #------------UI params-----------------------------
+------------to be removed later -------
+mosip.mandatory.languages=ara,fra
+mosip.optional.languages=
+mosip.min.languages.count=2
+mosip.max.languages.count=2
+-------------------------------------------
 # List of keys which UI will consume
-ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version
+ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version,mosip.mandatory.languages,mosip.max.languages.count,mosip.min.languages.count,mosip.optional.languages
 # This config is used for loading recommended centers based on the value of the config. 
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 preregistration.recommended.centers.locCode=5

From 1abf7933dd7dd7b22bd746bf4af1b2c9ca5c7cce Mon Sep 17 00:00:00 2001
From: jpnayak007 <43367563+jpnayak007@users.noreply.github.com>
Date: Tue, 16 Mar 2021 09:34:30 +0530
Subject: [PATCH 0007/1358] MOSIP-12132

---
 sandbox/registration-processor-mz.properties | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 75f3ab9120e..89c2d5d2a15 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -370,6 +370,8 @@ registration.processor.reprocess.fetchsize=100
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
 registration.processor.reprocess.elapse.time=7200
+# The elapse time (in sec) beyond which the rids will be fall under deafault pause&resume action
+registration.processor.default.action.elapse.time=300
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 # Reprocess type
@@ -377,11 +379,11 @@ registration.processor.reprocess.type=cron
 #schedular seconds configuration
 registration.processor.reprocess.seconds=0
 #schedular minutes configuration
-registration.processor.reprocess.minutes=0
+registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
 #schedular hours configuration
 # Under assumption of about 2 hrs of downtime for regproc on daily basis, the reprocessor 
 # frequency is made to 3 hours once
-registration.processor.reprocess.hours=0,3,6,9,12,15,18,21
+registration.processor.reprocess.hours=*
 #schedular days configuration
 registration.processor.reprocess.days_of_month=*
 #schedular months configuration

From cdb272b09ae5616acd7e09b3331c08c6406d3cb5 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Tue, 16 Mar 2021 10:19:33 +0530
Subject: [PATCH 0008/1358] MOSIP-12133 config changes

---
 sandbox/registration-processor-mz.properties | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 75f3ab9120e..60dfd64a383 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -389,6 +389,20 @@ registration.processor.reprocess.months=*
 #schedular weeks configuration
 registration.processor.reprocess.days_of_week=*
 
+# WorkflowAction api id
+mosip.registration.processor.workflow.action.id=mosip.registration.processor.workflow.action
+
+# WorkflowAction api version
+mosip.registration.processor.workflow.action.version=1.0
+
+#WorkflowAction service  hitlisted tagname
+mosip.regproc.workflow.action.hotlisted.tag=test
+
+#WorkflowAction service  beginning stage name
+mosip.regproc.workflow.action.resumefrombeginning.stage=SecurezoneNotificationStage
+
+#WorkflowAction service  websub topic name
+mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
 
 #Service Ids
 #Audit request id
@@ -425,6 +439,7 @@ PACKETMANAGER_SEARCH_BIOMETRICS=${packetmanager.base.url}/v1/packetmanager/biome
 PACKETMANAGER_SEARCH_AUDITS=${packetmanager.base.url}/v1/packetmanager/audits
 PACKETMANAGER_INFO=${packetmanager.base.url}/v1/packetmanager/info
 PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdateTag
+PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
 DATASHARECREATEURL=http://datashare-service/v1/datashare/create
 DATASHAREGETEURL=http://datashare-service/v1/datashare/get
 registration.processor.policy.id=mpolicy-default-abis

From 726266e728d14a696ec33f5ec88f65dc09039fc3 Mon Sep 17 00:00:00 2001
From: jpnayak007 <43367563+jpnayak007@users.noreply.github.com>
Date: Tue, 16 Mar 2021 11:32:51 +0530
Subject: [PATCH 0009/1358] Update registration-processor-mz.properties

---
 sandbox/registration-processor-mz.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 89c2d5d2a15..7cc5adc4fdf 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -370,8 +370,6 @@ registration.processor.reprocess.fetchsize=100
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
 registration.processor.reprocess.elapse.time=7200
-# The elapse time (in sec) beyond which the rids will be fall under deafault pause&resume action
-registration.processor.default.action.elapse.time=300
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 # Reprocess type

From 710cd221246ade875437493775001480ce80e2d6 Mon Sep 17 00:00:00 2001
From: jpnayak007 <43367563+jpnayak007@users.noreply.github.com>
Date: Tue, 16 Mar 2021 18:16:58 +0530
Subject: [PATCH 0010/1358] Update registration-processor-mz.properties

---
 sandbox/registration-processor-mz.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 7cc5adc4fdf..9e3741dc9cb 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -377,10 +377,9 @@ registration.processor.reprocess.type=cron
 #schedular seconds configuration
 registration.processor.reprocess.seconds=0
 #schedular minutes configuration
+#the frequency for reprocess has been updated to every 5 minutes for pause/resume feature
 registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
 #schedular hours configuration
-# Under assumption of about 2 hrs of downtime for regproc on daily basis, the reprocessor 
-# frequency is made to 3 hours once
 registration.processor.reprocess.hours=*
 #schedular days configuration
 registration.processor.reprocess.days_of_month=*

From aaf414669d766f9ca511330edf74b4c16cb849ec Mon Sep 17 00:00:00 2001
From: Nagarjuna K <nagarjunabtechece@gmail.com>
Date: Wed, 17 Mar 2021 02:51:29 +0530
Subject: [PATCH 0011/1358] mosip-12162

---
 sandbox/admin-mz.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sandbox/admin-mz.properties b/sandbox/admin-mz.properties
index eb1f9ee9600..1264ab78979 100644
--- a/sandbox/admin-mz.properties
+++ b/sandbox/admin-mz.properties
@@ -186,6 +186,9 @@ mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/au
 mosip.admin-services.open-id.token_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
+#--------------------------------------------------------------------------------------
+mosip.ui.spec.default.domain=registration-client
+
 #---------------------------------------Security Properties-----------------------------
 
 #CSRF switch

From 0fb77ca2fc98b2f83e91c62eddee434700752f17 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Wed, 17 Mar 2021 13:19:48 +0530
Subject: [PATCH 0012/1358] MOSIP-12133 fixed as review comments

---
 sandbox/registration-processor-mz.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 60dfd64a383..68bb81c5265 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -390,13 +390,13 @@ registration.processor.reprocess.months=*
 registration.processor.reprocess.days_of_week=*
 
 # WorkflowAction api id
-mosip.registration.processor.workflow.action.id=mosip.registration.processor.workflow.action
+mosip.regproc.workflow.action.api-id=mosip.registration.processor.workflow.action
 
 # WorkflowAction api version
-mosip.registration.processor.workflow.action.version=1.0
+mosip.regproc.workflow.action.version=1.0
 
 #WorkflowAction service  hitlisted tagname
-mosip.regproc.workflow.action.hotlisted.tag=test
+mosip.regproc.workflow.action.hotlisted-tag=test
 
 #WorkflowAction service  beginning stage name
 mosip.regproc.workflow.action.resumefrombeginning.stage=SecurezoneNotificationStage

From 2b14d8e4e8838cb6f537c207e5de12684c230529 Mon Sep 17 00:00:00 2001
From: Ajay1596 <44763643+Ajay1596@users.noreply.github.com>
Date: Wed, 17 Mar 2021 14:33:51 +0530
Subject: [PATCH 0013/1358] removing multi lang properties

---
 sandbox/pre-registration-mz.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sandbox/pre-registration-mz.properties b/sandbox/pre-registration-mz.properties
index 3c10013f29c..624cded0fc7 100644
--- a/sandbox/pre-registration-mz.properties
+++ b/sandbox/pre-registration-mz.properties
@@ -451,7 +451,7 @@ mosip.min.languages.count=2
 mosip.max.languages.count=2
 -------------------------------------------
 # List of keys which UI will consume
-ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version,mosip.mandatory.languages,mosip.max.languages.count,mosip.min.languages.count,mosip.optional.languages
+ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version
 # This config is used for loading recommended centers based on the value of the config. 
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 preregistration.recommended.centers.locCode=5

From 1703e3354bfac0d3e88578b59879a4fe1f69b862 Mon Sep 17 00:00:00 2001
From: Nagarjuna K <nagarjunabtechece@gmail.com>
Date: Wed, 17 Mar 2021 14:40:56 +0530
Subject: [PATCH 0014/1358] config added for language translator

---
 sandbox/pre-registration-mz.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sandbox/pre-registration-mz.properties b/sandbox/pre-registration-mz.properties
index 3c10013f29c..57ba31d9d31 100644
--- a/sandbox/pre-registration-mz.properties
+++ b/sandbox/pre-registration-mz.properties
@@ -440,7 +440,7 @@ por.url=proofOfRelationship
 # Determines request & response id of transliteration-service
 mosip.pre-registration.transliteration.transliterate.id=mosip.pre-registration.transliteration.transliterate
 mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.transliteration.transliterate
-
+mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j
 
 
 #------------UI params-----------------------------

From da8d04028f3097491761d1e4305e718337c068e1 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
Date: Wed, 17 Mar 2021 15:13:15 +0530
Subject: [PATCH 0015/1358] added stage config

---
 sandbox/registration-processor-mz.properties | 25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 9e3741dc9cb..e3a79350bd5 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -619,6 +619,30 @@ packetmanager.provider.uingenerator.proofOfIdentity=source:CNIE\/process:CORRECT
 packetmanager.provider.uingenerator.proofOfRelationship=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.provider.uingenerator.proofOfException=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 
+#Kafka event bus configruations
+mosip.regproc.eventbus.kafka.commit.type=${mosip.regproc.packet.classifier.eventbus.kafka.commit.type}
+mosip.regproc.eventbus.kafka.max.poll.records=${mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records}
+mosip.regproc.eventbus.kafka.poll.frequency=${mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency}
+mosip.regproc.eventbus.kafka.group.id=${mosip.regproc.packet.classifier.eventbus.kafka.group.id}
+
+# Default base packages for stage beans to be scanned in a stage group
+mosip.regproc.stage-groups.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor
+# Add any new base package specific to stage group as below
+# mosip.regproc.stage-groups.stage-beans-base-packages.<stage_group_name>=${mosip.regproc.stage-groups.stage-beans-base-packages.default}
+# Example: mosip.regproc.stage-groups.stage-beans-base-packages.stage-group-1=${mosip.regproc.stage-groups.stage-beans-base-packages.default},my.stage.bean.base.package
+
+
+#### Stage Specific properties ####
+
+mosip.regproc.packet.classifier.server.port=8092
+mosip.regproc.packet.classifier.eventbus.port=5724
+mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/packetclassifier
+
+
+mosip.regproc.packet.validator.server.port=8088
+mosip.regproc.packet.validator.eventbus.port=5715
+mosip.regproc.packet.validator.server.servlet.path=/registrationprocessor/v1/packetvalidator
+
 # packet-classifier-stage
 # List of tag generator that should be run on every packet
 # Available tag generators MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus
@@ -649,3 +673,4 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'CHILD':'0-17','ADULT':
 mosip.regproc.packet.classifier.tagging.supervisorapprovalstatus.tag-name=SUPERVISOR_APPROVAL_STATUS
 # Tag name that will be used while tagging exception biometrics
 mosip.regproc.packet.classifier.tagging.exceptionbiometrics.tag-name=EXCEPTION_BIOMETRICS
+

From a25f6fb1afc828888a50c26e3bbcfc167b575e30 Mon Sep 17 00:00:00 2001
From: Manoj SP <Manoj.SP@mindtree.com>
Date: Wed, 17 Mar 2021 15:55:33 +0530
Subject: [PATCH 0016/1358] [MOSIP-12124] added ref ids of base keys for
 encryption/decryption

---
 sandbox/id-repository-mz.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sandbox/id-repository-mz.properties b/sandbox/id-repository-mz.properties
index 5bff5b7cc1c..87776d5f671 100644
--- a/sandbox/id-repository-mz.properties
+++ b/sandbox/id-repository-mz.properties
@@ -50,6 +50,12 @@ mosip.idrepo.modulo-value=1000
 #the requests originating from a system that is not in time-sync will be accepted for the time period
 mosip.idrepo.datetime.future-time-adjustment=2
 
+# Reference IDs of base keys used for encryption/decryption
+mosip.idrepo.crypto.refId.uin=uin
+mosip.idrepo.crypto.refId.uin-data=identity_data
+mosip.idrepo.crypto.refId.demo-doc-data=demographic_data
+mosip.idrepo.crypto.refId.bio-doc-data=biometric_data
+
 #---------------------------Kernel Retry Configurations----------------------------------------------------#
 # The retry limit excluding the first attempt before attempting for retries. Default is set to 5.
 kernel.retry.attempts.limit=5

From 68f584fa3fc6e3c6d76550692558ca3531102457 Mon Sep 17 00:00:00 2001
From: nikhileshkumar0408
 <68633957+nikhileshkumar0408@users.noreply.github.com>
Date: Fri, 19 Mar 2021 09:00:13 +0530
Subject: [PATCH 0017/1358] MOSIP-12629 "added Mock ABIS key"

---
 sandbox/mock-abis-mz.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sandbox/mock-abis-mz.properties b/sandbox/mock-abis-mz.properties
index 4aba1514f87..9b768f5aecb 100644
--- a/sandbox/mock-abis-mz.properties
+++ b/sandbox/mock-abis-mz.properties
@@ -6,3 +6,4 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
+abis.return.duplicate=false

From 98aae943ac9ae0b5a179f0f889615503c07edf5d Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Fri, 19 Mar 2021 14:05:59 +0530
Subject: [PATCH 0018/1358] MOSIP-12133 config changes

---
 sandbox/registration-processor-mz.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 68bb81c5265..1db9af6e5a1 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -399,7 +399,7 @@ mosip.regproc.workflow.action.version=1.0
 mosip.regproc.workflow.action.hotlisted-tag=test
 
 #WorkflowAction service  beginning stage name
-mosip.regproc.workflow.action.resumefrombeginning.stage=SecurezoneNotificationStage
+mosip.regproc.workflow.action.resumefrombeginning.stage=PacketUploaderStage
 
 #WorkflowAction service  websub topic name
 mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event

From 31460debc7fba45c4f461a41ed3a4a43bda10257 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Fri, 19 Mar 2021 14:45:01 +0530
Subject: [PATCH 0019/1358] MOSIP-12133 config changes

---
 sandbox/registration-processor-mz.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 1db9af6e5a1..b881ef2e2ee 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -396,7 +396,7 @@ mosip.regproc.workflow.action.api-id=mosip.registration.processor.workflow.actio
 mosip.regproc.workflow.action.version=1.0
 
 #WorkflowAction service  hitlisted tagname
-mosip.regproc.workflow.action.hotlisted-tag=test
+mosip.regproc.workflow.action.hotlisted-tag=HOTLISTED
 
 #WorkflowAction service  beginning stage name
 mosip.regproc.workflow.action.resumefrombeginning.stage=PacketUploaderStage

From e6ba88fe760de75d3ceceaa1141d52237108d064 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
Date: Fri, 19 Mar 2021 18:37:28 +0530
Subject: [PATCH 0020/1358] Added stage properties

---
 sandbox/registration-processor-dmz.properties |   7 +
 sandbox/registration-processor-mz.properties  | 202 ++++++++++++++++--
 2 files changed, 191 insertions(+), 18 deletions(-)

diff --git a/sandbox/registration-processor-dmz.properties b/sandbox/registration-processor-dmz.properties
index 2f2240dacaf..364f92bebac 100644
--- a/sandbox/registration-processor-dmz.properties
+++ b/sandbox/registration-processor-dmz.properties
@@ -138,3 +138,10 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends 
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-brdige-dmz
+
+# Packet Recevier
+mosip.regproc.message.tag.loading.disable=true
+
+mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
+mosip.regproc.packet.receiver.server.port=8081
+mosip.regproc.packet.receiver.eventbus.port=5711
\ No newline at end of file
diff --git a/sandbox/registration-processor-mz.properties b/sandbox/registration-processor-mz.properties
index 58ed3417c9c..0ead735c376 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/sandbox/registration-processor-mz.properties
@@ -634,31 +634,14 @@ packetmanager.provider.uingenerator.proofOfIdentity=source:CNIE\/process:CORRECT
 packetmanager.provider.uingenerator.proofOfRelationship=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.provider.uingenerator.proofOfException=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 
-#Kafka event bus configruations
-mosip.regproc.eventbus.kafka.commit.type=${mosip.regproc.packet.classifier.eventbus.kafka.commit.type}
-mosip.regproc.eventbus.kafka.max.poll.records=${mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records}
-mosip.regproc.eventbus.kafka.poll.frequency=${mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency}
-mosip.regproc.eventbus.kafka.group.id=${mosip.regproc.packet.classifier.eventbus.kafka.group.id}
-
-# Default base packages for stage beans to be scanned in a stage group
-mosip.regproc.stage-groups.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor
-# Add any new base package specific to stage group as below
-# mosip.regproc.stage-groups.stage-beans-base-packages.<stage_group_name>=${mosip.regproc.stage-groups.stage-beans-base-packages.default}
-# Example: mosip.regproc.stage-groups.stage-beans-base-packages.stage-group-1=${mosip.regproc.stage-groups.stage-beans-base-packages.default},my.stage.bean.base.package
-
 
 #### Stage Specific properties ####
 
+# packet-classifier-stage
 mosip.regproc.packet.classifier.server.port=8092
 mosip.regproc.packet.classifier.eventbus.port=5724
 mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/packetclassifier
 
-
-mosip.regproc.packet.validator.server.port=8088
-mosip.regproc.packet.validator.eventbus.port=5715
-mosip.regproc.packet.validator.server.servlet.path=/registrationprocessor/v1/packetvalidator
-
-# packet-classifier-stage
 # List of tag generator that should be run on every packet
 # Available tag generators MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus
 mosip.regproc.packet.classifier.tag-generators=MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus
@@ -689,3 +672,186 @@ mosip.regproc.packet.classifier.tagging.supervisorapprovalstatus.tag-name=SUPERV
 # Tag name that will be used while tagging exception biometrics
 mosip.regproc.packet.classifier.tagging.exceptionbiometrics.tag-name=EXCEPTION_BIOMETRICS
 
+mosip.regproc.packet.classifier.eventbus.kafka.commit.type=${mosip.regproc.packet.classifier.eventbus.kafka.commit.type}
+mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=${mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records}
+mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=${mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency}
+mosip.regproc.packet.classifier.eventbus.kafka.group.id=${mosip.regproc.packet.classifier.eventbus.kafka.group.id}
+
+# Packet Validator
+mosip.regproc.packet.validator.server.port=8088
+mosip.regproc.packet.validator.eventbus.port=5715
+mosip.regproc.packet.validator.server.servlet.path=/registrationprocessor/v1/packetvalidator
+
+mosip.regproc.packet.validator.eventbus.kafka.commit.type=${mosip.regproc.packet.validator.eventbus.kafka.commit.type}
+mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=${mosip.regproc.packet.validator.eventbus.kafka.max.poll.records}
+mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=${mosip.regproc.packet.validator.eventbus.kafka.poll.frequency}
+mosip.regproc.packet.validator.eventbus.kafka.group.id=${mosip.regproc.packet.validator.eventbus.kafka.group.id}
+
+mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT
+mosip.kernel.jsonvalidator.schema-name=mosip-identity-json-schema.json
+mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+
+
+# External Stage
+mosip.regproc.external.eventbus.port=5736
+mosip.regproc.external.server.port=8095
+mosip.regproc.external.server.servlet.path=/registrationprocessor/v1/external
+
+
+mosip.regproc.external.eventbus.kafka.commit.type=${mosip.regproc.external.eventbus.kafka.commit.type}
+mosip.regproc.external.eventbus.kafka.max.poll.records=${mosip.regproc.external.eventbus.kafka.max.poll.records}
+mosip.regproc.external.eventbus.kafka.poll.frequency=${mosip.regproc.external.eventbus.kafka.poll.frequency}
+mosip.regproc.external.eventbus.kafka.group.id=${mosip.regproc.external.eventbus.kafka.group.id}
+
+#Message Sender
+mosip.regproc.message.sender.server.port=8088
+mosip.regproc.message.sender.eventbus.port=5721
+mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sender-stage
+
+mosip.regproc.message.sender.eventbus.kafka.commit.type=${mosip.regproc.message.sender.eventbus.kafka.commit.type}
+mosip.regproc.message.sender.eventbus.kafka.max.poll.records=${mosip.regproc.message.sender.eventbus.kafka.max.poll.records}
+mosip.regproc.message.sender.eventbus.kafka.poll.frequency=${mosip.regproc.message.sender.eventbus.kafka.poll.frequency}
+mosip.regproc.message.sender.eventbus.kafka.group.id=${mosip.regproc.message.sender.eventbus.kafka.group.id}
+
+#OSI Validator
+mosip.regproc.osi.validator.server.port=8089
+mosip.regproc.osi.validator.eventbus.port=5716
+mosip.regproc.osi.validator.server.servlet.path=/registrationprocessor/v1/osivalidator
+
+mosip.regproc.osi.validator.eventbus.kafka.commit.type=${mosip.regproc.osi.validator.eventbus.kafka.commit.type}
+mosip.regproc.osi.validator.eventbus.kafka.max.poll.records=${mosip.regproc.osi.validator.eventbus.kafka.max.poll.records}
+mosip.regproc.osi.validator.eventbus.kafka.poll.frequency=${mosip.regproc.osi.validator.eventbus.kafka.poll.frequency}
+mosip.regproc.osi.validator.eventbus.kafka.group.id=${mosip.regproc.osi.validator.eventbus.kafka.group.id}
+
+
+# packet-uploader-stage properties
+packet.uploader.stage=registration-processor-packet-uploader-stage
+
+mosip.regproc.packet.uploader.server.port=8087
+mosip.regproc.packet.uploader.server.servlet.path=/registrationprocessor/v1/uploader
+mosip.regproc.packet.uploader.eventbus.port=5714
+
+mosip.regproc.packet.uploader.eventbus.kafka.commit.type=${mosip.regproc.packet.uploader.eventbus.kafka.commit.type}
+mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=${mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records}
+mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=${mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency}
+mosip.regproc.packet.uploader.eventbus.kafka.group.id=${mosip.regproc.packet.uploader.eventbus.kafka.group.id}
+
+# Print Stage
+mosip.regproc.printing.server.port=8099
+mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
+mosip.regproc.printing.eventbus.port=5722
+
+mosip.regproc.printing.eventbus.kafka.commit.type=${mosip.regproc.printing.eventbus.kafka.commit.type}
+mosip.regproc.printing.eventbus.kafka.max.poll.records=${mosip.regproc.printing.eventbus.kafka.max.poll.records}
+mosip.regproc.printing.eventbus.kafka.poll.frequency=${mosip.regproc.printing.eventbus.kafka.poll.frequency}
+mosip.regproc.printing.eventbus.kafka.group.id=${mosip.regproc.printing.eventbus.kafka.group.id}
+
+# Quality Checker
+mosip.regproc.quality.checker.server.port=9072
+mosip.regproc.quality.checker.eventbus.port=5727
+mosip.regproc.quality.checker.server.servlet.path=/registrationprocessor/v1/qualitychecker
+
+mosip.regproc.quality.checker.eventbus.kafka.commit.type=${mosip.regproc.quality.checker.eventbus.kafka.commit.type}
+mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=${mosip.regproc.quality.checker.eventbus.kafka.max.poll.records}
+mosip.regproc.quality.checker.eventbus.kafka.poll.frequency=${mosip.regproc.quality.checker.eventbus.kafka.poll.frequency}
+mosip.regproc.quality.checker.eventbus.kafka.group.id=${mosip.regproc.quality.checker.eventbus.kafka.group.id}
+
+# Secure Zone Notification Stage
+mosip.regproc.securezone.notification.server.port=8090
+mosip.regproc.securezone.notification.server.servlet.path=/registrationprocessor/v1/securezone
+mosip.regproc.securezone.notification.eventbus.port=5712
+
+mosip.regproc.securezone.notification.eventbus.kafka.commit.type=${mosip.regproc.securezone.notification.eventbus.kafka.commit.type}
+mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=${mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records}
+mosip.regproc.securezone.notification.eventbus.kafka.poll.frequency=${mosip.regproc.securezone.notification.eventbus.kafka.poll.frequency}
+mosip.regproc.securezone.notification.eventbus.kafka.group.id=${mosip.regproc.securezone.notification.eventbus.kafka.group.id}
+
+mosip.regproc.message.tag.loading.disable=true
+
+# UIN Generator Stage
+mosip.regproc.uin.generator.server.port=8099
+mosip.regproc.uin.generator.eventbus.port=5719
+mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-generator
+
+mosip.regproc.uin.generator.eventbus.kafka.commit.type=${mosip.regproc.uin.generator.eventbus.kafka.commit.type}
+mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=${mosip.regproc.uin.generator.eventbus.kafka.max.poll.records}
+mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=${mosip.regproc.uin.generator.eventbus.kafka.poll.frequency}
+mosip.regproc.uin.generator.eventbus.kafka.group.id=${mosip.regproc.uin.generator.eventbus.kafka.group.id}
+
+# Reporcessor Stage
+mosip.regproc.reprocessor.server.port=8021
+mosip.regproc.reprocessor.eventbus.port=5750
+mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reprocessor
+
+mosip.regproc.reprocessor.eventbus.kafka.commit.type=${mosip.regproc.reprocessor.eventbus.kafka.commit.type}
+mosip.regproc.reprocessor.eventbus.kafka.max.poll.records=${mosip.regproc.reprocessor.eventbus.kafka.max.poll.records}
+mosip.regproc.reprocessor.eventbus.kafka.poll.frequency=${mosip.regproc.reprocessor.eventbus.kafka.poll.frequency}
+mosip.regproc.reprocessor.eventbus.kafka.group.id=${mosip.regproc.reprocessor.eventbus.kafka.group.id}
+
+# Manual Stage
+mosip.regproc.manual.verification.server.servlet.path=/registrationprocessor/v1/manualverification
+mosip.regproc.manual.verification.server.port=8084
+mosip.regproc.manual.verification.eventbus.port=5720
+
+mosip.regproc.manual.verification.eventbus.kafka.commit.type=${mosip.regproc.manual.verification.eventbus.kafka.commit.type}
+mosip.regproc.manual.verification.eventbus.kafka.max.poll.records=${mosip.regproc.manual.verification.eventbus.kafka.max.poll.records}
+mosip.regproc.manual.verification.eventbus.kafka.poll.frequency=${mosip.regproc.manual.verification.eventbus.kafka.poll.frequency}
+mosip.regproc.manual.verification.eventbus.kafka.group.id=${mosip.regproc.manual.verification.eventbus.kafka.group.id}
+
+#Demo Dedupe
+mosip.regproc.demo.dedupe.server.port=8091
+mosip.regproc.demo.dedupe.eventbus.port=5717
+mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedupe
+
+mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=${mosip.regproc.demo.dedupe.eventbus.kafka.commit.type}
+mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=${mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records}
+mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=${mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency}
+mosip.regproc.demo.dedupe.eventbus.kafka.group.id=${mosip.regproc.demo.dedupe.eventbus.kafka.group.id}
+
+# Biometric Auth Stage
+mosip.regproc.biometric.authentication.server.port=8020
+mosip.regproc.biometric.authentication.eventbus.port=5777
+mosip.regproc.biometric.authentication.server.servlet.path=/registrationprocessor/v1/bioauth
+
+mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=${mosip.regproc.biometric.authentication.eventbus.kafka.commit.type}
+mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=${mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records}
+mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=${mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency}
+mosip.regproc.biometric.authentication.eventbus.kafka.group.id=${mosip.regproc.biometric.authentication.eventbus.kafka.group.id}
+
+# Bio Dedupe
+mosip.regproc.bio.dedupe.server.port=9096
+mosip.regproc.bio.dedupe.eventbus.port=5718
+mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
+
+mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=${mosip.regproc.bio.dedupe.eventbus.kafka.commit.type}
+mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=${mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records}
+mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=${mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency}
+mosip.regproc.bio.dedupe.eventbus.kafka.group.id=${mosip.regproc.bio.dedupe.eventbus.kafka.group.id}
+
+# Abis Middleware
+mosip.regproc.abis.middleware.server.port=8091
+mosip.regproc.abis.middleware.eventbus.port=5888
+mosip.regproc.abis.middleware.server.servlet.path=/registrationprocessor/v1/abismiddleware
+
+mosip.regproc.abis.middleware.eventbus.kafka.commit.type=${mosip.regproc.abis.middleware.eventbus.kafka.commit.type}
+mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=${mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records}
+mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=${mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency}
+mosip.regproc.abis.middleware.eventbus.kafka.group.id=${mosip.regproc.abis.middleware.eventbus.kafka.group.id}
+
+# Abis Handler
+mosip.regproc.abis.handler.server.port=9071
+mosip.regproc.abis.handler.eventbus.port=5726
+mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
+
+mosip.regproc.abis.handler.eventbus.kafka.commit.type=${mosip.regproc.abis.handler.eventbus.kafka.commit.type}
+mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=${mosip.regproc.abis.handler.eventbus.kafka.max.poll.records}
+mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=${mosip.regproc.abis.handler.eventbus.kafka.poll.frequency}
+mosip.regproc.abis.handler.eventbus.kafka.group.id=${mosip.regproc.abis.handler.eventbus.kafka.group.id}
+
+
+# Stage Group Configuratoins
+# Default base packages for stage beans to be scanned in a stage group
+mosip.regproc.stage-groups.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor
+# Add any new base package of Stage bean specific to stage group as below
+# mosip.regproc.stage-groups.stage-beans-base-packages.<stage_group_name>=${mosip.regproc.stage-groups.stage-beans-base-packages.default}
+# Example: mosip.regproc.stage-groups.stage-beans-base-packages.stage-group-1=${mosip.regproc.stage-groups.stage-beans-base-packages.default},my.stage.bean.base.package

From 3c1127763afa8a3f3484b105c55dc94573f9a1e4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 21 Mar 2021 05:56:18 +0530
Subject: [PATCH 0021/1358] [MOSIP-12666] WIP.

---
 ...CredentialType.json => CredentialType.json |   0
 README.md                                     |   6 +-
 .../admin-mz.properties => admin.properties   |   0
 ...son => applicanttype-document-mapping.json |   0
 .../applicanttype.mvel => applicanttype.mvel  |   0
 ...on-mz.properties => application.properties |  12 +-
 ...icy-schema.json => auth-policy-schema.json |   0
 ...credentialdata.mvel => credentialdata.mvel |   0
 ...hema.json => data-share-policy-schema.json |   0
 ...are-mz.properties => data-share.properties |   0
 sandbox/hazelcast_mz-mz.xml => hazelcast.xml  |   0
 ...elcast_cache-mz.xml => hazelcast_cache.xml |   0
 ...otlist-mz.properties => hotlist.properties |   0
 ...ing.json => id-authentication-mapping.json |   0
 ...properties => id-authentication.properties |   0
 ...-mz.properties => id-repository.properties |   0
 ...=> idobject-document-category-mapping.json |   0
 .../kernel-mz.properties => kernel.properties |   0
 ...abis-mz.properties => mock-abis.properties |   0
 sandbox/mosip-cbeff.xsd => mosip-cbeff.xsd    |   0
 ...chema.json => mosip-vid-policy-schema.json |   0
 ...p-vid-policy.json => mosip-vid-policy.json |   0
 ...roperties => partner-management.properties |   0
 ....json => pre-registration-demographic.json |   0
 ... => pre-registration-identity-mapping.json |   0
 ....properties => pre-registration.properties |   0
 .../print-mz.properties => print.properties   |   0
 ...s.json => registration-processor-abis.json |   0
 ...ration-processor-camel-routes-activate.xml |   0
 ...tion-processor-camel-routes-deactivate.xml |   0
 ...gistration-processor-camel-routes-lost.xml |   0
 ...egistration-processor-camel-routes-new.xml |   0
 ...ion-processor-camel-routes-res-reprint.xml |   0
 ...tion-processor-camel-routes-res-update.xml |   0
 ...stration-processor-camel-routes-update.xml |   0
 ...on => registration-processor-identity.json |   0
 ...egistration-processor-print-text-file.json |   0
 ...rties => registration-processor.properties | 230 +++--------
 ...n-mz.properties => registration.properties |   0
 ...ident-mz.properties => resident.properties |   0
 sandbox/README.md                             |  12 -
 sandbox/application-dmz.properties            | 360 ------------------
 sandbox/hazelcast_dmz-dmz.xml                 |  37 --
 sandbox/mosip-cbeff-env.xsd                   | 174 ---------
 ...on-processor-camel-routes-activate-dmz.xml |  34 --
 ...-processor-camel-routes-deactivate-dmz.xml |  34 --
 ...ration-processor-camel-routes-lost-dmz.xml |  34 --
 ...tration-processor-camel-routes-new-dmz.xml |  34 --
 ...processor-camel-routes-res-reprint-dmz.xml |  34 --
 ...-processor-camel-routes-res-update-dmz.xml |  34 --
 ...tion-processor-camel-routes-update-dmz.xml |  34 --
 sandbox/registration-processor-dmz.properties | 147 -------
 ...cdata-mz.properties => syncdata.properties |   0
 53 files changed, 63 insertions(+), 1153 deletions(-)
 rename sandbox/CredentialType.json => CredentialType.json (100%)
 rename sandbox/admin-mz.properties => admin.properties (100%)
 rename sandbox/applicanttype-document-mapping.json => applicanttype-document-mapping.json (100%)
 rename sandbox/applicanttype.mvel => applicanttype.mvel (100%)
 rename sandbox/application-mz.properties => application.properties (98%)
 rename sandbox/auth-policy-schema.json => auth-policy-schema.json (100%)
 rename sandbox/credentialdata.mvel => credentialdata.mvel (100%)
 rename sandbox/data-share-policy-schema.json => data-share-policy-schema.json (100%)
 rename sandbox/data-share-mz.properties => data-share.properties (100%)
 rename sandbox/hazelcast_mz-mz.xml => hazelcast.xml (100%)
 rename sandbox/hazelcast_cache-mz.xml => hazelcast_cache.xml (100%)
 rename sandbox/hotlist-mz.properties => hotlist.properties (100%)
 rename sandbox/id-authentication-mapping.json => id-authentication-mapping.json (100%)
 rename sandbox/id-authentication-mz.properties => id-authentication.properties (100%)
 rename sandbox/id-repository-mz.properties => id-repository.properties (100%)
 rename sandbox/idobject-document-category-mapping.json => idobject-document-category-mapping.json (100%)
 rename sandbox/kernel-mz.properties => kernel.properties (100%)
 rename sandbox/mock-abis-mz.properties => mock-abis.properties (100%)
 rename sandbox/mosip-cbeff.xsd => mosip-cbeff.xsd (100%)
 rename sandbox/mosip-vid-policy-schema.json => mosip-vid-policy-schema.json (100%)
 rename sandbox/mosip-vid-policy.json => mosip-vid-policy.json (100%)
 rename sandbox/partner-management-mz.properties => partner-management.properties (100%)
 rename sandbox/pre-registration-demographic.json => pre-registration-demographic.json (100%)
 rename sandbox/pre-registration-identity-mapping.json => pre-registration-identity-mapping.json (100%)
 rename sandbox/pre-registration-mz.properties => pre-registration.properties (100%)
 rename sandbox/print-mz.properties => print.properties (100%)
 rename sandbox/registration-processor-abis.json => registration-processor-abis.json (100%)
 rename sandbox/registration-processor-camel-routes-activate-mz.xml => registration-processor-camel-routes-activate.xml (100%)
 rename sandbox/registration-processor-camel-routes-deactivate-mz.xml => registration-processor-camel-routes-deactivate.xml (100%)
 rename sandbox/registration-processor-camel-routes-lost-mz.xml => registration-processor-camel-routes-lost.xml (100%)
 rename sandbox/registration-processor-camel-routes-new-mz.xml => registration-processor-camel-routes-new.xml (100%)
 rename sandbox/registration-processor-camel-routes-res-reprint-mz.xml => registration-processor-camel-routes-res-reprint.xml (100%)
 rename sandbox/registration-processor-camel-routes-res-update-mz.xml => registration-processor-camel-routes-res-update.xml (100%)
 rename sandbox/registration-processor-camel-routes-update-mz.xml => registration-processor-camel-routes-update.xml (100%)
 rename sandbox/registration-processor-identity.json => registration-processor-identity.json (100%)
 rename sandbox/registration-processor-print-text-file.json => registration-processor-print-text-file.json (100%)
 rename sandbox/registration-processor-mz.properties => registration-processor.properties (89%)
 rename sandbox/registration-mz.properties => registration.properties (100%)
 rename sandbox/resident-mz.properties => resident.properties (100%)
 delete mode 100644 sandbox/README.md
 delete mode 100644 sandbox/application-dmz.properties
 delete mode 100644 sandbox/hazelcast_dmz-dmz.xml
 delete mode 100644 sandbox/mosip-cbeff-env.xsd
 delete mode 100644 sandbox/registration-processor-camel-routes-activate-dmz.xml
 delete mode 100644 sandbox/registration-processor-camel-routes-deactivate-dmz.xml
 delete mode 100644 sandbox/registration-processor-camel-routes-lost-dmz.xml
 delete mode 100644 sandbox/registration-processor-camel-routes-new-dmz.xml
 delete mode 100644 sandbox/registration-processor-camel-routes-res-reprint-dmz.xml
 delete mode 100644 sandbox/registration-processor-camel-routes-res-update-dmz.xml
 delete mode 100644 sandbox/registration-processor-camel-routes-update-dmz.xml
 delete mode 100644 sandbox/registration-processor-dmz.properties
 rename sandbox/syncdata-mz.properties => syncdata.properties (100%)

diff --git a/sandbox/CredentialType.json b/CredentialType.json
similarity index 100%
rename from sandbox/CredentialType.json
rename to CredentialType.json
diff --git a/README.md b/README.md
index b9eeaf9e30a..b80d6e49da9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-# mosip-config
+# MOSIP Configuration
 
-Configuration files for mosip-platform.
-
-MOSIP uses Spring CLoud Config Server to read the properties files. So, to use the properties files in this repo, please updated the IP addresses, keys and passwords and then point to this repo in spring cloud config in kernel module.
+MOSIP uses Spring CLoud Config Server to read the properties files. So, to use the properties files in this repo, please update the IP addresses, keys and passwords and then point to this repo in spring cloud config in kernel module.
 
diff --git a/sandbox/admin-mz.properties b/admin.properties
similarity index 100%
rename from sandbox/admin-mz.properties
rename to admin.properties
diff --git a/sandbox/applicanttype-document-mapping.json b/applicanttype-document-mapping.json
similarity index 100%
rename from sandbox/applicanttype-document-mapping.json
rename to applicanttype-document-mapping.json
diff --git a/sandbox/applicanttype.mvel b/applicanttype.mvel
similarity index 100%
rename from sandbox/applicanttype.mvel
rename to applicanttype.mvel
diff --git a/sandbox/application-mz.properties b/application.properties
similarity index 98%
rename from sandbox/application-mz.properties
rename to application.properties
index 8c3de84757a..230ea44ef1c 100644
--- a/sandbox/application-mz.properties
+++ b/application.properties
@@ -223,8 +223,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 #------------------------Auth-Adapter-----------------------------------------------
 auth.server.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
-mosip.keycloak.issuerUrl=${mosipbox.public.url}/auth/realms/mosip
-auth-token-generator.rest.issuerUrl=${mosip.keycloak.issuerUrl}
+auth-token-generator.rest.issuerUrl=${iam.url}/auth/realms/mosip
 
 #----------------------- Crypto --------------------------------------------------
 #Crypto asymmetric algorithm name
@@ -471,13 +470,6 @@ server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t"
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
 #---------------- Web Sub properties -------------------------
-# The base URL of dmz ingress used to point to websub service
-dmz.ingress.base.url=http://dmz.ingress:30080
-# Websub base url
-websub.base.url=${dmz.ingress.base.url}
-# Websub URL for Topic Subscriptions
-websub.hub.url=${websub.base.url}/websub/hub
-# Websub URL for Publishing/registering topics
-websub.publish.url=${websub.base.url}/websub/publish
+websub.publish.url=http://websub/publish
 #---------------- Web Sub property ----------------------------
 packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
diff --git a/sandbox/auth-policy-schema.json b/auth-policy-schema.json
similarity index 100%
rename from sandbox/auth-policy-schema.json
rename to auth-policy-schema.json
diff --git a/sandbox/credentialdata.mvel b/credentialdata.mvel
similarity index 100%
rename from sandbox/credentialdata.mvel
rename to credentialdata.mvel
diff --git a/sandbox/data-share-policy-schema.json b/data-share-policy-schema.json
similarity index 100%
rename from sandbox/data-share-policy-schema.json
rename to data-share-policy-schema.json
diff --git a/sandbox/data-share-mz.properties b/data-share.properties
similarity index 100%
rename from sandbox/data-share-mz.properties
rename to data-share.properties
diff --git a/sandbox/hazelcast_mz-mz.xml b/hazelcast.xml
similarity index 100%
rename from sandbox/hazelcast_mz-mz.xml
rename to hazelcast.xml
diff --git a/sandbox/hazelcast_cache-mz.xml b/hazelcast_cache.xml
similarity index 100%
rename from sandbox/hazelcast_cache-mz.xml
rename to hazelcast_cache.xml
diff --git a/sandbox/hotlist-mz.properties b/hotlist.properties
similarity index 100%
rename from sandbox/hotlist-mz.properties
rename to hotlist.properties
diff --git a/sandbox/id-authentication-mapping.json b/id-authentication-mapping.json
similarity index 100%
rename from sandbox/id-authentication-mapping.json
rename to id-authentication-mapping.json
diff --git a/sandbox/id-authentication-mz.properties b/id-authentication.properties
similarity index 100%
rename from sandbox/id-authentication-mz.properties
rename to id-authentication.properties
diff --git a/sandbox/id-repository-mz.properties b/id-repository.properties
similarity index 100%
rename from sandbox/id-repository-mz.properties
rename to id-repository.properties
diff --git a/sandbox/idobject-document-category-mapping.json b/idobject-document-category-mapping.json
similarity index 100%
rename from sandbox/idobject-document-category-mapping.json
rename to idobject-document-category-mapping.json
diff --git a/sandbox/kernel-mz.properties b/kernel.properties
similarity index 100%
rename from sandbox/kernel-mz.properties
rename to kernel.properties
diff --git a/sandbox/mock-abis-mz.properties b/mock-abis.properties
similarity index 100%
rename from sandbox/mock-abis-mz.properties
rename to mock-abis.properties
diff --git a/sandbox/mosip-cbeff.xsd b/mosip-cbeff.xsd
similarity index 100%
rename from sandbox/mosip-cbeff.xsd
rename to mosip-cbeff.xsd
diff --git a/sandbox/mosip-vid-policy-schema.json b/mosip-vid-policy-schema.json
similarity index 100%
rename from sandbox/mosip-vid-policy-schema.json
rename to mosip-vid-policy-schema.json
diff --git a/sandbox/mosip-vid-policy.json b/mosip-vid-policy.json
similarity index 100%
rename from sandbox/mosip-vid-policy.json
rename to mosip-vid-policy.json
diff --git a/sandbox/partner-management-mz.properties b/partner-management.properties
similarity index 100%
rename from sandbox/partner-management-mz.properties
rename to partner-management.properties
diff --git a/sandbox/pre-registration-demographic.json b/pre-registration-demographic.json
similarity index 100%
rename from sandbox/pre-registration-demographic.json
rename to pre-registration-demographic.json
diff --git a/sandbox/pre-registration-identity-mapping.json b/pre-registration-identity-mapping.json
similarity index 100%
rename from sandbox/pre-registration-identity-mapping.json
rename to pre-registration-identity-mapping.json
diff --git a/sandbox/pre-registration-mz.properties b/pre-registration.properties
similarity index 100%
rename from sandbox/pre-registration-mz.properties
rename to pre-registration.properties
diff --git a/sandbox/print-mz.properties b/print.properties
similarity index 100%
rename from sandbox/print-mz.properties
rename to print.properties
diff --git a/sandbox/registration-processor-abis.json b/registration-processor-abis.json
similarity index 100%
rename from sandbox/registration-processor-abis.json
rename to registration-processor-abis.json
diff --git a/sandbox/registration-processor-camel-routes-activate-mz.xml b/registration-processor-camel-routes-activate.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-activate-mz.xml
rename to registration-processor-camel-routes-activate.xml
diff --git a/sandbox/registration-processor-camel-routes-deactivate-mz.xml b/registration-processor-camel-routes-deactivate.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-deactivate-mz.xml
rename to registration-processor-camel-routes-deactivate.xml
diff --git a/sandbox/registration-processor-camel-routes-lost-mz.xml b/registration-processor-camel-routes-lost.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-lost-mz.xml
rename to registration-processor-camel-routes-lost.xml
diff --git a/sandbox/registration-processor-camel-routes-new-mz.xml b/registration-processor-camel-routes-new.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-new-mz.xml
rename to registration-processor-camel-routes-new.xml
diff --git a/sandbox/registration-processor-camel-routes-res-reprint-mz.xml b/registration-processor-camel-routes-res-reprint.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-res-reprint-mz.xml
rename to registration-processor-camel-routes-res-reprint.xml
diff --git a/sandbox/registration-processor-camel-routes-res-update-mz.xml b/registration-processor-camel-routes-res-update.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-res-update-mz.xml
rename to registration-processor-camel-routes-res-update.xml
diff --git a/sandbox/registration-processor-camel-routes-update-mz.xml b/registration-processor-camel-routes-update.xml
similarity index 100%
rename from sandbox/registration-processor-camel-routes-update-mz.xml
rename to registration-processor-camel-routes-update.xml
diff --git a/sandbox/registration-processor-identity.json b/registration-processor-identity.json
similarity index 100%
rename from sandbox/registration-processor-identity.json
rename to registration-processor-identity.json
diff --git a/sandbox/registration-processor-print-text-file.json b/registration-processor-print-text-file.json
similarity index 100%
rename from sandbox/registration-processor-print-text-file.json
rename to registration-processor-print-text-file.json
diff --git a/sandbox/registration-processor-mz.properties b/registration-processor.properties
similarity index 89%
rename from sandbox/registration-processor-mz.properties
rename to registration-processor.properties
index 0ead735c376..20f59ecfa4f 100644
--- a/sandbox/registration-processor-mz.properties
+++ b/registration-processor.properties
@@ -1,100 +1,74 @@
 dmz.ingress.base.url=http://dmz.ingress:30080
 
-# Database Host name
-mosip.registration.processor.database.hostname=postgres
-
-# Database Port
-mosip.registration.processor.database.port=80
-
-registration.processor.zone=mz
-
-#-----------Health checker--------------
+## Health check
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=info,health,refresh
 
-#------packet-bio-dedupe-service--------
-#Maximum abis records to be fetched at a time
+## ABIS 
+
+# Maximum abis records to be fetched at a time
 registration.processor.abis.maxResults=30
-#Dummy Tag for face in cbeff file
+# Dummy Tag for face in cbeff file
 registration.processor.abis.targetFPIR=30
 # supported 'byte' and 'text format
 activemq.message.format=text
 # Buffer time above the expiry for all queues to allow reprocessing (in seconds)
 registration.processor.bio.dedupe.reprocess.buffer.time=900
 
-# ---------DB connection---------------
-#Driver name
+## Database
+mosip.registration.processor.database.hostname=postgres
+mosip.registration.processor.database.port=80
 javax.persistence.jdbc.driver=org.postgresql.Driver
-
-# Database connection URL
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
-
 javax.persistence.jdbc.user=regprcuser
-# TODO: user cipher below
 javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 
-#Hibernate properties
+## Hibernate
 hibernate.hbm2ddl.auto=none
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.show_sql=false
 
-#-----packet-manager----------
+## Packets
 registration.processor.LANDING_ZONE = /mnt/regproc/landing
-
-#Location to store the file which is consumed from the print and postal queue
-registration.processor.PRINT_POSTAL_SERVICE=/home/ftp1/PRINIT_POSTAL_SERVICE
-
-#-----packet-utility----------
 # The known packet sources. Should be set as all fieldCategory present in idschema
 # (NOTE : if fieldCategory is set as pvt then the source should be id)
 registration.processor.sourcepackets=id,evidence,optional
-# The mandatory default source packet.(In default configuration this is thd id packet)
+# The mandatory default source packet. (In default configuration this is thd id packet)
 packet.default.source=id
 # the default schema field cagegory (ex - private)
 schema.default.fieldCategory=pvt,none
 # The IDSchemaVersion used to create packets in reg-proc
 IDSchema.Version=0.1
+# Url from where packets need to be picked up DMZ (landing zone)
+NGINXURL=${dmz.ingress.base.url}/registrationprocessor/v1/dmzpacketserver
+packet.info.storage.service=*
 
-#---------registration-processor-camel-bridge------------
-
-#Url to cluster manager to enable this stage for joining the cluster in secure zone
-cluster.manager.file.name=hazelcast_mz.xml
-
-#workel pool size to process multiple requests parallely 
+## Camel bridge
+# Url to cluster manager to enable this stage for joining the cluster in secure zone
+cluster.manager.file.name=hazelcast.xml
+# Workel pool size to process multiple requests parallely 
 worker.pool.size=10
-
-#Route files corresponding to the secure flow
+# Route files corresponding to the secure flow
 camel.secure.active.flows.file.names=registration-processor-camel-routes-new-mz.xml,registration-processor-camel-routes-update-mz.xml,registration-processor-camel-routes-activate-mz.xml,registration-processor-camel-routes-res-update-mz.xml,registration-processor-camel-routes-deactivate-mz.xml,registration-processor-camel-routes-lost-mz.xml,registration-processor-camel-routes-res-reprint-mz.xml
 
-#-------------TOKEN GENERATION----------------
-#Token generation request id
+## Token generation
 token.request.id=io.mosip.registration.processor
-#Token generation app id
 token.request.appid=regproc
-#Token generation username
 token.request.username=registrationprocessor
-#Token generation password
 token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGVnY3M1DIeKGFAeBNfi6jH5qgj1KCUmFONLwSmfcrPx9m6MYXXQMYwyAeq13Msy1fcG1AtZQASKeLbuMCaRwinwdt7C/WYzvVVv47NojD+VmHHVTY3qBXJ4dwZ0/BqmUBPXyYrJPKTcdouxT76bgm5+fXXNcT7lciXgD1aCnWKziL5nDa6Y9dhc+ZPyM0d+I0JfS+emsByt7tWgcZukQkOEx8JWfcCR4eVpERYVa/ps/EAuQRXmxIvnr54GSCc/KKpwnYnjLtKIx/75I6pezBdKU/BBJG1syjQp9VQC9adSI5fdsn3ijkxJjC9TSIFJKDlTHqNCnJaxQXcSBWL4Y=
-#Token generation version
 token.request.version=1.0
-#Token generation Client Id
 token.request.clientId=mosip-regproc-client
-#Token generation secret key
 token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-#Token generation issuer url
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-
 token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
 
-#--------Registration processor rest client API's--------------
-
 
-#Audit Service
+## Audit Service
 AUDIT=http://kernel-auditmanager-service/v1/auditmanager/audits
 
-#Auth Service
+## Auth Service
 authmanager.base.url=http://kernel-auth-service
 PASSWORDBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/useridPwd
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -102,7 +76,7 @@ TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateTok
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
 INTERNALAUTH=http://ida-internal-service/idauthentication/v1/internal/auth
 
-#Master Data Services
+## Master Data Services
 MASTER=http://kernel-masterdata-service/v1/masterdata
 MACHINEHISTORY=${MASTER}/machineshistories
 CENTERHISTORY=${MASTER}/registrationcentershistory
@@ -124,7 +98,7 @@ DEVICEVALIDATEHISTORY=http://pms-partner-manager-service/v1/partnermanager/devic
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
 
-#ID Repository Services
+## ID Repository Services
 IDREPOSITORY=http://idrepo-identity-service/idrepository/v1/identity/
 IDREPOGETIDBYUIN=http://idrepo-identity-service/idrepository/v1/identity/idvid
 UINGENERATOR=http://kernel-idgenerator-service/v1/idgenerator/uin
@@ -135,190 +109,131 @@ GETUINBYVID=http://idrepo-vid-service/idrepository/v1/idvid
 CREDENTIALREQUEST=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
 GETVIDSBYUIN=http://idrepo-vid-service/idrepository/v1/vid/uin
 
-#Encrypt Services
+## Encrypt Services
 ENCRYPTURL=http://kernel-keymanager-service/v1/keymanager/encrypt
 ENCRYPTIONSERVICE=http://kernel-keymanager-service/v1/keymanager/publickey
 PDFSIGN=http://kernel-keymanager-service/v1/keymanager/pdf/sign
 
-#Digital Signature Service
+## Digital Signature Service
 DIGITALSIGNATURE=http://kernel-keymanager-service/v1/keymanager/sign
-
-#Digital Signature Id
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
 
-# Url from where packets need to be picked up DMZ (landing zone)
-NGINXDMZURL=${dmz.ingress.base.url}/registrationprocessor/v1/dmzpacketserver
-
-#--------Registration Processor Rest Client API's-----------
+## Crypto
 CRYPTOMANAGERDECRYPT=http://kernel-keymanager-service/v1/keymanager/decrypt
+crypto.PrependThumbprint.enable=true
 
-#External Service
+## External Service
 EISERVICE=http://regproc-external-integration-service/registrationprocessor/v1/eis/registration-processor/external-integration-service/v1.0
 
-#RID Generation Service
+## RID Generation Service
 RIDGENERATION=http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
 
-#Registration Processor Status Services
-# We specify Ingress location for dmz which is any worker node and a ingress port
-SYNCSERVICE=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+## Registration Processor Status Services
+SYNCSERVICE=http://regproc-registration-status-service/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=http://regproc-packet-receiver-stage/registrationprocessor/v1/packetreceiver/registrationpackets
 
-#SMS and EMAIL notification services
+## SMS and EMAIL notification services
 SMSNOTIFIER=http://kernel-notification-service/v1/notifier/sms/send
 EMAILNOTIFIER=http://kernel-notification-service/v1/notifier/email/send
 
+## PMS
 PMS=http://pms-policy-manager-service/v1/policymanager/policies
 
-#---------Registration Status---------
-
-#Maximum retry count for packet
+## Registration status properties
 registration.processor.max.retry=10
-#Registration Status Id
 mosip.registration.processor.registration.status.id=mosip.registration.status
-#Registration Sync Id
 mosip.registration.processor.registration.sync.id=mosip.registration.sync
-#Registration Transaction Id
 mosip.registration.processor.registration.transaction.id=mosip.registration.transaction
-#Registration Sync Version
 mosip.registration.processor.sync.version=1.0
-#Registration Status Version
 mosip.registration.processor.registration.status.version=1.0
-#Registration Transaction Version
 mosip.registration.processor.transaction.version=1.0
 
-#--------Demo Dedupe Stage---------
+## Demo dedupe
 application.id=REGISTRATION
-#Status for matched records in demo dedupe stage
+# Status for matched records in demo dedupe stage
 registration.processor.demodedupe.manualverification.status=REJECTED
-#configuration parameter to disable or enable Demographic Deduplication 
 mosip.registration.processor.demographic.deduplication.enable=true
 
-#-----------Manual Verification Stage------------
-#Manual verification assignment request Id
+## Manual verification
 mosip.registration.processor.manual.verification.assignment.id=mosip.manual.verification.assignment
-#Manual verification decision request Id
 mosip.registration.processor.manual.verification.decision.id=mosip.manual.verification.decision
-#Manual verification biometric request Id
 mosip.registration.processor.manual.verification.biometric.id=mosip.manual.verification.biometric
-#Manual verification demographic request Id
 mosip.registration.processor.manual.verification.demographic.id=mosip.manual.verification.demographic
-#Manual verification packetinfo request Id
 mosip.registration.processor.manual.verification.packetinfo.id=mosip.manual.verification.packetinfo
-
-#Manual verification queue message expiry in seconds, if given 0 then message will never expire
+# Manual verification queue message expiry in seconds, if given 0 then message will never expire
 registration.processor.queue.manualverification.request.messageTTL=5400
 # Buffer time above the expiry queue to allow reprocessing (in seconds)
 registration.processor.manual.verification.reprocess.buffer.time=900
-
 registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
 registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
 registration.processor.manual.adjudication.json=registration-processor-abis.json
-#packet.info.storage.service=registration-processor-packet-info-storage-service
-packet.info.storage.service=*
-config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
 
+config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
 
-#--------OSI Validation Stage----------
-#To enable or disable the Center working hour validation
+## OSI validate
 mosip.workinghour.validation.required=true
-#Applicant date of birth format
 registration.processor.applicant.dob.format=yyyy/MM/dd
-#Internal Auth request id
 mosip.identity.auth.internal.requestid=mosip.identity.auth.internal
 registration.processor.validate.introducer=true
 mosip.kernel.device.validate.history.id=""
-#UMC configuarble
+## UMC: User, Machine, Center
 mosip.registartion.processor.validateUMC=true
-crypto.PrependThumbprint.enable=true
 auth.PrependThumbprint.enable=false
 
-#---------Packet Receiver Stage------------
-#Maximum file size to be upload from packet receiver
+## Packet receiver
 registration.processor.max.file.size=5
-#Packet receiver application version
 mosip.registration.processor.application.version=1.0
-#Request Date Time format
 mosip.registration.processor.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-#Request Date Timezone
 mosip.registration.processor.timezone=GMT
-#Packet Receiver request Id
 mosip.registration.processor.packet.id=mosip.registration.packet
-#Request time grace period
 mosip.registration.processor.grace.period=10800
 
-#-----------Retry Stage-----------
 registration.processor.wait.period=1
 
-#----------Uin Generator Stage------------
-#Idrepo create request Id
+## UIN generation
 registration.processor.id.repo.create=mosip.id.create
-#Idrepo read request Id
 registration.processor.id.repo.read=mosip.id.read
-#Idrepo update request Id
 registration.processor.id.repo.update=mosip.id.update
-#Idrepo vidType request Id
 registration.processor.id.repo.vidType=Perpetual
-#Idrepo generate request Id
 registration.processor.id.repo.generate=mosip.vid.create
-#Idrepo vid version
 registration.processor.id.repo.vidVersion=v1
 
-#---------Virus Scanner Stage---------
-#Virus scanner packet extension
+## Virus scanner
 registration.processor.packet.ext=.zip
-#Virus scanner server host
 mosip.kernel.virus-scanner.host=clamav
-#Virus scanner port
 mosip.kernel.virus-scanner.port=80
-#Virus scanner application request id
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
 
-#---------Message Sender Stage----------------------
-#Mapping Identity json to map with the applicant id json
+## Message sender
+# Mapping identity json to map with the applicant id json
 registration.processor.identityjson=registration-processor-identity.json
-#create text print text file
 registration.processor.print.textfile=registration-processor-print-text-file.json
-#Abis queue configuration json
 registration.processor.abis.json=registration-processor-abis.json
-#Demographic identity label
 registration.processor.demographic.identity=identity
 registration.processor.notification.emails=
 
-#Email subjects for success & failure scenario
-#Uin generated subject
+## Email
 registration.processor.uin.generated.subject=UIN Generated
-#Duplicate Uin subject
 registration.processor.duplicate.uin.subject=Registration Failed because you have already Registered
-#Applicant re-register subject
 registration.processor.reregister.subject=Re-Register because there was a Technical Issue
-#Uin activated subject
 registration.processor.uin.activated.subject=Uin is activated successfully
-#Uin deactivated subject
 registration.processor.uin.deactivated.subject=Uin is deactivated
-#Uin details updated subject
 registration.processor.updated.subject=UIN Details Updated
 
-#------------Queue-----------------------
-#Queue username
+## Queue
 registration.processor.queue.username=admin
-#Queue Password
 registration.processor.queue.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
-#Queue Url
 registration.processor.queue.url=tcp://activemq:80  
-#Type of the Queue
 registration.processor.queue.typeOfQueue=ACTIVEMQ
-#Print Service address
 registration.processor.queue.address = print-service
-#Post Service address
 registration.processor.queue.printpostaladdress = postal-service
 
 # Enable proxy postal service response for test environments where actual postal service wont be available
 # IMPORTANT : This should always be set as false in actual production environment
 registration.processor.enable.proxy.postalservice=true
 
-#------------Packet Validator Stage-----------
-#Attributes to be validated in master data validation
+## Packet validator
 registration.processor.masterdata.validation.attributes = gender,region,province,city
 registration.processor.validateSchema=true
 registration.processor.validateFile=true
@@ -326,80 +241,53 @@ registration.processor.validateChecksum=true
 registration.processor.validateApplicantDocument=true
 registration.processor.validateMasterData=false
 registration-processor.validatemandotary=true
-
 registration.processor.document.category=idobject-document-category-mapping.json
 registration.processor.applicant.type=applicanttype-document-mapping.json
 
-#------------Packet Generator-----------------
-#Audit request id for packet generator
+## Packet generator
 registration.processor.audit.applicationId=PACGEN
-#Audit request application name for packet generator
 registration.processor.audit.applicationName=PACKET_GENERATOR
-#Packet generator request id
 mosip.registration.processor.registration.packetgenerator.id=mosip.registration.packetgenerator
-#Uin Card RePrint request id
 mosip.registration.processor.uincard.reprint.id = mosip.uincard.reprint
-#Packet generator request version
 mosip.registration.processor.packetgenerator.version=1.0
-#resident update service id
 mosip.registration.processor.resident.service.id=mosip.registration.update
-#resident lost service id
 mosip.registration.processor.lost.id=mosip.registration.lost
 
-
-#-------------Printing Service--------------------
+## Print stage
 mosip.registration.processor.print.service.id=mosip.registration.print
-#unmasked uin length
 registration.processor.unMaskedUin.length=4
-#UIN card password
 mosip.registration.processor.print.service.uincard.password=postalCode|fullName
-#header length to be removed from iso image to get actual image
+# Header length to be removed from iso image to get actual image
 mosip.print.uin.header.length=73
-#Rectangle coordinates for pfd signataured data
+# Rectangle coordinates for pfd signataured data
 mosip.registration.processor.print.service.uincard.lowerleftx=73
 mosip.registration.processor.print.service.uincard.lowerlefty=100
 mosip.registration.processor.print.service.uincard.upperrightx=300
 mosip.registration.processor.print.service.uincard.upperrighty=300
 mosip.registration.processor.print.service.uincard.signature.reason="signing"
 
-#--------------Reprocessor stage----------------
-
-#Number of the reprocess records to be fetched at a time
+## Reprocessor stage
+# Number of the reprocess records to be fetched at a time
 registration.processor.reprocess.fetchsize=100
-
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
 registration.processor.reprocess.elapse.time=7200
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
-# Reprocess type
 registration.processor.reprocess.type=cron
-#schedular seconds configuration
 registration.processor.reprocess.seconds=0
-#schedular minutes configuration
-#the frequency for reprocess has been updated to every 5 minutes for pause/resume feature
+# Frequency for reprocess has been updated to every 5 minutes for pause/resume feature
 registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
-#schedular hours configuration
 registration.processor.reprocess.hours=*
-#schedular days configuration
 registration.processor.reprocess.days_of_month=*
-#schedular months configuration
 registration.processor.reprocess.months=*
-#schedular weeks configuration
 registration.processor.reprocess.days_of_week=*
 
-# WorkflowAction api id
+## WorkflowAction api id
 mosip.regproc.workflow.action.api-id=mosip.registration.processor.workflow.action
-
-# WorkflowAction api version
 mosip.regproc.workflow.action.version=1.0
-
-#WorkflowAction service  hitlisted tagname
 mosip.regproc.workflow.action.hotlisted-tag=HOTLISTED
-
-#WorkflowAction service  beginning stage name
 mosip.regproc.workflow.action.resumefrombeginning.stage=PacketUploaderStage
-
 #WorkflowAction service  websub topic name
 mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
 
diff --git a/sandbox/registration-mz.properties b/registration.properties
similarity index 100%
rename from sandbox/registration-mz.properties
rename to registration.properties
diff --git a/sandbox/resident-mz.properties b/resident.properties
similarity index 100%
rename from sandbox/resident-mz.properties
rename to resident.properties
diff --git a/sandbox/README.md b/sandbox/README.md
deleted file mode 100644
index 500c037d5ab..00000000000
--- a/sandbox/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Since are working with 2 kubernetes clusters - mz and dmz, for registration process we have to replicate the property files with a suffix -dmz.
-
-Suffix:
-* MZ (secure cluster): -mz
-* DMZ : -dmz
-
-
-* Properties for secure zone hazelcast have been duplicated as -dmz.  Earlier hazelcast dmz assumed docker containers, not kubernetes.
-* File name needs to have `_dmz` and `_mz`, e.g. `hazelcast_dmz-dmz.xml` as these suffixes are being searched in the code (hardcoded).
-
-Similarly registration-processor-mz.properties has been replicated to registration-processor-dmz.properties.  Some of the links in the latter point to MZ cluster, hence the links are different.
-
diff --git a/sandbox/application-dmz.properties b/sandbox/application-dmz.properties
deleted file mode 100644
index e02b234633a..00000000000
--- a/sandbox/application-dmz.properties
+++ /dev/null
@@ -1,360 +0,0 @@
-#---------------------------------------Common properties-----------------------
-aplication.configuration.level.version=1.1.4
-mz.ingress.base.url: http://mz.ingress:30080
-
-#Kernel-idobjectalidator
-# Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key
-mosip.kernel.idobjectvalidator.property-source=APPLICATION_CONTEXT
-mosip.kernel.idobjectvalidator.schema-name=mosip-identity-json-schema.json
-mosip.kernel.idobjectvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable=NA
-
-mosip.masterdata.base.url = ${mz.ingress.base.url}
-mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
-mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
-mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
-mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
-mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
-
-mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
-
-mosip.country.code=MOR
-
-# Language Supported By Platform - ISO 
-mosip.supported-languages=eng,ara,fra
-
-mosip.primary-language=eng
-mosip.secondary-language=ara
-
-# Application IDs
-mosip.prereg.app-id=PRE_REGISTRATION
-mosip.reg.app-id=REGISTRATION
-mosip.regproc.app-id=REGISTRATION_PROCESSOR
-mosip.ida.app-id=IDA
-mosip.ida.ref-id=INTERNAL
-mosip.idrepo.app-id=ID_REPO
-
-# UTC ISO Date Time Pattern
-mosip.utc-datetime-pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-mosip.sign.header=response-signature
-mosip.signed.response.header=response-signature
-
-#----------------------- CBEFF Util--------------------------------------------------
-# Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
-mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-# Cbeff XSD file name in config server
-mosip.kernel.xsdfile=mosip-cbeff.xsd
-
-#----------------------------- Applicant Type --------------------------------------------------
-mosip.kernel.applicant.type.age.limit = 5
-
-#----------------------------- Static PIN --------------------------------------------------
-mosip.kernel.pin.length=6
-
-#-----------------------------TspId -----------------------------------------------
-#length of the Tsp id
-mosip.kernel.tspid.length=4
-
-#-----------------------------partnerId -----------------------------------------------
-#length of the partner id
-mosip.kernel.partnerid.length=4
-
-#-----------------------------TOKEN-ID Properties---------------------------------
-#length of the token id
-mosip.kernel.tokenid.length=36
-
-#-----------------------------Registration Center Id -----------------------------------------------
-#length of the registration center id
-mosip.kernel.registrationcenterid.length=5
-
-#-----------------------------Machine Id -----------------------------------------------
-#length of the machine id
-mosip.kernel.machineid.length=5
-
-#-----------------------------RID Properties---------------------------------------
-# length of the rid
-mosip.kernel.rid.length=29
-# length of the timestamp
-mosip.kernel.rid.timestamp-length=14
-# rid sequence max digits
-mosip.kernel.rid.sequence-length=5
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-mosip.kernel.tokenid.sequence-limit=3
-
-#-----------------------------PRID Properties------------------------------------
-#prid-length
-mosip.kernel.prid.length=14
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-#to disable validation assign zero or negative value
-mosip.kernel.prid.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-#to disable validation assign zero or negative value
-mosip.kernel.prid.repeating-block-limit=3
-
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit) to disable validation assign zero or negative value
-mosip.kernel.prid.repeating-limit=2
-
-# list of number that id should not be start with to disable null
-mosip.kernel.prid.not-start-with=0,1
-
-#restricted numbers for prid
-mosip.kernel.prid.restricted-numbers=786,666
-
-
-#-----------------------------VID Properties--------------------------------------
-# length of the vid
-mosip.kernel.vid.length=16
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-# to disable sequence limit validation assign 0 or negative value
-mosip.kernel.vid.length.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-# to disable repeating block validation assign 0 or negative value
-mosip.kernel.vid.length.repeating-block-limit=2
-
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
-# to disable repeating limit validation, assign 0  or negative value
-mosip.kernel.vid.length.repeating-limit=2
-
-# list of number that id should not be start with
-# to disable null
-mosip.kernel.vid.not-start-with=0,1
-
-#restricted numbers for vid
-mosip.kernel.vid.restricted-numbers=786,666
-
-#-----------------------------UIN Properties--------------------------------------
-#length of the uin
-mosip.kernel.uin.length=10
-#minimum threshold of unused uin
-mosip.kernel.uin.min-unused-threshold=200000
-#number of uins to generate
-mosip.kernel.uin.uins-to-generate=500000
-#restricted numbers for uin
-mosip.kernel.uin.restricted-numbers=786,666
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-# to disable sequence limit validation assign 0 or negative value
-mosip.kernel.uin.length.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-#to disable validation assign zero or negative value
-mosip.kernel.uin.length.repeating-block-limit=2
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
-# to disable repeating limit validation, assign 0  or negative value
-mosip.kernel.uin.length.repeating-limit=2
-
-#reverse group digit limit for uin filter
-mosip.kernel.uin.length.reverse-digits-limit=5
-
-#group digit limit for uin filter
-mosip.kernel.uin.length.digits-limit=5
-
-#should not start with
-mosip.kernel.uin.not-start-with=0,1
-
-#adjacent even digit limit for uin filter
-mosip.kernel.uin.length.conjugative-even-digits-limit=3
-
-
-
-#------------------------Auth-Adapter-----------------------------------------------
-auth.server.validate.url=${mz.ingress.base.url}/v1/authmanager/authorize/admin/validateToken
-#----------------------- Crypto --------------------------------------------------
-#Crypto asymmetric algorithm name
-mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
-#Crypto symmetric algorithm name
-mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
-#Keygenerator asymmetric algorithm name
-mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Keygenerator symmetric algorithm name
-mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-#Asymmetric algorithm key length
-mosip.kernel.keygenerator.asymmetric-key-length=2048
-#Symmetric algorithm key length
-mosip.kernel.keygenerator.symmetric-key-length=256
-#Keygenerator symmetric algorithm name
-mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-# keygenerator asymmetric algorithm name
-mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Encrypted data and encrypted symmetric key separator
-mosip.kernel.data-key-splitter=#KEY_SPLITTER#
-#GCM tag length
-mosip.kernel.crypto.gcm-tag-length=128
-#Hash algo name
-mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
-#Symmtric key length used in hash
-mosip.kernel.crypto.hash-symmetric-key-length=256
-#No of iterations in hash
-mosip.kernel.crypto.hash-iteration=100000
-#Sign algo name
-mosip.kernel.crypto.sign-algorithm-name=RS256
-
-mosip.keymanager.base.url=http://kernel-keymanager-service
-mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
-mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
-mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
-mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
-mosip.sign.applicationid=KERNEL
-mosip.sign.refid=SIGN
-mosip.kernel.cryptomanager.request_id=CRYPTOMANAGER.REQUEST
-mosip.kernel.cryptomanager.request_version=v1.0
-mosip.kernel.signature.signature-request-id=SIGNATURE.REQUEST
-mosip.kernel.signature.signature-version-id=v1.0
-
-
-
-#----------------------------------ID Repo------------------------------------------
-mosip.idrepo.identity.uin-status.registered=ACTIVATED
-mosip.idrepo.identity.uin-status=ACTIVATED,BLOCKED,DEACTIVATED
-
-#---------------------------------------otp manager service-------------------------------
-#the default length for otp(in number)
-mosip.kernel.otp.default-length=6
-#the default crypto function
-#It can be: HmacSHA512, HmacSHA256, HmacSHA1.
-mosip.kernel.otp.mac-algorithm=HmacSHA512
-#the OTP expires after the given time(in seconds).
-mosip.kernel.otp.expiry-time=180
-#the key is freezed for the given time(in seconds).
-mosip.kernel.otp.key-freeze-time=1800
-#the number of validation attempts allowed(in number).
-#mosip.kernel.otp.validation-attempt-threshold =3 means , the validation and generation will be blocked from 4th time.
-mosip.kernel.otp.validation-attempt-threshold=10
-#minimum length of key(in number).
-mosip.kernel.otp.min-key-length=3
-#maximum length of key(in number).
-mosip.kernel.otp.max-key-length=64
-
-
-#--------------------------------------Licensekeymanager  Service--------------------------------------
-#the license key length.
-mosip.kernel.licensekey.length=16
-#List of permissions
-# NOTE: ',' in the below list is used as splitter in the implementation. 
-# Use of ',' in the values for below key should be avoided.
-# Use of spaces before and after ',' also should be avoided.
-mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authentication - Identity Data Match,Demo Authentication - Address Data Match,Demo Authentication - Full Address Data Match,Demo Authentication - Secondary Language Match,Biometric Authentication - FMR Data Match,Biometric Authentication - IIR Data Match,Biometric Authentication - FID Data Match,Static Pin Authentication,eKYC - limited,eKYC - Full,eKYC - No
-
-
-
-#-----------------------------Virus Scanner--------------------------------------
-mosip.kernel.virus-scanner.host=clamav 
-mosip.kernel.virus-scanner.port=80
-
-#------------------------Transliteration-----------------------------------------------
-mosip.kernel.transliteration.arabic-language-code=ara
-mosip.kernel.transliteration.franch-language-code=fra
-
-
-
-#-------Registration processor Notification types------------
-mosip.registration.processor.notification.types=SMS|EMAIL
-
-
-mosip.default.dob.month=01
-mosip.default.dob.day=01
-mosip.login.mode= email,mobile
-
-
-#---Language orientation-----
-mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng,fra
-
-
-#**************** Notification Type *************
-#mosip.notificationtype=SMS|EMAIL
-mosip.notificationtype=EMAIL
-mosip.kernel.sms.proxy-sms=false
-#******** Notification lanugage types - either PRIMARY or BOTH ********
-mosip.notification.language-type=BOTH
-
-
-#-------------------System---------------
-logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
-
-#-------------------Admin---------------
-mosip.min-digit-longitude-latitude=4
-mosip.kernel.filtervalue.max_columns=20
-
-auth.server.admin.validate.url=${mz.ingress.base.url}/v1/authmanager/authorize/admin/validateToken
-
-#------------------PDF Genration-----------------------------------------
-mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-#------------------Quality Check-----------------------------------------
-#Quality threshold for applicant iris
-mosip.iris_threshold=0
-#Quality threshold for applicant leftslap fingerprint
-mosip.leftslap_fingerprint_threshold=0
-#Quality threshold for applicant rightslap fingerprint
-mosip.rightslap_fingerprint_threshold=0
-#Quality threshold for applicant thumbs fingerprint
-mosip.thumbs_fingerprint_threshold=0
-#Quality threshold for applicant face
-mosip.facequalitythreshold=0
-#Bio SDK Integration
-mosip.fingerprint.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
-mosip.face.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
-mosip.iris.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
-
-#-------UIN Alias-------------------
-mosip.uin.alias=
-
-#---------------------------------kernel Salt Generator---------------------------------------------------#
-mosip.kernel.salt-generator.chunk-size=10
-mosip.kernel.salt-generator.start-sequence=0
-mosip.kernel.salt-generator.end-sequence=999
-#----------------------------------------------------------------------------------------------------------#
-server.max-http-header-size=10000000
-
-mosip.kernel.auth.adapter.ssl-bypass=true
-
-# device registration/deregistration config
-mosip.stage.environment=Developer
-
-# log level
-logging.level.root=WARN
-logging.level.io.mosip=INFO
-logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
-
-#iam adapter
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
-
-# tomcat access logs
-server.tomcat.accesslog.enabled=true
-server.tomcat.accesslog.directory=/dev
-server.tomcat.accesslog.prefix=stdout
-server.tomcat.accesslog.buffered=false
-server.tomcat.accesslog.suffix=
-server.tomcat.accesslog.file-date-format=
-server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}"}
-server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
diff --git a/sandbox/hazelcast_dmz-dmz.xml b/sandbox/hazelcast_dmz-dmz.xml
deleted file mode 100644
index 160d06581f8..00000000000
--- a/sandbox/hazelcast_dmz-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright 2017 Red Hat, Inc. ~ ~ Red Hat licenses this file to you 
-     	under the Apache License, version 2.0 ~ (the "License"); you may not use 
-	this file except in compliance with the ~ License. You may obtain a copy 
-	of the License at: ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless 
-	required by applicable law or agreed to in writing, software ~ distributed 
-	under the License is distributed on an "AS IS" BASIS, WITHOUT ~ WARRANTIES 
-	OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
-	the specific language governing permissions and limitations ~ under the License. -->
-
-<hazelcast
-	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-	xmlns="http://www.hazelcast.com/schema/config"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <properties>
-   <property name="hazelcast.discovery.enabled">true</property>
-	 <property name="hazelcast.logging.type">slf4j</property>
- </properties>
-<group>
-		<name>k8s</name>
-		<password/>
-	</group>
- <network>
-   <join>
-     <multicast enabled="false"/>
-     <tcp-ip enabled="false" />
-     <discovery-strategies>
-       <discovery-strategy enabled="true"
-           class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
-         <properties>
-           <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
-         </properties>
-       </discovery-strategy>
-     </discovery-strategies>
-   </join>
- </network>
-</hazelcast>
diff --git a/sandbox/mosip-cbeff-env.xsd b/sandbox/mosip-cbeff-env.xsd
deleted file mode 100644
index 4f53d61be96..00000000000
--- a/sandbox/mosip-cbeff-env.xsd
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Permission is hereby granted, free of charge in perpetuity, to any person 
-obtaining a copy of the Schema, to use, copy, modify, merge and distribute free
-of charge, copies of the Schema for the purposes of developing, implementing, 
-installing and using software based on the Schema, and to permit persons to 
-whom the Schema is furnished to do so, subject to the following conditions:
-
-THE SCHEMA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SCHEMA OR THE USE OR OTHER DEALINGS IN THE
-SCHEMA. 
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://standards.iso.org/iso-iec/19785/-3/ed-2/" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="BIR" type="BIRType"/>
-	<xs:complexType name="BIRType">
-		<xs:sequence>
-			<xs:element name="Version" type="VersionType" minOccurs="0"/>
-			<xs:element name="CBEFFVersion" type="VersionType" minOccurs="0"/>
-			<xs:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="BIRInfo" type="BIRInfoType"/>
-			<xs:element name="BDBInfo" type="BDBInfoType" minOccurs="0"/>
-			<xs:element name="SBInfo" type="SBInfoType" minOccurs="0"/>
-			<xs:element name="BIR" type="BIRType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="BDB" type="xs:base64Binary" minOccurs="0"/>
-			<xs:element name="SB" type="xs:base64Binary" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="VersionType">
-		<xs:sequence>
-			<xs:element name="Major" type="xs:unsignedInt"/>
-			<xs:element name="Minor" type="xs:unsignedInt"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BIRInfoType">
-		<xs:sequence>
-			<xs:element name="Creator" type="xs:string" minOccurs="0"/>
-			<xs:element name="Index" type="UUIDType" minOccurs="0"/>
-			<xs:element name="Payload" type="xs:base64Binary" minOccurs="0"/>
-			<xs:element name="Integrity" type="xs:boolean"/>
-			<xs:element name="CreationDate" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="NotValidBefore" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="NotValidAfter" type="xs:dateTime" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="BDBInfoType">
-		<xs:sequence>
-			<xs:element name="ChallengeResponse" type="xs:base64Binary" minOccurs="0"/>
-			<xs:element name="Index" type="UUIDType" minOccurs="0"/>
-			<xs:element name="Format" type="RegistryIDType" minOccurs="0"/>
-			<xs:element name="Encryption" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="CreationDate" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="NotValidBefore" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="NotValidAfter" type="xs:dateTime" minOccurs="0"/>
-			<xs:element name="Type" type="MultipleTypesType" minOccurs="0"/>
-			<xs:element name="Subtype" type="SubtypeType" minOccurs="0"/>
-			<xs:element name="Level" type="ProcessedLevelType" minOccurs="0"/>
-			<xs:element name="Product" type="RegistryIDType" minOccurs="0"/>
-			<xs:element name="CaptureDevice" type="RegistryIDType" minOccurs="0"/>
-			<xs:element name="FeatureExtractionAlgorithm" type="RegistryIDType" minOccurs="0"/>
-			<xs:element name="ComparisonAlgorithm" type="RegistryIDType" minOccurs="0"/>
-			<xs:element name="CompressionAlgorithm" type="RegistryIDType" minOccurs="0"/>
-			<xs:element name="Purpose" type="PurposeType" minOccurs="0"/>
-			<xs:element name="Quality" type="QualityType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="RegistryIDType">
-		<xs:sequence>
-			<xs:element name="Organization" type="xs:string"/>
-			<xs:element name="Type" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="SBInfoType">
-		<xs:sequence>
-			<xs:element name="Format" type="RegistryIDType" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:simpleType name="QualityScoreType">
-		<xs:restriction base="xs:unsignedInt">
-			<xs:maxInclusive value="100"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:complexType name="QualityType">
-		<xs:sequence>
-			<xs:element name="Algorithm" type="RegistryIDType"/>
-			<xs:choice>
-				<xs:element name="Score" type="QualityScoreType"/>
-				<xs:element name="QualityCalculationFailed" type="xs:string"/>
-			</xs:choice>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:simpleType name="SingleTypeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Scent"/>
-			<xs:enumeration value="DNA"/>
-			<xs:enumeration value="Ear "/>
-			<xs:enumeration value="Face"/>
-			<xs:enumeration value="Finger"/>
-			<xs:enumeration value="Foot"/>
-			<xs:enumeration value="HandGeometry"/>
-			<xs:enumeration value="Vein"/>
-			<xs:enumeration value="Iris"/>
-			<xs:enumeration value="Retina"/>
-			<xs:enumeration value="Voice"/>
-			<xs:enumeration value="Gait"/>
-			<xs:enumeration value="Keystroke"/>
-			<xs:enumeration value="LipMovement"/>
-			<xs:enumeration value="SignatureSign"/>
-			<xs:enumeration value="Palm"/>
-			<xs:enumeration value="BackOfHand"/>
-			<xs:enumeration value="Wrist"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="MultipleTypesType">
-		<xs:list itemType="SingleTypeType"/>
-	</xs:simpleType>
-	<xs:simpleType name="SingleAnySubtypeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Left"/>
-			<xs:enumeration value="Right"/>
-			<xs:enumeration value="Thumb"/>
-			<xs:enumeration value="IndexFinger"/>
-			<xs:enumeration value="MiddleFinger"/>
-			<xs:enumeration value="RingFinger"/>
-			<xs:enumeration value="LittleFinger"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="SingleVeinOnlySubtypeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="LeftVein"/>
-			<xs:enumeration value="RightVein"/>
-			<xs:enumeration value="Palm"/>
-			<xs:enumeration value="BackOfHand"/>
-			<xs:enumeration value="Wrist"/>
-			<xs:enumeration value="Reserved1"/>
-			<xs:enumeration value="Reserved2"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="MultipleAnySubtypesType">
-		<xs:list itemType="SingleAnySubtypeType"/>
-	</xs:simpleType>
-	<xs:simpleType name="MultipleVeinOnlySubtypesType">
-		<xs:list itemType="SingleVeinOnlySubtypeType"/>
-	</xs:simpleType>
-	<xs:simpleType name="SubtypeType">
-		<xs:union memberTypes="MultipleAnySubtypesType MultipleVeinOnlySubtypesType"/>
-	</xs:simpleType>
-	<xs:simpleType name="ProcessedLevelType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Raw"/>
-			<xs:enumeration value="Intermediate"/>
-			<xs:enumeration value="Processed"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PurposeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Verify"/>
-			<xs:enumeration value="Identify"/>
-			<xs:enumeration value="Enroll"/>
-			<xs:enumeration value="EnrollVerify"/>
-			<xs:enumeration value="EnrollIdentify"/>
-			<xs:enumeration value="Audit"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="UUIDType">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}"/>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
diff --git a/sandbox/registration-processor-camel-routes-activate-dmz.xml b/sandbox/registration-processor-camel-routes-activate-dmz.xml
deleted file mode 100644
index d332fa91532..00000000000
--- a/sandbox/registration-processor-camel-routes-activate-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- Packet-Reciever to packet-uploader Route -->
-    <route id="packet-reciever-->packet-uploader activated route">
-        <from uri="eventbus:packet-receiver-activated-bus-out" />
-        <log
-            message="packet-reciever-->packet-uploader activated-route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <process ref="tokenGenerationProcessor"/>
-                <setHeader headerName="CamelHttpMethod">
-                    <constant>POST</constant>
-                </setHeader>
-                <setHeader headerName="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader headerName="Cookie">
-                    <simple>${header.Cookie}</simple>
-                </setHeader>
-                <setBody>
-                    <simple>${bodyAs(String)}</simple>
-                </setBody>
-                <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
diff --git a/sandbox/registration-processor-camel-routes-deactivate-dmz.xml b/sandbox/registration-processor-camel-routes-deactivate-dmz.xml
deleted file mode 100644
index c61c7ba2a18..00000000000
--- a/sandbox/registration-processor-camel-routes-deactivate-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- Packet-Reciever to packet-uploader Route -->
-    <route id="packet-reciever-->packet-uploader deactivated route">
-        <from uri="eventbus:packet-receiver-deactivated-bus-out" />
-        <log
-            message="packet-reciever-->packet-uploader deactivated-route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <process ref="tokenGenerationProcessor"/>
-                <setHeader headerName="CamelHttpMethod">
-                    <constant>POST</constant>
-                </setHeader>
-                <setHeader headerName="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader headerName="Cookie">
-                    <simple>${header.Cookie}</simple>
-                </setHeader>
-                <setBody>
-                    <simple>${bodyAs(String)}</simple>
-                </setBody>
-                <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
diff --git a/sandbox/registration-processor-camel-routes-lost-dmz.xml b/sandbox/registration-processor-camel-routes-lost-dmz.xml
deleted file mode 100644
index ab3cb6e2166..00000000000
--- a/sandbox/registration-processor-camel-routes-lost-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-	<!-- Packet-Reciever to packet-uploader lost Route -->
-	<route id="packet-reciever-->packet-uploader lost route">
-		<from uri="eventbus:packet-receiver-lost-bus-out" />
-		<log
-			message="packet-reciever-->packet-uploader ${bodyAs(String)}" />
-		<choice>
-			<when>
-				<simple>${bodyAs(String)} contains '"isValid":true'</simple>
-				<process ref="tokenGenerationProcessor"/>
-				<setHeader headerName="CamelHttpMethod">
-					<constant>POST</constant>
-				</setHeader>
-				<setHeader headerName="Content-Type">
-					<constant>application/json</constant>
-				</setHeader>
-				<setHeader headerName="Cookie">
-					<simple>${header.Cookie}</simple>
-				</setHeader>
-				<setBody>
-					<simple>${bodyAs(String)}</simple>
-				</setBody>
-				<to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification"/>
-			</when>
-			<when>
-				<simple>${bodyAs(String)} contains '"internalError":true'</simple>
-				<to uri="eventbus:retry-bus-in" />
-			</when>
-			<otherwise>
-				<to uri="eventbus:error-bus-in" />
-			</otherwise>
-		</choice>
-	</route>
-</routes>
diff --git a/sandbox/registration-processor-camel-routes-new-dmz.xml b/sandbox/registration-processor-camel-routes-new-dmz.xml
deleted file mode 100644
index af8f1a77c11..00000000000
--- a/sandbox/registration-processor-camel-routes-new-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- Packet-Reciever to packet-uploader Route -->
-    <route id="packet-reciever-->packet-uploader new route">
-        <from uri="eventbus:packet-receiver-new-bus-out" />
-        <log
-            message="packet-reciever-->packet-uploader new ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <process ref="tokenGenerationProcessor"/>
-                <setHeader headerName="CamelHttpMethod">
-                    <constant>POST</constant>
-                </setHeader>
-                <setHeader headerName="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader headerName="Cookie">
-                    <simple>${header.Cookie}</simple>
-                </setHeader>
-                <setBody>
-                    <simple>${bodyAs(String)}</simple>
-                </setBody>
-                <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
diff --git a/sandbox/registration-processor-camel-routes-res-reprint-dmz.xml b/sandbox/registration-processor-camel-routes-res-reprint-dmz.xml
deleted file mode 100644
index e77e14c41c2..00000000000
--- a/sandbox/registration-processor-camel-routes-res-reprint-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- Packet-Reciever to packet-uploader Route -->
-    <route id="packet-reciever-->packet-uploader res_reprint route">
-        <from uri="eventbus:packet-receiver-res_reprint-bus-out" />
-        <log
-            message="packet-reciever-->packet-uploader res_reprint ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <process ref="tokenGenerationProcessor"/>
-                <setHeader headerName="CamelHttpMethod">
-                    <constant>POST</constant>
-                </setHeader>
-                <setHeader headerName="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader headerName="Cookie">
-                    <simple>${header.Cookie}</simple>
-                </setHeader>
-                <setBody>
-                    <simple>${bodyAs(String)}</simple>
-                </setBody>
-                <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />`
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
diff --git a/sandbox/registration-processor-camel-routes-res-update-dmz.xml b/sandbox/registration-processor-camel-routes-res-update-dmz.xml
deleted file mode 100644
index 61d1c5da36b..00000000000
--- a/sandbox/registration-processor-camel-routes-res-update-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- Packet-Reciever to packet-uploader Route -->
-    <route id="packet-reciever-->packet-uploader res_update route">
-        <from uri="eventbus:packet-receiver-res_update-bus-out" />
-        <log
-            message="packet-reciever-->packet-uploader res_update ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <process ref="tokenGenerationProcessor"/>
-                <setHeader headerName="CamelHttpMethod">
-                    <constant>POST</constant>
-                </setHeader>
-                <setHeader headerName="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader headerName="Cookie">
-                    <simple>${header.Cookie}</simple>
-                </setHeader>
-                <setBody>
-                    <simple>${bodyAs(String)}</simple>
-                </setBody>
-                <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
diff --git a/sandbox/registration-processor-camel-routes-update-dmz.xml b/sandbox/registration-processor-camel-routes-update-dmz.xml
deleted file mode 100644
index 0142b6ee601..00000000000
--- a/sandbox/registration-processor-camel-routes-update-dmz.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- Packet-Reciever to packet-uploader Route -->
-    <route id="packet-reciever-->packet-uploader update route">
-        <from uri="eventbus:packet-receiver-update-bus-out" />
-        <log
-            message="packet-reciever-->packet-uploader update ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <process ref="tokenGenerationProcessor"/>
-                <setHeader headerName="CamelHttpMethod">
-                    <constant>POST</constant>
-                </setHeader>
-                <setHeader headerName="Content-Type">
-                    <constant>application/json</constant>
-                </setHeader>
-                <setHeader headerName="Cookie">
-                    <simple>${header.Cookie}</simple>
-                </setHeader>
-                <setBody>
-                    <simple>${bodyAs(String)}</simple>
-                </setBody>
-                <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
diff --git a/sandbox/registration-processor-dmz.properties b/sandbox/registration-processor-dmz.properties
deleted file mode 100644
index 364f92bebac..00000000000
--- a/sandbox/registration-processor-dmz.properties
+++ /dev/null
@@ -1,147 +0,0 @@
-# DB
-mosip.registration.processor.database.hostname=mz.ingress
-mosip.registration.processor.database.port=30090
-
-# To connect to services on other cluster
-mz.ingress.url=http://mz.ingress:30080
-
-registration.processor.zone=dmz
-
-#-----------Health checker--------------
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=info,health,refresh
-
-# ---------DB connection---------------
-javax.persistence.jdbc.driver=org.postgresql.Driver
-javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
-javax.persistence.jdbc.user=regprcuser
-javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
-#Hibernate properties
-hibernate.hbm2ddl.auto=none
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-hibernate.jdbc.lob.non_contextual_creation=true
-hibernate.show_sql=false
-
-#-----packet-manager----------
-
-registration.processor.LANDING_ZONE = /mnt/regproc/landing
-
-#-----packet-utility----------
-# The known packet sources. Should be set as all fieldCategory present in idschema
-# (NOTE : if fieldCategory is set as pvt then the source should be id)
-registration.processor.sourcepackets=id,evidence,optional
-# The mandatory default source packet.(In default configuration this is thd id packet)
-packet.default.source=id
-# the default schema field cagegory (ex - private)
-schema.default.fieldCategory=pvt
-# The IDSchemaVersion used to create packets in reg-proc
-IDSchema.Version=1.0
-
-#---------registration-processor-camel-bridge------------
-
-#workel pool size to process multiple requests parallely 
-worker.pool.size=10
-
-#Route files corresponding to the dmz flow
-camel.dmz.active.flows.file.names=registration-processor-camel-routes-new-dmz.xml,registration-processor-camel-routes-update-dmz.xml,registration-processor-camel-routes-activate-dmz.xml,registration-processor-camel-routes-res-update-dmz.xml,registration-processor-camel-routes-deactivate-dmz.xml,registration-processor-camel-routes-lost-dmz.xml,registration-processor-camel-routes-res-reprint-dmz.xml
-
-#-------------TOKEN GENERATION----------------
-token.request.id=io.mosip.registration.processor
-token.request.appid=regproc
-token.request.version=1.0
-token.request.clientId=mosip-regproc-client 
-token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
-
-#--------Registration processor rest client API's--------------
-CRYPTOMANAGERDECRYPT=${mz.ingress.url}/v1/keymanager/decrypt
-
-#Audit Service
-AUDIT=${mz.ingress.url}/v1/auditmanager/audits
-
-#Auth Services
-KEYBASEDTOKENAPI=${mz.ingress.url}/v1/authmanager/authenticate/clientidsecretkey
-TOKENVALIDATE=${mz.ingress.url}/v1/authmanager/authorize/admin/validateToken
-DIGITALSIGNATURE=${mz.ingress.url}/v1/keymanager/sign
-mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
-
-ida-internal-auth-uri=${mz.ingress.url}/idauthentication/v1/internal/auth
-ida-internal-get-certificate-uri=${mz.ingress.url}/idauthentication/v1/internal/getCertificate
-
-#---------Registration Status---------
-
-registration.processor.max.retry=3
-mosip.registration.processor.registration.status.id=mosip.registration.status
-mosip.registration.processor.registration.sync.id=mosip.registration.sync
-mosip.registration.processor.sync.version=1.0
-mosip.registration.processor.registration.status.version=1.0
-
-#---------Packet Receiver Stage------------
-#Maximum file size to be upload from packet receiver
-registration.processor.max.file.size=5
-mosip.registration.processor.application.version=1.0
-mosip.registration.processor.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-mosip.registration.processor.timezone=GMT
-mosip.registration.processor.packet.id=mosip.registration.packet
-mosip.registration.processor.grace.period=10800
-
-#---------Virus Scanner Stage---------
-registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav 
-mosip.kernel.virus-scanner.port=80
-registration.processor.application.id=REGISTRATION
-registration.processor.rid.machineidsubstring=10
-
-#--------------Reprocessor stage----------------
-
-# The reprocessor scheduler configurations
-# The elapse time beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=300
-
-#Service Ids
-mosip.registration.processor.audit.id=mosip.applicanttype.getApplicantType
-mosip.registration.processor.crypto.decrypt.id=mosip.cryptomanager.decrypt
-
-#Kernel Crypto signature
-registration.processor.signature.isEnabled=true
-
-#--------Registration Processor Rest Client API's-----------
-CRYPTOMANAGERDECRYPT=${mz.ingress.url}/v1/keymanager/decrypt
-ENCRYPTURL=${mz.ingress.url}/v1/keymanager/encrypt
-
-#iam adapter
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
-
-#----------------------------------Event Bus------------------------------------------
-#Supported eventbus types: vertx, kafka. Defaults to vertx if the config is not given
-mosip.regproc.eventbus.type=kafka
-
-#Kafka event bus config, will be used only when the type is kafka
-#Kafka cluster servers comma separated, common for all stages and camel
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default.svc.cluster.local:9092,kafka-1.kafka-headless.default.svc.cluster.local:9092,kafka-2.kafka-headless.default.svc.cluster.local:9092
-
-#packet-receiver-stage
-#Supported commmit config: auto, batch, single
-mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
-#Maximum records that can be received in one poll to kafka
-mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
-#Interval between each poll calls to kafka in milli sec
-mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
-#kafka consumer group id, one unique id is required for for every stage
-mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
-
-#camel-bridge
-mosip.regproc.camel.bridge.eventbus.kafka.commit.type=single
-mosip.regproc.camel.bridge.eventbus.kafka.max.poll.records=100
-mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
-#Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends 
-#MosipVerticleAPIManager
-mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-brdige-dmz
-
-# Packet Recevier
-mosip.regproc.message.tag.loading.disable=true
-
-mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
-mosip.regproc.packet.receiver.server.port=8081
-mosip.regproc.packet.receiver.eventbus.port=5711
\ No newline at end of file
diff --git a/sandbox/syncdata-mz.properties b/syncdata.properties
similarity index 100%
rename from sandbox/syncdata-mz.properties
rename to syncdata.properties

From 7232123ea7b5f6b10921ad7c0ecf431b392f9993 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 3 Apr 2021 15:45:19 +0530
Subject: [PATCH 0022/1358] Unused properties removed.

---
 kernel.properties   | 4 ----
 syncdata.properties | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/kernel.properties b/kernel.properties
index 7cdd8c6dda1..3a3fa390d42 100644
--- a/kernel.properties
+++ b/kernel.properties
@@ -181,15 +181,11 @@ audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.k
 audit_database_username=audituser
 audit_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 
-
 #Database mappings masterdata
 masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-#masterdata_database_username=sysadmin
-#masterdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 masterdata_database_username=masteruser
 masterdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 
-
 #Database mappings uin
 uin.swagger.base-url=https://qa.mosip.io
 uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
diff --git a/syncdata.properties b/syncdata.properties
index 6ec4c545e73..47c381289aa 100644
--- a/syncdata.properties
+++ b/syncdata.properties
@@ -181,15 +181,11 @@ audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.k
 audit_database_username=audituser
 audit_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 
-
 #Database mappings masterdata
 masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-#masterdata_database_username=sysadmin
-#masterdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 masterdata_database_username=masteruser
 masterdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
 
-
 #Database mappings uin
 uin.swagger.base-url=https://qa.mosip.io
 uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel

From be57b7c61e59f3cfce8b2a33fca926d50e9cf75a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 5 Apr 2021 10:54:04 +0530
Subject: [PATCH 0023/1358] [MOSIP-12666] Minior cleanup.

---
 id-repository.properties | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/id-repository.properties b/id-repository.properties
index 87776d5f671..1c76f167437 100644
--- a/id-repository.properties
+++ b/id-repository.properties
@@ -1,55 +1,29 @@
 management.endpoint.restart.enabled=true
 
 #----------------------------------ID Repo dynamic properties----------------------------------------------#
-
-# IDRepo database url
 mosip.idrepo.db.url=postgres
-
-# IDRepo database port
 mosip.idrepo.db.port=80
-
-#IDRepo identity service database name
 mosip.idrepo.db.identity.db-name=mosip_idrepo
-
-#IDRepo identity service database username
 mosip.idrepo.db.identity.username=idrepouser
-
-#IDRepo database password (encrypted)
 mosip.idrepo.db.identity.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
-#IDRepo VID service database name
 mosip.idrepo.db.vid.db-name=mosip_idmap
-
-#IDRepo VID service database username
 mosip.idrepo.db.vid.username=idmapuser
-
-#IDRepo VID service database password (encrypted)
 mosip.idrepo.db.vid.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
-#IDRepo ObjectStore account name
 mosip.idrepo.objectstore.account-name=idrepo
-
-#IDRepo ObjectStore bucket name under which all idrepo objects are stored
 mosip.idrepo.objectstore.bucket-name=idrepo
-
-#IDRepo ObjectStore adapter name
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #----------------------------------ID Repo Service---------------------------------------------------------#
 
 # Application name using for auditing
 mosip.idrepo.application.name=ID-Repository
-
 # Application version validation in ID-Repo requests
 mosip.idrepo.application.version.pattern=^v\\d+(\\.\\d+)?$
-
 # Modulo value used to evaluate expression (UIN % modulo) used to get the salt from salt table 
 mosip.idrepo.modulo-value=1000
-
 # Configuration for +/- time period adjustment in minutes for the request time validation, so that 
 #the requests originating from a system that is not in time-sync will be accepted for the time period
 mosip.idrepo.datetime.future-time-adjustment=2
-
 # Reference IDs of base keys used for encryption/decryption
 mosip.idrepo.crypto.refId.uin=uin
 mosip.idrepo.crypto.refId.uin-data=identity_data
@@ -308,8 +282,6 @@ PARTNER_POLICY=http://pms-partner-manager-service/v1/partnermanager/partners/{pa
 PARTNER_EXTRACTION_POLICY=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
 credential.service.token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
 
-
-
 #--------------------------Credential-Service properties ends--------------------------------------------------#
 
 #--------------------------Bio SDK Integration - Bio extractor Service ----------------------------------------#
@@ -342,8 +314,6 @@ mosip.biometric.sdk.provider.face.version=0.9
 mosip.biometric.sdk.provider.face.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
 #------
-
-
 # Credential issuance Event properties
 id-repo-ida-event-type-namespace=mosip
 id-repo-ida-event-type-name=ida
@@ -354,4 +324,3 @@ id-repo-ida-credential-recepiant=IDA
 # Kernel token ID generator properties
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
-

From 97e12fb4e69b774eb32e9a78838e16aabecc13ee Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 5 Apr 2021 17:38:19 +0530
Subject: [PATCH 0024/1358] [MOSIP-12666] Properties updated for various
 secrets.

---
 kernel.properties | 51 +++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/kernel.properties b/kernel.properties
index 3a3fa390d42..53e27663f6e 100644
--- a/kernel.properties
+++ b/kernel.properties
@@ -82,11 +82,11 @@ idrepo.api.getuindetails=http://idrepo-identity-service/idrepository/v1/identity
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+mosip.kernel.auth.secret.key=${mosip.mosip.auth.client.secret}
 
 mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
 #------------------------Token id generation service salts---------------------------
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
@@ -170,70 +170,70 @@ logging.level.org.hibernate.type=ERROR
 #Kernel admin service
 admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 admin_database_username=kerneluser
-admin_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+admin_database_password=${db.user.password}
 
 syncjob_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 syncjob_database_username=masteruser
-syncjob_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+syncjob_database_password=${db.user.password}
 
 #Database mappings audit
 audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_audit
 audit_database_username=audituser
-audit_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+audit_database_password=${db.user.password}
 
 #Database mappings masterdata
 masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 masterdata_database_username=masteruser
-masterdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+masterdata_database_password=${db.user.password}
 
 #Database mappings uin
 uin.swagger.base-url=https://qa.mosip.io
 uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 uin_database_username=kerneluser
-uin_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+uin_database_password=${db.user.password}
 hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
 
 #Database mappings id
 id_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 id_database_username=kerneluser
-id_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+id_database_password=${db.user.password}
 
 #Database mappings vid
 vid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 vid_database_username=kerneluser
-vid_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+vid_database_password=${db.user.password}
 
 #Database mappings prid
 prid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 prid_database_username=kerneluser
-prid_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+prid_database_password=${db.user.password}
 
 #Database mappings keymanager
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_keymgr
-keymanager_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+keymanager_database_password=${db.user.password}
 keymanager_database_username= keymgruser
 
 #Database mappings otp manager
 otpmanager_database_username = kerneluser
 otpmanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-otpmanager_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+otpmanager_database_password=${db.user.password}
 
 #Database mappings syncdata
 syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 syncdata_database_username=masteruser
-syncdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+syncdata_database_password=${db.user.password}
 
 #Database mappings licensekeymanager
 licensekeymanager.persistence.jdbc.driver=org.postgresql.Driver
 licensekeymanager_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 licensekeymanager_database_username=masteruser
-licensekeymanager_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+licensekeymanager_database_password=${db.user.password}
 
 #Database mappings rid generator
 ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
-ridgenerator_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+ridgenerator_database_password=${db.user.password}
 
 
 #Database mappings authmanager
@@ -245,21 +245,21 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
 db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
 db_1_DS.datastore.username=iamuser
-db_1_DS.datastore.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+db_1_DS.datastore.password=${db.user.password}
 db_1_DS.datastore.driverClassName=org.postgresql.Driver
 db_1_DS.datastore.schema=GOVT_OFFICERS
 
 db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
 db_2_DS.datastore.username=iamuser
-db_2_DS.datastore.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+db_2_DS.datastore.password=${db.user.password}
 db_2_DS.datastore.driverClassName=org.postgresql.Driver
 db_2_DS.datastore.schema=GOVT_OFFICERS
 
 #-------------------------------------------------------------------------------------------------#
 
 #------------------------KeyCloak Config changes---------------------------#
-
-mosip.iam.base-url=http://keycloak
+# keycloak.host:  env variable
+mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
 mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/
@@ -270,7 +270,7 @@ mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=http://keycloak/auth
+keycloak.auth-server-url=${keycloak.host}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
@@ -284,7 +284,7 @@ mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
 mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret={cipher}46b4a98aac7347e6a2d4f723e281cfd1e7b859100cc17494fc7ed9fb357a6cd9
+mosip.admin.clientsecret=${mosip-mosip-admin-client-secret}
 mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
 mosip.admin_realm_id=mosip
 
@@ -300,7 +300,8 @@ db_3_DS.keycloak.driverClassName=org.postgresql.Driver
 
 mosip.keycloak.admin.client.id=admin-cli
 mosip.keycloak.admin.user.id=admin
-mosip.keycloak.admin.secret.key={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+# env variable
+mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
 
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
@@ -318,7 +319,8 @@ masterdata.registerdevice.timestamp.validate=+10
 
 mosip.kernel.prereg.realm-id=preregistration
 mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+# env variable
+mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
 
 # UIN Schedular config
 kernel.uin.transfer-scheduler-type=cron
@@ -401,7 +403,8 @@ mosip.syncdata.tpm.required=false
 
 mosip.kernel.registrationclient.app.id=registrationclient
 mosip.kernel.registrationclient.client.id=mosip-reg-client
-mosip.kernel.registrationclient.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+# env variable
+mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
 mosip.kernel.authtoken.NEW.internal.url=http://kernel-auth-service/v1/authmanager/authenticate/internal/useridPwd

From eab75517a1f587f265f21a3969ac0866fe1ccd0c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 9 Apr 2021 18:50:46 +0530
Subject: [PATCH 0025/1358] [MOSIP-12666] Cleanup.

---
 kernel.properties | 194 ++++++++++++++++++----------------------------
 1 file changed, 74 insertions(+), 120 deletions(-)

diff --git a/kernel.properties b/kernel.properties
index 53e27663f6e..08898d1e29a 100644
--- a/kernel.properties
+++ b/kernel.properties
@@ -1,10 +1,17 @@
-#---------------------------------------kernel common properties-----------------------
-# Inside Kubernetes services are exposed on port 80 (most of them)
-# For external connection to postgres, nodePort must be used.
-mosip.kernel.database.hostname=postgres
-mosip.kernel.database.port=80
-
-#---------------------------------------Sync Data service-------------------------------
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# keycloak.host
+# keycloak.admin.password
+# mosip.mosip.auth.client.secret   (convention: <namespace>.<keycloak client name>)
+# mosip.mosip.ida.client.secret
+# mosip.mosip.admin.client.secret
+# mosip.mosip.reg.client.secret
+# preregistration.mosip.prereg.client.secret
+
+
+## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
@@ -17,23 +24,20 @@ mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.p
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
 mosip.kernel.syncdata-service-idschema-url=http://kernel-masterdata-service/v1/masterdata/idschema/latest
 
-
-#------------------------------------sms notification service-------------------------------
+## SMS notification
 mosip.kernel.sms.enabled=false
 mosip.kernel.sms.country.code=91
 mosip.kernel.sms.number.length=10
-
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=gateway
-
-#--msg91 gateway--
+## --msg91 gateway--
 mosip.kernel.sms.api=smsapi
 mosip.kernel.sms.authkey=authkey
 mosip.kernel.sms.route=route
 mosip.kernel.sms.sender=sender
 mosip.kernel.sms.unicode=unicode
 
-# -- Email notification -------
+## Email notification
 mosip.kernel.notification.email.from=mosipuser@gmail.com
 spring.mail.host=smtphost
 spring.mail.username=username
@@ -47,23 +51,21 @@ spring.mail.debug=false
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=5MB
 
-#--------------------------------------Keymanager  Service--------------------------------------
+## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
 mosip.kernel.keymanager.hsm.keystore-type=PKCS11
-
 # For PKCS11 provide Path of config file.
 # For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
 # For Offline & JCE property can be left blank, specified value will be ignored.
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
-
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
 mosip.kernel.keymanager.hsm.keystore-pass={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
 
-#--------------------Audit Manager------------------------------------------------
+## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log
 
-#--------------------Auth service --------------------------------------------------
+## Auth service
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 auth.jwt.expiry=6000000
@@ -88,61 +90,36 @@ mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
 mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
-#------------------------Token id generation service salts---------------------------
+## Token id salts
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
 
-#------------------------VID Generator Service---------------------------------------
-#minimum threshold of unused vid
+## VID generator service
 mosip.kernel.vid.min-unused-threshold=100000
-#number of vids to generate
 mosip.kernel.vid.vids-to-generate=200000
-#time to release after expiry(in days)
 mosip.kernel.vid.time-to-release-after-expiry=5
-#for genaration on init vids timeout 
 mosip.kernel.vid.pool-population-timeout=10000000
-
 kernel.vid.revoke-scheduler-type=cron
-#schedular seconds configuration
 kernel.vid.revoke-scheduler-seconds=0
-#schedular minutes configuration
 kernel.vid.revoke-scheduler-minutes=0
-#schedular hours configuration
 kernel.vid.revoke-scheduler-hours=23
-#schedular days configuration
 kernel.vid.revoke-scheduler-days_of_month=*
-#schedular months configuration
 kernel.vid.revoke-scheduler-months=*
-#schedular weeks configuration
 kernel.vid.revoke-scheduler-days_of_week=*
-
 kernel.vid.isolator-scheduler-type=cron
-#schedular seconds configuration
 kernel.vid.isolator-scheduler-seconds=0
-#schedular minutes configuration
 kernel.vid.isolator-scheduler-minutes=0
-#schedular hours configuration
 kernel.vid.isolator-scheduler-hours=*
-#schedular days configuration
 kernel.vid.isolator-scheduler-days_of_month=*
-#schedular months configuration
 kernel.vid.isolator-scheduler-months=*
-#schedular weeks configuration
 kernel.vid.isolator-scheduler-days_of_week=*
 
-#------------------------PRID Properties--------------------------------------------
-
-#minimum threshold of unused prid
+## PRID properties
 mosip.kernel.prid.min-unused-threshold=1000
-#number of prids to generate
 mosip.kernel.prid.prids-to-generate=2000
-#for genaration on init prids timeout 
 mosip.kernel.prid.pool-population-timeout=10000000
-
 mosip.kernel.prid.sequence-limit=3
 kernel.prid.revoke-scheduler-type=cron
-
-# Schedular config
 kernel.prid.revoke-scheduler-seconds=0
 kernel.prid.revoke-scheduler-minutes=0
 kernel.prid.revoke-scheduler-hours=23
@@ -150,7 +127,12 @@ kernel.prid.revoke-scheduler-days_of_month=*
 kernel.prid.revoke-scheduler-months=*
 kernel.prid.revoke-scheduler-days_of_week=*
 
-#------------------------DataBase Properties-----------------------------------------
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.kernel.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.kernel.database.port=5432
+
 javax.persistence.jdbc.driver=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
@@ -163,80 +145,65 @@ hibernate.cache.use_query_cache=false
 hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
-#hibernate.ejb.interceptor=io.mosip.kernel.dataaccess.hibernate.config.EncryptionInterceptor
 logging.level.org.hibernate.SQL=ERROR
 logging.level.org.hibernate.type=ERROR
 
-#Kernel admin service
 admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 admin_database_username=kerneluser
-admin_database_password=${db.user.password}
+admin_database_password=${db.dbuser.password}
 
 syncjob_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 syncjob_database_username=masteruser
-syncjob_database_password=${db.user.password}
+syncjob_database_password=${db.dbuser.password}
 
-#Database mappings audit
 audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_audit
 audit_database_username=audituser
-audit_database_password=${db.user.password}
+audit_database_password=${db.dbuser.password}
 
-#Database mappings masterdata
 masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 masterdata_database_username=masteruser
-masterdata_database_password=${db.user.password}
+masterdata_database_password=${db.dbuser.password}
 
-#Database mappings uin
 uin.swagger.base-url=https://qa.mosip.io
 uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 uin_database_username=kerneluser
-uin_database_password=${db.user.password}
+uin_database_password=${db.dbuser.password}
 hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
 
-#Database mappings id
 id_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 id_database_username=kerneluser
-id_database_password=${db.user.password}
+id_database_password=${db.dbuser.password}
 
-#Database mappings vid
 vid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 vid_database_username=kerneluser
-vid_database_password=${db.user.password}
+vid_database_password=${db.dbuser.password}
 
-#Database mappings prid
 prid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 prid_database_username=kerneluser
-prid_database_password=${db.user.password}
+prid_database_password=${db.dbuser.password}
 
-#Database mappings keymanager
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_keymgr
-keymanager_database_password=${db.user.password}
+keymanager_database_password=${db.dbuser.password}
 keymanager_database_username= keymgruser
 
-#Database mappings otp manager
 otpmanager_database_username = kerneluser
 otpmanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-otpmanager_database_password=${db.user.password}
+otpmanager_database_password=${db.dbuser.password}
 
-#Database mappings syncdata
 syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 syncdata_database_username=masteruser
-syncdata_database_password=${db.user.password}
+syncdata_database_password=${db.dbuser.password}
 
-#Database mappings licensekeymanager
 licensekeymanager.persistence.jdbc.driver=org.postgresql.Driver
 licensekeymanager_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 licensekeymanager_database_username=masteruser
-licensekeymanager_database_password=${db.user.password}
+licensekeymanager_database_password=${db.dbuser.password}
 
-#Database mappings rid generator
 ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
-ridgenerator_database_password=${db.user.password}
-
+ridgenerator_database_password=${db.dbuser.password}
 
-#Database mappings authmanager
 iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
 iam.datasource.username=iamuser
 iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
@@ -245,29 +212,28 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
 db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
 db_1_DS.datastore.username=iamuser
-db_1_DS.datastore.password=${db.user.password}
+db_1_DS.datastore.password=${db.dbuser.password}
 db_1_DS.datastore.driverClassName=org.postgresql.Driver
 db_1_DS.datastore.schema=GOVT_OFFICERS
 
 db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
 db_2_DS.datastore.username=iamuser
-db_2_DS.datastore.password=${db.user.password}
+db_2_DS.datastore.password=${db.dbuser.password}
 db_2_DS.datastore.driverClassName=org.postgresql.Driver
 db_2_DS.datastore.schema=GOVT_OFFICERS
 
-#-------------------------------------------------------------------------------------------------#
 
-#------------------------KeyCloak Config changes---------------------------#
-# keycloak.host:  env variable
+## Keycloak properties
 mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url=${mosip.iam.base-url}/auth/admin/
+mosip.iam.open-id-url =${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/admin/realms/{realmId}
+mosip.iam.admin-url=${mosip.iam.base-url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
+
 keycloak.realm=registration-client
 keycloak.resource=account
 keycloak.auth-server-url=${keycloak.host}/auth
@@ -276,20 +242,9 @@ keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
-
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
-mosip.admin.login_flow.name=authorization_code
-mosip.admin.login_flow.response_type=code
-mosip.admin.login_flow.scope=cls
-mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip-mosip-admin-client-secret}
-mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
-mosip.admin_realm_id=mosip
-
+mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
 mosip.iam.master.realm-id=master
-
 mosip.iam.pre-reg_user_password=mosip
 
 db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
@@ -300,29 +255,35 @@ db_3_DS.keycloak.driverClassName=org.postgresql.Driver
 
 mosip.keycloak.admin.client.id=admin-cli
 mosip.keycloak.admin.user.id=admin
-# env variable
 mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
-
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-#---latest changes--#
+mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
+mosip.admin.login_flow.name=authorization_code
+mosip.admin.login_flow.response_type=code
+mosip.admin.login_flow.scope=cls
+mosip.admin.clientid=mosip-admin-client
+mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
+mosip.admin_realm_id=mosip
+
 master.search.maximum.rows=50
 mosip.level=2
 mosip.kernel.masterdata.audit-url= http://kernel-auditmanager-service/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
-#---Register device changes--#
+## Register device
 mosip.kernel.sign-url=http://kernel-keymanager-service/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
+## Prereg
 mosip.kernel.prereg.realm-id=preregistration
 mosip.kernel.prereg.client.id=mosip-prereg-client
-# env variable
 mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
 
-# UIN Schedular config
+## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
 kernel.uin.transfer-scheduler-minutes=48
@@ -331,33 +292,26 @@ kernel.uin.transfer-scheduler-days_of_month=*
 kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
-# UIN Auth adapter config
+## UIN Auth adapter config
 auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
 
-# Proxy otp
+## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
-#---------------------------------------Security Properties-----------------------------
-#CSRF switch
+## Security properties
 mosip.security.csrf-enable=false
-
-#CORS switch
 mosip.security.cors-enable=false
-
-#comma separated allowed origins
 mosip.security.origins=localhost:8080
-
-#secure cookie switch
 mosip.security.secure-cookie=false
 
-# ROOT key identifier
+## ROOT key identifier
 mosip.root.key.applicationid=ROOT
 
-# Certificate signing algorithm
+## Certificate signing algorithm
 mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 
-# Default certificate params
+## Default certificate params
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
 mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
 mosip.kernel.keymanager.certificate.default.organization=IITB
@@ -365,7 +319,7 @@ mosip.kernel.keymanager.certificate.default.location=BANGALORE
 mosip.kernel.keymanager.certificate.default.state=KA
 mosip.kernel.keymanager.certificate.default.country=IN
 
-# Zero Knowledge Master & Public Key identifier.
+## Zero Knowledge Master & Public Key identifier.
 mosip.kernel.zkcrypto.masterkey.application.id=KERNEL
 mosip.kernel.zkcrypto.masterkey.reference.id=IDENTITY_CACHE
 mosip.kernel.zkcrypto.publickey.application.id=IDA
@@ -373,18 +327,18 @@ mosip.kernel.zkcrypto.publickey.reference.id=PUBLIC_KEY
 mosip.kernel.zkcrypto.wrap.algorithm-name=AES/ECB/NoPadding
 mosip.kernel.zkcrypto.derive.encrypt.algorithm-name=AES/ECB/PKCS5Padding
 
-# Application Id for PMS master key.
+## Application Id for PMS master key.
 mosip.kernel.partner.sign.masterkey.application.id=PMS
 
 datastores=ldap_1_DS,db_1_DS,db_2_DS
 
-# Partner Management Service allowed partner domains
+## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
-# List of keys to auto generate.
+## List of keys to auto generate.
 mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS
 
-# random keys required for ZK encrypt.
+## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 
 datastores=db_1_DS,db_2_DS

From 0c81c8fabad7fee1b8f07eaa7a7bc7567c0fd869 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 14 Apr 2021 09:59:13 +0530
Subject: [PATCH 0026/1358] [MOSIP-13230] Softhsm property added.

---
 kernel.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel.properties b/kernel.properties
index 08898d1e29a..f288ba69282 100644
--- a/kernel.properties
+++ b/kernel.properties
@@ -9,6 +9,7 @@
 # mosip.mosip.admin.client.secret
 # mosip.mosip.reg.client.secret
 # preregistration.mosip.prereg.client.secret
+# softhsm.kernel.pin
 
 
 ## Sync data
@@ -60,7 +61,7 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.pin}
 
 ## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log

From 2ce5edf994b8cb3434f6984121faeec213306cc7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 19 Apr 2021 18:57:41 +0530
Subject: [PATCH 0027/1358] [MOSIP-12666] 'default' suffix added to basename of
 properties.

---
 admin.properties => admin-default.properties                      | 0
 application.properties => application-default.properties          | 0
 data-share.properties => data-share-default.properties            | 0
 hazelcast.xml => hazelcast-default.xml                            | 0
 hazelcast_cache.xml => hazelcast_cache-default.xml                | 0
 hotlist.properties => hotlist-default.properties                  | 0
 ...hentication.properties => id-authentication-default.properties | 0
 id-repository.properties => id-repository-default.properties      | 0
 kernel.properties => kernel-default.properties                    | 0
 mock-abis.properties => mock-abis-default.properties              | 0
 ...management.properties => partner-management-default.properties | 0
 ...registration.properties => pre-registration-default.properties | 0
 print.properties => print-default.properties                      | 0
 registration.properties => registration-default.properties        | 0
 ...ml => registration-processor-camel-routes-activate-default.xml | 0
 ... => registration-processor-camel-routes-deactivate-default.xml | 0
 ...st.xml => registration-processor-camel-routes-lost-default.xml | 0
 ...new.xml => registration-processor-camel-routes-new-default.xml | 0
 ...=> registration-processor-camel-routes-res-reprint-default.xml | 0
 ... => registration-processor-camel-routes-res-update-default.xml | 0
 ....xml => registration-processor-camel-routes-update-default.xml | 0
 ...cessor.properties => registration-processor-default.properties | 0
 resident.properties => resident-default.properties                | 0
 syncdata.properties => syncdata-default.properties                | 0
 24 files changed, 0 insertions(+), 0 deletions(-)
 rename admin.properties => admin-default.properties (100%)
 rename application.properties => application-default.properties (100%)
 rename data-share.properties => data-share-default.properties (100%)
 rename hazelcast.xml => hazelcast-default.xml (100%)
 rename hazelcast_cache.xml => hazelcast_cache-default.xml (100%)
 rename hotlist.properties => hotlist-default.properties (100%)
 rename id-authentication.properties => id-authentication-default.properties (100%)
 rename id-repository.properties => id-repository-default.properties (100%)
 rename kernel.properties => kernel-default.properties (100%)
 rename mock-abis.properties => mock-abis-default.properties (100%)
 rename partner-management.properties => partner-management-default.properties (100%)
 rename pre-registration.properties => pre-registration-default.properties (100%)
 rename print.properties => print-default.properties (100%)
 rename registration.properties => registration-default.properties (100%)
 rename registration-processor-camel-routes-activate.xml => registration-processor-camel-routes-activate-default.xml (100%)
 rename registration-processor-camel-routes-deactivate.xml => registration-processor-camel-routes-deactivate-default.xml (100%)
 rename registration-processor-camel-routes-lost.xml => registration-processor-camel-routes-lost-default.xml (100%)
 rename registration-processor-camel-routes-new.xml => registration-processor-camel-routes-new-default.xml (100%)
 rename registration-processor-camel-routes-res-reprint.xml => registration-processor-camel-routes-res-reprint-default.xml (100%)
 rename registration-processor-camel-routes-res-update.xml => registration-processor-camel-routes-res-update-default.xml (100%)
 rename registration-processor-camel-routes-update.xml => registration-processor-camel-routes-update-default.xml (100%)
 rename registration-processor.properties => registration-processor-default.properties (100%)
 rename resident.properties => resident-default.properties (100%)
 rename syncdata.properties => syncdata-default.properties (100%)

diff --git a/admin.properties b/admin-default.properties
similarity index 100%
rename from admin.properties
rename to admin-default.properties
diff --git a/application.properties b/application-default.properties
similarity index 100%
rename from application.properties
rename to application-default.properties
diff --git a/data-share.properties b/data-share-default.properties
similarity index 100%
rename from data-share.properties
rename to data-share-default.properties
diff --git a/hazelcast.xml b/hazelcast-default.xml
similarity index 100%
rename from hazelcast.xml
rename to hazelcast-default.xml
diff --git a/hazelcast_cache.xml b/hazelcast_cache-default.xml
similarity index 100%
rename from hazelcast_cache.xml
rename to hazelcast_cache-default.xml
diff --git a/hotlist.properties b/hotlist-default.properties
similarity index 100%
rename from hotlist.properties
rename to hotlist-default.properties
diff --git a/id-authentication.properties b/id-authentication-default.properties
similarity index 100%
rename from id-authentication.properties
rename to id-authentication-default.properties
diff --git a/id-repository.properties b/id-repository-default.properties
similarity index 100%
rename from id-repository.properties
rename to id-repository-default.properties
diff --git a/kernel.properties b/kernel-default.properties
similarity index 100%
rename from kernel.properties
rename to kernel-default.properties
diff --git a/mock-abis.properties b/mock-abis-default.properties
similarity index 100%
rename from mock-abis.properties
rename to mock-abis-default.properties
diff --git a/partner-management.properties b/partner-management-default.properties
similarity index 100%
rename from partner-management.properties
rename to partner-management-default.properties
diff --git a/pre-registration.properties b/pre-registration-default.properties
similarity index 100%
rename from pre-registration.properties
rename to pre-registration-default.properties
diff --git a/print.properties b/print-default.properties
similarity index 100%
rename from print.properties
rename to print-default.properties
diff --git a/registration.properties b/registration-default.properties
similarity index 100%
rename from registration.properties
rename to registration-default.properties
diff --git a/registration-processor-camel-routes-activate.xml b/registration-processor-camel-routes-activate-default.xml
similarity index 100%
rename from registration-processor-camel-routes-activate.xml
rename to registration-processor-camel-routes-activate-default.xml
diff --git a/registration-processor-camel-routes-deactivate.xml b/registration-processor-camel-routes-deactivate-default.xml
similarity index 100%
rename from registration-processor-camel-routes-deactivate.xml
rename to registration-processor-camel-routes-deactivate-default.xml
diff --git a/registration-processor-camel-routes-lost.xml b/registration-processor-camel-routes-lost-default.xml
similarity index 100%
rename from registration-processor-camel-routes-lost.xml
rename to registration-processor-camel-routes-lost-default.xml
diff --git a/registration-processor-camel-routes-new.xml b/registration-processor-camel-routes-new-default.xml
similarity index 100%
rename from registration-processor-camel-routes-new.xml
rename to registration-processor-camel-routes-new-default.xml
diff --git a/registration-processor-camel-routes-res-reprint.xml b/registration-processor-camel-routes-res-reprint-default.xml
similarity index 100%
rename from registration-processor-camel-routes-res-reprint.xml
rename to registration-processor-camel-routes-res-reprint-default.xml
diff --git a/registration-processor-camel-routes-res-update.xml b/registration-processor-camel-routes-res-update-default.xml
similarity index 100%
rename from registration-processor-camel-routes-res-update.xml
rename to registration-processor-camel-routes-res-update-default.xml
diff --git a/registration-processor-camel-routes-update.xml b/registration-processor-camel-routes-update-default.xml
similarity index 100%
rename from registration-processor-camel-routes-update.xml
rename to registration-processor-camel-routes-update-default.xml
diff --git a/registration-processor.properties b/registration-processor-default.properties
similarity index 100%
rename from registration-processor.properties
rename to registration-processor-default.properties
diff --git a/resident.properties b/resident-default.properties
similarity index 100%
rename from resident.properties
rename to resident-default.properties
diff --git a/syncdata.properties b/syncdata-default.properties
similarity index 100%
rename from syncdata.properties
rename to syncdata-default.properties

From af4646857f44104ff7c92e670096037e80f88063 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 19 Apr 2021 18:59:25 +0530
Subject: [PATCH 0028/1358] [MOSIP-12666] Names updated for previous change.

---
 application-default.properties            | 2 +-
 registration-processor-default.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 230ea44ef1c..a5a813c9ae5 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -424,7 +424,7 @@ objectstore.crypto.name=OnlinePacketCryptoServiceImpl
 default.provider.version=v1.0
 # posix adapter config
 object.store.base.location=/home/mosip
-hazelcast.config=classpath:hazelcast.xml
+hazelcast.config=classpath:hazelcast-default.xml
 #-------------S3adapter-------------------
 # s3 adapter config
 object.store.s3.accesskey=admin
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 20f59ecfa4f..781efc20d82 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -46,11 +46,11 @@ packet.info.storage.service=*
 
 ## Camel bridge
 # Url to cluster manager to enable this stage for joining the cluster in secure zone
-cluster.manager.file.name=hazelcast.xml
+cluster.manager.file.name=hazelcast-default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
-camel.secure.active.flows.file.names=registration-processor-camel-routes-new-mz.xml,registration-processor-camel-routes-update-mz.xml,registration-processor-camel-routes-activate-mz.xml,registration-processor-camel-routes-res-update-mz.xml,registration-processor-camel-routes-deactivate-mz.xml,registration-processor-camel-routes-lost-mz.xml,registration-processor-camel-routes-res-reprint-mz.xml
+camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml
 
 ## Token generation
 token.request.id=io.mosip.registration.processor

From 612b59382c4f488e005144c30b3473e430e1294f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 21 Apr 2021 06:45:52 +0530
Subject: [PATCH 0029/1358] [MOSIP-12666] Unused properties removed.

---
 kernel-default.properties | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index f288ba69282..b03f2050e40 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -205,23 +205,23 @@ ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
 ridgenerator_database_password=${db.dbuser.password}
 
-iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-iam.datasource.username=iamuser
-iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-iam.datasource.driverClassName=org.postgresql.Driver
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-db_1_DS.datastore.username=iamuser
-db_1_DS.datastore.password=${db.dbuser.password}
-db_1_DS.datastore.driverClassName=org.postgresql.Driver
-db_1_DS.datastore.schema=GOVT_OFFICERS
-
-db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-db_2_DS.datastore.username=iamuser
-db_2_DS.datastore.password=${db.dbuser.password}
-db_2_DS.datastore.driverClassName=org.postgresql.Driver
-db_2_DS.datastore.schema=GOVT_OFFICERS
+#iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
+#iam.datasource.username=iamuser
+#iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+#iam.datasource.driverClassName=org.postgresql.Driver
+#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+#
+#db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
+#db_1_DS.datastore.username=iamuser
+#db_1_DS.datastore.password=${db.dbuser.password}
+#db_1_DS.datastore.driverClassName=org.postgresql.Driver
+#db_1_DS.datastore.schema=GOVT_OFFICERS
+#
+#db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
+#db_2_DS.datastore.username=iamuser
+#db_2_DS.datastore.password=${db.dbuser.password}
+#db_2_DS.datastore.driverClassName=org.postgresql.Driver
+#db_2_DS.datastore.schema=GOVT_OFFICERS
 
 
 ## Keycloak properties

From 7d911f00cec959e6fd51edfe2b4ae622a8bfd825 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 21 Apr 2021 08:57:49 +0530
Subject: [PATCH 0030/1358] [MOSIP-12666] Keycloak property corrected.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index b03f2050e40..ab79662af16 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -237,7 +237,7 @@ mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.host}/auth
+keycloak.auth-server-url=${mosip.iam.base-url}
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true

From d2abfd6349d442a1483fac62c5324fd4314d009a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 21 Apr 2021 10:12:10 +0530
Subject: [PATCH 0031/1358] Reverted previous change

---
 kernel-default.properties | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ab79662af16..3ac2be76987 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -205,23 +205,23 @@ ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
 ridgenerator_database_password=${db.dbuser.password}
 
-#iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-#iam.datasource.username=iamuser
-#iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-#iam.datasource.driverClassName=org.postgresql.Driver
-#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-#
-#db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-#db_1_DS.datastore.username=iamuser
-#db_1_DS.datastore.password=${db.dbuser.password}
-#db_1_DS.datastore.driverClassName=org.postgresql.Driver
-#db_1_DS.datastore.schema=GOVT_OFFICERS
-#
-#db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-#db_2_DS.datastore.username=iamuser
-#db_2_DS.datastore.password=${db.dbuser.password}
-#db_2_DS.datastore.driverClassName=org.postgresql.Driver
-#db_2_DS.datastore.schema=GOVT_OFFICERS
+iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
+iam.datasource.username=iamuser
+iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+iam.datasource.driverClassName=org.postgresql.Driver
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
+db_1_DS.datastore.username=iamuser
+db_1_DS.datastore.password=${db.dbuser.password}
+db_1_DS.datastore.driverClassName=org.postgresql.Driver
+db_1_DS.datastore.schema=GOVT_OFFICERS
+
+db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
+db_2_DS.datastore.username=iamuser
+db_2_DS.datastore.password=${db.dbuser.password}
+db_2_DS.datastore.driverClassName=org.postgresql.Driver
+db_2_DS.datastore.schema=GOVT_OFFICERS
 
 
 ## Keycloak properties

From 3d5477d2a80c1aab596ee097f2437f72dceb2223 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 21 Apr 2021 17:57:57 +0530
Subject: [PATCH 0032/1358] Trial json.

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index ef3fea4bb15..650e4cbd56e 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS1",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://mz.ingress:30616",
+        "brokerUrl": "tcp://${keycloak.host}:30616",
         "inboundQueueName": "mosip-to-abis1",
         "outboundQueueName": "abis1-to-mosip",
         "pingInboundQueueName": "",

From b94d9725ae359fa8a8265c8901a2a6ec70fffa5e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Apr 2021 13:50:47 +0530
Subject: [PATCH 0033/1358] [MOSIP-12666] Placeholders added.

---
 registration-processor-abis.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 650e4cbd56e..6af474b881c 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -1,11 +1,11 @@
 {
     "abis": [{
-        "name": "ABIS1",
+        "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${keycloak.host}:30616",
-        "inboundQueueName": "mosip-to-abis1",
-        "outboundQueueName": "abis1-to-mosip",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
+        "inboundQueueName": "mosip-to-abis",
+        "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",
         "pingOutboundQueueName": "",
         "userName": "admin",

From 1f07166413cb7bd06275ce684362258fe6d5009a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Apr 2021 14:03:05 +0530
Subject: [PATCH 0034/1358] [MOSIP-12666] Activemq config updated.

---
 registration-processor-abis.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 6af474b881c..d81b599cac2 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -8,8 +8,8 @@
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",
         "pingOutboundQueueName": "",
-        "userName": "admin",
-        "password": "admin",
+        "userName": "artemis",
+        "password": ${activemq.password},
         "typeOfQueue": "ACTIVEMQ",
         "inboundMessageTTL": 2700
     }]

From fdcd631be337cfb9e13a4e3e2ba6c8cadd5349e9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 29 Apr 2021 06:17:09 +0530
Subject: [PATCH 0035/1358] Missing quotes added to log format.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index a5a813c9ae5..b523a308645 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -466,7 +466,7 @@ server.tomcat.accesslog.prefix=stdout
 server.tomcat.accesslog.buffered=false
 server.tomcat.accesslog.suffix=
 server.tomcat.accesslog.file-date-format=
-server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}","req.userAgent":"%{User-Agent}i","req.xForwardedFor":"%{X-Forwarded-For}i","req.referer":"%{Referer}i","req.method":%m,"req.remoteHost":%a}
+server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}","req.userAgent":"%{User-Agent}i","req.xForwardedFor":"%{X-Forwarded-For}i","req.referer":"%{Referer}i","req.method":"%m","req.remoteHost":"%a"}
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
 #---------------- Web Sub properties -------------------------

From 50e67ffb23456641ea6d2c2c9ea0fbbc285d7688 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 8 May 2021 16:01:30 +0530
Subject: [PATCH 0036/1358] [MOSIP-12666] Kernel properties synced with develop
 branch.

---
 kernel-default.properties | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 3ac2be76987..04e18ebfb70 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -245,6 +245,15 @@ keycloak.verify-token-audience=true
 
 mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
 mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin.login_flow.name=authorization_code
+mosip.admin.login_flow.response_type=code
+mosip.admin.login_flow.scope=cls
+mosip.admin.clientid=mosip-admin-client
+mosip.admin.clientsecret={cipher}46b4a98aac7347e6a2d4f723e281cfd1e7b859100cc17494fc7ed9fb357a6cd9
+mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
+mosip.admin_realm_id=mosip
 mosip.iam.master.realm-id=master
 mosip.iam.pre-reg_user_password=mosip
 
@@ -300,6 +309,17 @@ auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authori
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
+## identity schema backward compatability ########
+mosip.ui.spec.default.domain=registration-client
+
+#### Required for admin UI ##############
+## this pattern like --> display column : configKey. 
+## We can provide multiple values with ";" separated 
+mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
+
+## Used to get IAM user details. 
+mosip.kernel.masterdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
+mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
 mosip.security.cors-enable=false
@@ -391,3 +411,8 @@ syncdata.websub.resubscription.retry.count=3
 syncdata.websub.resubscription.delay.secs=7200
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000
+
+# Flag to identify the support of no thumbprint in 1.1.3 version. 
+# Added this for backward compatability. default is false, means support is not required.
+# Make it to true if support is required.
+mosip.kernel.keymanager.113nothumbprint.support=false

From f4e4738da676ea1197f9a2b45e68d80c7018177c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 8 May 2021 16:10:18 +0530
Subject: [PATCH 0037/1358] [MOSIP-12666] Missing property added.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 04e18ebfb70..eb7bcb6e473 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -234,7 +234,7 @@ mosip.iam.admin-url=${mosip.iam.base-url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
-
+mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 keycloak.realm=registration-client
 keycloak.resource=account
 keycloak.auth-server-url=${mosip.iam.base-url}

From 27138335b554ed36fa42f1417b178328fbb39156 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 9 May 2021 06:42:15 +0530
Subject: [PATCH 0038/1358] [MOSIP-12666] db properties updated.

---
 kernel-default.properties | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index eb7bcb6e473..b9f95be8185 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -257,10 +257,13 @@ mosip.admin_realm_id=mosip
 mosip.iam.master.realm-id=master
 mosip.iam.pre-reg_user_password=mosip
 
-db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
-db_3_DS.keycloak.port=80
-db_3_DS.keycloak.username=postgres
-db_3_DS.keycloak.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+## TODO: Below config is not needed anymore.  Need to remove init of db_3_DS in authmanager code. For now, we just
+## point to a valid db.
+#db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
+db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+db_3_DS.keycloak.port=${mosip.kernel.database.port}
+db_3_DS.keycloak.username=kerneluser
+db_3_DS.keycloak.password=${db.dbuser.password}
 db_3_DS.keycloak.driverClassName=org.postgresql.Driver
 
 mosip.keycloak.admin.client.id=admin-cli

From 56b8b4af2d27c1358f0e89e93fa7cf3b254dbb0a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 May 2021 10:51:12 +0530
Subject: [PATCH 0039/1358] [MOSIP-12666] Syncdata properties added.

---
 syncdata-default.properties | 248 ++++++++++++++++--------------------
 1 file changed, 108 insertions(+), 140 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 47c381289aa..1fe327ed2e2 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -1,10 +1,19 @@
-#---------------------------------------kernel common properties-----------------------
-# Inside Kubernetes services are exposed on port 80 (most of them)
-# For external connection to postgres, nodePort must be used.
-mosip.kernel.database.hostname=postgres
-mosip.kernel.database.port=80
-
-#---------------------------------------Sync Data service-------------------------------
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# mosip.api.public.url
+# db.dbuser.password 
+# keycloak.host
+# keycloak.admin.password
+# mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
+# mosip.mosip.ida.client.secret
+# mosip.mosip.admin.client.secret
+# mosip.mosip.reg.client.secret
+# preregistration.mosip.prereg.client.secret
+# softhsm.kernel.pin
+
+
+## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
@@ -17,23 +26,20 @@ mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.p
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
 mosip.kernel.syncdata-service-idschema-url=http://kernel-masterdata-service/v1/masterdata/idschema/latest
 
-
-#------------------------------------sms notification service-------------------------------
+## SMS notification
 mosip.kernel.sms.enabled=false
 mosip.kernel.sms.country.code=91
 mosip.kernel.sms.number.length=10
-
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=gateway
-
-#--msg91 gateway--
+## --msg91 gateway--
 mosip.kernel.sms.api=smsapi
 mosip.kernel.sms.authkey=authkey
 mosip.kernel.sms.route=route
 mosip.kernel.sms.sender=sender
 mosip.kernel.sms.unicode=unicode
 
-# -- Email notification -------
+## Email notification
 mosip.kernel.notification.email.from=mosipuser@gmail.com
 spring.mail.host=smtphost
 spring.mail.username=username
@@ -47,23 +53,21 @@ spring.mail.debug=false
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=5MB
 
-#--------------------------------------Keymanager  Service--------------------------------------
+## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
-mosip.kernel.keymanager.hsm.keystore-type=Offline
-
+mosip.kernel.keymanager.hsm.keystore-type=OFFLINE
 # For PKCS11 provide Path of config file.
 # For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
 # For Offline & JCE property can be left blank, specified value will be ignored.
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
-
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.pin}
 
-#--------------------Audit Manager------------------------------------------------
+## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log
 
-#--------------------Auth service --------------------------------------------------
+## Auth service
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 auth.jwt.expiry=6000000
@@ -82,67 +86,42 @@ idrepo.api.getuindetails=http://idrepo-identity-service/idrepository/v1/identity
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+mosip.kernel.auth.secret.key=${mosip.mosip.auth.client.secret}
 
 mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
-#------------------------Token id generation service salts---------------------------
+## Token id salts
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
 
-#------------------------VID Generator Service---------------------------------------
-#minimum threshold of unused vid
+## VID generator service
 mosip.kernel.vid.min-unused-threshold=100000
-#number of vids to generate
 mosip.kernel.vid.vids-to-generate=200000
-#time to release after expiry(in days)
 mosip.kernel.vid.time-to-release-after-expiry=5
-#for genaration on init vids timeout 
 mosip.kernel.vid.pool-population-timeout=10000000
-
 kernel.vid.revoke-scheduler-type=cron
-#schedular seconds configuration
 kernel.vid.revoke-scheduler-seconds=0
-#schedular minutes configuration
 kernel.vid.revoke-scheduler-minutes=0
-#schedular hours configuration
 kernel.vid.revoke-scheduler-hours=23
-#schedular days configuration
 kernel.vid.revoke-scheduler-days_of_month=*
-#schedular months configuration
 kernel.vid.revoke-scheduler-months=*
-#schedular weeks configuration
 kernel.vid.revoke-scheduler-days_of_week=*
-
 kernel.vid.isolator-scheduler-type=cron
-#schedular seconds configuration
 kernel.vid.isolator-scheduler-seconds=0
-#schedular minutes configuration
 kernel.vid.isolator-scheduler-minutes=0
-#schedular hours configuration
 kernel.vid.isolator-scheduler-hours=*
-#schedular days configuration
 kernel.vid.isolator-scheduler-days_of_month=*
-#schedular months configuration
 kernel.vid.isolator-scheduler-months=*
-#schedular weeks configuration
 kernel.vid.isolator-scheduler-days_of_week=*
 
-#------------------------PRID Properties--------------------------------------------
-
-#minimum threshold of unused prid
+## PRID properties
 mosip.kernel.prid.min-unused-threshold=1000
-#number of prids to generate
 mosip.kernel.prid.prids-to-generate=2000
-#for genaration on init prids timeout 
 mosip.kernel.prid.pool-population-timeout=10000000
-
 mosip.kernel.prid.sequence-limit=3
 kernel.prid.revoke-scheduler-type=cron
-
-# Schedular config
 kernel.prid.revoke-scheduler-seconds=0
 kernel.prid.revoke-scheduler-minutes=0
 kernel.prid.revoke-scheduler-hours=23
@@ -150,7 +129,12 @@ kernel.prid.revoke-scheduler-days_of_month=*
 kernel.prid.revoke-scheduler-months=*
 kernel.prid.revoke-scheduler-days_of_week=*
 
-#------------------------DataBase Properties-----------------------------------------
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.kernel.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.kernel.database.port=5432
+
 javax.persistence.jdbc.driver=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
@@ -163,121 +147,86 @@ hibernate.cache.use_query_cache=false
 hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
-#hibernate.ejb.interceptor=io.mosip.kernel.dataaccess.hibernate.config.EncryptionInterceptor
 logging.level.org.hibernate.SQL=ERROR
 logging.level.org.hibernate.type=ERROR
 
-#Kernel admin service
 admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 admin_database_username=kerneluser
-admin_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+admin_database_password=${db.dbuser.password}
 
 syncjob_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 syncjob_database_username=masteruser
-syncjob_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+syncjob_database_password=${db.dbuser.password}
 
-#Database mappings audit
 audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_audit
 audit_database_username=audituser
-audit_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+audit_database_password=${db.dbuser.password}
 
-#Database mappings masterdata
 masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 masterdata_database_username=masteruser
-masterdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+masterdata_database_password=${db.dbuser.password}
 
-#Database mappings uin
 uin.swagger.base-url=https://qa.mosip.io
 uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 uin_database_username=kerneluser
-uin_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+uin_database_password=${db.dbuser.password}
 hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
 
-#Database mappings id
 id_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 id_database_username=kerneluser
-id_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+id_database_password=${db.dbuser.password}
 
-#Database mappings vid
 vid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 vid_database_username=kerneluser
-vid_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+vid_database_password=${db.dbuser.password}
 
-#Database mappings prid
 prid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 prid_database_username=kerneluser
-prid_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+prid_database_password=${db.dbuser.password}
 
-#Database mappings keymanager
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_keymgr
-keymanager_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+keymanager_database_password=${db.dbuser.password}
 keymanager_database_username= keymgruser
 
-#Database mappings otp manager
 otpmanager_database_username = kerneluser
 otpmanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-otpmanager_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+otpmanager_database_password=${db.dbuser.password}
 
-#Database mappings syncdata
 syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 syncdata_database_username=masteruser
-syncdata_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+syncdata_database_password=${db.dbuser.password}
 
-#Database mappings licensekeymanager
 licensekeymanager.persistence.jdbc.driver=org.postgresql.Driver
 licensekeymanager_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 licensekeymanager_database_username=masteruser
-licensekeymanager_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+licensekeymanager_database_password=${db.dbuser.password}
 
-#Database mappings rid generator
 ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
-ridgenerator_database_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
-
-#Database mappings authmanager
-iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-iam.datasource.username=iamuser
-iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-iam.datasource.driverClassName=org.postgresql.Driver
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-db_1_DS.datastore.username=iamuser
-db_1_DS.datastore.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-db_1_DS.datastore.driverClassName=org.postgresql.Driver
-db_1_DS.datastore.schema=GOVT_OFFICERS
+ridgenerator_database_password=${db.dbuser.password}
 
-db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-db_2_DS.datastore.username=iamuser
-db_2_DS.datastore.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-db_2_DS.datastore.driverClassName=org.postgresql.Driver
-db_2_DS.datastore.schema=GOVT_OFFICERS
-
-#-------------------------------------------------------------------------------------------------#
-
-#------------------------KeyCloak Config changes---------------------------#
-
-mosip.iam.base-url=http://keycloak
+## Keycloak properties
+mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url=${mosip.iam.base-url}/auth/admin/
+mosip.iam.open-id-url =${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/admin/realms/{realmId}
+mosip.iam.admin-url=${mosip.iam.base-url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
+mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=http://keycloak/auth
+keycloak.auth-server-url=${mosip.iam.base-url}
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
-
+mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
 mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
@@ -287,40 +236,49 @@ mosip.admin.clientid=mosip-admin-client
 mosip.admin.clientsecret={cipher}46b4a98aac7347e6a2d4f723e281cfd1e7b859100cc17494fc7ed9fb357a6cd9
 mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
 mosip.admin_realm_id=mosip
-
 mosip.iam.master.realm-id=master
-
 mosip.iam.pre-reg_user_password=mosip
 
-db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
-db_3_DS.keycloak.port=80
-db_3_DS.keycloak.username=postgres
-db_3_DS.keycloak.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+## TODO: Below config is not needed anymore.  Need to remove init of db_3_DS in authmanager code. For now, we just
+## point to a valid db.
+#db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
+db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+db_3_DS.keycloak.port=${mosip.kernel.database.port}
+db_3_DS.keycloak.username=kerneluser
+db_3_DS.keycloak.password=${db.dbuser.password}
 db_3_DS.keycloak.driverClassName=org.postgresql.Driver
 
 mosip.keycloak.admin.client.id=admin-cli
 mosip.keycloak.admin.user.id=admin
-mosip.keycloak.admin.secret.key={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
-
+mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-#---latest changes--#
+mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
+mosip.admin.login_flow.name=authorization_code
+mosip.admin.login_flow.response_type=code
+mosip.admin.login_flow.scope=cls
+mosip.admin.clientid=mosip-admin-client
+mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
+mosip.admin_realm_id=mosip
+
 master.search.maximum.rows=50
 mosip.level=2
 mosip.kernel.masterdata.audit-url= http://kernel-auditmanager-service/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
-#---Register device changes--#
+## Register device
 mosip.kernel.sign-url=http://kernel-keymanager-service/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
+## Prereg
 mosip.kernel.prereg.realm-id=preregistration
 mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
 
-# UIN Schedular config
+## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
 kernel.uin.transfer-scheduler-minutes=48
@@ -329,33 +287,37 @@ kernel.uin.transfer-scheduler-days_of_month=*
 kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
-# UIN Auth adapter config
+## UIN Auth adapter config
 auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
 
-# Proxy otp
+## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
-#---------------------------------------Security Properties-----------------------------
-#CSRF switch
-mosip.security.csrf-enable=false
+## identity schema backward compatability ########
+mosip.ui.spec.default.domain=registration-client
 
-#CORS switch
-mosip.security.cors-enable=false
+#### Required for admin UI ##############
+## this pattern like --> display column : configKey. 
+## We can provide multiple values with ";" separated 
+mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
-#comma separated allowed origins
+## Used to get IAM user details. 
+mosip.kernel.masterdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
+mosip.kernel.masterdata.auth-user-details=/userdetails
+## Security properties
+mosip.security.csrf-enable=false
+mosip.security.cors-enable=false
 mosip.security.origins=localhost:8080
-
-#secure cookie switch
 mosip.security.secure-cookie=false
 
-# ROOT key identifier
+## ROOT key identifier
 mosip.root.key.applicationid=ROOT
 
-# Certificate signing algorithm
+## Certificate signing algorithm
 mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 
-# Default certificate params
+## Default certificate params
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
 mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
 mosip.kernel.keymanager.certificate.default.organization=IITB
@@ -363,7 +325,7 @@ mosip.kernel.keymanager.certificate.default.location=BANGALORE
 mosip.kernel.keymanager.certificate.default.state=KA
 mosip.kernel.keymanager.certificate.default.country=IN
 
-# Zero Knowledge Master & Public Key identifier.
+## Zero Knowledge Master & Public Key identifier.
 mosip.kernel.zkcrypto.masterkey.application.id=KERNEL
 mosip.kernel.zkcrypto.masterkey.reference.id=IDENTITY_CACHE
 mosip.kernel.zkcrypto.publickey.application.id=IDA
@@ -371,18 +333,18 @@ mosip.kernel.zkcrypto.publickey.reference.id=PUBLIC_KEY
 mosip.kernel.zkcrypto.wrap.algorithm-name=AES/ECB/NoPadding
 mosip.kernel.zkcrypto.derive.encrypt.algorithm-name=AES/ECB/PKCS5Padding
 
-# Application Id for PMS master key.
+## Application Id for PMS master key.
 mosip.kernel.partner.sign.masterkey.application.id=PMS
 
 datastores=ldap_1_DS,db_1_DS,db_2_DS
 
-# Partner Management Service allowed partner domains
+## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
-# List of keys to auto generate.
+## List of keys to auto generate.
 mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS
 
-# random keys required for ZK encrypt.
+## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 
 datastores=db_1_DS,db_2_DS
@@ -401,7 +363,8 @@ mosip.syncdata.tpm.required=false
 
 mosip.kernel.registrationclient.app.id=registrationclient
 mosip.kernel.registrationclient.client.id=mosip-reg-client
-mosip.kernel.registrationclient.secret.key={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+# env variable
+mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
 mosip.kernel.authtoken.NEW.internal.url=http://kernel-auth-service/v1/authmanager/authenticate/internal/useridPwd
@@ -422,7 +385,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=http://kernel-syncdata-service/v1/syncdata/websub/callback/cacert
+syncdata.websub.callback.url.ca-cert=${mosip.api.public.url}/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a
@@ -433,3 +396,8 @@ syncdata.websub.resubscription.retry.count=3
 syncdata.websub.resubscription.delay.secs=7200
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000
+
+# Flag to identify the support of no thumbprint in 1.1.3 version. 
+# Added this for backward compatability. default is false, means support is not required.
+# Make it to true if support is required.
+mosip.kernel.keymanager.113nothumbprint.support=false

From 5a035c7d2f62bf4b4604e6c35e75f9059348c66e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 May 2021 11:28:54 +0530
Subject: [PATCH 0040/1358] [MOSIP-12666] Websub properties updated in
 applications.

---
 application-default.properties | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index b523a308645..3f424c666f0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -469,7 +469,9 @@ server.tomcat.accesslog.file-date-format=
 server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}","req.userAgent":"%{User-Agent}i","req.xForwardedFor":"%{X-Forwarded-For}i","req.referer":"%{Referer}i","req.method":"%m","req.remoteHost":"%a"}
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
-#---------------- Web Sub properties -------------------------
-websub.publish.url=http://websub/publish
-#---------------- Web Sub property ----------------------------
+## Websub (internal url)
+websub.base.url=http://websub.websub
+websub.hub.url=${websub.base.url}/websub/hub
+websub.publish.url=${websub.base.url}/websub/publish
+
 packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}

From 9f7e6a007123f2d81bedd403e972462096a26a5c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 May 2021 16:03:07 +0530
Subject: [PATCH 0041/1358] [MOSIP-12666] Service urls updated.

---
 kernel-default.properties | 58 ++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 38 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index b9f95be8185..b4d301b4599 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -4,7 +4,7 @@
 # db.dbuser.password 
 # keycloak.host
 # keycloak.admin.password
-# mosip.mosip.auth.client.secret   (convention: <namespace>.<keycloak client name>)
+# mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
 # mosip.mosip.ida.client.secret
 # mosip.mosip.admin.client.secret
 # mosip.mosip.reg.client.secret
@@ -13,7 +13,7 @@
 
 
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
+mosip.kernel.syncdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -23,7 +23,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=http://kernel-masterdata-service/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-idschema-url=http://masterdata.kernel/v1/masterdata/idschema/latest
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -75,11 +75,11 @@ auth.refreshtoken.header=RefreshToken
 auth.jwt.refresh.expiry=86400000
 auth.primary.language=eng
 
-otp.manager.api.generate=http://kernel-otpmanager-service/v1/otpmanager/otp/generate
-otp.manager.api.verify=http://kernel-otpmanager-service/v1/otpmanager/otp/validate
-otp.sender.api.email.send=http://kernel-notification-service/v1/notifier/email/send
-otp.sender.api.sms.send=http://kernel-notification-service/v1/notifier/sms/send
-masterdata.api.template=http://kernel-masterdata-service/v1/masterdata/templates/
+otp.manager.api.generate=http://otpmanager.kernel/v1/otpmanager/otp/generate
+otp.manager.api.verify=http://otpmanager.kernel/v1/otpmanager/otp/validate
+otp.sender.api.email.send=http://notifier.kernel/v1/notifier/email/send
+otp.sender.api.sms.send=http://notifier.kernel/v1/notifier/sms/send
+masterdata.api.template=http://masterdata.kernel/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
 idrepo.api.getuindetails=http://idrepo-identity-service/idrepository/v1/identity/uin/{uin}
 
@@ -205,25 +205,6 @@ ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
 ridgenerator_database_password=${db.dbuser.password}
 
-iam.datasource.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-iam.datasource.username=iamuser
-iam.datasource.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-iam.datasource.driverClassName=org.postgresql.Driver
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-db_1_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-db_1_DS.datastore.username=iamuser
-db_1_DS.datastore.password=${db.dbuser.password}
-db_1_DS.datastore.driverClassName=org.postgresql.Driver
-db_1_DS.datastore.schema=GOVT_OFFICERS
-
-db_2_DS.datastore.ipaddress=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_iam
-db_2_DS.datastore.username=iamuser
-db_2_DS.datastore.password=${db.dbuser.password}
-db_2_DS.datastore.driverClassName=org.postgresql.Driver
-db_2_DS.datastore.schema=GOVT_OFFICERS
-
-
 ## Keycloak properties
 mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
@@ -273,7 +254,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
+mosip.authmanager.base-url=http://authmanager.kernel/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -284,11 +265,12 @@ mosip.admin_realm_id=mosip
 
 master.search.maximum.rows=50
 mosip.level=2
-mosip.kernel.masterdata.audit-url= http://kernel-auditmanager-service/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url= http://auditmanager.kernel/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
-mosip.kernel.sign-url=http://kernel-keymanager-service/v1/keymanager/sign
+# Keymanager runs in separate namespace "keymanager"
+mosip.kernel.sign-url=http://keymanager.keymanager/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
@@ -306,7 +288,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
@@ -321,7 +303,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -373,7 +355,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=http://kernel-masterdata-service/v1/masterdata/machines/%s/eng
+mosip.kernel.syncdata-service-machine-url=http://masterdata.kernel/v1/masterdata/machines/%s/eng
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments
@@ -385,10 +367,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=http://kernel-auth-service/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=http://kernel-auth-service/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=http://kernel-auth-service/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=http://kernel-auth-service/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=http://authmanager.kernel/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=http://authmanager.kernel/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
@@ -403,7 +385,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/callback/partner/ca_certificate
-syncdata.websub.callback.url.ca-cert=http://kernel-syncdata-service/v1/syncdata/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a

From f64528793bed7de8bf6a720a9b264f045439362f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 May 2021 21:48:16 +0530
Subject: [PATCH 0042/1358] [MOSIP-12666] Updated.

---
 kernel-default.properties           |   2 +-
 pre-registration-default.properties | 349 ++++++++++------------------
 2 files changed, 128 insertions(+), 223 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index b4d301b4599..518ab6430e0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -4,7 +4,7 @@
 # db.dbuser.password 
 # keycloak.host
 # keycloak.admin.password
-# mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
+# mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.ida.client.secret
 # mosip.mosip.admin.client.secret
 # mosip.mosip.reg.client.secret
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 734685ad57f..b95d6cfb2ae 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -1,42 +1,50 @@
-# ------------ Database Connection Properties ------------------
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# preregistration.mosip.prereg.client.secret
+# mosip.api.public.url
+
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
 javax.persistence.jdbc.driver=org.postgresql.Driver
-mosip.database.ip=postgres
-mosip.database.port=80
+mosip.database.ip=postgres-postgresql.postgres.svc.cluster.local
+mosip.database.port=5432
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_prereg?useSSL=false
 javax.persistence.jdbc.user=prereguser
-javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+javax.persistence.jdbc.password=${db.dbuser.password}
 
-# ------------ Hibernate Properties for Database ---------------
+## Hibernate
 hibernate.hbm2ddl.auto=none
 hibernate.show_sql=false
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 
-# ------------ Hickari Logs for Database -----------------------
+## Hickari Logs for Database
 logging.level.com.zaxxer.hikari=DEBUG
 
-
-# ------------ Project Version for the API response ------------ 
+## Project Version for the API response 
 version=1.0
 
-# Not in use, to be removed after verification -----------------
-application.id=pre-registration
-preregistration.preid.regex=[0-9]+
+##Not in use, to be removed after verification -----------------
+#application.id=pre-registration
+#preregistration.preid.regex=[0-9]+
 
 
-# ------------ Age to be an adult ------------------------------
-# Used in UI to identify the applicant type 
+## Age to be an adult
+## Used in UI to identify the applicant type 
 mosip.adult.age=5
 
 
-# ------------ ID Schema Version -------------------------------
-# This version is set in the ID object created in pre-registration
+## ID Schema 
+## This version is set in the ID object created in pre-registration
 mosip.idschema.version=0.1
 
 
-# ------------ Demographic Service -----------------------------
+## Demographic Service 
 demographic.service.version=v1
-demographic.service.env=http://prereg-application-service
+demographic.service.env=http://prereg-application.prereg
 demographic.service.contextpath=preregistration/${demographic.service.version}
 demographic.resource.url=${demographic.service.env}/${demographic.service.contextpath}
 # ID values for application APIs
@@ -57,17 +65,17 @@ mosip.id.preregistration.demographic.update=mosip.pre-registration.demographic.u
 mosip.id.preregistration.demographic.retrieve.date=mosip.pre-registration.demographic.retrieve.date
 
 
-# Not in use, to be removed after verification -----------------
-mosip.pregistration.pagesize=20
-
+# Not in use, to be removed after verification 
+#mosip.pregistration.pagesize=20
 
 
-# ------------ Document Service --------------------------------
+## Document Service
 document.service.version=v1
-document.service.env=http://prereg-application-service
+document.service.env=http://prereg-application.prereg
 document.service.contextpath=preregistration/${document.service.version}
 document.resource.url=${document.service.env}/${document.service.contextpath}
-# ID values for document APIs
+
+## ID values for document APIs
 mosip.preregistration.document.upload.id=mosip.pre-registration.document.upload
 mosip.preregistration.document.copy.id=mosip.pre-registration.document.copy
 mosip.preregistration.document.fetch.metadata.id=mosip.pre-registration.document.fetch.metadata
@@ -78,30 +86,27 @@ mosip.preregistration.document.delete.specific.id=mosip.pre-registration.documen
 mosip.preregistration.document.id.upload=mosip.pre-registration.document.upload
 mosip.preregistration.document.update.docrefId.id=mosip.preregistration.docrefId.update
 
-# ------------ Document Properties -----------------------------
+## Document properties
 # Maximum size of file allowed uploaded in document service API (in mb)
 max.file.size=2
 
 # Not in use, to be removed after verification -----------------
-spring.servlet.multipart.max-file-size=-1
-spring.servlet.multipart.max-request-size=-1
+#spring.servlet.multipart.max-file-size=-1
+#spring.servlet.multipart.max-request-size=-1
 
-# Allowed Formats of Documents
+# Allowed formats for documents
 preregistration.document.extention=PDF,JPEG,PNG,JPG
 
-# Virus Scanner Property 
-# 'true' to enable virus scaning during document upload
-# 'false' to disable virus scanning during document upload
+## Virus scanner 
+## 'true/false' to enable/disable virus scaning during document upload
 mosip.preregistration.document.scan=true
 
-# Object Store Account Name to store documents
+## To store documents
 mosip.kernel.objectstore.account-name=prereg
 
-
-
-# ------------ Booking Service -------------------------------
+## Booking Service
 booking.service.version=v1
-booking.service.env=http://prereg-booking-service
+booking.service.env=http://prereg-booking.prereg
 booking.service.contextpath=preregistration/${booking.service.version}
 booking.resource.url=${booking.service.env}/${booking.service.contextpath}
 appointmentResourse.url=${booking.resource.url}
@@ -120,96 +125,72 @@ mosip.preregistration.booking.exception.id=mosip.preregistration.booking.parse.e
 
 mosip.preregistration.booking.id.book=mosip.pre-registration.booking.book
 
-# ------------ Booking Properties --------------------------------
-
-# Sync happens in every n days 
+## Booking 
+## Sync every n days 
 preregistration.availability.sync=37
-
-# Number of days for which booking slots will be available
+## Number of days for which booking slots will be available
 preregistration.availability.noOfDays=140
-
-# Gap between the date of booking and the first appointment date to be shown
-# Ex: If a user has logged in pre-reg application today then, he can select booking slots after n days
+## Gap between the date of booking and the first appointment date to be shown
+## Ex: If a user has logged in pre-reg application today then, he can select booking slots after n days
 preregistration.booking.offset=2
-
-# Number of hours from the appointment time before which an appicant can change/re-book the appointment
+## Number of hours from the appointment time before which an appicant can change/re-book the appointment
 preregistration.timespan.rebook=24
-
-# Number of hours before the appointment time before which an applicant can cancel an appointment 
+## Number of hours before the appointment time before which an applicant can cancel an appointment 
 preregistration.timespan.cancel=24
 
-# Time Zone 
-# Used for converting the time zones to UTC
+## Time zone. Used for converting the time zones to UTC
 preregistration.country.specific.zoneId=GMT+05:30
 
-
-
-# ------------ Batch Job Service -----------------------------
+## Batch job service
 batch.service.version=v1
-batch.service.env=http://prereg-batchjob-service
+batch.service.env=http://prereg-batchjob.prereg
 batch.service.contextpath=preregistration/${batch.service.version}/batch
 batch.resource.url=${batch.service.env}/${batch.service.contextpath}
-# Id values of batch job service
+## Id values of batch job service
 mosip.preregistration.batchjob.service.consumed.id=mosip.pre-registration.batchjob.service.consumed
 mosip.preregistration.batchjob.service.expired.id=mosip.pre-registration.batchjob.service.expired
 
-
 # Batch Job Service used to fetch token from key cloak
 mosip.batch.token.authmanager.appId=prereg
 mosip.batch.token.authmanager.userName=mosip-prereg-client
-mosip.batch.token.authmanager.password={cipher}f4ba53f63109c6559d882fda0b7e9f16620cbe15604ea83c940af995520905d7
+mosip.batch.token.authmanager.password=${preregistration.mosip.prereg.client.secret}
 mosip.batch.token.authmanager.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}/authenticate/clientidsecretkey
 mosip.batch.token.request.id=
 
-# Determines the Time of the day, batch job should be intiated
+## Determines the Time of the day, batch job should be intiated
 preregistration.job.schedule.cron.consumedStatusJob=0 0 0 * * ?
 preregistration.job.schedule.cron.slotavailability=0 0 0 * * ?
 preregistration.job.schedule.cron.expiredStatusJob=0 0 0 * * ?
-
-#Schema name for batch job table
+## Schema name for batch job table
 spring.batch.tablePrefix=PREREG.BATCH_
-
-#Booking service URL for creating time slots
+## Booking service URL for creating time slots
 bookingAvailablity.url=${booking.resource.url}/appointment/availability/sync
-
-#BatchJob-service URL for updating the consumed status
+##BatchJob-service URL for updating the consumed status
 updateConsumedStatus.url=${batch.resource.url}/consumedStatus
-
 #BatchJob-service URL for updating to expiredStatus
 expiredStatus.url=${batch.resource.url}/expiredStatus
-
 batch.appointment.cancel=${batch.service.env}/preregistration/v1
-#-------------Login Service-----------------------------------
-
 
+## Login service
 secret_url.id=string
 secret_url.requesttime=2018-12-10T06:12:52.994Z
 secret_url.version=string
-
-
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=3
-
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-
-mail-notification.rest.uri=http://kernel-notification-service/v1/notifier/email/send
-sms-notification.rest.uri=http://kernel-notification-service/v1/notifier/sms/send
-
-otp-generate.rest.uri=http://kernel-otpmanager-service/v1/otpmanager/otp/generate
-
+mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
+sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
+otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=pre-reg-login-email-subject-template
 pre.reg.login.otp.mail.content.template=pre-reg-login-email-content-template
-
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-
 mosip.primary-language=eng
-id-masterdata-template-service-multilang.rest.uri=http://kernel-masterdata-service/v1/masterdata/templates/templatetypecodes/{code}
-
+id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
 
-# ------------ Master Data Service ---------------------------
+## Masterdata service
 masterdata.service.version=v1
-masterdata.service.env=http://kernel-masterdata-service
+masterdata.service.env=http://masterdata.kernel
 masterdata.service.contextpath=masterdata
 masterdata.resource.url=${masterdata.service.env}/${masterdata.service.version}/${masterdata.service.contextpath}
 regCenter.url=${masterdata.resource.url}/registrationcenters
@@ -217,133 +198,97 @@ holiday.url=${masterdata.resource.url}/getregistrationcenterholidays/
 holiday.exceptional.url=${masterdata.resource.url}/exceptionalholidays
 working.day.url=${masterdata.resource.url}/workingdays
 mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/{langcode}
-#Kernel Service URL for fetching templates
+##Kernel Service URL for fetching templates
 resource.template.url=${masterdata.resource.url}/templates
 mosip.pre-registration.notification.id=mosip.pre-registration.notification.notify
 
-# Notification Templates for various scenarios
-# Email Template
+## Notification templates for various scenarios
 email.acknowledgement.template=Email-Acknowledgement
-# Email Template Subject
 email.acknowledgement.subject.template=Acknowledgement-email-subject
-# SMS Template
 sms.acknowledgement.template=SMS-Acknowledgement
-# Cancel Appointment Template
 cancel.appoinment.template=cancel-appointment
 
-
-
-# ------------ Notification Service --------------------------
+## Notification service
 notification.service.version=v1
-notification.service.env=http://prereg-application-service
+notification.service.env=http://prereg-application.prereg
 notification.service.contextpath=preregistration/${notification.service.version}
 notification.url=${notification.service.env}/${notification.service.version}/${notification.service.contextpath}/notification
 mosip.pre-registration.notification.id.send=mosip.pre-registration.notification.notify
-# TimeZone to get an Email or SMS Templates
+# TimeZone to get an email or SMS templates
 timeZone=Asia/Calcutta
 
-# ------------ Email Service ---------------------------------
-email.service.env=http://kernel-notification-service
+## Email service 
+email.service.env=http://notifier.kernel
 email.service.contextpath=notifier
 #Kernel Service URL for Sending Emails
 emailResourse.url=${email.service.env}/${masterdata.service.version}/${email.service.contextpath}/email/send
 
-# ------------ SMS Service -----------------------------------
-sms.service.env=http://kernel-notification-service
+## SMS service
+sms.service.env=http://notifier.kernel
 sms.service.contextpath=notifier
-#Kernel Service URL for Sending SMS
+#Kernel service URL for sending SMS
 smsResourse.url=${sms.service.env}/${masterdata.service.version}/${sms.service.contextpath}/sms/send
 
-
-
-# ------------ Audit Service ---------------------------------
-audit.service.env=http://kernel-auditmanager-service
+## Audit service 
+audit.service.env=http://auditmanager.kernel
 audit.service.contextpath=auditmanager
-#Kernel Service URL for Audit logging
 audit.url=${audit.service.env}/${masterdata.service.version}/${audit.service.contextpath}/audits
 
-
-
-# ------------ Crypto Service --------------------------------
-crypto.service.env=http://kernel-keymanager-service
+## Crypto service 
+crypto.service.env=http://keymanager.keymanager
 crypto.service.contextpath=keymanager
-#Kernel Service URL for Encryption and decryption 
+## Kernel Service URL for Encryption and decryption 
 cryptoResource.url=${crypto.service.env}/${masterdata.service.version}/${crypto.service.contextpath}
 
-
-
-# ------------ KeyCloak Properties -----------------------------
-# Both below fields must match with what is there on Keycloak Properties 
+##  KeyCloak 
+## Both below fields must match with what is there on Keycloak properties 
 clientId=mosip-prereg-client
-secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+secretKey=${preregistration.mosip.prereg.client.secret}
 
-# Used for Key Creating KeyCloak Session
+## Used for Key Creating KeyCloak session
 userIdType=USERID
 appId=prereg
 
-
-# ------------ Auth Service ----------------------------------
-kernel.auth.env=http://kernel-auth-service
+## Auth service 
+kernel.auth.env=http://authmanager.kernel
 kernel.auth.contextpath=authmanager
-auth.server.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 
-
-
-# ------------ PRID Service ----------------------------------
-kernel.prid.env=http://kernel-pridgenerator-service
+## PRID service 
+kernel.prid.env=http://pridgenerator.kernel
 kernel.prid.contextpath=pridgenerator
 mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid.contextpath}/prid
 
-
-
-# ------------ Sync Data Service -----------------------------
-# To fetch the latest ID Schema for the ID object validator
-kernel.syncdata.env=http://kernel-syncdata-service
+## Syncdata service
+## To fetch the latest ID Schema for the ID object validator
+kernel.syncdata.env=http://syncdata.kernel
 kernel.syncdata.version=v1/syncdata
 latestidschema.service.contextpath=latestidschema
 mosip.preregistration.id-schema=${kernel.syncdata.env}/${kernel.syncdata.version}/${latestidschema.service.contextpath}
-# API to Fetch the Latest ID Schema
+## API to fetch the latest ID schema
 mosip.preregistration.id-schema=http://kernel-syncdata-service/v1/syncdata/latestidschema
 
-
-
-# ------------ OTP Properties --------------------------------
+## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}
-
-# Channel for Sending OTP on Phone
 otpChannel.mobile=phone
-
-# Channel for Sending OTP on EMAIL
 otpChannel.email=email
-
 secret_url.id=string
 secret_url.requesttime=2018-12-10T06:12:52.994Z
 secret_url.version=string
-
-
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=3
-
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-
 mail-notification.rest.uri=${mosip.base.url}/v1/notifier/email/send
 sms-notification.rest.uri=${mosip.base.url}/v1/notifier/sms/send
-
 otp-generate.rest.uri=${mosip.base.url}/v1/otpmanager/otp/generate
-
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
-
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
-
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-
 mosip.primary-language=eng
-
 id-masterdata-template-service-multilang.rest.uri=${mosip.base.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 
-
-# ----------- Login Service -----------------------------------
+## Login service 
 mosip.preregistration.login.service.version=1.0
 mosip.preregistration.sendotp.id=mosip.pre-registration.login.sendotp
 mosip.preregistration.validateotp.id=mosip.pre-registration.login.useridotp
@@ -351,15 +296,12 @@ mosip.id.preregistration.sendotp=mosip.pre-registration.login.sendotp
 mosip.id.preregistration.validateotp=mosip.pre-registration.login.useridotp
 mosip.preregistration.invalidatetoken.id=mosip.pre-registration.login.invalidate
 mosip.preregistration.config.id=mosip.pre-registration.login.config
-
 mosip.preregistration.login.id.sendotp=mosip.pre-registration.login.sendotp
 mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridotp
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-
-# -----------------------------------------------------------------------------------
-mosip.base.url=${mosipbox.public.url}
+mosip.base.url=${mosip.api.public.url}
 auth-token-generator.rest.issuerUrl=${mosip.base.url}/keycloak/auth/realms/preregistration
 validationStatus=success
 context=auth-otp
@@ -367,7 +309,7 @@ prereg.auth.jwt.secret=Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
 prereg.auth.jwt.token.expiration=3600
 prereg.auth.jwt.token.roles=INDIVIDUAL
 
-# ------------ ID Object Validation Properties -----------------
+## ID object validation
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${masterdata.resource.url}/languages
 mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${masterdata.resource.url}/gendertypes
@@ -377,22 +319,16 @@ mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${masterdata.resour
 mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${masterdata.resource.url}/locations/locationhierarchy/{hierarchyname} 
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode}
 
-# Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
+## Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 
-
-
-# -------------- Configurations File Names ---------------------
-# Global/Application Configuration File Name
+## Configurations file names 
 global.config.file=application-${spring.profiles.active}.properties
-
-# Pre-reg Configuration File Name
 pre.reg.config.file=pre-registration-${spring.profiles.active}.properties
-
-# Mapping file for Pre-registration & ID Object
+## Mapping file for Pre-registration & ID Object
 preregistartion.config.identityjson=pre-registration-identity-mapping.json 
 
-# UI Scheme JSON
+# UI scheme json
 preregistration.demographic.idschema-json-filename=pre-registration-demographic.json
 
 # Verify where it is used
@@ -403,114 +339,83 @@ preregistartion.identity.email=email
 preregistartion.identity.phone=phone
 preregistartion.identity=identity 
 
-
-
-# -------- QR Code Service ------------
+## QR code service
 mosip.pre-registration.qrcode.generate.id=mosip.pre-registration.qrcode.generate
 mosip.pre-registration.qrcode.service.version=1.0
 qrversion=V1
 mosip.pre-registration.qrcode.id.generate=mosip.pre-registration.qrcode.generate
 mosip.id.pre-registration.qrcode.generate: mosip.pre-registration.qrcode.generate
 
-
-
-#--------Data Sync with Registration Client----------
-#id for retrieve all pre-registration ids API
+## Data sync with registration client
 mosip.id.preregistration.datasync.fetch.ids=mosip.pre-registration.datasync.fetch.ids
-#id for storing cosumed pre-registration ids API
+## id for storing consumed pre-registration ids API
 mosip.id.preregistration.datasync.store=mosip.pre-registration.datasync.store
-#id for get preregistration id API
+## id for get preregistration id API
 mosip.id.preregistration.datasync.fetch=mosip.pre-registration.datasync.fetch
 
-
-
-# Verify --------------------------------------------
-#config parameter to define proof of address
+## Verify 
 poa.url=proofOfAddress
-#config parameter to define proof of identity
 poi.url=proofOfIdentity
-#config parameter to define proof of birth
 pod.url=proofOfDateOfBirth
-#config parameter to define proof of relationship
 por.url=proofOfRelationship
 
-
-
-#------------Transliteration Service---------------
-# Determines request & response id of transliteration-service
+## Transliteration service
+## Determines request & response id of transliteration-service
 mosip.pre-registration.transliteration.transliterate.id=mosip.pre-registration.transliteration.transliterate
 mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.transliteration.transliterate
 mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j
 
-
-#------------UI params-----------------------------
-------------to be removed later -------
-mosip.mandatory.languages=ara,fra
-mosip.optional.languages=
-mosip.min.languages.count=2
-mosip.max.languages.count=2
+## UI params
+#------------to be removed later -------
+#mosip.mandatory.languages=ara,fra
+#mosip.optional.languages=
+#mosip.min.languages.count=2
+#mosip.max.languages.count=2
 -------------------------------------------
-# List of keys which UI will consume
+## List of keys which UI will consume
 ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version
-# This config is used for loading recommended centers based on the value of the config. 
-# The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
+## This config is used for loading recommended centers based on the value of the config. 
+## The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 preregistration.recommended.centers.locCode=5
-
-# The Registration centers will be searched based on the distance value from the Geo location identified
+## The Registration centers will be searched based on the distance value from the Geo location identified
 preregistration.nearby.centers=2000
-
-# Determines file upload type allowed in UI
+## Determines file upload type allowed in UI
 preregistration.documentupload.allowed.file.type = application/pdf,image/jpeg,image/png,image/jpg
-
 # Determines the file name length(with extension) allowed in UI
 preregistration.documentupload.allowed.file.nameLength = 50
-
 # Determines maximum size of file allowed uploaded in document service api (in bytes)
 preregistration.documentupload.allowed.file.size = 2000000
-
 # Determines idle condition(in seconds)
 mosip.preregistration.auto.logout.idle=180
-
 # Determines pop up timer(in seconds)
 mosip.preregistration.auto.logout.timeout=60
-
 preregistration.ui.version=1.1.5
-
 # Determines to maintain iternal cycle & make sure value is not null (any value greater than zero)
 mosip.preregistration.auto.logout.ping=30
 
-# Not in use, to be removed after verification -----------------
-# UI Modularity config files (Not used yet)
-# Determines which stages of Pre-Registration can be switched off and switched on
-preregistration.workflow.demographic=true/false
-preregistration.workflow.documentupload=true/false
-preregistration.workflow.booking=true/false 
+## Not in use, to be removed after verification -----------------
+## UI Modularity config files (Not used yet)
+## Determines which stages of Pre-Registration can be switched off and switched on
+#preregistration.workflow.demographic=true/false
+#preregistration.workflow.documentupload=true/false
+#preregistration.workflow.booking=true/false 
 
 mosip.id.validation.identity.dateOfBirth=^\d{4}[\-\/\s]?((((0[13578])|(1[02]))[\-\/\s]?(([0-2][0-9])|(3[01])))|(((0[469])|(11))[\-\/\s]?(([0-2][0-9])|(30)))|(02[\-\/\s]?[0-2][0-9]))$
 
-#------------------ Captcha Service --------------
-# Configuration for google re-captcha
+## Captcha service
+## Configuration for google re-captcha
 google.recaptcha.site.key=sitekey
 google.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
 google.recaptcha.secret.key=secret
 mosip.preregistration.captcha.id.validate = mosip.pre-registration.captcha.id.validate
-# Enable or Disable Captch - true to enable & false to disable
 enable-captcha=false
 
-
-
-#---------- Security Properties -------------------------
-# CSRF Switch
+## Security 
 mosip.security.csrf-enable:false
-
-# CORS Switch
 mosip.security.cors-enable:false
-
 # Comma Separated Allowed Origins
 mosip.security.origins:localhost:8080,localhost:4200
-
-# Secure Cookie Switch
 mosip.security.secure-cookie:false
 
-# for prereg booking notification name validation
+## for prereg booking notification name validation
 preregistration.notification.nameFormat=fullName

From d9bd6d4a6ea5a7746a822e426864b101cacf6515 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 12 May 2021 04:30:18 +0530
Subject: [PATCH 0043/1358] Keycloak params updated.

---
 kernel-default.properties           | 4 ++--
 pre-registration-default.properties | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 518ab6430e0..fc7815c15c7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -226,8 +226,8 @@ keycloak.verify-token-audience=true
 
 mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
 mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index b95d6cfb2ae..9eba7f3ce1c 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -4,6 +4,7 @@
 # db.dbuser.password 
 # preregistration.mosip.prereg.client.secret
 # mosip.api.public.url
+# keycloak.host
 
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
@@ -302,7 +303,8 @@ mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.inva
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
 mosip.base.url=${mosip.api.public.url}
-auth-token-generator.rest.issuerUrl=${mosip.base.url}/keycloak/auth/realms/preregistration
+iam.base.url=${keycloak.host}
+auth-token-generator.rest.issuerUrl=${iam.base.url}/realms/preregistration
 validationStatus=success
 context=auth-otp
 prereg.auth.jwt.secret=Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=

From 00010fcbb7b7843af8febd7928f0785c026f5c3d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 12 May 2021 21:35:52 +0530
Subject: [PATCH 0044/1358] Keycloak paths corrected.

---
 kernel-default.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index fc7815c15c7..a4255630c8e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -209,25 +209,25 @@ ridgenerator_database_password=${db.dbuser.password}
 mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/admin/realms/{realmId}
-mosip.iam.admin-url=${mosip.iam.base-url}/admin/
+mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url=${mosip.iam.base-url}/auth/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${mosip.iam.base-url}
+keycloak.auth-server-url=${mosip.iam.base-url}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 6b5b19fe67a86ad561c924eaa8a58815b2d62f69 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 12 May 2021 21:36:51 +0530
Subject: [PATCH 0045/1358] Keycloak path corrected.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 9eba7f3ce1c..6e86e39c605 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -304,7 +304,7 @@ mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
 mosip.base.url=${mosip.api.public.url}
 iam.base.url=${keycloak.host}
-auth-token-generator.rest.issuerUrl=${iam.base.url}/realms/preregistration
+auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
 validationStatus=success
 context=auth-otp
 prereg.auth.jwt.secret=Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=

From 022af821cfbcd4fb58eea8754549486bddb639da Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 13 May 2021 06:16:45 +0530
Subject: [PATCH 0046/1358] log level changed to debug.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 3f424c666f0..caac2dfd8b7 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -451,8 +451,8 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 # log level
-logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.root=DEBUG
+logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 70f391e6c73199ac1853597ff7686870c814958d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 13 May 2021 06:26:07 +0530
Subject: [PATCH 0047/1358] Log level reverted back to default

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index caac2dfd8b7..3f424c666f0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -451,8 +451,8 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 # log level
-logging.level.root=DEBUG
-logging.level.io.mosip=DEBUG
+logging.level.root=WARN
+logging.level.io.mosip=INFO
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 259322f145967d2ce3457b4350208f07317cece2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 14 May 2021 21:15:46 +0530
Subject: [PATCH 0048/1358] Log level changed to DEBUG.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 3f424c666f0..caac2dfd8b7 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -451,8 +451,8 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 # log level
-logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.root=DEBUG
+logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From c10e55e235d60e6efd3224b506fff7e94e4959e6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 16 May 2021 21:00:43 +0530
Subject: [PATCH 0049/1358] Reverted back log level to default.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index caac2dfd8b7..b7dec5e3b02 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -451,8 +451,8 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 # log level
-logging.level.root=DEBUG
-logging.level.io.mosip=DEBUG
+logging.level.root=WARN
+-logging.level.io.mosip=INFO
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 6fc520b9ed6fabad25534e62f90103c208f88851 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 16 May 2021 21:29:28 +0530
Subject: [PATCH 0050/1358] [MOSIP-14112] Updated for version 1.1.5

---
 pre-registration-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 6e86e39c605..692202a88ea 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -236,10 +236,12 @@ audit.service.contextpath=auditmanager
 audit.url=${audit.service.env}/${masterdata.service.version}/${audit.service.contextpath}/audits
 
 ## Crypto service 
-crypto.service.env=http://keymanager.keymanager
 crypto.service.contextpath=keymanager
 ## Kernel Service URL for Encryption and decryption 
 cryptoResource.url=${crypto.service.env}/${masterdata.service.version}/${crypto.service.contextpath}
+preregistration.crypto.applicationId=PRE_REGISTRATION
+preregistration.crypto.referenceId=INDIVIDUAL
+preregistration.crypto.PrependThumbprint=false
 
 ##  KeyCloak 
 ## Both below fields must match with what is there on Keycloak properties 

From 2b1529dd1896954e3a9459efdbd7758d17b334d4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 16 May 2021 21:32:20 +0530
Subject: [PATCH 0051/1358] Updated for 1.1.5

---
 pre-registration-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 692202a88ea..c97dd22178c 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -236,6 +236,7 @@ audit.service.contextpath=auditmanager
 audit.url=${audit.service.env}/${masterdata.service.version}/${audit.service.contextpath}/audits
 
 ## Crypto service 
+crypto.service.env=http://keymanager.keymanager
 crypto.service.contextpath=keymanager
 ## Kernel Service URL for Encryption and decryption 
 cryptoResource.url=${crypto.service.env}/${masterdata.service.version}/${crypto.service.contextpath}

From 60639bf97db3a6efb1fdaeb84797c3af4342a2c6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 17 May 2021 10:12:15 +0530
Subject: [PATCH 0052/1358] [MOSIP-14151] Admin properties updated.

---
 admin-default.properties | 92 +++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 1264ab78979..0aaaa05f500 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -1,11 +1,18 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# keycloak.host
+# mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.api.public.url
+
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
 mosip.kernel.database.hostname=postgres
 mosip.kernel.database.port=80
 
-#----------------------------------------------ACCOUNTMANAGEMENT------------------------------------------------#
-
-authmanager.base.url=http://kernel-auth-service/v1/authmanager
+## Account management
+authmanager.base.url=http://authmanager.kernel/v1/authmanager
 mosip.admin.accountmgmt.auth-manager-base-uri=${authmanager.base.url}
 mosip.admin.accountmgmt.user-name-url=/username/
 mosip.admin.accountmgmt.user-detail-url=/userdetail/
@@ -14,21 +21,17 @@ mosip.admin.accountmgmt.change-passoword-url=/changepassword/
 mosip.admin.accountmgmt.reset-password-url=/resetpassword/
 mosip.admin.app-id=admin
 
-#---------------------------------------------------------------------------------------------------------------#
-
-mosip.kernel.signature.cryptomanager-encrypt-url=http://kernel-keymanager-service/v1/keymanager/private/encrypt
+mosip.kernel.signature.cryptomanager-encrypt-url=http://keymanager.keymanager/v1/keymanager/private/encrypt
 auth.server.validate.url=${authmanager.base.url}/authorize/admin/validateToken
 auth.server.refreshToken.url=${authmanager.base.url}/authorize/admin/refreshToken
 auth.role.prefix=ROLE_
 auth.header.name=Authorization
 
-#------------------------------------DB PROPERTIES-------------------------------------------------------------#
-
+## Databases
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
 javax.persistence.jdbc.user=masteruser
-javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
+javax.persistence.jdbc.password=${db.dbuser.password}
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.hbm2ddl.auto=none
@@ -40,18 +43,16 @@ hibernate.cache.use_query_cache=false
 hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
-#---------------------------UserRegistration---------------------------------
-
+## Use registration
 auth.server.user-register-url=${authmanager.base.url}/user
-mosip.kernel.emailnotifier-url=http://kernel-notification-service/v1/notifier/email/send
+mosip.kernel.emailnotifier-url=http://notifier.kernel/v1/notifier/email/send
 auth.server.sendotp-url=${authmanager.base.url}/authenticate/sendotp
 auth.server.user-add-password-url=${authmanager.base.url}/user/addpassword
 mosip.admin-appid=admin
 mosip.admin-otp-context=auth-otp
 mosip.admin-userid-otp-type=USERID 
 
-#---------------------------Security Policy---------------------------------
-
+## Security policy
 mosip.admin.security.policy.auth-types=bio,nonbio
 mosip.admin.security.policy.bio=finger,iris,face
 mosip.admin.security.policy.nonbio=otp,password
@@ -62,7 +63,7 @@ mosip.admin.security.policy.type3=otp
 mosip.admin.security.policy.role-policy-mapping={ZONAL_ADMIN:'type2',ZONAL_APPROVER:'type1',CENTRAL_ADMIN:'type1',CENTRAL_APPROVER:'type1',REGISTRATION_OFFICER:'type1',REGISTRATION_SUPERVISOR:'type1',REGISTRATION_OPERATOR:'type1'}
 mosip.admin.security.policy.userrole-auth-url=${authmanager.base.url}/role/{appId}/{username}
 
-#---------------------------Masterdata Cards---------------------------------
+## Masterdata cards
 
 mosip.admin.masterdata.lang-code=eng,ara,fra
 
@@ -136,87 +137,74 @@ mosip.admin.masterdata.card.document-category-eng=Document Category
 mosip.admin.masterdata.card.document-category-fra=Catégorie de document
 mosip.admin.masterdata.card.document-category-ara=\u0641\u0626\u0629 \u0627\u0644\u0648\u062B\u064A\u0642\u0629
 
-#masteradata holidays
+## masteradata holidays
 mosip.admin.masterdata.card.holidays-eng=Holidays
 mosip.admin.masterdata.card.holidays-fra=Vacances
 mosip.admin.masterdata.card.holidays-ara=\u0627\u0644\u0639\u0637\u0644
 
-#masterdata locations
+## masterdata locations
 mosip.admin.masterdata.card.locations-eng=Locations
 mosip.admin.masterdata.card.locations-fra=Emplacements
 mosip.admin.masterdata.card.locations-ara=\u0645\u0648\u0627\u0642\u0639
 
-#masterdata template
+## masterdata template
 mosip.admin.masterdata.card.templates-eng=Templates
 mosip.admin.masterdata.card.templates-fra=Modèles
 mosip.admin.masterdata.card.templates-ara=\u0642\u0648\u0627\u0644\u0628
 
-#masterdata valid document
+## masterdata valid document
 mosip.admin.masterdata.card.valid-document-eng=Valid Documents
 mosip.admin.masterdata.card.valid-document-fra=Documents valides
 mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u0635\u0627\u0644\u062D\u0629
 
-#-----------------UINActive/Deactive--------------------------------- 
-
-mosip.admin.uinmgmt.uin-detail-search=http://idrepo-identity-service/v1/identity/uin/{uin}
-mosip.kernel.packet-status-update-url=http://regproc-registration-transaction-service/registrationprocessor/v1/registrationtransaction/search
-mosip.kernel.packet-reciever-api-url=http://dmz.ingress:30080/registrationprocessor/v1/packetreceiver/registrationpackets
-
-mosip.kernel.zone-validation-url=http://kernel-masterdata-service/v1/masterdata/zones/authorize
+## UIN activate/deactivate
+mosip.admin.uinmgmt.uin-detail-search=http://identity.idrepo/v1/identity/uin/{uin}
+mosip.kernel.packet-status-update-url=http://registration-transaction.regproc/registrationprocessor/v1/registrationtransaction/search
+mosip.kernel.packet-reciever-api-url=http://packet-receiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
+mosip.kernel.zone-validation-url=http://masterdata.kernel/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
-mosip.kernel.audit.manager.api=http://kernel-auditmanager-service/v1/auditmanager/audits
-mosip.kernel.masterdata.audit-url=http://kernel-auditmanager-service/v1/auditmanager/audits
-
------------
+mosip.kernel.audit.manager.api=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
 
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
-mosip.open-id.base-url=${keycloak.external.url} 
-mosip.admin-services.audit.manager.api=http://kernel-auditmanager-service/v1/auditmanager/audits
+mosip.open-id.base-url=${keycloak.host}
+mosip.admin-services.audit.manager.api=http://auditmanager.kernel/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
-mosip.admin-services.open-id.clientid=mosip-admin-services-client
-mosip.admin-services.open-id.clientsecret={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+mosip.admin-services.open-id.clientid=mosip-admin-client
+mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
-# mosipbox.public.url is Ansible defined
-mosip.admin-services.redirecturi=${mosipbox.public.url}/v1/admin/login-redirect/
+# TODO: Admin should have internal access. Change this to internal URL later.
+mosip.admin-services.redirecturi=${mosip.api.public.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=cls
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.admin-services.open-id.token_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
-#--------------------------------------------------------------------------------------
 mosip.ui.spec.default.domain=registration-client
 
-#---------------------------------------Security Properties-----------------------------
-
-#CSRF switch
+## Security
 mosip.security.csrf-enable=false
-
-#CORS switch
 mosip.security.cors-enable=false
-
-#comma separated allowed origins
 mosip.security.origins=localhost:8080
-
-#secure cookie switch
 mosip.security.secure-cookie=false
 
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
-mosip.iam.module.clientsecret={cipher}29ab73abaca4b954df11ce802dbf92258da2456117ba901b96ff5d51185c3aa1
-mosip.iam.module.redirecturi=${mosipbox.public.url}/v1/admin/login-redirect/
+mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.module.redirecturi=${mosip.api.public.url}/v1/admin/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${mosipbox.public.url}/keycloak/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${mosipbox.public.url}/keycloak/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
-regproc.token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
 KEYBASEDTOKENAPI=${authmanager.base.url}/authenticate/clientidsecretkey

From d6cdb823d32b95ad03f95f8f089fef4e3f987de4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 17 May 2021 11:46:21 +0530
Subject: [PATCH 0053/1358] Admin properties updated.

---
 admin-default.properties | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 0aaaa05f500..b2ec2cdc0d6 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -8,8 +8,11 @@
 
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
-mosip.kernel.database.hostname=postgres
-mosip.kernel.database.port=80
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.kernel.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.kernel.database.port=5432
 
 ## Account management
 authmanager.base.url=http://authmanager.kernel/v1/authmanager

From beb556e72a91c76dc43d6823512bb00e5c2b0c32 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 20 May 2021 05:22:32 +0530
Subject: [PATCH 0054/1358] Admin properties updated.

---
 admin-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index b2ec2cdc0d6..363045713b9 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -4,7 +4,7 @@
 # db.dbuser.password 
 # keycloak.host
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
-# mosip.api.public.url
+# mosip.api.internal.url
 
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
@@ -179,7 +179,7 @@ mosip.admin-services.open-id.clientid=mosip-admin-client
 mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
 # TODO: Admin should have internal access. Change this to internal URL later.
-mosip.admin-services.redirecturi=${mosip.api.public.url}/v1/admin/login-redirect/
+mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=cls
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
@@ -198,7 +198,7 @@ mosip.security.secure-cookie=false
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
 mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.module.redirecturi=${mosip.api.public.url}/v1/admin/login-redirect/
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth

From f19fad3d1549d1c16066c6f09f86ff821b957f10 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 20 May 2021 06:26:21 +0530
Subject: [PATCH 0055/1358] Admin properties udpated.

---
 admin-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-default.properties b/admin-default.properties
index 363045713b9..a5bc3ad22a3 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -4,6 +4,7 @@
 # db.dbuser.password 
 # keycloak.host
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.mosip.regproc.client.secret
 # mosip.api.internal.url
 
 mosip.admin.version-id=v1.0

From 8911a0dd3dda28280b44d0b42b908da5dbfc0558 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 20 May 2021 12:27:16 +0530
Subject: [PATCH 0056/1358] Admin property updated.

---
 admin-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index a5bc3ad22a3..31b828521d9 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -200,7 +200,8 @@ mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
 mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
-mosip.iam.module.login_flow.scope=cls
+#mosip.iam.module.login_flow.scope=cls
+mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip

From 68ea27273ebdc982bae621b340d6f69c3c29ae4d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 20 May 2021 12:27:58 +0530
Subject: [PATCH 0057/1358] Updated.

---
 admin-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 31b828521d9..3a72cf49c85 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -181,7 +181,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
 # TODO: Admin should have internal access. Change this to internal URL later.
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
-mosip.admin-services.open-id.login_flow.scope=cls
+#mosip.admin-services.open-id.login_flow.scope=cls
+mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.admin-services.open-id.token_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/token

From 0f2538e94f3018ea778b23519cbb0feb5027d124 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 20 May 2021 18:42:47 +0530
Subject: [PATCH 0058/1358] Updated.

---
 application-default.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index b7dec5e3b02..f0a827f00a4 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -7,7 +7,7 @@ aplication.configuration.level.version=1.1.4
 mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable=NA
 
 # Masterdata apis used to retreive data for IdObjectReferenceValidator
-mosip.masterdata.base.url = http://kernel-masterdata-service
+mosip.masterdata.base.url = http://masterdata.kernel
 
 # Commenting/removing below property will disable all masterdata validations as supported languages are required for all other validations
 mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
@@ -222,7 +222,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 
 #------------------------Auth-Adapter-----------------------------------------------
-auth.server.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth-token-generator.rest.issuerUrl=${iam.url}/auth/realms/mosip
 
 #----------------------- Crypto --------------------------------------------------
@@ -255,7 +255,7 @@ mosip.kernel.crypto.hash-iteration=100000
 #Sign algo name
 mosip.kernel.crypto.sign-algorithm-name=RS256
 
-mosip.keymanager.base.url=http://kernel-keymanager-service
+mosip.keymanager.base.url=http://keymanager.keymanager
 mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
 mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
 mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
@@ -356,7 +356,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 mosip.min-digit-longitude-latitude=4
 mosip.kernel.filtervalue.max_columns=20
 
-auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 
 #------------------PDF Genration-----------------------------------------
 mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
@@ -443,7 +443,7 @@ CRYPTOMANAGER_DECRYPT=${mosip.keymanager.base.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.keymanager.base.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.masterdata.base.url}/v1/masterdata/idschema/latest
 KEYMANAGER_SIGN=${mosip.keymanager.base.url}/v1/keymanager/sign
-AUDIT_URL=http://kernel-auditmanager-service/v1/auditmanager/audits
+AUDIT_URL=http://auditmanager.kernel/v1/auditmanager/audits
 packet.default.source=id
 schema.default.fieldCategory=pvt,none
 

From 8e851eb7b6d7af5f7467e1eb6053f369a803df7d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 24 May 2021 06:46:17 +0530
Subject: [PATCH 0059/1358] Cleaned up. Langauages changed to two (from three).

---
 application-default.properties | 294 ++++++++++-----------------------
 1 file changed, 90 insertions(+), 204 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index f0a827f00a4..0e441f64dad 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -1,28 +1,18 @@
-
-#---------------------------------------Common properties-----------------------
 aplication.configuration.level.version=1.1.4
 
-#---------------------------------------IdObjetReferenceValidator Properties-----------------------#
-# Value used in IdObjectReferenceValidator when location is not available
+## Idobject validator
 mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable=NA
-
-# Masterdata apis used to retreive data for IdObjectReferenceValidator
 mosip.masterdata.base.url = http://masterdata.kernel
-
 # Commenting/removing below property will disable all masterdata validations as supported languages are required for all other validations
 mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
-
 # commenting/removing below property will disable Gender masterdata validation
 mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
-
 # commenting/removing below properties will disable Document Type masterdata validation
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
-
 # commenting/removing below properties will disable location and location hierarchy masterdata validations
 mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
-
 # commenting/removing below properties will disable individualtype/resident status masterdata validations
 mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
 
@@ -39,8 +29,7 @@ mosip.kernel.idobjectvalidator.locationhierarchy.mapping.5=postalCode
 # Date format expected in identity json. commenting/removing below property will disable dob format validation in identity json.
 mosip.kernel.idobjectvalidator.date-format=uuuu/MM/dd
 
-# --------- Properties that needs to be updated when Identity Schema has been updated ---------------#
-# Mandatory attributes used by IdObjectSchemaValidator. These values needs to be updated when Identity schema is updated.
+## Properties that need to be updated when Identity Schema has been updated
 mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone
 mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.update-uin=IDSchemaVersion,UIN
 mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
@@ -52,22 +41,22 @@ mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registra
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.other=IDSchemaVersion,UIN
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.lost=IDSchemaVersion
 
-# Bio attribute allowed to be stored in IDRepo as per Identity Schema
+## Bio attribute allowed to be stored in IDRepo as per Identity Schema
 mosip.idrepo.identity.allowedBioAttributes=individualBiometrics
 
-# List of all bio attriutes defined in Identity Schema
+## List of all bio attriutes defined in Identity Schema
 mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometrics
-#----------------------------------------------------------------------------------------------------#
-
-mosip.country.code=MOR
 
-# Language Supported By Platform - ISO 
-mosip.supported-languages=eng,ara,fra
+mosip.country.code=CON
 
+## Language supported by platform
+mosip.supported-languages=eng,fra
 mosip.primary-language=eng
-mosip.secondary-language=ara
+mosip.secondary-language=fra
+#mosip.right_to_left_orientation=ara
+mosip.left_to_right_orientation=eng,fra
 
-# Application IDs
+## Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
 mosip.reg.app-id=REGISTRATION
 mosip.regproc.app-id=REGISTRATION_PROCESSOR
@@ -75,186 +64,127 @@ mosip.ida.app-id=IDA
 mosip.ida.ref-id=INTERNAL
 mosip.idrepo.app-id=ID_REPO
 
-# UTC ISO Date Time Pattern
 mosip.utc-datetime-pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.sign.header=response-signature
 mosip.signed.response.header=response-signature
 
-#----------------------- CBEFF Util--------------------------------------------------
+## CBEFF util
 # Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
 mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 # Cbeff XSD file name in config server
 mosip.kernel.xsdfile=mosip-cbeff.xsd
 
-#----------------------------- Applicant Type --------------------------------------------------
+## Applicant type
 mosip.kernel.applicant.type.age.limit = 5
 mosip.kernel.applicantType.mvel.file=applicanttype.mvel
 mosip.kernel.config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-#----------------------------- Static PIN --------------------------------------------------
-mosip.kernel.pin.length=6
 
-#-----------------------------TspId -----------------------------------------------
-#length of the Tsp id
+## Various length parameters
+mosip.kernel.pin.length=6
 mosip.kernel.tspid.length=4
-
-#-----------------------------partnerId -----------------------------------------------
-#length of the partner id
 mosip.kernel.partnerid.length=4
-
-#-----------------------------TOKEN-ID Properties---------------------------------
-#length of the token id
 mosip.kernel.tokenid.length=36
-
-#-----------------------------Registration Center Id -----------------------------------------------
-#length of the registration center id
 mosip.kernel.registrationcenterid.length=5
-
-#-----------------------------Machine Id -----------------------------------------------
-#length of the machine id
 mosip.kernel.machineid.length=5
 
-#-----------------------------RID Properties---------------------------------------
-# length of the rid
+## RID
 mosip.kernel.rid.length=29
-# length of the timestamp
 mosip.kernel.rid.timestamp-length=14
-# rid sequence max digits
 mosip.kernel.rid.sequence-length=5
 
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-mosip.kernel.tokenid.sequence-limit=3
-
-#-----------------------------PRID Properties------------------------------------
-#prid-length
+## PRID
 mosip.kernel.prid.length=14
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-#to disable validation assign zero or negative value
+## Upper bound of number of digits in sequence allowed in id. For example if
+## limit is 3, then 12 is allowed but 123 is not allowed in id (in both
+## ascending and descending order)
+mosip.kernel.tokenid.sequence-limit=3
+## Upper bound of number of digits in sequence allowed in id. For example if
+## limit is 3, then 12 is allowed but 123 is not allowed in id (in both
+## ascending and descending order)
+## to disable validation assign zero or negative value
 mosip.kernel.prid.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-#to disable validation assign zero or negative value
+## Number of digits in repeating block allowed in id. For example if limit is 2,
+## then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
+## to disable validation assign zero or negative value
 mosip.kernel.prid.repeating-block-limit=3
-
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit) to disable validation assign zero or negative value
+## Lower bound of number of digits allowed in between two repeating digits in
+## id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit) to disable validation assign zero or negative value
 mosip.kernel.prid.repeating-limit=2
-
-# list of number that id should not be start with to disable null
+## list of number that id should not be start with to disable null
 mosip.kernel.prid.not-start-with=0,1
-
-#restricted numbers for prid
+## restricted numbers for prid
 mosip.kernel.prid.restricted-numbers=786,666
 
-
-#-----------------------------VID Properties--------------------------------------
-# length of the vid
+## VID
 mosip.kernel.vid.length=16
-
 # Upper bound of number of digits in sequence allowed in id. For example if
 # limit is 3, then 12 is allowed but 123 is not allowed in id (in both
 # ascending and descending order)
 # to disable sequence limit validation assign 0 or negative value
 mosip.kernel.vid.length.sequence-limit=3
-
 # Number of digits in repeating block allowed in id. For example if limit is 2,
 # then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
 # to disable repeating block validation assign 0 or negative value
 mosip.kernel.vid.length.repeating-block-limit=2
-
-
 # Lower bound of number of digits allowed in between two repeating digits in
 # id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
 # to disable repeating limit validation, assign 0  or negative value
 mosip.kernel.vid.length.repeating-limit=2
-
-# list of number that id should not be start with
-# to disable null
+# list of number that id should not be start with to disable null
 mosip.kernel.vid.not-start-with=0,1
-
-#restricted numbers for vid
 mosip.kernel.vid.restricted-numbers=786,666
 
-#-----------------------------UIN Properties--------------------------------------
-#length of the uin
+## UIN
 mosip.kernel.uin.length=10
-#minimum threshold of unused uin
 mosip.kernel.uin.min-unused-threshold=200000
-#number of uins to generate
 mosip.kernel.uin.uins-to-generate=500000
-#restricted numbers for uin
 mosip.kernel.uin.restricted-numbers=786,666
-
 # Upper bound of number of digits in sequence allowed in id. For example if
 # limit is 3, then 12 is allowed but 123 is not allowed in id (in both
 # ascending and descending order)
 # to disable sequence limit validation assign 0 or negative value
 mosip.kernel.uin.length.sequence-limit=3
-
 # Number of digits in repeating block allowed in id. For example if limit is 2,
 # then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
 #to disable validation assign zero or negative value
 mosip.kernel.uin.length.repeating-block-limit=2
-
 # Lower bound of number of digits allowed in between two repeating digits in
 # id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
 # to disable repeating limit validation, assign 0  or negative value
 mosip.kernel.uin.length.repeating-limit=2
-
 #reverse group digit limit for uin filter
 mosip.kernel.uin.length.reverse-digits-limit=5
-
 #group digit limit for uin filter
 mosip.kernel.uin.length.digits-limit=5
-
 #should not start with
 mosip.kernel.uin.not-start-with=0,1
-
 #adjacent even digit limit for uin filter
 mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 
-
-#------------------------Auth-Adapter-----------------------------------------------
+## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth-token-generator.rest.issuerUrl=${iam.url}/auth/realms/mosip
+#iam adapter
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.kernel.auth.adapter.ssl-bypass=true
+mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
 
-#----------------------- Crypto --------------------------------------------------
-#Crypto asymmetric algorithm name
+## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
-#Crypto symmetric algorithm name
 mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
-#Keygenerator asymmetric algorithm name
 mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Keygenerator symmetric algorithm name
 mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-#Asymmetric algorithm key length
 mosip.kernel.keygenerator.asymmetric-key-length=2048
-#Symmetric algorithm key length
 mosip.kernel.keygenerator.symmetric-key-length=256
-#Keygenerator symmetric algorithm name
 mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-# keygenerator asymmetric algorithm name
 mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Encrypted data and encrypted symmetric key separator
 mosip.kernel.data-key-splitter=#KEY_SPLITTER#
-#GCM tag length
 mosip.kernel.crypto.gcm-tag-length=128
-#Hash algo name
 mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
-#Symmtric key length used in hash
 mosip.kernel.crypto.hash-symmetric-key-length=256
-#No of iterations in hash
 mosip.kernel.crypto.hash-iteration=100000
-#Sign algo name
 mosip.kernel.crypto.sign-algorithm-name=RS256
-
 mosip.keymanager.base.url=http://keymanager.keymanager
 mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
 mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
@@ -268,128 +198,91 @@ mosip.kernel.cryptomanager.request_version=v1.0
 mosip.kernel.signature.signature-request-id=SIGNATURE.REQUEST
 mosip.kernel.signature.signature-version-id=v1.0
 
-
-
-#----------------------------------ID Repo------------------------------------------
+## ID repo
 mosip.idrepo.identity.uin-status.registered=ACTIVATED
 mosip.idrepo.identity.uin-status=ACTIVATED,BLOCKED,DEACTIVATED
 
-#---------------------------------------otp manager service-------------------------------
-#the default length for otp(in number)
+## OTP manager
 mosip.kernel.otp.default-length=6
-#the default crypto function
-#It can be: HmacSHA512, HmacSHA256, HmacSHA1.
+## Default crypto function: HmacSHA512, HmacSHA256, HmacSHA1.
 mosip.kernel.otp.mac-algorithm=HmacSHA512
-#the OTP expires after the given time(in seconds).
+## OTP expires after the given time (in seconds).
 mosip.kernel.otp.expiry-time=180
-#the key is freezed for the given time(in seconds).
+## Key is frozen for the given time (in seconds).
 mosip.kernel.otp.key-freeze-time=1800
-#the number of validation attempts allowed(in number).
-#mosip.kernel.otp.validation-attempt-threshold =3 means , the validation and generation will be blocked from 4th time.
+## Number of validation attempts allowed.
+## mosip.kernel.otp.validation-attempt-threshold =3 means , the validation and generation will be blocked from 4th time.
 mosip.kernel.otp.validation-attempt-threshold=10
-#minimum length of key(in number).
 mosip.kernel.otp.min-key-length=3
-#maximum length of key(in number).
 mosip.kernel.otp.max-key-length=64
 
-
-#--------------------------------------Licensekeymanager  Service--------------------------------------
-#the license key length.
+## Licence key manager
 mosip.kernel.licensekey.length=16
-#List of permissions
-# NOTE: ',' in the below list is used as splitter in the implementation. 
-# Use of ',' in the values for below key should be avoided.
-# Use of spaces before and after ',' also should be avoided.
+# List of permissions
+## NOTE: ',' in the below list is used as splitter in the implementation. 
+## Use of ',' in the values for below key should be avoided.
+## Use of spaces before and after ',' also should be avoided.
 mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authentication - Identity Data Match,Demo Authentication - Address Data Match,Demo Authentication - Full Address Data Match,Demo Authentication - Secondary Language Match,Biometric Authentication - FMR Data Match,Biometric Authentication - IIR Data Match,Biometric Authentication - FID Data Match,Static Pin Authentication,eKYC - limited,eKYC - Full,eKYC - No
 
-
-
-#-----------------------------Virus Scanner--------------------------------------
-# Here we specify the Kubernetes service name, as clamav runs in the same cluster
-mosip.kernel.virus-scanner.host=clamav 
+## Virus scanner
+# Here we specify the Kubernetes service name if clamav runs inside cluster
+mosip.kernel.virus-scanner.host=clamav.clamav 
 mosip.kernel.virus-scanner.port=80
 
-#-------------------------------FS Adapter- HDFS -------------------------------
-mosip.kernel.fsadapter.hdfs.name-node-url=hdfs://hadoop-hdfs-nn:9000
-mosip.kernel.fsadapter.hdfs.authentication-enabled=false
-# If HDFS is security is configured with Kerberos, Key Distribution Center domain
-mosip.kernel.fsadapter.hdfs.kdc-domain=HDFSKERBEROS1.SOUTHINDIA.CLOUDAPP.AZURE.COM
-# HDFS log level. Change this to debug to see hdfs logs
-logging.level.org.apache.hadoop=warn
-mosip.kernel.fsadapter.hdfs.keytab-file=classpath:mosip.keytab
-
-
-
-#------------------------Transliteration-----------------------------------------------
+## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
 mosip.kernel.transliteration.franch-language-code=fra
 
-
-
-#-------Registration processor Notification types------------
-mosip.registration.processor.notification.types=EMAIL
-
-
+## DOB
 mosip.default.dob.month=01
 mosip.default.dob.day=01
 mosip.login.mode= email,mobile
 
-
-#---Language orientation-----
-mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng,fra
-
-
-#**************** Notification Type *************
+## Notification
+mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
 mosip.kernel.sms.proxy-sms=true
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true
-#******** Notification lanugage types - either PRIMARY or BOTH ********
+## Notification lanugage types: either PRIMARY or BOTH 
 mosip.notification.language-type=BOTH
 
-
-#-------------------System---------------
+## System 
 logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 
-#-------------------Admin---------------
+## Admin
 mosip.min-digit-longitude-latitude=4
 mosip.kernel.filtervalue.max_columns=20
-
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 
-#------------------PDF Genration-----------------------------------------
+## PDF generation. TODO: this password must be passed as config server env variable
 mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-#------------------Quality Check-----------------------------------------
-#Quality threshold for applicant iris
+
+## Quality check treshold
 mosip.iris_threshold=0
-#Quality threshold for applicant leftslap fingerprint
 mosip.leftslap_fingerprint_threshold=0
-#Quality threshold for applicant rightslap fingerprint
 mosip.rightslap_fingerprint_threshold=0
-#Quality threshold for applicant thumbs fingerprint
 mosip.thumbs_fingerprint_threshold=0
-#Quality threshold for applicant face
 mosip.facequalitythreshold=0
-#Bio SDK Integration
+
+## Bio SDK Integration
 mosip.fingerprint.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
 mosip.face.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
 mosip.iris.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
 
-#-------UIN Alias-------------------
+## UIN alias
 mosip.uin.alias=
 
-#---------------------------------kernel Salt Generator---------------------------------------------------#
+## Kernel salt generator
 mosip.kernel.salt-generator.chunk-size=10
 mosip.kernel.salt-generator.start-sequence=0
 mosip.kernel.salt-generator.end-sequence=999
-#----------------------------------------------------------------------------------------------------------#
+
+## HTTP 
 server.max-http-header-size=10000000
 
-mosip.kernel.auth.adapter.ssl-bypass=true
-mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
 
-#---------------------------------prometheus : Metrics related configurations---------------------------------------------------#
+## Prometheus
 management.endpoint.metrics.enabled=true
 management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
@@ -399,41 +292,39 @@ mosip.kernel.syncdata-service-idschema-url=${mosip.masterdata.base.url}/v1/maste
 mosip.kernel.syncdata-service-dynamicfield-url=${mosip.masterdata.base.url}/v1/masterdata/dynamicfields
 mosip.kernel.keymanager-service-validate-url=${mosip.keymanager.base.url}/v1/keymanager/validate
 
-# ------------ GPS settings ---------
-
+## GPS
 mosip.registration.gps_device_enable_flag=n
 
-
-# ------------- Packet manager ----------------------
-# if source is not passed, packetmanager supports below default strategy -
-# 1. 'exception' : it will throw exception.
-# 2.  'defaultPriority' : use default priority packetmanager.default.priority.
+## Packet manager
+## if source is not passed, packetmanager supports below default strategy -
+## 1. 'exception' : it will throw exception.
+## 2.  'defaultPriority' : use default priority packetmanager.default.priority.
 packetmanager.default.read.strategy=defaultPriority
 packetmanager.default.priority=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-
+packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
 mosip.commons.packetnames=id,evidence,optional
-# reader
 provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
 provider.packetreader.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketReaderImpl
-# writer
 provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|CORRECTION,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
-# can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
+## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
 objectstore.crypto.name=OnlinePacketCryptoServiceImpl
 default.provider.version=v1.0
-# posix adapter config
+## posix adapter config
 object.store.base.location=/home/mosip
 hazelcast.config=classpath:hazelcast-default.xml
-#-------------S3adapter-------------------
-# s3 adapter config
+
+
+## S3 object store adapter. TODO: ciphers here must be passed as config-server env variables.
 object.store.s3.accesskey=admin
 object.store.s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
-object.store.s3.url=http://minio:9000
+## Below url assumes minio is running in the cluster itself.
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=
 object.store.s3.readlimit=10000000
 
-# swift adapter config
+## Swift
 object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
@@ -447,19 +338,16 @@ AUDIT_URL=http://auditmanager.kernel/v1/auditmanager/audits
 packet.default.source=id
 schema.default.fieldCategory=pvt,none
 
-# device registration/deregistration config
+## Device registration/deregistration config
 mosip.stage.environment=Developer
 
-# log level
+## Log level
 logging.level.root=WARN
 -logging.level.io.mosip=INFO
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
-#iam adapter
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
-
-# tomcat access logs
+## Tomcat access logs
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.directory=/dev
 server.tomcat.accesslog.prefix=stdout
@@ -473,5 +361,3 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.base.url=http://websub.websub
 websub.hub.url=${websub.base.url}/websub/hub
 websub.publish.url=${websub.base.url}/websub/publish
-
-packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}

From f87f910e9165bff0db1450b63e6fca7377390cdd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 24 May 2021 13:33:41 +0530
Subject: [PATCH 0060/1358] [MOSIP-14376] Regproc properties updated.

---
 registration-processor-default.properties | 116 ++++++++++++----------
 1 file changed, 65 insertions(+), 51 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 781efc20d82..e002b1db4f8 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -1,11 +1,17 @@
-dmz.ingress.base.url=http://dmz.ingress:30080
+
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# mosip.mosip.regproc.client.secret
+# mosip.api.internal.url
+# keycloak.host
 
 ## Health check
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=info,health,refresh
 
 ## ABIS 
-
 # Maximum abis records to be fetched at a time
 registration.processor.abis.maxResults=30
 # Dummy Tag for face in cbeff file
@@ -16,12 +22,15 @@ activemq.message.format=text
 registration.processor.bio.dedupe.reprocess.buffer.time=900
 
 ## Database
-mosip.registration.processor.database.hostname=postgres
-mosip.registration.processor.database.port=80
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.registration.processor.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.registration.processor.database.port=5432
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
 javax.persistence.jdbc.user=regprcuser
-javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+javax.persistence.jdbc.password=${db.dbuser.password}
 
 ## Hibernate
 hibernate.hbm2ddl.auto=none
@@ -41,7 +50,8 @@ schema.default.fieldCategory=pvt,none
 # The IDSchemaVersion used to create packets in reg-proc
 IDSchema.Version=0.1
 # Url from where packets need to be picked up DMZ (landing zone)
-NGINXURL=${dmz.ingress.base.url}/registrationprocessor/v1/dmzpacketserver
+## TODO: correct this
+NGINXURL=${dmz.ingress.base.url}/registrationprocessor/v1/packetserver
 packet.info.storage.service=*
 
 ## Camel bridge
@@ -55,29 +65,31 @@ camel.secure.active.flows.file.names=registration-processor-camel-routes-new-def
 ## Token generation
 token.request.id=io.mosip.registration.processor
 token.request.appid=regproc
+## TODO: unused, remove
 token.request.username=registrationprocessor
-token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGVnY3M1DIeKGFAeBNfi6jH5qgj1KCUmFONLwSmfcrPx9m6MYXXQMYwyAeq13Msy1fcG1AtZQASKeLbuMCaRwinwdt7C/WYzvVVv47NojD+VmHHVTY3qBXJ4dwZ0/BqmUBPXyYrJPKTcdouxT76bgm5+fXXNcT7lciXgD1aCnWKziL5nDa6Y9dhc+ZPyM0d+I0JfS+emsByt7tWgcZukQkOEx8JWfcCR4eVpERYVa/ps/EAuQRXmxIvnr54GSCc/KKpwnYnjLtKIx/75I6pezBdKU/BBJG1syjQp9VQC9adSI5fdsn3ijkxJjC9TSIFJKDlTHqNCnJaxQXcSBWL4Y=
+## TODO: unused, remove
+token.request.password=
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
-token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+token.request.secretKey=mosip.mosip.regproc.client.secret
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
-
+token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
 ## Audit Service
-AUDIT=http://kernel-auditmanager-service/v1/auditmanager/audits
+AUDIT=http://auditmanager.kernel/v1/auditmanager/audits
 
 ## Auth Service
-authmanager.base.url=http://kernel-auth-service
+authmanager.base.url=http://authmanager.kernel
 PASSWORDBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/useridPwd
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateToken
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
-INTERNALAUTH=http://ida-internal-service/idauthentication/v1/internal/auth
+IDAINTERNAL=http://ida-internal.ida
+INTERNALAUTH=${IDAINTERNAL}/idauthentication/v1/internal/auth
 
 ## Master Data Services
-MASTER=http://kernel-masterdata-service/v1/masterdata
+MASTER=http://masterdata.kernel/v1/masterdata
 MACHINEHISTORY=${MASTER}/machineshistories
 CENTERHISTORY=${MASTER}/registrationcentershistory
 CENTERUSERMACHINEHISTORY=${MASTER}/getregistrationmachineusermappinghistory
@@ -94,50 +106,54 @@ POSTALCODE=${MASTER}/locations/validate
 PROVINCE=${MASTER}/locations/validate
 USERDETAILS=${MASTER}/users
 TEMPLATES=${MASTER}/templates
-DEVICEVALIDATEHISTORY=http://pms-partner-manager-service/v1/partnermanager/deviceprovidermanagement/validate
+DEVICEVALIDATEHISTORY=http://partnermanager.pms/v1/partnermanager/deviceprovidermanagement/validate
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
 
 ## ID Repository Services
-IDREPOSITORY=http://idrepo-identity-service/idrepository/v1/identity/
-IDREPOGETIDBYUIN=http://idrepo-identity-service/idrepository/v1/identity/idvid
-UINGENERATOR=http://kernel-idgenerator-service/v1/idgenerator/uin
-RETRIEVEIDENTITYFROMRID=http://idrepo-identity-service/idrepository/v1/identity/idvid
-RETRIEVEIDENTITY=http://idrepo-identity-service/idrepository/v1/identity/idvid
-CREATEVID=http://idrepo-vid-service/idrepository/v1/vid
-GETUINBYVID=http://idrepo-vid-service/idrepository/v1/idvid
-CREDENTIALREQUEST=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
-GETVIDSBYUIN=http://idrepo-vid-service/idrepository/v1/vid/uin
+
+IDREPOIDENTITY=http://idrepo-identity.idrepo/idrepository/v1/identity/
+IDREPOGETIDBYUIN=${IDREPOIDENTITY}/idvid
+UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
+RETRIEVEIDENTITYFROMRID=${IDREPOIDENTITY}/idvid
+RETRIEVEIDENTITY=${IDREPOIDENTITY}/idvid
+IDREPOVID=http://idrepo-vid.idrepo
+CREATEVID=${IDREPOVID}/idrepository/v1/vid
+GETUINBYVID=${IDREPOVID}/idrepository/v1/idvid
+CREDENTIALREQUEST=http://idrepo-credrequest.idrepo/v1/credentialrequest/requestgenerator
+GETVIDSBYUIN=${IDREPOVID}/idrepository/v1/vid/uin
 
 ## Encrypt Services
-ENCRYPTURL=http://kernel-keymanager-service/v1/keymanager/encrypt
-ENCRYPTIONSERVICE=http://kernel-keymanager-service/v1/keymanager/publickey
-PDFSIGN=http://kernel-keymanager-service/v1/keymanager/pdf/sign
+KEYMANAGER=http://keymanager.keymanager/
+ENCRYPTURL=${KEYMANAGER}/v1/keymanager/encrypt
+ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
+PDFSIGN=${KEYMANAGER}/v1/keymanager/pdf/sign
 
 ## Digital Signature Service
-DIGITALSIGNATURE=http://kernel-keymanager-service/v1/keymanager/sign
+DIGITALSIGNATURE=${KEYMANAGER}/v1/keymanager/sign
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
 
 ## Crypto
-CRYPTOMANAGERDECRYPT=http://kernel-keymanager-service/v1/keymanager/decrypt
+CRYPTOMANAGERDECRYPT=${KEYMANAGER}/v1/keymanager/decrypt
 crypto.PrependThumbprint.enable=true
 
 ## External Service
-EISERVICE=http://regproc-external-integration-service/registrationprocessor/v1/eis/registration-processor/external-integration-service/v1.0
+EISERVICE=http://regproc-external.regproc/registrationprocessor/v1/eis/registration-processor/external-integration-service/v1.0
 
 ## RID Generation Service
-RIDGENERATION=http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
+RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
 
 ## Registration Processor Status Services
-SYNCSERVICE=http://regproc-registration-status-service/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=http://regproc-packet-receiver-stage/registrationprocessor/v1/packetreceiver/registrationpackets
+SYNCSERVICE=http://regproc-regstatus.regproc/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=http://regproc-packetreceiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
 
 ## SMS and EMAIL notification services
-SMSNOTIFIER=http://kernel-notification-service/v1/notifier/sms/send
-EMAILNOTIFIER=http://kernel-notification-service/v1/notifier/email/send
+NOTIFIER=http://notifier.kernel
+SMSNOTIFIER=${NOTIFIER}/v1/notifier/sms/send
+EMAILNOTIFIER=${NOTIFIER}/v1/notifier/email/send
 
 ## PMS
-PMS=http://pms-policy-manager-service/v1/policymanager/policies
+PMS=http://pms-policy.pms/v1/policymanager/policies
 
 ## Registration status properties
 registration.processor.max.retry=10
@@ -224,7 +240,7 @@ registration.processor.updated.subject=UIN Details Updated
 ## Queue
 registration.processor.queue.username=admin
 registration.processor.queue.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
-registration.processor.queue.url=tcp://activemq:80  
+registration.processor.queue.url=tcp://${mosip.api.internal.url}:61616
 registration.processor.queue.typeOfQueue=ACTIVEMQ
 registration.processor.queue.address = print-service
 registration.processor.queue.printpostaladdress = postal-service
@@ -308,15 +324,14 @@ registration.processor.signature.isEnabled=true
 registration.processor.infant.dedupe=N
 
 # ID Authentication 
-IDAUTHENCRYPTION=http://ida-internal-service/idauthentication/v1/internal/encrypt
-IDAUTHPUBLICKEY=http://ida-internal-service/idauthentication/v1/internal/publickey
-IDAUTHCERTIFICATE=http://ida-internal-service/idauthentication/v1/internal/getCertificate
-ida-internal-auth-uri=http://ida-internal-service/idauthentication/v1/internal/auth
-ida-internal-get-certificate-uri=http://ida-internal-service/idauthentication/v1/internal/getCertificate
-
+IDAUTHENCRYPTION=${IDAINTERNAL}/idauthentication/v1/internal/encrypt
+IDAUTHPUBLICKEY=${IDAINTERNAL}/idauthentication/v1/internal/publickey
+IDAUTHCERTIFICATE=${IDAINTERNAL}/idauthentication/v1/internal/getCertificate
+ida-internal-auth-uri=${IDAINTERNAL}/idauthentication/v1/internal/auth
+ida-internal-get-certificate-uri=${IDAINTERNAL}/idauthentication/v1/internal/getCertificate
 
 registration.processor.objectstore.adapter.name=S3Adapter
-packetmanager.base.url=http://packetmanager-service/commons
+packetmanager.base.url=http://packetmanager.packetmanager/commons
 PACKETMANAGER_SEARCH_FIELD=${packetmanager.base.url}/v1/packetmanager/searchField
 PACKETMANAGER_SEARCH_FIELDS=${packetmanager.base.url}/v1/packetmanager/searchFields
 PACKETMANAGER_SEARCH_METAINFO=${packetmanager.base.url}/v1/packetmanager/metaInfo
@@ -327,12 +342,12 @@ PACKETMANAGER_SEARCH_AUDITS=${packetmanager.base.url}/v1/packetmanager/audits
 PACKETMANAGER_INFO=${packetmanager.base.url}/v1/packetmanager/info
 PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdateTag
 PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
-DATASHARECREATEURL=http://datashare-service/v1/datashare/create
-DATASHAREGETEURL=http://datashare-service/v1/datashare/get
+DATASHARE=http://datashare.datashare
+DATASHARECREATEURL=${DATASHARE}/v1/datashare/create
+DATASHAREGETEURL=${DATASHARE}/v1/datashare/get
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
 
-
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
@@ -341,19 +356,19 @@ mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1
 mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 
-#--------------Print stage----------------
+## Pring
 mosip.registration.processor.credentialtype=euin
 mosip.registration.processor.encrypt=false
 mosip.registration.processor.issuer=mpartner-default-print 
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
 
-#----------------------------------Event Bus------------------------------------------
+## Event bus
 #Supported eventbus types: vertx, kafka. Defaults to vertx if the config is not given
 mosip.regproc.eventbus.type=kafka
 
 #Kafka event bus config, will be used only when the type is kafka
 #Kafka cluster servers comma separated, common for all stages and camel
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default.svc.cluster.local:9092,kafka-1.kafka-headless.default.svc.cluster.local:9092,kafka-2.kafka-headless.default.svc.cluster.local:9092
+mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka.svc.cluster.local:9092,kafka-1.kafka-headless.kafka.svc.cluster.local:9092,kafka-2.kafka-headless.kafka.svc.cluster.local:9092
 
 #securezone-notification-stage
 #Supported commmit config: auto, batch, single
@@ -522,7 +537,6 @@ packetmanager.provider.uingenerator.proofOfIdentity=source:CNIE\/process:CORRECT
 packetmanager.provider.uingenerator.proofOfRelationship=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.provider.uingenerator.proofOfException=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 
-
 #### Stage Specific properties ####
 
 # packet-classifier-stage

From 6b6c1b9e1ef8a1812315f4f063e5e39e2b4f20cf Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 24 May 2021 16:22:19 +0530
Subject: [PATCH 0061/1358] [MOSIP-14376] Camel routes corrected.

---
 ...ion-processor-camel-routes-new-default.xml | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index c753d3aba88..e8e92455f6e 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -1,4 +1,24 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
+    <!-- packet-receiver to securezone notifiation -->
+    <route id="packet-receiver->securezone-notification new route">
+        <from uri="eventbus:packet-receiver-new-bus-out" />
+        <log
+                message="packet-receiver-->securezone-notification new route ${bodyAs(String)}" />
+        <choice>
+            <when>
+                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
+                <to uri="eventbus:securezone-notification-bus-in" />
+            </when>
+            <when>
+                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
+                <to uri="eventbus:retry-bus-in" />
+            </when>
+            <otherwise>
+                <to uri="eventbus:error-bus-in" />
+            </otherwise>
+        </choice>
+    </route>
+
     <!-- securezone-notification to packet-uploader Route -->
     <route id="securezone-notification-->packet-uploader new route">
         <from uri="eventbus:securezone-notification-new-bus-out" />

From 391249c9556396cc61cd5e13c53df4afd8c31bb5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 24 May 2021 20:00:03 +0530
Subject: [PATCH 0062/1358] Updated

---
 hazelcast_cache.xml | 262 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 262 insertions(+)
 create mode 100644 hazelcast_cache.xml

diff --git a/hazelcast_cache.xml b/hazelcast_cache.xml
new file mode 100644
index 00000000000..3009e119cb0
--- /dev/null
+++ b/hazelcast_cache.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--
+  The default Hazelcast configuration.
+
+  This XML file is used when no hazelcast.xml is present.
+
+  To learn how to configure Hazelcast, please see the schema at
+  https://hazelcast.com/schema/config/hazelcast-config-4.0.xsd
+  or the Reference Manual at https://hazelcast.org/documentation/
+-->
+
+<!--suppress XmlDefaultAttributeValue -->
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+           http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
+
+    <cluster-name>dev</cluster-name>
+
+    <network>
+        <join>
+            <multicast enabled="false"/>
+            <tcp-ip enabled="false" />
+            <discovery-strategies>
+                <discovery-strategy enabled="true"
+                                    class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
+                    <properties>
+                        <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
+                    </properties>
+                </discovery-strategy>
+            </discovery-strategies>
+        </join>
+    </network>
+
+    <partition-group enabled="false"/>
+    <executor-service name="default">
+        <pool-size>16</pool-size>
+        <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
+        <queue-capacity>0</queue-capacity>
+    </executor-service>
+    <security>
+        <client-block-unmapped-actions>true</client-block-unmapped-actions>
+    </security>
+    <queue name="default">
+        <!--
+            Maximum size of the queue. When a JVM's local queue size reaches the maximum,
+            all put/offer operations will get blocked until the queue size
+            of the JVM goes down below the maximum.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size>0</max-size>
+        <!--
+            Number of backups. If 1 is set as the backup-count for example,
+            then all entries of the map will be copied to another JVM for
+            fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+
+        <!--
+            Number of async backups. 0 means no backup.
+        -->
+        <async-backup-count>0</async-backup-count>
+
+        <empty-queue-ttl>-1</empty-queue-ttl>
+
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </queue>
+    <map name="default">
+        <!--
+           Data type that will be used for storing recordMap.
+           Possible values:
+           BINARY (default): keys and values will be stored as binary data
+           OBJECT : values will be stored in their object forms
+           NATIVE : values will be stored in non-heap region of JVM
+        -->
+        <in-memory-format>OBJECT</in-memory-format>
+
+        <!--
+            Metadata creation policy for this map. Hazelcast may process objects of supported types ahead of time to
+            create additional metadata about them. This metadata then is used to make querying and indexing faster.
+            Metadata creation may decrease put throughput.
+            Valid values are:
+            CREATE_ON_UPDATE (default): Objects of supported types are pre-processed when they are created and updated.
+            OFF: No metadata is created.
+        -->
+        <metadata-policy>CREATE_ON_UPDATE</metadata-policy>
+
+        <!--
+            Number of backups. If 1 is set as the backup-count for example,
+            then all entries of the map will be copied to another JVM for
+            fail-safety. 0 means no backup.
+        -->
+        <backup-count>1</backup-count>
+        <!--
+            Number of async backups. 0 means no backup.
+        -->
+        <async-backup-count>0</async-backup-count>
+        <!--
+            Maximum number of seconds for each entry to stay in the map. Entries that are
+            older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
+            will get automatically evicted from the map.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0
+        -->
+        <time-to-live-seconds>30</time-to-live-seconds>
+        <!--
+            Maximum number of seconds for each entry to stay idle in the map. Entries that are
+            idle(not touched) for more than <max-idle-seconds> will get
+            automatically evicted from the map. Entry is touched if get, put or containsKey is called.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
+        -->
+        <max-idle-seconds>60</max-idle-seconds>
+
+        <eviction eviction-policy="LRU" max-size-policy="PER_NODE" size="0"/>
+        <!--
+            While recovering from split-brain (network partitioning),
+            map entries in the small cluster will merge into the bigger cluster
+            based on the policy set here. When an entry merge into the
+            cluster, there might an existing entry with the same key already.
+            Values of these entries might be different for that same key.
+            Which value should be set for the key? Conflict is resolved by
+            the policy set here. Default policy is PutIfAbsentMapMergePolicy
+
+            There are built-in merge policies such as
+            com.hazelcast.spi.merge.PassThroughMergePolicy; entry will be overwritten if merging entry exists for the key.
+            com.hazelcast.spi.merge.PutIfAbsentMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
+            com.hazelcast.spi.merge.HigherHitsMergePolicy ; entry with the higher hits wins.
+            com.hazelcast.spi.merge.LatestUpdateMergePolicy ; entry with the latest update wins.
+        -->
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+
+        <!--
+           Control caching of de-serialized values. Caching makes query evaluation faster, but it cost memory.
+           Possible Values:
+                        NEVER: Never cache deserialized object
+                        INDEX-ONLY: Caches values only when they are inserted into an index.
+                        ALWAYS: Always cache deserialized values.
+        -->
+        <cache-deserialized-values>ALWAYS</cache-deserialized-values>
+
+    </map>
+
+    <multimap name="default">
+        <backup-count>1</backup-count>
+        <value-collection-type>SET</value-collection-type>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </multimap>
+
+    <replicatedmap name="default">
+        <in-memory-format>OBJECT</in-memory-format>
+        <async-fillup>true</async-fillup>
+        <statistics-enabled>true</statistics-enabled>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </replicatedmap>
+
+    <list name="default">
+        <backup-count>1</backup-count>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </list>
+
+    <set name="default">
+        <backup-count>1</backup-count>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </set>
+
+    <reliable-topic name="default">
+        <read-batch-size>10</read-batch-size>
+        <topic-overload-policy>BLOCK</topic-overload-policy>
+        <statistics-enabled>true</statistics-enabled>
+    </reliable-topic>
+
+    <ringbuffer name="default">
+        <capacity>10000</capacity>
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+        <time-to-live-seconds>0</time-to-live-seconds>
+        <in-memory-format>BINARY</in-memory-format>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </ringbuffer>
+
+    <flake-id-generator name="default">
+        <prefetch-count>100</prefetch-count>
+        <prefetch-validity-millis>600000</prefetch-validity-millis>
+        <epoch-start>1514764800000</epoch-start>
+        <node-id-offset>0</node-id-offset>
+        <bits-sequence>6</bits-sequence>
+        <bits-node-id>16</bits-node-id>
+        <allowed-future-millis>15000</allowed-future-millis>
+        <statistics-enabled>true</statistics-enabled>
+    </flake-id-generator>
+
+    <serialization>
+        <portable-version>0</portable-version>
+    </serialization>
+
+    <lite-member enabled="false"/>
+
+    <cardinality-estimator name="default">
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+        <merge-policy batch-size="100">HyperLogLogMergePolicy</merge-policy>
+    </cardinality-estimator>
+
+    <scheduled-executor-service name="default">
+        <capacity>100</capacity>
+        <durability>1</durability>
+        <pool-size>16</pool-size>
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </scheduled-executor-service>
+
+    <crdt-replication>
+        <replication-period-millis>1000</replication-period-millis>
+        <max-concurrent-replication-targets>1</max-concurrent-replication-targets>
+    </crdt-replication>
+
+    <pn-counter name="default">
+        <replica-count>2147483647</replica-count>
+        <statistics-enabled>true</statistics-enabled>
+    </pn-counter>
+
+    <cp-subsystem>
+        <cp-member-count>0</cp-member-count>
+        <group-size>0</group-size>
+        <session-time-to-live-seconds>30</session-time-to-live-seconds>
+        <session-heartbeat-interval-seconds>5</session-heartbeat-interval-seconds>
+        <missing-cp-member-auto-removal-seconds>14400</missing-cp-member-auto-removal-seconds>
+        <fail-on-indeterminate-operation-state>false</fail-on-indeterminate-operation-state>
+        <raft-algorithm>
+            <leader-election-timeout-in-millis>2000</leader-election-timeout-in-millis>
+            <leader-heartbeat-period-in-millis>5000</leader-heartbeat-period-in-millis>
+            <max-missed-leader-heartbeat-count>5</max-missed-leader-heartbeat-count>
+            <append-request-max-entry-count>100</append-request-max-entry-count>
+            <commit-index-advance-count-to-snapshot>10000</commit-index-advance-count-to-snapshot>
+            <uncommitted-entry-count-to-reject-new-appends>100</uncommitted-entry-count-to-reject-new-appends>
+            <append-request-backoff-timeout-in-millis>100</append-request-backoff-timeout-in-millis>
+        </raft-algorithm>
+    </cp-subsystem>
+
+    <metrics enabled="true">
+        <management-center enabled="true">
+            <retention-seconds>5</retention-seconds>
+        </management-center>
+        <jmx enabled="true"/>
+        <collection-frequency-seconds>5</collection-frequency-seconds>
+    </metrics>
+</hazelcast>

From 819a0e2a02863608bafc3ce4beb05c4f97edbcd9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 25 May 2021 06:27:09 +0530
Subject: [PATCH 0063/1358] Hazelcast updated.

---
 hazelcast_cache-default.xml | 262 ------------------------------------
 hazelcast_cache.xml         | 229 ++++++++++++++++++++++---------
 2 files changed, 169 insertions(+), 322 deletions(-)
 delete mode 100644 hazelcast_cache-default.xml

diff --git a/hazelcast_cache-default.xml b/hazelcast_cache-default.xml
deleted file mode 100644
index 3009e119cb0..00000000000
--- a/hazelcast_cache-default.xml
+++ /dev/null
@@ -1,262 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!--
-  The default Hazelcast configuration.
-
-  This XML file is used when no hazelcast.xml is present.
-
-  To learn how to configure Hazelcast, please see the schema at
-  https://hazelcast.com/schema/config/hazelcast-config-4.0.xsd
-  or the Reference Manual at https://hazelcast.org/documentation/
--->
-
-<!--suppress XmlDefaultAttributeValue -->
-<hazelcast xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
-
-    <cluster-name>dev</cluster-name>
-
-    <network>
-        <join>
-            <multicast enabled="false"/>
-            <tcp-ip enabled="false" />
-            <discovery-strategies>
-                <discovery-strategy enabled="true"
-                                    class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
-                    <properties>
-                        <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
-                    </properties>
-                </discovery-strategy>
-            </discovery-strategies>
-        </join>
-    </network>
-
-    <partition-group enabled="false"/>
-    <executor-service name="default">
-        <pool-size>16</pool-size>
-        <!--Queue capacity. 0 means Integer.MAX_VALUE.-->
-        <queue-capacity>0</queue-capacity>
-    </executor-service>
-    <security>
-        <client-block-unmapped-actions>true</client-block-unmapped-actions>
-    </security>
-    <queue name="default">
-        <!--
-            Maximum size of the queue. When a JVM's local queue size reaches the maximum,
-            all put/offer operations will get blocked until the queue size
-            of the JVM goes down below the maximum.
-            Any integer between 0 and Integer.MAX_VALUE. 0 means
-            Integer.MAX_VALUE. Default is 0.
-        -->
-        <max-size>0</max-size>
-        <!--
-            Number of backups. If 1 is set as the backup-count for example,
-            then all entries of the map will be copied to another JVM for
-            fail-safety. 0 means no backup.
-        -->
-        <backup-count>1</backup-count>
-
-        <!--
-            Number of async backups. 0 means no backup.
-        -->
-        <async-backup-count>0</async-backup-count>
-
-        <empty-queue-ttl>-1</empty-queue-ttl>
-
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </queue>
-    <map name="default">
-        <!--
-           Data type that will be used for storing recordMap.
-           Possible values:
-           BINARY (default): keys and values will be stored as binary data
-           OBJECT : values will be stored in their object forms
-           NATIVE : values will be stored in non-heap region of JVM
-        -->
-        <in-memory-format>OBJECT</in-memory-format>
-
-        <!--
-            Metadata creation policy for this map. Hazelcast may process objects of supported types ahead of time to
-            create additional metadata about them. This metadata then is used to make querying and indexing faster.
-            Metadata creation may decrease put throughput.
-            Valid values are:
-            CREATE_ON_UPDATE (default): Objects of supported types are pre-processed when they are created and updated.
-            OFF: No metadata is created.
-        -->
-        <metadata-policy>CREATE_ON_UPDATE</metadata-policy>
-
-        <!--
-            Number of backups. If 1 is set as the backup-count for example,
-            then all entries of the map will be copied to another JVM for
-            fail-safety. 0 means no backup.
-        -->
-        <backup-count>1</backup-count>
-        <!--
-            Number of async backups. 0 means no backup.
-        -->
-        <async-backup-count>0</async-backup-count>
-        <!--
-            Maximum number of seconds for each entry to stay in the map. Entries that are
-            older than <time-to-live-seconds> and not updated for <time-to-live-seconds>
-            will get automatically evicted from the map.
-            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0
-        -->
-        <time-to-live-seconds>30</time-to-live-seconds>
-        <!--
-            Maximum number of seconds for each entry to stay idle in the map. Entries that are
-            idle(not touched) for more than <max-idle-seconds> will get
-            automatically evicted from the map. Entry is touched if get, put or containsKey is called.
-            Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
-        -->
-        <max-idle-seconds>60</max-idle-seconds>
-
-        <eviction eviction-policy="LRU" max-size-policy="PER_NODE" size="0"/>
-        <!--
-            While recovering from split-brain (network partitioning),
-            map entries in the small cluster will merge into the bigger cluster
-            based on the policy set here. When an entry merge into the
-            cluster, there might an existing entry with the same key already.
-            Values of these entries might be different for that same key.
-            Which value should be set for the key? Conflict is resolved by
-            the policy set here. Default policy is PutIfAbsentMapMergePolicy
-
-            There are built-in merge policies such as
-            com.hazelcast.spi.merge.PassThroughMergePolicy; entry will be overwritten if merging entry exists for the key.
-            com.hazelcast.spi.merge.PutIfAbsentMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
-            com.hazelcast.spi.merge.HigherHitsMergePolicy ; entry with the higher hits wins.
-            com.hazelcast.spi.merge.LatestUpdateMergePolicy ; entry with the latest update wins.
-        -->
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-
-        <!--
-           Control caching of de-serialized values. Caching makes query evaluation faster, but it cost memory.
-           Possible Values:
-                        NEVER: Never cache deserialized object
-                        INDEX-ONLY: Caches values only when they are inserted into an index.
-                        ALWAYS: Always cache deserialized values.
-        -->
-        <cache-deserialized-values>ALWAYS</cache-deserialized-values>
-
-    </map>
-
-    <multimap name="default">
-        <backup-count>1</backup-count>
-        <value-collection-type>SET</value-collection-type>
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </multimap>
-
-    <replicatedmap name="default">
-        <in-memory-format>OBJECT</in-memory-format>
-        <async-fillup>true</async-fillup>
-        <statistics-enabled>true</statistics-enabled>
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </replicatedmap>
-
-    <list name="default">
-        <backup-count>1</backup-count>
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </list>
-
-    <set name="default">
-        <backup-count>1</backup-count>
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </set>
-
-    <reliable-topic name="default">
-        <read-batch-size>10</read-batch-size>
-        <topic-overload-policy>BLOCK</topic-overload-policy>
-        <statistics-enabled>true</statistics-enabled>
-    </reliable-topic>
-
-    <ringbuffer name="default">
-        <capacity>10000</capacity>
-        <backup-count>1</backup-count>
-        <async-backup-count>0</async-backup-count>
-        <time-to-live-seconds>0</time-to-live-seconds>
-        <in-memory-format>BINARY</in-memory-format>
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </ringbuffer>
-
-    <flake-id-generator name="default">
-        <prefetch-count>100</prefetch-count>
-        <prefetch-validity-millis>600000</prefetch-validity-millis>
-        <epoch-start>1514764800000</epoch-start>
-        <node-id-offset>0</node-id-offset>
-        <bits-sequence>6</bits-sequence>
-        <bits-node-id>16</bits-node-id>
-        <allowed-future-millis>15000</allowed-future-millis>
-        <statistics-enabled>true</statistics-enabled>
-    </flake-id-generator>
-
-    <serialization>
-        <portable-version>0</portable-version>
-    </serialization>
-
-    <lite-member enabled="false"/>
-
-    <cardinality-estimator name="default">
-        <backup-count>1</backup-count>
-        <async-backup-count>0</async-backup-count>
-        <merge-policy batch-size="100">HyperLogLogMergePolicy</merge-policy>
-    </cardinality-estimator>
-
-    <scheduled-executor-service name="default">
-        <capacity>100</capacity>
-        <durability>1</durability>
-        <pool-size>16</pool-size>
-        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
-    </scheduled-executor-service>
-
-    <crdt-replication>
-        <replication-period-millis>1000</replication-period-millis>
-        <max-concurrent-replication-targets>1</max-concurrent-replication-targets>
-    </crdt-replication>
-
-    <pn-counter name="default">
-        <replica-count>2147483647</replica-count>
-        <statistics-enabled>true</statistics-enabled>
-    </pn-counter>
-
-    <cp-subsystem>
-        <cp-member-count>0</cp-member-count>
-        <group-size>0</group-size>
-        <session-time-to-live-seconds>30</session-time-to-live-seconds>
-        <session-heartbeat-interval-seconds>5</session-heartbeat-interval-seconds>
-        <missing-cp-member-auto-removal-seconds>14400</missing-cp-member-auto-removal-seconds>
-        <fail-on-indeterminate-operation-state>false</fail-on-indeterminate-operation-state>
-        <raft-algorithm>
-            <leader-election-timeout-in-millis>2000</leader-election-timeout-in-millis>
-            <leader-heartbeat-period-in-millis>5000</leader-heartbeat-period-in-millis>
-            <max-missed-leader-heartbeat-count>5</max-missed-leader-heartbeat-count>
-            <append-request-max-entry-count>100</append-request-max-entry-count>
-            <commit-index-advance-count-to-snapshot>10000</commit-index-advance-count-to-snapshot>
-            <uncommitted-entry-count-to-reject-new-appends>100</uncommitted-entry-count-to-reject-new-appends>
-            <append-request-backoff-timeout-in-millis>100</append-request-backoff-timeout-in-millis>
-        </raft-algorithm>
-    </cp-subsystem>
-
-    <metrics enabled="true">
-        <management-center enabled="true">
-            <retention-seconds>5</retention-seconds>
-        </management-center>
-        <jmx enabled="true"/>
-        <collection-frequency-seconds>5</collection-frequency-seconds>
-    </metrics>
-</hazelcast>
diff --git a/hazelcast_cache.xml b/hazelcast_cache.xml
index 3009e119cb0..b9d53358e65 100644
--- a/hazelcast_cache.xml
+++ b/hazelcast_cache.xml
@@ -1,53 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2008-2020, Hazelcast, Inc. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!--
-  The default Hazelcast configuration.
-
-  This XML file is used when no hazelcast.xml is present.
-
-  To learn how to configure Hazelcast, please see the schema at
-  https://hazelcast.com/schema/config/hazelcast-config-4.0.xsd
-  or the Reference Manual at https://hazelcast.org/documentation/
--->
-
-<!--suppress XmlDefaultAttributeValue -->
 <hazelcast xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-           http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
+           http://www.hazelcast.com/schema/config/hazelcast-config-3.12.xsd">
 
-    <cluster-name>dev</cluster-name>
+    <group>
+        <name>dev</name>
+    </group>
 
     <network>
+        <port auto-increment="true" port-count="100">5701</port>
+        <outbound-ports>
+            <!--
+            Allowed port range when connecting to other nodes.
+            0 or * means use system provided port.
+            -->
+            <ports>0</ports>
+        </outbound-ports>
         <join>
-            <multicast enabled="false"/>
-            <tcp-ip enabled="false" />
+            <multicast enabled="false">
+                <multicast-group>224.2.2.3</multicast-group>
+                <multicast-port>54327</multicast-port>
+            </multicast>
+            <tcp-ip enabled="false">
+                <interface>127.0.0.1</interface>
+                <member-list>
+                    <member>127.0.0.1</member>
+                </member-list>
+            </tcp-ip>
+            <aws enabled="false">
+                <access-key>my-access-key</access-key>
+                <secret-key>my-secret-key</secret-key>
+                <!--optional, default is us-east-1 -->
+                <region>us-west-1</region>
+                <!--optional, default is ec2.amazonaws.com. If set, region shouldn't be set as it will override this property -->
+                <host-header>ec2.amazonaws.com</host-header>
+                <!-- optional, only instances belonging to this group will be discovered, default will try all running instances -->
+                <security-group-name>hazelcast-sg</security-group-name>
+                <tag-key>type</tag-key>
+                <tag-value>hz-nodes</tag-value>
+            </aws>
+            <gcp enabled="false">
+                <zones>us-east1-b,us-east1-c</zones>
+            </gcp>
+            <azure enabled="false">
+                <client-id>CLIENT_ID</client-id>
+                <client-secret>CLIENT_SECRET</client-secret>
+                <tenant-id>TENANT_ID</tenant-id>
+                <subscription-id>SUB_ID</subscription-id>
+                <cluster-id>HZLCAST001</cluster-id>
+                <group-name>GROUP-NAME</group-name>
+            </azure>
+            <kubernetes enabled="true">
+                <namespace>packetmanager</namespace>
+            </kubernetes>
+            <eureka enabled="false">
+                <self-registration>true</self-registration>
+                <namespace>hazelcast</namespace>
+            </eureka>
             <discovery-strategies>
-                <discovery-strategy enabled="true"
-                                    class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
-                    <properties>
-                        <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
-                    </properties>
-                </discovery-strategy>
             </discovery-strategies>
         </join>
+        <interfaces enabled="false">
+            <interface>10.10.1.*</interface>
+        </interfaces>
+        <ssl enabled="false"/>
+        <socket-interceptor enabled="false"/>
+        <symmetric-encryption enabled="false">
+            <!--
+               encryption algorithm such as
+               DES/ECB/PKCS5Padding,
+               PBEWithMD5AndDES,
+               AES/CBC/PKCS5Padding,
+               Blowfish,
+               DESede
+            -->
+            <algorithm>PBEWithMD5AndDES</algorithm>
+            <!-- salt value to use when generating the secret key -->
+            <salt>thesalt</salt>
+            <!-- pass phrase to use when generating the secret key -->
+            <password>thepass</password>
+            <!-- iteration count to use when generating the secret key -->
+            <iteration-count>19</iteration-count>
+        </symmetric-encryption>
+        <failure-detector>
+            <icmp enabled="false"/>
+        </failure-detector>
     </network>
-
     <partition-group enabled="false"/>
     <executor-service name="default">
         <pool-size>16</pool-size>
@@ -118,16 +157,41 @@
             will get automatically evicted from the map.
             Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0
         -->
-        <time-to-live-seconds>30</time-to-live-seconds>
+        <time-to-live-seconds>300</time-to-live-seconds>
         <!--
             Maximum number of seconds for each entry to stay idle in the map. Entries that are
             idle(not touched) for more than <max-idle-seconds> will get
             automatically evicted from the map. Entry is touched if get, put or containsKey is called.
             Any integer between 0 and Integer.MAX_VALUE. 0 means infinite. Default is 0.
         -->
-        <max-idle-seconds>60</max-idle-seconds>
-
-        <eviction eviction-policy="LRU" max-size-policy="PER_NODE" size="0"/>
+        <max-idle-seconds>300</max-idle-seconds>
+        <!--
+            Valid values are:
+            NONE (no eviction),
+            LRU (Least Recently Used),
+            LFU (Least Frequently Used).
+            NONE is the default.
+        -->
+        <eviction-policy>LRU</eviction-policy>
+        <!--
+            Maximum size of the map. When max size is reached,
+            map is evicted based on the policy defined.
+            Any integer between 0 and Integer.MAX_VALUE. 0 means
+            Integer.MAX_VALUE. Default is 0.
+        -->
+        <max-size policy="PER_NODE">0</max-size>
+        <!--
+            `eviction-percentage` property is deprecated and will be ignored when it is set.
+            As of version 3.7, eviction mechanism changed.
+            It uses a probabilistic algorithm based on sampling. Please see documentation for further details
+        -->
+        <eviction-percentage>25</eviction-percentage>
+        <!--
+            `min-eviction-check-millis` property is deprecated  and will be ignored when it is set.
+            As of version 3.7, eviction mechanism changed.
+            It uses a probabilistic algorithm based on sampling. Please see documentation for further details
+        -->
+        <min-eviction-check-millis>100</min-eviction-check-millis>
         <!--
             While recovering from split-brain (network partitioning),
             map entries in the small cluster will merge into the bigger cluster
@@ -136,12 +200,11 @@
             Values of these entries might be different for that same key.
             Which value should be set for the key? Conflict is resolved by
             the policy set here. Default policy is PutIfAbsentMapMergePolicy
-
             There are built-in merge policies such as
-            com.hazelcast.spi.merge.PassThroughMergePolicy; entry will be overwritten if merging entry exists for the key.
-            com.hazelcast.spi.merge.PutIfAbsentMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
-            com.hazelcast.spi.merge.HigherHitsMergePolicy ; entry with the higher hits wins.
-            com.hazelcast.spi.merge.LatestUpdateMergePolicy ; entry with the latest update wins.
+            com.hazelcast.map.merge.PassThroughMergePolicy; entry will be overwritten if merging entry exists for the key.
+            com.hazelcast.map.merge.PutIfAbsentMapMergePolicy ; entry will be added if the merging entry doesn't exist in the cluster.
+            com.hazelcast.map.merge.HigherHitsMapMergePolicy ; entry with the higher hits wins.
+            com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
         -->
         <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
 
@@ -156,6 +219,34 @@
 
     </map>
 
+    <!--
+           Configuration for an event journal. The event journal keeps events related
+           to a specific partition and data structure. For instance, it could keep
+           map add, update, remove, merge events along with the key, old value, new value and so on.
+        -->
+    <event-journal enabled="false">
+        <mapName>mapName</mapName>
+        <capacity>10000</capacity>
+        <time-to-live-seconds>0</time-to-live-seconds>
+    </event-journal>
+
+    <event-journal enabled="false">
+        <cacheName>cacheName</cacheName>
+        <capacity>10000</capacity>
+        <time-to-live-seconds>0</time-to-live-seconds>
+    </event-journal>
+
+    <!--
+       Configuration for a merkle tree.
+       The merkle tree is a data structure used for efficient comparison of the
+       difference in the contents of large data structures. The precision of
+       such a comparison mechanism is defined by the depth of the merkle tree.
+    -->
+    <merkle-tree enabled="false">
+        <mapName>mapName</mapName>
+        <depth>10</depth>
+    </merkle-tree>
+
     <multimap name="default">
         <backup-count>1</backup-count>
         <value-collection-type>SET</value-collection-type>
@@ -179,6 +270,22 @@
         <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
     </set>
 
+    <jobtracker name="default">
+        <max-thread-size>0</max-thread-size>
+        <!-- Queue size 0 means number of partitions * 2 -->
+        <queue-size>0</queue-size>
+        <retry-count>0</retry-count>
+        <chunk-size>1000</chunk-size>
+        <communicate-stats>true</communicate-stats>
+        <topology-changed-strategy>CANCEL_RUNNING_OPERATION</topology-changed-strategy>
+    </jobtracker>
+
+    <semaphore name="default">
+        <initial-permits>0</initial-permits>
+        <backup-count>1</backup-count>
+        <async-backup-count>0</async-backup-count>
+    </semaphore>
+
     <reliable-topic name="default">
         <read-batch-size>10</read-batch-size>
         <topic-overload-policy>BLOCK</topic-overload-policy>
@@ -197,18 +304,27 @@
     <flake-id-generator name="default">
         <prefetch-count>100</prefetch-count>
         <prefetch-validity-millis>600000</prefetch-validity-millis>
-        <epoch-start>1514764800000</epoch-start>
+        <id-offset>0</id-offset>
         <node-id-offset>0</node-id-offset>
-        <bits-sequence>6</bits-sequence>
-        <bits-node-id>16</bits-node-id>
-        <allowed-future-millis>15000</allowed-future-millis>
         <statistics-enabled>true</statistics-enabled>
     </flake-id-generator>
 
+    <atomic-long name="default">
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </atomic-long>
+
+    <atomic-reference name="default">
+        <merge-policy batch-size="100">com.hazelcast.spi.merge.PutIfAbsentMergePolicy</merge-policy>
+    </atomic-reference>
+
+    <count-down-latch name="default"/>
+
     <serialization>
         <portable-version>0</portable-version>
     </serialization>
 
+    <services enable-defaults="true"/>
+
     <lite-member enabled="false"/>
 
     <cardinality-estimator name="default">
@@ -237,7 +353,7 @@
     <cp-subsystem>
         <cp-member-count>0</cp-member-count>
         <group-size>0</group-size>
-        <session-time-to-live-seconds>30</session-time-to-live-seconds>
+        <session-time-to-live-seconds>300</session-time-to-live-seconds>
         <session-heartbeat-interval-seconds>5</session-heartbeat-interval-seconds>
         <missing-cp-member-auto-removal-seconds>14400</missing-cp-member-auto-removal-seconds>
         <fail-on-indeterminate-operation-state>false</fail-on-indeterminate-operation-state>
@@ -251,12 +367,5 @@
             <append-request-backoff-timeout-in-millis>100</append-request-backoff-timeout-in-millis>
         </raft-algorithm>
     </cp-subsystem>
-
-    <metrics enabled="true">
-        <management-center enabled="true">
-            <retention-seconds>5</retention-seconds>
-        </management-center>
-        <jmx enabled="true"/>
-        <collection-frequency-seconds>5</collection-frequency-seconds>
-    </metrics>
 </hazelcast>
+

From 640416027b0475d8ea1b179c2ae61aed9d8875a3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 06:12:37 +0530
Subject: [PATCH 0064/1358] [MOSIP-14287] Complete overhaul.

---
 id-authentication-default.properties | 411 +++++++++++----------------
 1 file changed, 161 insertions(+), 250 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 92b1eb41ac2..8026a6ec386 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -1,22 +1,28 @@
-##################### Dynamic Properties - this may change for different deployemnts ##############################
-# Database hostname
-mosip.ida.database.hostname=postgres
-# Database port
-mosip.ida.database.port=80
-# Database user
-mosip.ida.database.user=idauser
-# Database password
-mosip.ida.database.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-# Kernel auth client ID for IDA
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# mosip.mosip.ida.client.secret
+# biosdk.host.url
+# ida.websub.authtype.callback.secret
+# ida.websub.credential.issue.callback.secret
+# ida.websub.partner.service.callback.secret
+# ida.websub.ca.certificate.callback.secret
+# ida.websub.hotlist.callback.secret
+
+## Client
 mosip.ida.auth.clientId=mosip-ida-client
-# Kernel auth secret key for IDA
-mosip.ida.auth.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-# Kernel auth application ID for IDA
+mosip.ida.auth.secretKey=${mosip.mosip.ida.client.secret}
 mosip.ida.auth.appId=ida
 
+## Database
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.ida.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.ida.database.port=5432
+mosip.ida.database.user=idauser
+mosip.ida.database.password=${db.dbuser.password}
 
-######################## Spring and Hibernate Configurations ####################
-# ***************** Postgres Properties ***********************
 javax.persistence.jdbc.driverClassName=org.postgresql.Driver
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip.ida.database.port}/mosip_ida
@@ -27,7 +33,7 @@ javax.persistence.jdbc.schema=ida
 javax.persistence.jdbc.uinHashTable=uin_hash_salt
 javax.persistence.jdbc.uinEncryptTable=uin_encrypt_salt
 
-# *********** Hibernate Properties *************
+## Hibernate
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.hbm2ddl.auto=none
@@ -45,199 +51,176 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 log4j.logger.org.hibernate=warn
 hibernate.show_sql=false
 
-######################### ID-Authentication Application Configurations ##############
-# The Online Verification partner ID associated to the IDA instance.
-# This is used to subscribe to the credential issuance event notification sent by credential service.
-# for the particular Online Verification partner. 
-# This credential issueance notification is handled inside Internal Authentication module.
-# The credentials issued to the partner will be as per the data-share policy associated to the partner.
-# TO DO: Change the property key to online-verification-partner-id
+## The Online Verification partner ID associated to the IDA instance.
+## This is used to subscribe to the credential issuance event notification sent by credential service.
+## for the particular Online Verification partner. 
+## This credential issueance notification is handled inside Internal Authentication module.
+## The credentials issued to the partner will be as per the data-share policy associated to the partner.
+## TO DO: Change the property key to online-verification-partner-id
 ida-auth-partner-id=mpartner-default-auth
-
-# Application ID of IDA
 application.id=IDA
-# Application name of IDA
 application.name=ID-Authentication
 
-# Reference ID used for crypto manager in authentication (for request body)
+## Reference ID used for crypto manager in authentication (for request body)
 partner.reference.id=PARTNER
-# Reference ID used for crypto manager in internal authentication (for request body)
+## Reference ID used for crypto manager in internal authentication (for request body)
 internal.reference.id=INTERNAL
-# Reference ID used for crypto manager in authentication for biometrics
-# TO DO: Value to be Changed to IDA-BIO
+## Reference ID used for crypto manager in authentication for biometrics
+## TO DO: Value to be Changed to IDA-BIO
 partner.biometric.reference.id=IDA-FIR
-# Reference ID used for crypto manager in internal authentication for biometrics
+## Reference ID used for crypto manager in internal authentication for biometrics
 internal.biometric.reference.id=INTERNAL
 
-# Reference ID for Identity Cache data encryption
 identity-cache.reference.id=IDENTITY_CACHE
-# Application id for signing key
 mosip.sign.applicationid=${application.id}
-# Reference id for signing key
 mosip.sign.refid=SIGN
 
-# Kernel Symmetric Key decryption bytes count for AAD 
+## Kernel Symmetric Key decryption bytes count for AAD 
 ida.aad.lastbytes.num=16
-# Kernel Symmetric Key decryption bytes count for Salt 
+## Kernel Symmetric Key decryption bytes count for Salt 
 ida.salt.lastbytes.num=12
 
-# Request timeout used across all REST API calls in IDA
+## Request timeout used across all REST API calls in IDA
 mosip.ida.request.timeout.secs=10
-# Common JSON media type used across all REST API calls in IDA
+## Common JSON media type used across all REST API calls in IDA
 mosip.ida.request.mediaType=application/json
 
-#*** ID-Authentication Mapping json configurations ***
-# IDA Mapping JSON file name
+## IDA mapping
 ida.mapping.json.filename=id-authentication-mapping.json
-# IDA Mapping JSON file URI
 mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${ida.mapping.json.filename} 
-# IDA Mapping JSON file property source
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 
-#--------------------------Bio SDK Integration - Bio extractor Service ----------------------------------------#
-mosip.biosdk.default.host=http://13.233.66.241
-mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
+## Biosdk 
+mosip.biosdk.default.service.url=${biosdk.host.url}/biosdk-service
 
-# The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
-# This class will be loaded in runtime, the containing jar should be available in classpath
+## The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
+## This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-# The version of the BIO SDK API implemeted for Finger modality
+## The version of the BIO SDK API implemeted for Finger modality
 mosip.biometric.sdk.provider.finger.version=0.9
-# The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
-# If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
-# If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
+## The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
+## If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
+## If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
 mosip.biometric.sdk.provider.finger.format.url.default=${mosip.biosdk.default.service.url}
 
-# The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
-# This class will be loaded in runtime, the containing jar should be available in classpath
+## The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
+## This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-# The version of the BIO SDK API implemeted for Iris modality
+## The version of the BIO SDK API implemeted for Iris modality
 mosip.biometric.sdk.provider.iris.version=0.9
 mosip.biometric.sdk.provider.iris.format.url.default=${mosip.biosdk.default.service.url}
 
-# The fully qualified Class Name of the BIO SDK API implemented for Face modality 
-# This class will be loaded in runtime, the containing jar should be available in classpath
+## The fully qualified Class Name of the BIO SDK API implemented for Face modality 
+## This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-# The version of the BIO SDK API implemeted for Face modality
+## The version of the BIO SDK API implemeted for Face modality
 mosip.biometric.sdk.provider.face.version=0.9
 mosip.biometric.sdk.provider.face.format.url.default=${mosip.biosdk.default.service.url}
 
-#------
-
-
-# *********** REST-services *****************
-# Kernel-Audit
-audit.rest.uri=http://kernel-auditmanager-service/v1/auditmanager/audits
+## Kernel-Audit
+audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
 audit.rest.httpMethod=POST
 audit.rest.headers.mediaType=${mosip.ida.request.mediaType}
-#In seconds
 audit.rest.timeout=${mosip.ida.request.timeout.secs}
 
-# Kernel OTP Validator
-otp-validate.rest.uri=http://kernel-otpmanager-service/v1/otpmanager/otp/validate
+## Kernel OTP Validator
+otp-validate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/validate
 otp-validate.rest.httpMethod=GET
 otp-validate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-validate.rest.timeout=${mosip.ida.request.timeout.secs}
 
-# Kernel OTP Generator
-otp-generate.rest.uri=http://kernel-otpmanager-service/v1/otpmanager/otp/generate
+## Kernel OTP Generator
+otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
 otp-generate.rest.httpMethod=POST
 otp-generate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-generate.rest.timeout=${mosip.ida.request.timeout.secs}
 
-# Mail Notification
-mail-notification.rest.uri=http://kernel-notification-service/v1/notifier/email/send
+## Mail Notification
+mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
 mail-notification.rest.httpMethod=POST
 mail-notification.rest.headers.mediaType=multipart/form-data
 mail-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
-# SMS Notification
-sms-notification.rest.uri=http://kernel-notification-service/v1/notifier/sms/send
+## SMS Notification
+sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
 sms-notification.rest.httpMethod=POST
 sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
-#Get RID for USERID - Used in Internal Auth based on User ID
-userid-rid.rest.uri=http://kernel-auth-service/v1/authmanager/rid/{appId}/{uid}
+## Get RID for USERID - Used in Internal Auth based on User ID
+userid-rid.rest.uri=http://auth.kernel/v1/authmanager/rid/{appId}/{uid}
 userid-rid.rest.httpMethod=GET
 userid-rid.rest.headers.mediaType=${mosip.ida.request.mediaType}
 userid-rid.rest.timeout=${mosip.ida.request.timeout.secs}
 
-#Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=http://idrepo-identity-service/idrepository/v1/identity/idvid/{rid}?type={type}
+## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
+rid-uin.rest.uri=http://idrepo-identity.idrepo/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
-#Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=http://idrepo-identity-service/idrepository/v1/identity/idvid/{rid}
+## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
+rid-uin-auth.rest.uri=http://idrepo-identity.idrepo/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
 
-#Auth token generation and validation URLs
-auth-token-generator.rest.uri=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
-auth-token-validator.rest.uri=http://kernel-auth-service/v1/authmanager/authorize/validateToken
+## Auth token generation and validation URLs
+auth-token-generator.rest.uri=http://auth.kernel/v1/authmanager/authenticate/clientidsecretkey
+auth-token-validator.rest.uri=http://auth.kernel/v1/authmanager/authorize/validateToken
 auth-token-generator.rest.clientId=${mosip.ida.auth.clientId}
 auth-token-generator.rest.secretKey=${mosip.ida.auth.secretKey}
 auth-token-generator.rest.appId=${mosip.ida.auth.appId}
 
-# Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
-id-pmp-service.rest.uri=http://pms-partner-manager-service/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
+## Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
+id-pmp-service.rest.uri=http://partner-manager.pms/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
 id-pmp-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-pmp-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
-# Data Share API configurations - used to download data from data share URL provided in credential issueance event
+## Data Share API configurations - used to download data from data share URL provided in credential issueance event
 data-share-get.rest.uri=dummy_url_to_be_replaced_in_runtime
 data-share-get.rest.httpMethod=GET
 data-share-get.rest.headers.mediaType=application/octet-stream
 data-share-get.rest.timeout=10
 data-share-get-decrypt-ref-id=${ida-auth-partner-id}
 
-# Title Service rest api-GET
-id-masterdata-title-service.rest.uri=http://kernel-masterdata-service/v1/masterdata/title
+## Title Service rest api-GET
+id-masterdata-title-service.rest.uri=http://masterdata.kernel/v1/masterdata/title
 id-masterdata-title-service.rest.httpMethod=GET
 id-masterdata-title-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-title-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
-#Master Data - Template Single Language
-id-masterdata-template-service.rest.uri=http://kernel-masterdata-service/v1/masterdata/templates/{langcode}/{templatetypecode}
+## Master Data - Template Single Language
+id-masterdata-template-service.rest.uri=http://masterdata.kernel/v1/masterdata/templates/{langcode}/{templatetypecode}
 id-masterdata-template-service.rest.httpMethod=GET
 id-masterdata-template-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
-#Master Data - Template Multi language
-id-masterdata-template-service-multilang.rest.uri=http://kernel-masterdata-service/v1/masterdata/templates/templatetypecodes/{code}
+## Master Data - Template Multi language
+id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
 id-masterdata-template-service-multilang.rest.httpMethod=GET
 id-masterdata-template-service-multilang.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service-multilang.rest.timeout=${mosip.ida.request.timeout.secs}
 
-
-#-----Websub configurations------
-# Secret for auth type status update callback
-ida-websub-authtype-callback-secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-# Secret for credtial issueance callback
-ida-websub-credential-issue-callback-secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-# Secret for credtial issueance callback
-ida-websub-partner-service-callback-secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-# Secret for partner CA certification upload callback
-ida-websub-ca-certificate-callback-secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-# Secret for partner CA certification upload callback
-ida-websub-hotlist-callback-secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-
-# Callback url for auth type status update event notification
-ida-websub-auth-type-callback-url=${mosipbox.public.url}/idauthentication/v1/internal/callback/authTypeCallback/{partnerId}
-# Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-credential-issue-callback-url=${mosipbox.public.url}/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
-# Callback url for MISP/Partner change notification events
+## Websub
+ida-websub-authtype-callback-secret=${ida.websub.authtype.callback.secret}
+ida-websub-credential-issue-callback-secret=${ida.websub.credential.issue.callback.secret}
+ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback.secret}
+ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
+ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
+
+ida-websub-auth-type-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/authTypeCallback/{partnerId}
+## Callback url for credential issueance event notification, including id remove/deactivate/activate events
+ida-websub-credential-issue-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
+## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
-# Callback url for partner CA certification upload event
+## Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-# Callback url for hotlist event
+## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/hotlist
 
-#Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
+## Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000
 
 # The time interval in seconds to schedule subscription of topics which is done as a
@@ -247,64 +230,47 @@ subscriptions-delay-on-startup=120000
 # number like 1 * 60 * 60 = 3600 for one hour
 ida-websub-resubscription-delay-secs=7200
 
-#------ Web sub Event Topis used in IDA  ---
-# Topic for Auth Type Status Update Event
+## Websub even topics
 ida-topic-auth-type-status-updated=${ida-auth-partner-id}/AUTH_TYPE_STATUS_UPDATE
-# Topic for Credential Issueance Event (for UIN/VID create/update events)
+## Topic for Credential Issueance Event (for UIN/VID create/update events)
 ida-topic-credential-issued=${ida-auth-partner-id}/CREDENTIAL_ISSUED
-# Topic for ID Remove Event (UIN blocked / VID revoked events)
+## Topic for ID Remove Event (UIN blocked / VID revoked events)
 ida-topic-remove-id=${ida-auth-partner-id}/REMOVE_ID
-# Topic for ID Deactivate Event (UIN/VID deactivate events) 
+## Topic for ID Deactivate Event (UIN/VID deactivate events) 
 ida-topic-deactivate-id=${ida-auth-partner-id}/DEACTIVATE_ID
-# Topic for ID Activate Event (UIN/VID activate events) 
+## Topic for ID Activate Event (UIN/VID activate events) 
 ida-topic-activate-id=${ida-auth-partner-id}/ACTIVATE_ID
-
-# Topic for MISP update event
 ida-topic-pmp-misp-updated=MISP_UPDATED
-# Topic for Partner update event
 ida-topic-pmp-partner-updated=PARTNER_UPDATED
-# Topic for Partner API Key update event
 ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
-# Topic for Policy update event
 ida-topic-pmp-policy-updated=POLICY_UPDATED
-# Topic for Partner CA Certificate Upload event
 ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
-
-# Topic for Hotlisting event
 ida-topic-hotlist=MOSIP_HOTLIST
-#-----------------------
 
-#**************IDA cache properties**************
-# IDA cache Time to live in days - To clear cache scheduled based on the days provided.
-# value <= 0 means cache clearing based on schedule is disabled.
+## IDA cache
+## IDA cache Time to live in days - To clear cache scheduled based on the days provided.
+## value <= 0 means cache clearing based on schedule is disabled.
 ida-cache-ttl-in-days=1
-
-# To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
-# Value is based on CacheType enum provided by Spring Boot
+## To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
+## Value is based on CacheType enum provided by Spring Boot
 spring.cache.type=SIMPLE
-#================================================
-
-########################## Functional configurations ################################
 
+## Function configs
 #The modulo value to be calculated for a UIN/VID used to get salt value to be used in UIN/VID hashing
 ida.uin.salt.modulo=1000
 
-#**************** IDA DEMO NORMALIZATION *************
-
+## ID demographic normalization
 # This is used to define the seperator for normalizing regex(pattern) and the replacement word. Default is set to '='.
 ida.norm.sep==
-
 ####### Demo Name/Address Normalization Regular Expressions and their replacement configurations
 #Format:
 # ida.demo.<name/address/common>.normalization.regex.<languageCode/any>[<sequential index starting from 0>]=<reqular expression>${ida.norm.sep}<replacement string>
 # If replacement string is not specified that regular expression will be replaced with empty string 
 # Note: The sequence should not break in the middle, otherwise all normalization properties will not be read for the particular type.
-
-#**************** IDA DEMO NORMALIZATION address(for 'eng' language)*************
+## For eng.
 ida.demo.address.normalization.regex.eng[0]=[CcSsDdWwHh]/[Oo]
 ida.demo.address.normalization.regex.eng[1]=(M|m|D|d)(rs?)(.)
 ida.demo.address.normalization.regex.eng[2]=(N|n)(O|o)(\\.)?
- 
 ida.demo.address.normalization.regex.eng[3]=[aA][pP][aA][rR][tT][mM][eE][nN][tT]${ida.norm.sep}apt 
 ida.demo.address.normalization.regex.eng[4]=[sS][tT][rR][eE][eE][tT]${ida.norm.sep}st 
 ida.demo.address.normalization.regex.eng[5]=[rR][oO][aA][dD]${ida.norm.sep}rd 
@@ -312,7 +278,6 @@ ida.demo.address.normalization.regex.eng[6]=[mM][aA][iI][nN]${ida.norm.sep}mn
 ida.demo.address.normalization.regex.eng[7]=[cC][rR][oO][sS][sS]${ida.norm.sep}crs 
 ida.demo.address.normalization.regex.eng[8]=[oO][pP][pP][oO][sS][iI][tT][eE]${ida.norm.sep}opp 
 ida.demo.address.normalization.regex.eng[9]=[mM][aA][rR][kK][eE][tT]${ida.norm.sep}mkt 
-
 ida.demo.address.normalization.regex.eng[10]=1[sS][tT]${ida.norm.sep}1 
 ida.demo.address.normalization.regex.eng[11]=1[tT][hH]${ida.norm.sep}1 
 ida.demo.address.normalization.regex.eng[12]=2[nN][dD]${ida.norm.sep}2 
@@ -326,8 +291,6 @@ ida.demo.address.normalization.regex.eng[19]=7[tT][hH]${ida.norm.sep}7
 ida.demo.address.normalization.regex.eng[20]=8[tT][hH]${ida.norm.sep}8 
 ida.demo.address.normalization.regex.eng[21]=9[tT][hH]${ida.norm.sep}9 
 ida.demo.address.normalization.regex.eng[22]=0[tT][hH]${ida.norm.sep}0 
-
-#**************** IDA DEMO NORMALISATION  common*************
 # Note: the common normalization attributes will be replaced at the end.
 # Special characters are removed : . , - * ( ) [ ] ` ' / \ # "
 ida.demo.common.normalization.regex.any[0]=[\\.|,|\\-|\\*|\\(|\\)|\\[|\\]|`|\\'|/|\\|#|\"]
@@ -335,73 +298,52 @@ ida.demo.common.normalization.regex.any[0]=[\\.|,|\\-|\\*|\\(|\\)|\\[|\\]|`|\\'|
 ida.demo.common.normalization.regex.any[1]=\\s+${ida.norm.sep} .
 ida.demo.common.normalization.regex.any[2]=\\.${ida.norm.sep}
 
-
-# ********* ADMIN Configurations ************
-# Configure N time period threshold for accepting auth/OTP/KYC request for a country
+## Admin
+## Configure N time period threshold for accepting auth/OTP/KYC request for a country
 authrequest.received-time-allowed.minutes=30
 # Configuration for +/- time period adjustment in minutes for the request time validation, so that 
 # The requests originating from a system that is not in time-sync will be accepted for the time period
 authrequest.received-time-adjustment.minutes=5
-
 # Language Code
 ida.errormessages.default-lang=en
 
-
-# *********** Otp Flooding ************
-# Configure Time limit for OTP Flooding scenario (in minutes) 
+## OTP flooding
+## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=3
-# Configure no of requests for OTP Flooding scenario
 otp.request.flooding.max-count=3
 
-#------------- Notification message template names Configuration ----------------
-## Mail Message template names
-# Authenticaiton notification email template
+## Notification templates
 ida.auth.mail.content.template=auth-email-content
 ida.auth.mail.subject.template=auth-email-subject
-
-# OTP notification email template
 ida.otp.mail.content.template=ida-auth-otp-email-content-template
 ida.otp.mail.subject.template=ida-auth-otp-email-subject-template
-
-## SMS template names
-# Authenticaiton notification SMS template
 ida.auth.sms.template=auth-sms
-# OTP notification SMS template
 ida.otp.sms.template=ida-auth-otp-sms-template
-#---------------------------------------------------------------------------------
 
-# UIN/VID/USERID Masking to be done on SMS/EMAIL notification
-#Configure the no of digits to be masked while masking UIN/VID/USERID. 
-#For example if UIN is 1234567890 and mask count is 6, masked UIN will be: XXXXXX7890
+## UIN/VID/USERID Masking to be done on SMS/EMAIL notification
+## Configure the no of digits to be masked while masking UIN/VID/USERID. 
+## For example if UIN is 1234567890 and mask count is 6, masked UIN will be: XXXXXX7890
 notification.uin.masking.charcount=8
-
-#*************** Notification Date/time Format **********
 notification.date.format=dd-MM-yyyy
 notification.time.format=HH:mm:ss
 
-
-#********* Allowed authentication types for Authentciation/E-KYC/Internal Authentication requests *********
-# Accepted values otp-request, otp, demo, bio-Finger, bio-Iris, bio-Face
-
-#Configure authentications permissable for a country
+## Allowed authentication types for Authentciation/E-KYC/Internal Authentication requests
+## Accepted values otp-request, otp, demo, bio-Finger, bio-Iris, bio-Face
+## Configure authentications permissable for a country
 auth.types.allowed=demo,otp,bio-Finger,bio-Iris,bio-Face
-
-#Configure authentications permissable for e-KYC for a country
+## Configure authentications permissable for e-KYC for a country
 ekyc.auth.types.allowed=demo,otp,bio-Finger,bio-Iris,bio-Face
-
-#Configure authentication types permissable for internal authentication 
+## Configure authentication types permissable for internal authentication 
 internal.auth.types.allowed=otp,bio-Finger,bio-Iris,bio-Face
 
-#---------------- Allowed IdTypes for hotlisting -------------------
+## Allowed IdTypes for hotlisting 
 mosip.ida.internal.hotlist.idtypes.allowed=UIN,VID,PARTNER
 
-
-#---------------- IDA services request time date pattern -------------------
+## Datetime
 #Example allowed date time formats: "2020-10-23T12:21:38.660Z" , 2019-03-28T10:01:57.086+05:30
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
 
-#------------Request IDs---------------------
-# The request IDs used in IDA REST APIs
+# Request IDs used in IDA REST APIs
 ida.api.id.auth=mosip.identity.auth
 ida.api.id.kyc=mosip.identity.kyc
 ida.api.id.otp=mosip.identity.otp
@@ -411,9 +353,7 @@ ida.api.id.internal=mosip.identity.auth.internal
 ida.api.id.auth.transactions=mosip.identity.authtransactions.read
 ida.api.id.otp.internal=mosip.identity.otp.internal
 
-
-#------------Request Versions---------------------
-# The request versions used in IDA REST APIs
+## Request versions
 ida.api.version.auth=1.0
 ida.api.version.kyc=1.0
 ida.api.version.otp=1.0
@@ -423,111 +363,90 @@ ida.api.version.internal=1.0
 ida.api.version.auth.transactions=1.0
 ida.api.version.otp.internal=1.0
 
-#------ Authentication Response Token Configuration ---------------
-#Preference to turn on/off of authentication response token for a Country
-#A partner specific policy will govern how the response token is generated, whether it should be Random/Partner or Policy specific
-# TO DO: Remane static.token.enable to auth.token.enable
+## Auth response token config
+## Preference to turn on/off of authentication response token for a Country
+## A partner specific policy will govern how the response token is generated, whether it should be Random/Partner or Policy specific
+## TO DO: Remane static.token.enable to auth.token.enable
 static.token.enable=true
 
-#-------Configure Allowed ID Types (allowed values : UIN/VID/USERID) -------------
-#The ID types to be supported for Authentication/KYC/OTP Requests
+## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
 request.idtypes.allowed=VID,UIN
-
-#The ID types to be supported for Internal Authentication/OTP Requests
+## The ID types to be supported for Internal Authentication/OTP Requests
 request.idtypes.allowed.internalauth=UIN,USERID,VID
 
-#------ Encrypted Credential Attributes list -----------
-#The list of attributes in identity that are Zero Knowledge encrpted in IDA while storing the credential in DB.
-#This list is used to identify the attributes to decrypt when fetching the records from DB
+## Encrypted Credential Attributes list
+## The list of attributes in identity that are Zero Knowledge encrpted in IDA while storing the credential in DB.
+## This list is used to identify the attributes to decrypt when fetching the records from DB
 ida-zero-knowledge-encrypted-credential-attributes=individualBiometrics,fullName,dateOfBirth,phone,email
 
-
-#### Cryptograpic/Signature verificate related configurations
+## Cryptograpic/Signature verificate related configurations
 mosip.ida.auth.trust-validation-required=true
-
 mosip.ida.kyc.trust-validation-required=true
-
 mosip.ida.otp.trust-validation-required=true
-
 mosip.ida.internal.thumbprint-validation-required=false
 mosip.ida.internal.trust-validation-required=false
 
-
-#-------Kernel Retry Configurations----------------
+## Kernel retry
 # The retry limit excluding the first attempt before attempting for retries. Default is set to 5.
 kernel.retry.attempts.limit=5
-# The initial interval to be used for exponential backoff in milli seconds. If the exponential backoff is disabled by setting 'kernel.retry.exponential.backoff.multiplier' value as 1, this initial interval will be used as the fixed backoff interval for every retries. Default value is 200 millisecs
+## The initial interval to be used for exponential backoff in milli seconds. If the exponential backoff is disabled by setting 'kernel.retry.exponential.backoff.multiplier' value as 1, this initial interval will be used as the fixed backoff interval for every retries. Default value is 200 millisecs
 kernel.retry.exponential.backoff.initial.interval.millisecs=100
-# The multiplier for exponential backoff intreval. A double value greater than or equal to 1. Setting to 1 will make it to fixed backoff, more than 1 will apply exponential backoff. Default is 1.0 (fixed backoff). For exponential backoff the suggested value is 1.5 or 2. The next backoff interval is calculated with the formula: NextBackOffInterval = initialInterval * Math.pow(multiplier, retryCount)
+## The multiplier for exponential backoff intreval. A double value greater than or equal to 1. Setting to 1 will make it to fixed backoff, more than 1 will apply exponential backoff. Default is 1.0 (fixed backoff). For exponential backoff the suggested value is 1.5 or 2. The next backoff interval is calculated with the formula: NextBackOffInterval = initialInterval * Math.pow(multiplier, retryCount)
 kernel.retry.exponential.backoff.multiplier=1.5
 kernel.retry.exponential.backoff.max.interval.millisecs=1000
-# Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
+## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
-#Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
+## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.retryable.exceptions=io.mosip.authentication.core.exception.IdAuthRetryException,io.mosip.authentication.core.exception.IdAuthenticationBaseException
-#Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
+## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
-#-------Credential Store batch and retry configurations---
-# To disable automatic job launch in startup, setting to false.
+## Credential Store batch and retry configurations
+## To disable automatic job launch in startup, setting to false.
 spring.batch.job.enabled=false
-
-# The chunk size of items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.
+## Chunk size of items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.
 ida.batch.credential.store.chunk.size=5
 ida.batch.credential.store.job.delay=1000
-
-# The retry limit excluding the first attempt before attempting for retries
+## The retry limit excluding the first attempt before attempting for retries
 ida.credential.store.retry.max.limit=10
 ida.credential.store.retry.backoff.interval.millisecs=5000
-# The multiplier for exponential backoff intreval. A double value greater than or equal to 1. Setting to 1 will make it to fixed backoff, more than 1 will apply exponential backoff. Default is 1.0 (fixed backoff). For exponential backoff the suggested value is 1.5 or 2. The next backoff interval is calculated with the formula: NextBackOffInterval = initialInterval * Math.pow(multiplier, retryCount)
+## The multiplier for exponential backoff intreval. A double value greater than or equal to 1. Setting to 1 will make it to fixed backoff, more than 1 will apply exponential backoff. Default is 1.0 (fixed backoff). For exponential backoff the suggested value is 1.5 or 2. The next backoff interval is calculated with the formula: NextBackOffInterval = initialInterval * Math.pow(multiplier, retryCount)
 ida.credential.store.retry.backoff.exponential.multiplier=1.5
 ida.credential.store.retry.backoff.exponential.max.interval.millisecs=120000
 
-
-############## Configurations needed for dependent libraries #####
-#-----------------------------------Softhsm --------------------------------------
+## Configurations needed for dependent libraries
+## Softhsm
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.keystore-pass=1234
 
-#--------- Titles/Templates master data stored as configuration ---------- 
-# These are static IDA-Specific Master Data (base-64 encoded) - for fra and ara languages.
-# For any other language please update the respective properties.
-# Titles template used in Name Normalizatoin in Demographic authentication
+## Titles/Templates master data stored as configuration ---------- 
+## These are static IDA-Specific Master Data (base-64 encoded) - for fra and ara languages.
+## For any other language please update the respective properties.
+## Titles template used in Name Normalizatoin in Demographic authentication
 maste.data.titles=ewogICJpZCI6IG51bGwsCiAgInZlcnNpb24iOiBudWxsLAogICJyZXNwb25zZXRpbWUiOiAiMjAyMC0wNC0wM1QxMToxMTowNy4zODhaIiwKICAibWV0YWRhdGEiOiBudWxsLAogICJyZXNwb25zZSI6IHsKICAgICJ0aXRsZUxpc3QiOiBbCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNSVIiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTXIiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgVGl0bGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIk1SUyIsCiAgICAgICAgInRpdGxlTmFtZSI6ICJNcnMiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIkZlbWFsZSBUaXRsZSIsCiAgICAgICAgImlzQWN0aXZlIjogdHJ1ZSwKICAgICAgICAibGFuZ0NvZGUiOiAiZW5nIgogICAgICB9LAogICAgICB7CiAgICAgICAgImNvZGUiOiAiTUlTIiwKICAgICAgICAidGl0bGVOYW1lIjogIk1pc3MiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIlVubWFycmllZCBGZW1hbGUgVGl0bGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIk1JUiIsCiAgICAgICAgInRpdGxlTmFtZSI6ICLYo9iz2KrYp9iwIiwKICAgICAgICAidGl0bGVEZXNjcmlwdGlvbiI6ICLYp9mE2LnZhtmI2KfZhiDYp9mE2LDZg9mI2LEiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImFyYSIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIk1SUyIsCiAgICAgICAgInRpdGxlTmFtZSI6ICLYs9iqIiwKICAgICAgICAidGl0bGVEZXNjcmlwdGlvbiI6ICLYudmG2YjYp9mGINij2YbYq9mJIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJhcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNSVMiLAogICAgICAgICJ0aXRsZU5hbWUiOiAi2KLZhtiz2KkiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogItin2YTYudmG2YjYp9mGINin2YTYpdmG2KfYqyDYutmK2LEg2KfZhNmF2KrYstmI2KzYp9iqIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJhcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNSVIiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTW9uc2lldXIiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIlRpdHJlIG1hc2N1bGluIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJmcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNUlMiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTWFkYW1lIiwKICAgICAgICAidGl0bGVEZXNjcmlwdGlvbiI6ICJUaXRyZSBmw6ltaW5pbiIsCiAgICAgICAgImlzQWN0aXZlIjogdHJ1ZSwKICAgICAgICAibGFuZ0NvZGUiOiAiZnJhIgogICAgICB9LAogICAgICB7CiAgICAgICAgImNvZGUiOiAiTUlTIiwKICAgICAgICAidGl0bGVOYW1lIjogIk1hZGVtb2lzZWxsZSIsCiAgICAgICAgInRpdGxlRGVzY3JpcHRpb24iOiAiVGl0cmUgZGUgZmVtbWUgY8OpbGliYXRhaXJlIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJmcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNQVIiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTXN0ZXIiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgQ2hpbGQgVGl0bGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIlRFU1QiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTWFzdGVyIFRFU1QiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgVEVTVCBUaXRsZSBVcGRhdGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIlRFU1QgT25lIiwKICAgICAgICAidGl0bGVOYW1lIjogIk1hc3RlciBURVNUIE9uZSBVcGRhdGUiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgVEVTVCBPbmUgVGl0bGUgVXBkYXRlIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJlbmciCiAgICAgIH0KICAgIF0KICB9LAogICJlcnJvcnMiOiBudWxsCn0
 # SMS and Email templates for OTP notification and Authentication notification
 master.data.ida-templates={
  "id": null,
  "version": null,
  "responsetime": "2020-04-03T11:13:07.948Z",
  "metadata": null,
  "response": {
    "templates": [
      {
        "id": "1151",
        "name": "Template for Email Content",
        "description": "Template for Email Content",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "Dear $name\nOTP for $idvidType  $idvid is $otp and is valid for $validTime minutes. (Generated on $date at $time Hrs)",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "ida-auth-otp-email-content-template",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1151",
        "name": "قالب لمحتوى البريد الإلكتروني",
        "description": "قالب لمحتوى البريد الإلكتروني",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "عزيزي $name \n nOTP لـ $idvidType $idvid هو $otp وهو صالح لمدة $validTime دقيقة. (تم إنشاؤه في $date في $time Hrs)",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "ida-auth-otp-email-content-template",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1151",
        "name": "Modèle de contenu de courrier électronique",
        "description": "Modèle de contenu de courrier électronique",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Cher $name,\nOTP pour $idvidType $idvid est $otp et est valide pour $validTime minutes. (Généré le $date à $time Hrs)",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "ida-auth-otp-email-content-template",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1152",
        "name": "Template for Email Subject",
        "description": "Template for Email Subject",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "$idvidType $idvid: OTP Request",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "ida-auth-otp-email-subject-template",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1152",
        "name": "قالب لموضوع البريد الإلكتروني",
        "description": "قالب لموضوع البريد الإلكتروني",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "$idvidType $idvid: طلب OTP",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "ida-auth-otp-email-subject-template",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1152",
        "name": "Modèle pour sujet demail",
        "description": "Modèle pour sujet demail",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "$idvidType $idvid: Requête OTP",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "ida-auth-otp-email-subject-template",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1153",
        "name": "Template for OTP in SMS ",
        "description": "Template for OTP in SMS ",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "OTP for $idvidType  $idvid is $otp and is valid for $validTime minutes. (Generated on $date at $time Hrs)",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "ida-auth-otp-sms-template",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1153",
        "name": "قالب كلمة المرور لمرة واحدة في الرسالة",
        "description": "قالب كلمة المرور لمرة واحدة في الرسالة",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "OTP لـ $idvidType $idvid هو $otp وهو صالح لمدة $validTime دقيقة. (التي تم إنشاؤها على $date في $time ساعات)",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "ida-auth-otp-sms-template",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1153",
        "name": "Modèle pour OTP dans SMS",
        "description": "Modèle pour OTP dans SMS",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "OTP pour $idvidType $idvid est $otp et est valide pour $validTime minutes. (Généré le $date à $time Hrs)",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "ida-auth-otp-sms-template",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1101",
        "name": "Template for authorization content",
        "description": "Template for authorization content",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Dear $name\nYour Authentication of $idvidType $idvid using $authType on $date at $time Hrs $status at a device deployed by MOSIP Services",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "auth-email-content",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1101",
        "name": "قالب لمحتوى التخويل",
        "description": "قالب لمحتوى التخويل",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "عزيزي $name ،\nمصاٿقة $idvidType $idvid باستخدام $authType على $date في $time Hrs $status على جهاز تم نشره بواسطة \"خٿمات MOSIP\".",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "auth-email-content",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1101",
        "name": "Modèle de contenu dautorisation",
        "description": "Modèle de contenu dautorisation",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Cher $name,\nVotre authentification $idvidType $idvid utilisant $authType le $date à $time Hrs $status sur un périphérique déployé par \"MOSIP Services\"",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "auth-email-content",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1102",
        "name": "Template for authorization subject",
        "description": "Template for authorization subject",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "$idvidType $idvid Authentication $status",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "auth-email-subject",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1102",
        "name": "قالب لموضوع التخويل",
        "description": "قالب لموضوع التخويل",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "$idvidType $idvid: مصادقة $status",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "auth-email-subject",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1102",
        "name": "Modèle pour sujet dautorisation",
        "description": "Modèle pour sujet dautorisation",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "$idvidType $idvid: $status dauthentification",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "auth-email-subject",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1103",
        "name": "Template for authorization SMS",
        "description": "Template for authorization SMS",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Your Authentication of $idvidType $idvid using $authType on $date at $time Hrs $status at a device deployed by MOSIP Services.",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "auth-sms",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1103",
        "name": "قالب لرسالة التفويض",
        "description": "قالب لرسالة التفويض",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "مصاٿقتك على $idvidType $idvid باستخدام $authType في $date في $time Hrs $status على جهاز تم نشره بواسطة \"خدمات MOSIP\".",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "auth-sms",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1103",
        "name": "Modèle de SMS dautorisation",
        "description": "Modèle de SMS dautorisation",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Votre authentification $idvidType $idvid utilisant $authType le $date à $time Hrs $status sur un périphérique déployé par \"MOSIP Services\".",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "auth-sms",
        "langCode": "fra",
        "isActive": true
      }
    ]
  },
  "errors": null
}
 
-
-#----------Security Properties - used in Internal Authentication Services by default Kernel Auth Adapter------------------
-# CSRF switch
+## Security - used in Internal Authentication Services by default Kernel Auth Adapter
 mosip.security.csrf-enable=false
-
-# CORS switch
 mosip.security.cors-enable=false
-
-# Comma separated allowed origins
 mosip.security.origins=localhost:8080
-
-# Secure cookie switch
 mosip.security.secure-cookie=false
 
-#------------- Key-manager properties -------------------------
-# ROOT key identifier
+## Key-manager 
 mosip.root.key.applicationid=ROOT
-
-# Certificate signing algorithm
 mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 
-# Default certificate params 
+## Default certificate params 
 mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
 mosip.kernel.keymanager.certificate.default.organization=IITB
 mosip.kernel.keymanager.certificate.default.location=BANGALORE
 mosip.kernel.keymanager.certificate.default.state=KA
 mosip.kernel.keymanager.certificate.default.country=IN
 
-# Zero Knowledge Master & Public Key identifier.
+## Zero Knowledge Master & Public Key identifier.
 mosip.kernel.zkcrypto.masterkey.application.id=${application.id}
 mosip.kernel.zkcrypto.masterkey.reference.id=${identity-cache.reference.id}
 mosip.kernel.zkcrypto.publickey.application.id=${application.id}
@@ -535,34 +454,26 @@ mosip.kernel.zkcrypto.publickey.reference.id=CRED_SERVICE
 mosip.kernel.zkcrypto.wrap.algorithm-name=AES/ECB/NoPadding
 mosip.kernel.zkcrypto.derive.encrypt.algorithm-name=AES/ECB/PKCS5Padding
 
-# Application Id for PMS master key.
+## Application Id for PMS master key.
 mosip.kernel.partner.sign.masterkey.application.id=PMS
 
-
-#---------------------------------kernel Salt Generator---------------------------------------------------#
+## Kernel salt generator
 mosip.kernel.salt-generator.db.key-alias=javax.persistence.jdbc
 mosip.kernel.salt-generator.schemaName=${javax.persistence.jdbc.schema}
-#----------------------------------------------------------------------------------------------------------#
 
-#--------------------------------TokenId generator---------------------------------------------------#
+## TokenId generator
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
-#----------------------------------------------------------------------------------------------------#
 
-# Partner Management Service allowed partner domains
+## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
-######################### IDA Key Generator configurations #############################
+## IDA key generator 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip.ida.database.port}/mosip_ida
 keymanager_database_username=${mosip.ida.database.user}
-keymanager_database_password={cipher}0cb863a5b2ae03d3879cf34723cc2549d5e86679f197b57a307b1a0ac62bfc42
+keymanager_database_password=${db.dbuser.password}
 mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id}
 mosip.kernel.keymanager.autogen.basekeys.list=${application.id}:${internal.reference.id},${application.id}:${partner.reference.id},${application.id}:${partner.biometric.reference.id},${application.id}:${mosip.kernel.zkcrypto.publickey.reference.id},${application.id}:${ida-auth-partner-id}
 zkcrypto.random.key.generate.count=0
-
 keymanager.persistence.jdbc.schema=ida
-#########################################################################################
-
-
-

From 16781f1f0992da0542d18bbf32227fc0a976d289 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 06:53:35 +0530
Subject: [PATCH 0065/1358] [MOSIP-14487] Complete overhaul

---
 partner-management-default.properties | 163 ++++++++++----------------
 1 file changed, 61 insertions(+), 102 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 18bf3e2399e..fb3b7e3ca81 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -1,25 +1,34 @@
-##################### Dynamic Properties ########################################
-# For PMS Database 
-mosip.pmp.database.hostname=postgres
-mosip.pmp.database.port=80
+## Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+## DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+## helm chart:
+## db.dbuser.password 
+## mosip.mosip.partner.client.secret
+## mosip.mosip.pms.client.secret
+## keycloak.host
+## keycloak.admin.password
+# mosip.api.public.url
+
+## Database
+## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+## If database is external to production, provide the DNS or ip of the host and port 
+mosip.pmp.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
-mosip.pmp.database.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+mosip.pmp.database.password=${db.dbuser.password}
 
-#### For Authenticate Device ########
-mosip.authdevice.database.hostname=postgres
-mosip.authdevice.database.port=80
+## Auth device
+mosip.authdevice.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.authdevice.database.port=5432
 mosip.authdevice.database.user=authdeviceuser
-mosip.authdevice.database.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+mosip.authdevice.database.password=${db.dbuser.password}
 
-######### For Registration Device ###########
-mosip.regdevice.database.hostname=postgres
-mosip.regdevice.database.port=80
+## Reg device
+mosip.regdevice.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.regdevice.database.port=5432
 mosip.regdevice.database.user=regdeviceuser
-mosip.regdevice.database.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+mosip.regdevice.database.password=${db.dbuser.password}
 
-
-######################## Spring and Hibernate Configurations ####################
-# ***************** PMS DB Postgres Properties ***********************
+## Hibernate
 javax.persistence.jdbc.driverClassName=org.postgresql.Driver
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.pmp.database.hostname}:${mosip.pmp.database.port}/mosip_pms
@@ -30,7 +39,7 @@ javax.persistence.jdbc.schema = pms
 javax.persistence.jdbc.uinHashTable=uin_hash_salt
 javax.persistence.jdbc.uinEncryptTable=uin_encrypt_salt
 
-## For Authenticate Device
+## Hibernate Auth device
 mosip.datasource.authdevice.jdbc.driver=org.postgresql.Driver
 mosip.datasource.authdevice.jdbc.url = jdbc:postgresql://${mosip.authdevice.database.hostname}:${mosip.authdevice.database.port}/mosip_authdevice
 mosip.datasource.authdevice.jdbc.password = ${mosip.authdevice.database.password}
@@ -38,7 +47,7 @@ mosip.datasource.authdevice.jdbc.user = ${mosip.authdevice.database.user}
 mosip.datasource.authdevice.jdbc.schema = authdevice
 mosip.datasource.authdevice.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 
-## For Registration Device
+## Hibernate Reg device
 mosip.datasource.regdevice.jdbc.driver=org.postgresql.Driver
 mosip.datasource.regdevice.jdbc.url = jdbc:postgresql://${mosip.regdevice.database.hostname}:${mosip.regdevice.database.port}/mosip_regdevice
 mosip.datasource.regdevice.jdbc.password = ${mosip.regdevice.database.password}
@@ -46,7 +55,6 @@ mosip.datasource.regdevice.jdbc.user = ${mosip.regdevice.database.user}
 mosip.datasource.regdevice.jdbc.schema = regdevice
 mosip.datasource.regdevice.hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 
-# *********** Hibernate Properties *************
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.hbm2ddl.auto=none
@@ -59,91 +67,60 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
-######################### Partner Management Application Configurations ##############
-# Application ID of PMP
-# Used to upload other domain certs
+## Application ID of PMP. Used to upload other domain certs
 application.id=PARTNER
-
-# Application name of PMP
 application.name=partner
 
-# To configure starting value or initial value of mispId.
-# ex: if value = 3 ==> mispId starts from  100
-# if value = 4 ==> mispId starts from 1000
+## To configure starting value or initial value of mispId.
+## ex: if value = 3 ==> mispId starts from  100
+## if value = 4 ==> mispId starts from 1000
 mosip.kernel.mispid.length = 3
-
-# To configure length of misp license key 
 mosip.kernel.idgenerator.misp.license-key-length = 50
-
-# To configure the partner types for which extractors are required. It should be "," separated.
+## To configure the partner types for which extractors are required. It should be "," separated.
 pmp.bioextractors.required.partner.types = Credential_Partner,Online_Verification_Partner
-
-# To configure misp license validity duration
 mosip.pmp.misp.license.expiry.period.indays = 90
-
-# To configure partner api key validity duration
 mosip.pmp.partner.policy.expiry.period.indays = 90
-
-# To configure policy validity duration/period
 pmp.policy.expiry.period.indays = 180
-
-# policy schema url where policy schemas published
 pmp.policy.schema.url= https://schemas.mosip.io/v1/auth-policy
 
-# To configure what are the allowed policy types.
-# If we add any new policy type, corresponding schema also needs to be added.
-# format for adding schema configuration for new policy type is as below
-# pmp.policyTypeName.policy.schema(all are in lowercase)= schema url
+## To configure what are the allowed policy types.
+## If we add any new policy type, corresponding schema also needs to be added.
+## format for adding schema configuration for new policy type is as below
+## pmp.policyTypeName.policy.schema(all are in lowercase)= schema url
 pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance
-
-# auth policy schema url
 pmp.auth.policy.schema = ${mosip.kernel.xsdstorage-uri}auth-policy-schema.json
-
-# datashare policy schema url
 pmp.datashare.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
-
-# credentialissuance policy schema url
 pmp.credentialissuance.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
 
-# To configure email format of misp
 pmp.misp.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$
-
-# To configure email format of partner
 pmp.partner.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$
-
-# To configure length of partnerId
 pmp.partner.partnerId.max.length=36
 
-# Time difference between request creation and request processing
+## Time difference between request creation and request processing
 masterdata.registerdevice.timestamp.validate=+5
 
-# Kernel audit Service
-mosip.kernel.masterdata.audit-url=http://kernel-auditmanager-service/v1/auditmanager/audits
-
-# Kernel sign service
-mosip.kernel.sign-url=http://kernel-keymanager-service/v1/keymanager/jwtSign
+## Kernel services
+mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.kernel.sign-url=http://keymanager.kernel/v1/keymanager/jwtSign
 
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
-
 # Kernel auth client ID for partner management services
 mosip.pmp.auth.clientId=mosip-partner-client
-
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= {cipher}4e22fb7201d82324263ff4fb91035e9d0462dffd76184184d554db962cab0840
-
+mosip.pmp.auth.secretKey= ${mosip.mosiop.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
-pms.cert.service.token.request.issuerUrl=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
-pmp.ca.certificaticate.upload.rest.uri=http://kernel-keymanager-service/v1/keymanager/uploadCACertificate
-pmp.partner.certificaticate.upload.rest.uri=http://kernel-keymanager-service/v1/keymanager/uploadPartnerCertificate
-pmp.partner.certificaticate.get.rest.uri=http://kernel-keymanager-service/v1/keymanager/getPartnerCertificate/{partnerCertId}
-pmp-keymanager.upload.other.domain.cert.rest.uri=http://kernel-keymanager-service/v1/keymanager/uploadOtherDomainCertificate
+pms.cert.service.token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+pmp.ca.certificaticate.upload.rest.uri=http://keymanager.kernel/v1/keymanager/uploadCACertificate
+pmp.partner.certificaticate.upload.rest.uri=http://keymanager.kernel/v1/keymanager/uploadPartnerCertificate
+pmp.partner.certificaticate.get.rest.uri=http://keymanager.kernel/v1/keymanager/getPartnerCertificate/{partnerCertId}
+pmp-keymanager.upload.other.domain.cert.rest.uri=http://keymanager.kernel/v1/keymanager/uploadOtherDomainCertificate
 
-###################KeyCloak configuration ###################################
+## Keycloak
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
-mosip.iam.base-url=http://keycloak
+mosip.iam.base-url=${keycloak.host}
 mosip.iam.realm.operations.base-url = ${mosip.iam.base-url}/auth/admin/realms/{realmId}
 mosip.iam.admin-url =${mosip.iam.base-url}/auth/admin/
 mosip.iam.admin-realm-id =admin
@@ -155,57 +132,39 @@ mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
 mosip.keycloak.admin.user.id=admin
-mosip.keycloak.admin.secret.key={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
-#------------------------Auth-Adapter-----------------------------------------------
-auth.server.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
+## Auth adapter
+auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-##############Security properties ########################
-#CSRF switch
+## Security
 mosip.security.csrf-enable:false
-#secure cookie switch
 mosip.security.secure-cookie:false
 
-#Max rows to be returned after filter
 partner.search.maximum.rows=10
 
-#Allowed credential types which partner can map against to policy
+## Allowed credential types which partner can map against to policy
 pmp.allowed.credential.types=auth,qrcode,euin,reprint
 
-#Allowed partner types who can map policies to credential types
+## Allowed partner types who can map policies to credential types
 policy.credential.type.mapping.allowed.partner.types=Credential_Partner,Online_Verification_Partner
 
-#Allowed kyc attributes
-#Used to display in UI
+## Allowed kyc attributes. Used to display in UI
 policy.allowed.kyc.attributes = {"fullName": "Full Name","middleName": "Middle Name","lastName": "Last Name","dateOfBirth": "DateOfBirth","gender": "Gender","phone": "phone"}
-#Used to display in UI
+## Used to display in UI
 policy.auth.allowed.token.types=random,partner,policy
 
 # IAM
-# mosipbox.public.url is Ansible defined
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret={cipher}4e22fb7201d82324263ff4fb91035e9d0462dffd76184184d554db962cab0840
-mosip.iam.module.redirecturi=${mosipbox.public.url}/v1/partnermanager/login-redirect/
+mosip.iam.module.clientsecret=${mosip.api.public.url}
+mosip.iam.module.redirecturi=${mosip.api.public.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${mosipbox.public.url}/keycloak/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.kernel.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${mosipbox.public.url}/keycloak/auth/realms/mosip/protocol/openid-connect/token
-
-###############Not used properties###################
-pmp.policy.allowed.authtokens.types=random,partner,policy
-mosip.kernel.device.search-url=http://kernel-masterdata-service/v1/masterdata/devices/search
-token.request.appid=admin
-token.request.password=mosip
-token.request.username=110005
-token.request.version=string
-token.request.id=v1
-token.request.issuerUrl=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
-token.request.clientId=admin
-PASSWORDBASEDTOKENAPI=http://kernel-auth-service/v1/authmanager/authenticate/useridPwd
-application.env.local=false
+mosip.iam.token_endpoint=${kecloak.host}/auth/realms/mosip/protocol/openid-connect/token

From ca549ad9f8e053eb0b05082ac605d0a55dfc353a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 07:27:10 +0530
Subject: [PATCH 0066/1358] [MOSIP-14487] Unused properties added back as code
 was crashing.

---
 partner-management-default.properties | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index fb3b7e3ca81..39a66adb35d 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -168,3 +168,16 @@ mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/ope
 mosip.iam.module.admin_realm_id=mosip
 mosip.kernel.filtervalue.max_columns =100
 mosip.iam.token_endpoint=${kecloak.host}/auth/realms/mosip/protocol/openid-connect/token
+
+## Unused properties. TODO: delete them once they are removed from code
+pmp.policy.allowed.authtokens.types=random,partner,policy
+mosip.kernel.device.search-url=http://masterdata.kernel/v1/masterdata/devices/search
+token.request.appid=admin
+token.request.password=mosip
+token.request.username=110005
+token.request.version=string
+token.request.id=v1
+token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+token.request.clientId=admin
+PASSWORDBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/useridPwd
+application.env.local=false

From d8f77f751f4e12743ac954de02115f6649c00652 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 09:03:50 +0530
Subject: [PATCH 0067/1358] [MOSIP-14287] Unused properties marked.

---
 id-authentication-default.properties | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 8026a6ec386..874c9e1bfa6 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -422,12 +422,10 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.keystore-pass=1234
 
 ## Titles/Templates master data stored as configuration ---------- 
-## These are static IDA-Specific Master Data (base-64 encoded) - for fra and ara languages.
-## For any other language please update the respective properties.
-## Titles template used in Name Normalizatoin in Demographic authentication
-maste.data.titles=ewogICJpZCI6IG51bGwsCiAgInZlcnNpb24iOiBudWxsLAogICJyZXNwb25zZXRpbWUiOiAiMjAyMC0wNC0wM1QxMToxMTowNy4zODhaIiwKICAibWV0YWRhdGEiOiBudWxsLAogICJyZXNwb25zZSI6IHsKICAgICJ0aXRsZUxpc3QiOiBbCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNSVIiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTXIiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgVGl0bGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIk1SUyIsCiAgICAgICAgInRpdGxlTmFtZSI6ICJNcnMiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIkZlbWFsZSBUaXRsZSIsCiAgICAgICAgImlzQWN0aXZlIjogdHJ1ZSwKICAgICAgICAibGFuZ0NvZGUiOiAiZW5nIgogICAgICB9LAogICAgICB7CiAgICAgICAgImNvZGUiOiAiTUlTIiwKICAgICAgICAidGl0bGVOYW1lIjogIk1pc3MiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIlVubWFycmllZCBGZW1hbGUgVGl0bGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIk1JUiIsCiAgICAgICAgInRpdGxlTmFtZSI6ICLYo9iz2KrYp9iwIiwKICAgICAgICAidGl0bGVEZXNjcmlwdGlvbiI6ICLYp9mE2LnZhtmI2KfZhiDYp9mE2LDZg9mI2LEiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImFyYSIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIk1SUyIsCiAgICAgICAgInRpdGxlTmFtZSI6ICLYs9iqIiwKICAgICAgICAidGl0bGVEZXNjcmlwdGlvbiI6ICLYudmG2YjYp9mGINij2YbYq9mJIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJhcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNSVMiLAogICAgICAgICJ0aXRsZU5hbWUiOiAi2KLZhtiz2KkiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogItin2YTYudmG2YjYp9mGINin2YTYpdmG2KfYqyDYutmK2LEg2KfZhNmF2KrYstmI2KzYp9iqIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJhcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNSVIiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTW9uc2lldXIiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIlRpdHJlIG1hc2N1bGluIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJmcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNUlMiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTWFkYW1lIiwKICAgICAgICAidGl0bGVEZXNjcmlwdGlvbiI6ICJUaXRyZSBmw6ltaW5pbiIsCiAgICAgICAgImlzQWN0aXZlIjogdHJ1ZSwKICAgICAgICAibGFuZ0NvZGUiOiAiZnJhIgogICAgICB9LAogICAgICB7CiAgICAgICAgImNvZGUiOiAiTUlTIiwKICAgICAgICAidGl0bGVOYW1lIjogIk1hZGVtb2lzZWxsZSIsCiAgICAgICAgInRpdGxlRGVzY3JpcHRpb24iOiAiVGl0cmUgZGUgZmVtbWUgY8OpbGliYXRhaXJlIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJmcmEiCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAiY29kZSI6ICJNQVIiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTXN0ZXIiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgQ2hpbGQgVGl0bGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIlRFU1QiLAogICAgICAgICJ0aXRsZU5hbWUiOiAiTWFzdGVyIFRFU1QiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgVEVTVCBUaXRsZSBVcGRhdGUiLAogICAgICAgICJpc0FjdGl2ZSI6IHRydWUsCiAgICAgICAgImxhbmdDb2RlIjogImVuZyIKICAgICAgfSwKICAgICAgewogICAgICAgICJjb2RlIjogIlRFU1QgT25lIiwKICAgICAgICAidGl0bGVOYW1lIjogIk1hc3RlciBURVNUIE9uZSBVcGRhdGUiLAogICAgICAgICJ0aXRsZURlc2NyaXB0aW9uIjogIk1hbGUgVEVTVCBPbmUgVGl0bGUgVXBkYXRlIiwKICAgICAgICAiaXNBY3RpdmUiOiB0cnVlLAogICAgICAgICJsYW5nQ29kZSI6ICJlbmciCiAgICAgIH0KICAgIF0KICB9LAogICJlcnJvcnMiOiBudWxsCn0
+## UNUSED. TODO: remove them later
+maste.data.titles=
 # SMS and Email templates for OTP notification and Authentication notification
-master.data.ida-templates={
  "id": null,
  "version": null,
  "responsetime": "2020-04-03T11:13:07.948Z",
  "metadata": null,
  "response": {
    "templates": [
      {
        "id": "1151",
        "name": "Template for Email Content",
        "description": "Template for Email Content",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "Dear $name\nOTP for $idvidType  $idvid is $otp and is valid for $validTime minutes. (Generated on $date at $time Hrs)",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "ida-auth-otp-email-content-template",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1151",
        "name": "قالب لمحتوى البريد الإلكتروني",
        "description": "قالب لمحتوى البريد الإلكتروني",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "عزيزي $name \n nOTP لـ $idvidType $idvid هو $otp وهو صالح لمدة $validTime دقيقة. (تم إنشاؤه في $date في $time Hrs)",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "ida-auth-otp-email-content-template",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1151",
        "name": "Modèle de contenu de courrier électronique",
        "description": "Modèle de contenu de courrier électronique",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Cher $name,\nOTP pour $idvidType $idvid est $otp et est valide pour $validTime minutes. (Généré le $date à $time Hrs)",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "ida-auth-otp-email-content-template",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1152",
        "name": "Template for Email Subject",
        "description": "Template for Email Subject",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "$idvidType $idvid: OTP Request",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "ida-auth-otp-email-subject-template",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1152",
        "name": "قالب لموضوع البريد الإلكتروني",
        "description": "قالب لموضوع البريد الإلكتروني",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "$idvidType $idvid: طلب OTP",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "ida-auth-otp-email-subject-template",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1152",
        "name": "Modèle pour sujet demail",
        "description": "Modèle pour sujet demail",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "$idvidType $idvid: Requête OTP",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "ida-auth-otp-email-subject-template",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1153",
        "name": "Template for OTP in SMS ",
        "description": "Template for OTP in SMS ",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "OTP for $idvidType  $idvid is $otp and is valid for $validTime minutes. (Generated on $date at $time Hrs)",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "ida-auth-otp-sms-template",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1153",
        "name": "قالب كلمة المرور لمرة واحدة في الرسالة",
        "description": "قالب كلمة المرور لمرة واحدة في الرسالة",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "OTP لـ $idvidType $idvid هو $otp وهو صالح لمدة $validTime دقيقة. (التي تم إنشاؤها على $date في $time ساعات)",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "ida-auth-otp-sms-template",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1153",
        "name": "Modèle pour OTP dans SMS",
        "description": "Modèle pour OTP dans SMS",
        "fileFormatCode": "txt",
        "model": "model",
        "fileText": "OTP pour $idvidType $idvid est $otp et est valide pour $validTime minutes. (Généré le $date à $time Hrs)",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "ida-auth-otp-sms-template",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1101",
        "name": "Template for authorization content",
        "description": "Template for authorization content",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Dear $name\nYour Authentication of $idvidType $idvid using $authType on $date at $time Hrs $status at a device deployed by MOSIP Services",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "auth-email-content",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1101",
        "name": "قالب لمحتوى التخويل",
        "description": "قالب لمحتوى التخويل",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "عزيزي $name ،\nمصاٿقة $idvidType $idvid باستخدام $authType على $date في $time Hrs $status على جهاز تم نشره بواسطة \"خٿمات MOSIP\".",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "auth-email-content",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1101",
        "name": "Modèle de contenu dautorisation",
        "description": "Modèle de contenu dautorisation",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Cher $name,\nVotre authentification $idvidType $idvid utilisant $authType le $date à $time Hrs $status sur un périphérique déployé par \"MOSIP Services\"",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "auth-email-content",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1102",
        "name": "Template for authorization subject",
        "description": "Template for authorization subject",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "$idvidType $idvid Authentication $status",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "auth-email-subject",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1102",
        "name": "قالب لموضوع التخويل",
        "description": "قالب لموضوع التخويل",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "$idvidType $idvid: مصادقة $status",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "auth-email-subject",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1102",
        "name": "Modèle pour sujet dautorisation",
        "description": "Modèle pour sujet dautorisation",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "$idvidType $idvid: $status dauthentification",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "auth-email-subject",
        "langCode": "fra",
        "isActive": true
      },
      {
        "id": "1103",
        "name": "Template for authorization SMS",
        "description": "Template for authorization SMS",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Your Authentication of $idvidType $idvid using $authType on $date at $time Hrs $status at a device deployed by MOSIP Services.",
        "moduleId": "10004",
        "moduleName": "ID Authentication",
        "templateTypeCode": "auth-sms",
        "langCode": "eng",
        "isActive": true
      },
      {
        "id": "1103",
        "name": "قالب لرسالة التفويض",
        "description": "قالب لرسالة التفويض",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "مصاٿقتك على $idvidType $idvid باستخدام $authType في $date في $time Hrs $status على جهاز تم نشره بواسطة \"خدمات MOSIP\".",
        "moduleId": "10004",
        "moduleName": "مصادقة الهوية",
        "templateTypeCode": "auth-sms",
        "langCode": "ara",
        "isActive": true
      },
      {
        "id": "1103",
        "name": "Modèle de SMS dautorisation",
        "description": "Modèle de SMS dautorisation",
        "fileFormatCode": "txt",
        "model": null,
        "fileText": "Votre authentification $idvidType $idvid utilisant $authType le $date à $time Hrs $status sur un périphérique déployé par \"MOSIP Services\".",
        "moduleId": "10004",
        "moduleName": "Authentification ID",
        "templateTypeCode": "auth-sms",
        "langCode": "fra",
        "isActive": true
      }
    ]
  },
  "errors": null
}
+master.data.ida-templates=
 
 ## Security - used in Internal Authentication Services by default Kernel Auth Adapter
 mosip.security.csrf-enable=false

From 737526cd217becd8f342b4ce7ad5a8134a1df790 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 09:45:46 +0530
Subject: [PATCH 0068/1358] Property corrected

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 39a66adb35d..71feccaaaef 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -167,7 +167,7 @@ mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.kernel.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${kecloak.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy

From b1eda7ef200b3ca925457d31e169a07a118e5ef0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 10:01:23 +0530
Subject: [PATCH 0069/1358] [MOSIP-11894] Minor cleanup.

---
 CredentialType.json                     |   2 +-
 auth-policy-schema.json                 | 116 ++++++------
 data-share-policy-schema.json           | 242 ++++++++++++------------
 id-authentication-mapping.json          | 118 ++++++------
 idobject-document-category-mapping.json |  76 ++++----
 mosip-vid-policy-schema.json            | 120 ++++++------
 mosip-vid-policy.json                   |   6 +-
 7 files changed, 340 insertions(+), 340 deletions(-)

diff --git a/CredentialType.json b/CredentialType.json
index 8c53a1a37f2..cdf19f9654f 100644
--- a/CredentialType.json
+++ b/CredentialType.json
@@ -1,6 +1,6 @@
   
 {
-	"types":
+  "types":
   [
     {
       "id" : "idtype1",
diff --git a/auth-policy-schema.json b/auth-policy-schema.json
index 8b4f2951219..ef345a8cbdf 100644
--- a/auth-policy-schema.json
+++ b/auth-policy-schema.json
@@ -1,59 +1,59 @@
 {
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"type": "object",
-	"properties": {
-		"allowedKycAttributes":{
-			"type":"array",
-			"additionalItems": false,
-			"items":
-			{
-				"type":"object",
-				"properties":{
-					"attributeName":{
-						"type":"string"
-					}
-				},
-				"required":[
-					"attributeName"
-				],
-				"additionalProperties": false				
-			}
-			
-		},
-		"allowedAuthTypes":{
-			"type":"array",
-			"additionalItems": false,
-			"items":
-			{
-				"type":"object",
-				"properties":{
-					"authType":{
-						"type":"string"
-					},
-					"authSubType":{
-						"type":"string"
-					},
-					"mandatory":{
-						"type":"boolean"
-					}
-				},
-				"required":[
-					"authType",
-					"mandatory"
-				],
-				"additionalProperties": false
-			}
-			
-		},
-		"authTokenType":{
-			"type":"string",
-			"enum":["random","partner","policy"]
-		}
-	},
-	"required":[
-		"authTokenType",
-		"allowedAuthTypes",
-		"allowedKycAttributes"
-	],
-	"additionalProperties": false	
-}
\ No newline at end of file
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "allowedKycAttributes":{
+      "type":"array",
+      "additionalItems": false,
+      "items":
+      {
+        "type":"object",
+        "properties":{
+          "attributeName":{
+            "type":"string"
+          }
+        },
+        "required":[
+          "attributeName"
+        ],
+        "additionalProperties": false        
+      }
+      
+    },
+    "allowedAuthTypes":{
+      "type":"array",
+      "additionalItems": false,
+      "items":
+      {
+        "type":"object",
+        "properties":{
+          "authType":{
+            "type":"string"
+          },
+          "authSubType":{
+            "type":"string"
+          },
+          "mandatory":{
+            "type":"boolean"
+          }
+        },
+        "required":[
+          "authType",
+          "mandatory"
+        ],
+        "additionalProperties": false
+      }
+      
+    },
+    "authTokenType":{
+      "type":"string",
+      "enum":["random","partner","policy"]
+    }
+  },
+  "required":[
+    "authTokenType",
+    "allowedAuthTypes",
+    "allowedKycAttributes"
+  ],
+  "additionalProperties": false  
+}
diff --git a/data-share-policy-schema.json b/data-share-policy-schema.json
index 0250effde67..c566502991b 100644
--- a/data-share-policy-schema.json
+++ b/data-share-policy-schema.json
@@ -1,123 +1,123 @@
 {
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"type": "object",
-	"properties": {
-		"dataSharePolicies": {
-			"type": "object",
-			"properties": {
-				"typeOfShare": {
-					"type": "string",
-					"enum":["Data Share","direct"]
-				},
-				"validForInMinutes": {
-					"type": "string"
-				},
-				"transactionsAllowed": {
-					"type": "string"
-				},
-				"encryptionType": {
-					"type": "string",
-					"enum":["Partner Based","none"]
-				},
-				"shareDomain": {
-					"type": "string"
-				},
-				"source": {
-					"type": "string"
-				}
-			},
-			"required": [
-				"typeOfShare",
-				"validForInMinutes",
-				"transactionsAllowed",
-				"encryptionType",
-				"shareDomain",
-				"source"
-			]
-		},
-		"shareableAttributes": {
-			"type": "array",
-			"additionalItems": false,
-			"items": {
-				"type": "object",				
-				"properties": {
-					"attributeName": {
-						"type": "string"
-					},
-					"group": {
-						"type": "string"
-					},
-					"source": {
-						"type": "array",
-						"items": {
-							"type": "object",
-							"properties": {
-								"attribute": {
-									"type": "string"
-								},
-								"filter": {
-									"type": "array",
-									"items": [{
-											"type": "object",
-											"properties": {
-												"type": {
-													"type": "string"
-												}
-											}
-										},
-										{
-											"type": "object",
-											"properties": {
-												"type": {
-													"type": "string"
-												},
-												"subType": {
-													"type": "array",
-													"items": [{
-															"type": "string"
-														},
-														{
-															"type": "string"
-														}
-													]
-												}
-											}
-										},
-										{
-											"type": "object",
-											"properties": {
-												"language": {
-													"type": "string"
-												}
-											}
-										}
-									]
-								}
-							},
-							"required": [
-								"attribute"
-							]
-						}
-					},
-					"encrypted": {
-						"type": "boolean"
-					},
-					"format": {
-						"type": "string"
-					}
-				},
-				"required": [
-					"attributeName",
-					"source",
-					"encrypted"
-				],
-				"additionalProperties": false
-			}
-		}
-	},
-	"required": [
-		"dataSharePolicies",
-		"shareableAttributes"
-	],
-	"additionalProperties": false
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "dataSharePolicies": {
+      "type": "object",
+      "properties": {
+        "typeOfShare": {
+          "type": "string",
+          "enum":["Data Share","direct"]
+        },
+        "validForInMinutes": {
+          "type": "string"
+        },
+        "transactionsAllowed": {
+          "type": "string"
+        },
+        "encryptionType": {
+          "type": "string",
+          "enum":["Partner Based","none"]
+        },
+        "shareDomain": {
+          "type": "string"
+        },
+        "source": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "typeOfShare",
+        "validForInMinutes",
+        "transactionsAllowed",
+        "encryptionType",
+        "shareDomain",
+        "source"
+      ]
+    },
+    "shareableAttributes": {
+      "type": "array",
+      "additionalItems": false,
+      "items": {
+        "type": "object",        
+        "properties": {
+          "attributeName": {
+            "type": "string"
+          },
+          "group": {
+            "type": "string"
+          },
+          "source": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "attribute": {
+                  "type": "string"
+                },
+                "filter": {
+                  "type": "array",
+                  "items": [{
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        }
+                      }
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "type": {
+                          "type": "string"
+                        },
+                        "subType": {
+                          "type": "array",
+                          "items": [{
+                              "type": "string"
+                            },
+                            {
+                              "type": "string"
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "language": {
+                          "type": "string"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "required": [
+                "attribute"
+              ]
+            }
+          },
+          "encrypted": {
+            "type": "boolean"
+          },
+          "format": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "attributeName",
+          "source",
+          "encrypted"
+        ],
+        "additionalProperties": false
+      }
+    }
+  },
+  "required": [
+    "dataSharePolicies",
+    "shareableAttributes"
+  ],
+  "additionalProperties": false
 }
diff --git a/id-authentication-mapping.json b/id-authentication-mapping.json
index 9d6bd5e00dd..33818b75f91 100644
--- a/id-authentication-mapping.json
+++ b/id-authentication-mapping.json
@@ -1,61 +1,61 @@
 {
-	"ida-mapping": {
-		"name": [
-			"fullName"
-		],
-		"dob": [
-			"dateOfBirth"
-		],
-		"age": [
-			"dateOfBirth"
-		],
-		"gender": [
-			"gender"
-		],
-		"phoneNumber": [
-			"phone"
-		],
-		"emailId": [
-			"email"
-		],
-		"addressLine1": [
-			"addressLine1"
-		],
-		"addressLine2": [
-			"addressLine2"
-		],
-		"addressLine3": [
-			"addressLine3"
-		],
-		"location1": [
-			"city"
-		],
-		"location2": [
-			"region"
-		],
-		"location3": [
-			"province"
-		],
-		"postalCode": [
-			"postalCode"
-		],
-		"fullAddress": [
-			"addressLine1",
-			"addressLine2",
-			"addressLine3",
-			"city",
-			"region",
-			"province",
-			"postalCode"
-		],
-		"iris": [
-			"CBEFF"
-		],
-		"fingerprint": [
-			"CBEFF"
-		],
-		"face": [
-			"CBEFF"
-		]
-	}
+  "ida-mapping": {
+    "name": [
+      "fullName"
+    ],
+    "dob": [
+      "dateOfBirth"
+    ],
+    "age": [
+      "dateOfBirth"
+    ],
+    "gender": [
+      "gender"
+    ],
+    "phoneNumber": [
+      "phone"
+    ],
+    "emailId": [
+      "email"
+    ],
+    "addressLine1": [
+      "addressLine1"
+    ],
+    "addressLine2": [
+      "addressLine2"
+    ],
+    "addressLine3": [
+      "addressLine3"
+    ],
+    "location1": [
+      "city"
+    ],
+    "location2": [
+      "region"
+    ],
+    "location3": [
+      "province"
+    ],
+    "postalCode": [
+      "postalCode"
+    ],
+    "fullAddress": [
+      "addressLine1",
+      "addressLine2",
+      "addressLine3",
+      "city",
+      "region",
+      "province",
+      "postalCode"
+    ],
+    "iris": [
+      "CBEFF"
+    ],
+    "fingerprint": [
+      "CBEFF"
+    ],
+    "face": [
+      "CBEFF"
+    ]
+  }
 }
diff --git a/idobject-document-category-mapping.json b/idobject-document-category-mapping.json
index 7fe51d2796c..0162586552d 100644
--- a/idobject-document-category-mapping.json
+++ b/idobject-document-category-mapping.json
@@ -1,40 +1,40 @@
 {
-	"identity": {
-		"fullName": {
-			"documentCategory": "proofOfIdentity"
-		},
-		"parentOrGuardianRID": {
-			"documentCategory" : "proofOfRelationship"
-		},
-		"parentOrGuardianUIN": {
-			"documentCategory" : "proofOfRelationship"
-		},
-		"age": {
-			"documentCategory" : "proofOfIdentity"
-		},
-		"addressLine1": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"addressLine2": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"addressLine3": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"region": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"province": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"postalCode": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"localAdministrativeAuthority": {
-			"documentCategory" : "proofOfAddress"
-		},
-		"city": {
-			"documentCategory" : "proofOfAddress"
-		}
-	}
+  "identity": {
+    "fullName": {
+      "documentCategory": "proofOfIdentity"
+    },
+    "parentOrGuardianRID": {
+      "documentCategory" : "proofOfRelationship"
+    },
+    "parentOrGuardianUIN": {
+      "documentCategory" : "proofOfRelationship"
+    },
+    "age": {
+      "documentCategory" : "proofOfIdentity"
+    },
+    "addressLine1": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "addressLine2": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "addressLine3": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "region": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "province": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "postalCode": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "localAdministrativeAuthority": {
+      "documentCategory" : "proofOfAddress"
+    },
+    "city": {
+      "documentCategory" : "proofOfAddress"
+    }
+  }
 } 
diff --git a/mosip-vid-policy-schema.json b/mosip-vid-policy-schema.json
index be704a33b37..f34aa0ed573 100644
--- a/mosip-vid-policy-schema.json
+++ b/mosip-vid-policy-schema.json
@@ -1,61 +1,61 @@
 {
-	"$id": "http://mosip.io/vid_policy_object/1.0/vid_policy_object.json",
-	"$schema": "http://json-schema.org/draft-07/schema#",
-	"title": "VID Policy schema",
-	"description": "MOSIP VID Policy schema",
-	"type": "object",
-	"additionalProperties": false,
-	"properties": {
-		"vidPolicies": {
-			"title": "vidPolicies",
-			"description": "This schema holds all the VID policies configured for a country",
-			"type": "array",
-			"additionalItems": false,
-			"uniqueItems": true,
-			"items": {
-				"type": "object",
-				"required": [
-					"vidType",
-					"vidPolicy"
-				],
-				"additionalProperties": false,
-				"properties": {
-					"vidType": {
-						"type": "string",
-						"pattern": "^(Perpetual|Temporary)$"
-					},
-					"vidPolicy": {
-						"$ref": "#/definitions/vidPolicyType"
-					}
-				}
-			}
-		}
-	},
-	"definitions": {
-		"vidPolicyType": {
-			"type": "object",
-			"properties": {
-				"validForInMinutes": {
-					"type": ["integer", "null"]
-				},
-				"transactionsAllowed": {
-					"type": ["integer", "null"],
-					"minimum": 1,
-					"maximum": 1
-				},
-				"instancesAllowed": {
-					"type": "integer",
-					"minimum": 1
-				},
-				"autoRestoreAllowed": {
-					"type": "boolean"
-				},
-				"restoreOnAction": {
-					"type": "string",
-					"pattern": "^(REVOKE|REGENERATE)$"
-				}
-			},
-			"additionalProperties": false
-		}
-	}
-}
\ No newline at end of file
+  "$id": "http://mosip.io/vid_policy_object/1.0/vid_policy_object.json",
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "VID Policy schema",
+  "description": "MOSIP VID Policy schema",
+  "type": "object",
+  "additionalProperties": false,
+  "properties": {
+    "vidPolicies": {
+      "title": "vidPolicies",
+      "description": "This schema holds all the VID policies configured for a country",
+      "type": "array",
+      "additionalItems": false,
+      "uniqueItems": true,
+      "items": {
+        "type": "object",
+        "required": [
+          "vidType",
+          "vidPolicy"
+        ],
+        "additionalProperties": false,
+        "properties": {
+          "vidType": {
+            "type": "string",
+            "pattern": "^(Perpetual|Temporary)$"
+          },
+          "vidPolicy": {
+            "$ref": "#/definitions/vidPolicyType"
+          }
+        }
+      }
+    }
+  },
+  "definitions": {
+    "vidPolicyType": {
+      "type": "object",
+      "properties": {
+        "validForInMinutes": {
+          "type": ["integer", "null"]
+        },
+        "transactionsAllowed": {
+          "type": ["integer", "null"],
+          "minimum": 1,
+          "maximum": 1
+        },
+        "instancesAllowed": {
+          "type": "integer",
+          "minimum": 1
+        },
+        "autoRestoreAllowed": {
+          "type": "boolean"
+        },
+        "restoreOnAction": {
+          "type": "string",
+          "pattern": "^(REVOKE|REGENERATE)$"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index 52f84074dc6..262cd99f55d 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -6,8 +6,8 @@
         "validForInMinutes": null,
         "transactionsAllowed": null,
         "instancesAllowed": 1,
-	"autoRestoreAllowed": true,
-	"restoreOnAction": "REVOKED"
+  "autoRestoreAllowed": true,
+  "restoreOnAction": "REVOKED"
       }
     },
     {
@@ -17,7 +17,7 @@
         "transactionsAllowed": 1,
         "instancesAllowed": 5,
         "autoRestoreAllowed": false,
-	"restoreOnAction": "REGENERATE"
+  "restoreOnAction": "REGENERATE"
       }
     }
   ]

From 2554e1726d4368c0bcbd713e32fb2051d394ec31 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 10:19:26 +0530
Subject: [PATCH 0070/1358] [MOSIP-14492] Idrepo properties updated.

---
 id-repository-default.properties | 143 +++++++++++++------------------
 1 file changed, 60 insertions(+), 83 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 1c76f167437..028116f05d3 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -1,23 +1,29 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# mosip.mosip.creqreq.client.secret
+# mosip.mosip.creser.client.secret
+# keycloak.host
+
 management.endpoint.restart.enabled=true
 
-#----------------------------------ID Repo dynamic properties----------------------------------------------#
-mosip.idrepo.db.url=postgres
-mosip.idrepo.db.port=80
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.idrepo.db.url=postgres-postgresql.postgres.svc.cluster.local
+mosip.idrepo.db.port=5432
 mosip.idrepo.db.identity.db-name=mosip_idrepo
 mosip.idrepo.db.identity.username=idrepouser
-mosip.idrepo.db.identity.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+mosip.idrepo.db.identity.password=${db.dbuser.password}
 mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
-mosip.idrepo.db.vid.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
 mosip.idrepo.objectstore.bucket-name=idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
-#----------------------------------ID Repo Service---------------------------------------------------------#
-
-# Application name using for auditing
+# For auditing
 mosip.idrepo.application.name=ID-Repository
-# Application version validation in ID-Repo requests
 mosip.idrepo.application.version.pattern=^v\\d+(\\.\\d+)?$
 # Modulo value used to evaluate expression (UIN % modulo) used to get the salt from salt table 
 mosip.idrepo.modulo-value=1000
@@ -30,7 +36,7 @@ mosip.idrepo.crypto.refId.uin-data=identity_data
 mosip.idrepo.crypto.refId.demo-doc-data=demographic_data
 mosip.idrepo.crypto.refId.bio-doc-data=biometric_data
 
-#---------------------------Kernel Retry Configurations----------------------------------------------------#
+## Kernel retry
 # The retry limit excluding the first attempt before attempting for retries. Default is set to 5.
 kernel.retry.attempts.limit=5
 # The initial interval to be used for exponential backoff in milli seconds. If the exponential backoff is disabled by setting 'kernel.retry.exponential.backoff.multiplier' value as 1, this initial interval will be used as the fixed backoff interval for every retries. Default value is 200 millisecs
@@ -45,43 +51,34 @@ kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRet
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
-#----------------------------------ID Repo Identity Service------------------------------------------------#
-
+## Identity service
 # Application version expected in the request
 mosip.idrepo.identity.application.version=v1
-
 # Application ids expected in the requests
 mosip.idrepo.identity.id.create=mosip.id.create
 mosip.idrepo.identity.id.read=mosip.id.read
 mosip.idrepo.identity.id.update=mosip.id.update
-
 #database mappings for identity service
 mosip.idrepo.identity.db.url=jdbc:postgresql://${mosip.idrepo.db.url}:${mosip.idrepo.db.port}/${mosip.idrepo.db.identity.db-name}
 mosip.idrepo.identity.db.username=${mosip.idrepo.db.identity.username}
 mosip.idrepo.identity.db.password=${mosip.idrepo.db.identity.password}
 mosip.idrepo.identity.db.driverClassName=org.postgresql.Driver
-
 # Path of UIN expected in the input idrepo request. This path is based on Identity schema.
 mosip.idrepo.identity.json.path=identity.UIN
-
 # UIN status value which is stored in database for newly inserted UIN/active UINs.
 mosip.idrepo.identity.uin-status.registered=ACTIVATED
-
 # List of allowed UIN status in ID-Repo 
 mosip.idrepo.identity.uin-status=ACTIVATED,BLOCKED,DEACTIVATED 
-
 # Types allowed in retreiveIdentity requests
 mosip.idrepo.identity.allowedTypes=bio,demo,all
 
-#-----------------------ID Repo Identity Service - idobjectvalidator---------------------------------------#
-
+# idobjectvalidator
 # Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 
-#----------------------------------ID Repo VID Service-----------------------------------------------------#
+# VID
 # Application version expected in the request
 mosip.idrepo.vid.application.version=v1
-
 # Application ids expected in the requests
 mosip.idrepo.vid.id.create=mosip.vid.create
 mosip.idrepo.vid.id.read=mosip.vid.read
@@ -89,122 +86,110 @@ mosip.idrepo.vid.id.update=mosip.vid.update
 mosip.idrepo.vid.id.regenerate=mosip.vid.regenerate 
 mosip.idrepo.vid.id.reactivate=mosip.vid.reactivate
 mosip.idrepo.vid.id.deactivate=mosip.vid.deactivate
-
 # Database mapping for VID service
 mosip.idrepo.vid.db.url=jdbc:postgresql://${mosip.idrepo.db.url}:${mosip.idrepo.db.port}/${mosip.idrepo.db.vid.db-name}
 mosip.idrepo.vid.db.username=${mosip.idrepo.db.vid.username}
 mosip.idrepo.vid.db.password=${mosip.idrepo.db.vid.password}
 mosip.idrepo.vid.db.driverClassName=org.postgresql.Driver
-
 # VID status value which is stored in database for newly inserted VID/active VIDs.
 mosip.idrepo.vid.active-status=ACTIVE
-
 # VID status for which unlimited txn is not allowed
 mosip.idrepo.vid.unlimited-txn-status=USED
-
 # VID status which are allowed for VID regeneration
 mosip.idrepo.vid.regenerate.allowed-status=ACTIVE,REVOKED,EXPIRED,USED
-
 # List of allowed VID status in ID-Repo 
 mosip.idrepo.vid.allowedstatus=ACTIVE,REVOKED,EXPIRED,USED,INVALIDATED,DEACTIVATED
-
 # VID status value which is stored in database for deactivated VIDs. Used in deactivate-all-vids api.
 mosip.idrepo.vid.deactive-status=DEACTIVATED
-
 # VID status value which is stored in database for reactivated VIDs. Used in reactivate-all-vids api.
 mosip.idrepo.vid.reactive-status=ACTIVE
 
 # Config server url
 mosip.idrepo.mosip-config-url=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-
 # VID policy schema against which VID policy is validated
 mosip.idrepo.vid.policy-schema-url=${mosip.idrepo.mosip-config-url}mosip-vid-policy-schema.json
-
 # VID policy based on which VID is created
 mosip.idrepo.vid.policy-file-url=${mosip.idrepo.mosip-config-url}mosip-vid-policy.json
 
-#----------------------------------REST-services ----------------------------------------------------------#
-mosip.idrepo.audit.rest.uri=http://kernel-auditmanager-service/v1/auditmanager/audits
+## Rest servies 
+mosip.idrepo.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
 mosip.idrepo.audit.rest.headers.mediaType=application/json
 
-mosip.idrepo.encryptor.rest.uri=http://kernel-keymanager-service/v1/keymanager/encrypt
+mosip.idrepo.encryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/encrypt
 mosip.idrepo.encryptor.rest.httpMethod=POST
 mosip.idrepo.encryptor.rest.headers.mediaType=application/json
 mosip.idrepo.encryptor.rest.timeout=100
 
-mosip.idrepo.decryptor.rest.uri=http://kernel-keymanager-service/v1/keymanager/decrypt
+mosip.idrepo.decryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/decrypt
 mosip.idrepo.decryptor.rest.httpMethod=POST
 mosip.idrepo.decryptor.rest.headers.mediaType=application/json
 mosip.idrepo.decryptor.rest.timeout=100
 
-mosip.idrepo.vid-service.rest.uri=http://idrepo-vid-service/idrepository/v1/vid/uin/{uin}
+mosip.idrepo.vid-service.rest.uri=http://vid.idrepo/idrepository/v1/vid/uin/{uin}
 mosip.idrepo.vid-service.rest.httpMethod=GET
 mosip.idrepo.vid-service.rest.headers.mediaType=application/json
 mosip.idrepo.vid-service.rest.timeout=100
 
-mosip.idrepo.retrieve-uin-by-vid.rest.uri=http://idrepo-vid-service/idrepository/v1/vid/{vid}
+mosip.idrepo.retrieve-uin-by-vid.rest.uri=http://vid.idrepo/idrepository/v1/vid/{vid}
 mosip.idrepo.retrieve-uin-by-vid.rest.httpMethod=GET
 mosip.idrepo.retrieve-uin-by-vid.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-uin-by-vid.rest.timeout=100
 
-mosip.idrepo.bio-extractor-service.rest.uri=http://idrepo-bioextractor-service/v1/bioextractor/{extractionFormat}/extracttemplates
+mosip.idrepo.bio-extractor-service.rest.uri=http://bioextractor.idrepo/v1/bioextractor/{extractionFormat}/extracttemplates
 mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
 mosip.idrepo.bio-extractor-service.rest.timeout=100
 
-mosip.idrepo.syncdata-service.rest.uri=http://kernel-masterdata-service/v1/masterdata/idschema/latest
+mosip.idrepo.syncdata-service.rest.uri=http://masterdata.kernel/v1/masterdata/idschema/latest
 mosip.idrepo.syncdata-service.rest.httpMethod=GET
 mosip.idrepo.syncdata-service.rest.headers.mediaType=application/json
 mosip.idrepo.syncdata-service.rest.timeout=100
 
-mosip.idrepo.pmp.partner.rest.uri=http://pms-partner-manager-service/v1/partnermanager/partners?partnerType=Online_Verification_Partner
+mosip.idrepo.pmp.partner.rest.uri=http://pms-partner.pms/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 mosip.idrepo.pmp.partner.rest.httpMethod=GET
 mosip.idrepo.pmp.partner.rest.headers.mediaType=application/json
 mosip.idrepo.pmp.partner.rest.timeout=10
 
-mosip.idrepo.credential.request.rest.uri=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
+mosip.idrepo.credential.request.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
 mosip.idrepo.credential.request.rest.httpMethod=POST
 mosip.idrepo.credential.request.rest.headers.mediaType=application/json
 mosip.idrepo.credential.request.rest.timeout=10
 
-mosip.idrepo.retrieve-by-uin.rest.uri=http://idrepo-identity-service/idrepository/v1/identity/idvid/{uin}
+mosip.idrepo.retrieve-by-uin.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-by-uin.rest.timeout=100
 
-mosip.idrepo.vid-generator.rest.uri=http://kernel-idgenerator-service/v1/idgenerator/vid
+mosip.idrepo.vid-generator.rest.uri=http://idgenerator.kernel/v1/idgenerator/vid
 mosip.idrepo.vid-generator.rest.httpMethod=GET
 mosip.idrepo.vid-generator.rest.headers.mediaType=application/json
 mosip.idrepo.vid-generator.rest.timeout=100
 
-#--------------------------Credential-Request-Generator properties-----------------------------------#
-
-#database mappings Credential-Request-Generator
-mosip.credential.service.database.hostname=postgres
-mosip.credential.service.database.port=80
+## Credential request generator
+mosip.credential.service.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.credential.service.database.port=5432
 mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.database.hostname}:${mosip.credential.service.database.port}/mosip_credential?currentSchema=credential
 mosip.credential.service.jdbc.user=credentialuser
-mosip.credential.service.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+mosip.credential.service.jdbc.password=${db.dbuser.password}
 mosip.credential.service.jdbc.driver=org.postgresql.Driver
 hibernate.hbm2ddl.auto=update
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.show_sql=false
-
-#Token generator properties Credential request generator
+# Token generator properties 
 credential.request.token.request.appid=crereq
 credential.request.token.request.clientId=mosip-crereq-client
-credential.request.token.request.secretKey={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+credential.request.token.request.secretKey=${mosip.mosip.creqreq.client.secret}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
-credential.request.token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+credential.request.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 mosip.credential.request.service.id=mosip.credential.request.generator
 mosip.credential.request.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.request.service.version=1.0
 
-#---------------Batch job properties----------------------------------#
-#batch job time intervel in miliseconds
+## Batch job
+# batch job time intervel in miliseconds
 mosip.credential.request.job.timedelay=1
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
@@ -220,11 +205,12 @@ credential.batch.chunk.size=10
 credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
 
-#----------------------------------REST-services ----------------------------------------------------------#
-CRDENTIALSERVICE=http://idrepo-credential-service/v1/credentialservice/issue
-KEYBASEDTOKENAPI=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
-CALLBACKURL=${mosipbox.public.url}/v1/credentialrequest/callback/notifyStatus
-#-----Websub configurations------
+## Rest services
+CRDENTIALSERVICE=http://credential.idrepo/v1/credentialservice/issue
+KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+CALLBACKURL=http://credential.idrepo/v1/credentialrequest/callback/notifyStatus
+
+# Websub
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscription-delay-secs=120000
 # The time interval in seconds to schedule subscription of topics which is done as a
@@ -235,17 +221,12 @@ subscription-delay-secs=120000
 resubscription-delay-secs=7200
 WEBSUBSECRET=test
 
-#--------------------------Credential-Request-Generator properties ends-----------------------------------#
-
-#--------------------------Credential-Service properties--------------------------------------------------#
-
-#Token generator properties Credential Service
+# Credential service
 credential.service.token.request.appid=creser
 credential.service.token.request.clientId=mosip-creser-client
-credential.service.token.request.secretKey={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+credential.service.token.request.secretKey=${mosip.mosip.creser.client.secret}
 credential.service.token.request.id=io.mosip.credentialstore
-
-#Credential formatter properties Credential Service
+# Credential formatter properties 
 mosip.credential.vc.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss'Z'
 mosip.credential.service.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.service.service.id=mosip.credential.store
@@ -270,21 +251,19 @@ mosip.credential.service.includePayload=false
 mosip.credential.service.share.prependThumbprint=true
 mosip.credential.service.retry.maxAttempts=3
 mosip.credential.service.retry.maxDelay=100
-#----------------------------------REST-services ----------------------------------------------------------#
-IDREPOGETIDBYID=http://idrepo-identity-service/idrepository/v1/identity/idvid
+
+IDREPOGETIDBYID=http://identity.idrepo/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
 CREATEDATASHARE=/v1/datashare/create
-KEYBASEDTOKENAPI=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
-KEYMANAGER_JWTSIGN=http://kernel-keymanager-service/v1/keymanager/jwtSign
-KEYMANAGER_ENCRYPT_PIN=http://kernel-keymanager-service/v1/keymanager/encryptWithPin
-KEYMANAGER_ENCRYPT_ZK=http://kernel-keymanager-service/v1/keymanager/zkEncrypt
-PARTNER_POLICY=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-PARTNER_EXTRACTION_POLICY=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
-credential.service.token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
-
-#--------------------------Credential-Service properties ends--------------------------------------------------#
-
-#--------------------------Bio SDK Integration - Bio extractor Service ----------------------------------------#
+KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
+KEYMANAGER_ENCRYPT_PIN=http://keymanager.keymanager/v1/keymanager/encryptWithPin
+KEYMANAGER_ENCRYPT_ZK=http://keymanager.keymanager/v1/keymanager/zkEncrypt
+PARTNER_POLICY=http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+PARTNER_EXTRACTION_POLICY=http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
+credential.service.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
+
+# BioSDK service
 mosip.biosdk.default.host=http://13.233.66.241
 mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
 
@@ -313,14 +292,12 @@ mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0
 mosip.biometric.sdk.provider.face.version=0.9
 mosip.biometric.sdk.provider.face.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
-#------
 # Credential issuance Event properties
 id-repo-ida-event-type-namespace=mosip
 id-repo-ida-event-type-name=ida
 id-repo-ida-credential-type=auth
 id-repo-ida-credential-recepiant=IDA
 
------------
 # Kernel token ID generator properties
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d

From d788508142f1ca5f51afbe43b11e7e4a498b412c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 11:25:04 +0530
Subject: [PATCH 0071/1358] Kernel salt property added.

---
 id-authentication-default.properties | 6 ++++--
 id-repository-default.properties     | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 874c9e1bfa6..6694c6f5f65 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -9,6 +9,8 @@
 # ida.websub.partner.service.callback.secret
 # ida.websub.ca.certificate.callback.secret
 # ida.websub.hotlist.callback.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
 
 ## Client
 mosip.ida.auth.clientId=mosip-ida-client
@@ -460,8 +462,8 @@ mosip.kernel.salt-generator.db.key-alias=javax.persistence.jdbc
 mosip.kernel.salt-generator.schemaName=${javax.persistence.jdbc.schema}
 
 ## TokenId generator
-mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
-mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
 ## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 028116f05d3..9927265fd0a 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -5,6 +5,8 @@
 # mosip.mosip.creqreq.client.secret
 # mosip.mosip.creser.client.secret
 # keycloak.host
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
 
 management.endpoint.restart.enabled=true
 
@@ -299,5 +301,6 @@ id-repo-ida-credential-type=auth
 id-repo-ida-credential-recepiant=IDA
 
 # Kernel token ID generator properties
-mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
-mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
+

From 7af070357ca1ed06aa28cbc781de2934d2ac8489 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 15:19:20 +0530
Subject: [PATCH 0072/1358] [MOSIP-14505] Datashare properties updated.

---
 data-share-default.properties | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 0cd6cc95616..0f4f613197a 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -1,25 +1,29 @@
-#--------------ID and Version --------------
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# keycloak.host
+# mosip.mosip.datsha.client.secret
+
 mosip.data.share.service.id=mosip.data.share
 mosip.data.share.service.version=1.0
-#--------------URI--------------------------
-CRYPTOMANAGER_ENCRYPT=http://kernel-keymanager-service/v1/keymanager/encrypt
-KEYMANAGER_JWTSIGN=http://kernel-keymanager-service/v1/keymanager/jwtSign
-PARTNER_POLICY=http://pms-policy-manager-service/v1/policymanager/policies/{policyId}/partner/{partnerId}
-KEYBASEDTOKENAPI=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
 
-#---------config-data-----------------------
+CRYPTOMANAGER_ENCRYPT=http://keymanager.kernel/v1/keymanager/encrypt
+KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
+PARTNER_POLICY=http://pms-policy.pms/v1/policymanager/policies/{policyId}/partner/{partnerId}
+KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+
 data.share.application.id=PARTNER
 mosip.data.share.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 !-- if value is true then  please set servlet path to /   --!
 mosip.data.share.urlshortner=false
 data.share.token.request.appid=datsha
 data.share.token.request.clientId=mosip-datsha-client
-data.share.token.request.secretKey={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+data.share.token.request.secretKey=${mosip.mosip.datsha.client.secret}
 data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
-data.share.token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+data.share.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
 mosip.data.share.protocol=http
 mosip.data.share.includeCertificateHash=false

From 9f6a4063ab68f550e28c455cb65864d41f628b24 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 26 May 2021 17:18:01 +0530
Subject: [PATCH 0073/1358] Softhsm pin added

---
 id-authentication-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 6694c6f5f65..fe9a28b75a0 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -11,6 +11,7 @@
 # ida.websub.hotlist.callback.secret
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
+# softhsm.ida.pin
 
 ## Client
 mosip.ida.auth.clientId=mosip-ida-client
@@ -421,7 +422,7 @@ ida.credential.store.retry.backoff.exponential.max.interval.millisecs=120000
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 mosip.kernel.keymanager.hsm.keystore-type=PKCS11
-mosip.kernel.keymanager.hsm.keystore-pass=1234
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.ida.pin}
 
 ## Titles/Templates master data stored as configuration ---------- 
 ## UNUSED. TODO: remove them later

From 95c4f2a3aff6ae066810323a4706547b99a17144 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 10:16:51 +0530
Subject: [PATCH 0074/1358] [MOSIP-14287] dummy added for biosdk

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index fe9a28b75a0..365f2fe41c0 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -94,7 +94,7 @@ mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 
 ## Biosdk 
-mosip.biosdk.default.service.url=${biosdk.host.url}/biosdk-service
+mosip.biosdk.default.service.url=http://to-be-decided/biosdk-service
 
 ## The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 ## This class will be loaded in runtime, the containing jar should be available in classpath

From 928899fa990da0a7aba0395410ddd77c49926787 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 11:31:57 +0530
Subject: [PATCH 0075/1358] [MOSIP-14287] Auth properties updated.

---
 id-authentication-default.properties | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 365f2fe41c0..86cf8ac400a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -12,6 +12,7 @@
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # softhsm.ida.pin
+# mosip.api.internal.url
 
 ## Client
 mosip.ida.auth.clientId=mosip-ida-client
@@ -217,11 +218,11 @@ ida-websub-auth-type-callback-url=http://ida-internal.ida/idauthentication/v1/in
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
 ida-websub-credential-issue-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
 ## Callback url for MISP/Partner change notification events
-ida-websub-partner-service-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
+ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
 ## Callback url for partner CA certification upload event
-ida-websub-ca-cert-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ## Callback url for hotlist event
-ida-websub-hotlist-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/hotlist
+ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
 
 ## Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000

From 9f1b717c41a86a0d8dc84b2bb9fa70be22dd2b64 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 15:17:45 +0530
Subject: [PATCH 0076/1358] [MOSIP-14287] Auth biosdk property updated.

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 86cf8ac400a..54aec9cbdaa 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -94,8 +94,8 @@ ida.mapping.json.filename=id-authentication-mapping.json
 mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${ida.mapping.json.filename} 
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 
-## Biosdk 
-mosip.biosdk.default.service.url=http://to-be-decided/biosdk-service
+## Biosdk. Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
+mosip.biosdk.default.service.url=http://biosdk-service.biosdk/biosdk-service
 
 ## The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 ## This class will be loaded in runtime, the containing jar should be available in classpath

From 2d30d6dd6155a049d9a86668b0ddb3bb86f8a6d1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 15:44:43 +0530
Subject: [PATCH 0077/1358] [MOSIP-14287] biosdk property updated

---
 id-authentication-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 54aec9cbdaa..177f0d10b0d 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -3,7 +3,6 @@
 # helm chart:
 # db.dbuser.password 
 # mosip.mosip.ida.client.secret
-# biosdk.host.url
 # ida.websub.authtype.callback.secret
 # ida.websub.credential.issue.callback.secret
 # ida.websub.partner.service.callback.secret
@@ -95,7 +94,7 @@ mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 
 ## Biosdk. Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
-mosip.biosdk.default.service.url=http://biosdk-service.biosdk/biosdk-service
+mosip.biosdk.default.service.url=http://biosdk-service.biosdk/
 
 ## The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 ## This class will be loaded in runtime, the containing jar should be available in classpath

From 6643cebe2e7553f0cdad10c6ed4344dc119ac432 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 17:06:16 +0530
Subject: [PATCH 0078/1358] biosdk property updated

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 177f0d10b0d..29ed653220d 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -94,7 +94,7 @@ mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 
 ## Biosdk. Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
-mosip.biosdk.default.service.url=http://biosdk-service.biosdk/
+mosip.biosdk.default.service.url=http://biosdk-service.biosdk/biosdk-service
 
 ## The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 ## This class will be loaded in runtime, the containing jar should be available in classpath

From 583133eeb5ab1e32185b7f60900eece31fc5b17e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 17:44:46 +0530
Subject: [PATCH 0079/1358] Auth url corrected

---
 id-authentication-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 29ed653220d..86e10cae44d 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -151,7 +151,7 @@ sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get RID for USERID - Used in Internal Auth based on User ID
-userid-rid.rest.uri=http://auth.kernel/v1/authmanager/rid/{appId}/{uid}
+userid-rid.rest.uri=http://authmanager.kernel/v1/authmanager/rid/{appId}/{uid}
 userid-rid.rest.httpMethod=GET
 userid-rid.rest.headers.mediaType=${mosip.ida.request.mediaType}
 userid-rid.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -169,8 +169,8 @@ rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Auth token generation and validation URLs
-auth-token-generator.rest.uri=http://auth.kernel/v1/authmanager/authenticate/clientidsecretkey
-auth-token-validator.rest.uri=http://auth.kernel/v1/authmanager/authorize/validateToken
+auth-token-generator.rest.uri=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+auth-token-validator.rest.uri=http://authmanager.kernel/v1/authmanager/authorize/validateToken
 auth-token-generator.rest.clientId=${mosip.ida.auth.clientId}
 auth-token-generator.rest.secretKey=${mosip.ida.auth.secretKey}
 auth-token-generator.rest.appId=${mosip.ida.auth.appId}

From 640eff4c197a2eba79228a56e7abfb25847cfd12 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 27 May 2021 17:48:37 +0530
Subject: [PATCH 0080/1358] application properties updated

---
 application-default.properties | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 0e441f64dad..58c03731ca0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -1,3 +1,7 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# keycloak.host
 aplication.configuration.level.version=1.1.4
 
 ## Idobject validator
@@ -164,7 +168,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth-token-generator.rest.issuerUrl=${iam.url}/auth/realms/mosip
+auth-token-generator.rest.issuerUrl=${keycloak.host}/auth/realms/mosip
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true

From 9aba2a984371d1796500ad81c56ada7d07a09e9c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 29 May 2021 07:03:59 +0530
Subject: [PATCH 0081/1358] [MOSIP-14376] Regproc properties updated.

---
 registration-processor-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e002b1db4f8..512b67ecdd6 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -106,13 +106,13 @@ POSTALCODE=${MASTER}/locations/validate
 PROVINCE=${MASTER}/locations/validate
 USERDETAILS=${MASTER}/users
 TEMPLATES=${MASTER}/templates
-DEVICEVALIDATEHISTORY=http://partnermanager.pms/v1/partnermanager/deviceprovidermanagement/validate
+DEVICEVALIDATEHISTORY=http://pms-partner.pms/v1/partnermanager/deviceprovidermanagement/validate
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
 
 ## ID Repository Services
 
-IDREPOIDENTITY=http://idrepo-identity.idrepo/idrepository/v1/identity/
+IDREPOIDENTITY=http://identity.idrepo/idrepository/v1/identity/
 IDREPOGETIDBYUIN=${IDREPOIDENTITY}/idvid
 UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
 RETRIEVEIDENTITYFROMRID=${IDREPOIDENTITY}/idvid
@@ -120,7 +120,7 @@ RETRIEVEIDENTITY=${IDREPOIDENTITY}/idvid
 IDREPOVID=http://idrepo-vid.idrepo
 CREATEVID=${IDREPOVID}/idrepository/v1/vid
 GETUINBYVID=${IDREPOVID}/idrepository/v1/idvid
-CREDENTIALREQUEST=http://idrepo-credrequest.idrepo/v1/credentialrequest/requestgenerator
+CREDENTIALREQUEST=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
 GETVIDSBYUIN=${IDREPOVID}/idrepository/v1/vid/uin
 
 ## Encrypt Services

From b3105e945a590bc73349adf5ae688c7656d1db4b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 29 May 2021 07:24:46 +0530
Subject: [PATCH 0082/1358] [MOSIP-14376] Reg proc properties updated.

---
 registration-processor-default.properties | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 512b67ecdd6..a0b49619bc2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -39,7 +39,8 @@ hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.show_sql=false
 
 ## Packets
-registration.processor.LANDING_ZONE = /mnt/regproc/landing
+## This must match mounted folder specified in the helm chart of packet receiver.
+registration.processor.LANDING_ZONE = /mnt/landing
 # The known packet sources. Should be set as all fieldCategory present in idschema
 # (NOTE : if fieldCategory is set as pvt then the source should be id)
 registration.processor.sourcepackets=id,evidence,optional
@@ -370,6 +371,16 @@ mosip.regproc.eventbus.type=kafka
 #Kafka cluster servers comma separated, common for all stages and camel
 mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka.svc.cluster.local:9092,kafka-1.kafka-headless.kafka.svc.cluster.local:9092,kafka-2.kafka-headless.kafka.svc.cluster.local:9092
 
+packet-receiver-stage
+#Supported commmit config: auto, batch, single
+mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
+#Maximum records that can be received in one poll to kafka
+mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
+#Interval between each poll calls to kafka in milli sec
+mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
+#kafka consumer group id, one unique id is required for for every stage
+mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
+
 #securezone-notification-stage
 #Supported commmit config: auto, batch, single
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single

From 851936ee1dff183615de4556445a0baa04ede4cc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 29 May 2021 09:20:49 +0530
Subject: [PATCH 0083/1358] [MOSIP-14376] File temporarily added as packet
 receiver is expecting it.

---
 hazelcast_dmz.xml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 hazelcast_dmz.xml

diff --git a/hazelcast_dmz.xml b/hazelcast_dmz.xml
new file mode 100644
index 00000000000..040c52de759
--- /dev/null
+++ b/hazelcast_dmz.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright 2017 Red Hat, Inc. ~ ~ Red Hat licenses this file to you 
+     	under the Apache License, version 2.0 ~ (the "License"); you may not use 
+	this file except in compliance with the ~ License. You may obtain a copy 
+	of the License at: ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless 
+	required by applicable law or agreed to in writing, software ~ distributed 
+	under the License is distributed on an "AS IS" BASIS, WITHOUT ~ WARRANTIES 
+	OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
+	the specific language governing permissions and limitations ~ under the License. -->
+
+<hazelcast
+	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
+	xmlns="http://www.hazelcast.com/schema/config"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <properties>
+   <property name="hazelcast.discovery.enabled">true</property>
+   <property name="hazelcast.logging.type">slf4j</property>
+ </properties>
+<group>
+		<name>k8s</name>
+		<password/>
+	</group>
+ <network>
+   <join>
+     <multicast enabled="false"/>
+     <tcp-ip enabled="false" />
+     <discovery-strategies>
+       <discovery-strategy enabled="true"
+           class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
+         <properties>
+           <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
+         </properties>
+       </discovery-strategy>
+     </discovery-strategies>
+   </join>
+ </network>
+</hazelcast>

From 70aa1b7e5fac3a3fbcd2182199a5a75bfd1e7cc0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 29 May 2021 12:32:19 +0530
Subject: [PATCH 0084/1358] [MOSIP-14376] Minor correction

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a0b49619bc2..f31a44495f3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -371,7 +371,7 @@ mosip.regproc.eventbus.type=kafka
 #Kafka cluster servers comma separated, common for all stages and camel
 mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka.svc.cluster.local:9092,kafka-1.kafka-headless.kafka.svc.cluster.local:9092,kafka-2.kafka-headless.kafka.svc.cluster.local:9092
 
-packet-receiver-stage
+# packet receiver stage
 #Supported commmit config: auto, batch, single
 mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
 #Maximum records that can be received in one poll to kafka

From 55a9b580bb7454c06367aab4a8e61a558c4da5d8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 29 May 2021 14:42:20 +0530
Subject: [PATCH 0085/1358] [MOSIP-14376] Camel route corrected for single
 cluster.

---
 ...ion-processor-camel-routes-new-default.xml | 25 +++----------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index e8e92455f6e..065d346ce50 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -1,29 +1,9 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
     <!-- packet-receiver to securezone notifiation -->
-    <route id="packet-receiver->securezone-notification new route">
+    <route id="packet-receiver->packet-uploader new route">
         <from uri="eventbus:packet-receiver-new-bus-out" />
         <log
-                message="packet-receiver-->securezone-notification new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:securezone-notification-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-
-    <!-- securezone-notification to packet-uploader Route -->
-    <route id="securezone-notification-->packet-uploader new route">
-        <from uri="eventbus:securezone-notification-new-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
+                message="packet-receiver-->packet-uploader new route ${bodyAs(String)}" />
         <choice>
             <when>
                 <simple>${bodyAs(String)} contains '"isValid":true'</simple>
@@ -38,6 +18,7 @@
             </otherwise>
         </choice>
     </route>
+
     <!-- packet-uploader to packet-validator Route -->
     <route id="packet-uploader-->packet-validator new route">
     <from uri="eventbus:packet-uploader-new-bus-out" />

From a22316e039c8abc3c016f972302a99c1e6ff7464 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 29 May 2021 14:42:51 +0530
Subject: [PATCH 0086/1358] [MOSIP-14376] Urls updated.

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f31a44495f3..dff492ace1e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -145,8 +145,8 @@ EISERVICE=http://regproc-external.regproc/registrationprocessor/v1/eis/registrat
 RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
 
 ## Registration Processor Status Services
-SYNCSERVICE=http://regproc-regstatus.regproc/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=http://regproc-packetreceiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
+SYNCSERVICE=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=http://regproc-receiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
 
 ## SMS and EMAIL notification services
 NOTIFIER=http://notifier.kernel

From a5b89f227edaab6c6a8f34ce7397ac3e3ff42ae1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 09:36:23 +0530
Subject: [PATCH 0087/1358] Hazelcast file rename.

---
 hazelcast-default.xml => hazelcast_default.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename hazelcast-default.xml => hazelcast_default.xml (100%)

diff --git a/hazelcast-default.xml b/hazelcast_default.xml
similarity index 100%
rename from hazelcast-default.xml
rename to hazelcast_default.xml

From e95fb0b6a731031469607d86651682b6e1149139 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 11:02:09 +0530
Subject: [PATCH 0088/1358] Nginx server prop updated.

---
 registration-processor-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index dff492ace1e..1a741c65b1d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -50,9 +50,8 @@ packet.default.source=id
 schema.default.fieldCategory=pvt,none
 # The IDSchemaVersion used to create packets in reg-proc
 IDSchema.Version=0.1
-# Url from where packets need to be picked up DMZ (landing zone)
 ## TODO: correct this
-NGINXURL=${dmz.ingress.base.url}/registrationprocessor/v1/packetserver
+NGINXURL=http://regproc-pktserver.regproc/
 packet.info.storage.service=*
 
 ## Camel bridge

From 2563dccff47e24154ccc07fa5955954e2f007bf5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 11:31:01 +0530
Subject: [PATCH 0089/1358] Reg proc kafka properties updated.

---
 registration-processor-default.properties | 240 +++-------------------
 1 file changed, 30 insertions(+), 210 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1a741c65b1d..020f2f962c3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -362,7 +362,7 @@ mosip.registration.processor.encrypt=false
 mosip.registration.processor.issuer=mpartner-default-print 
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
 
-## Event bus
+## Kafka Event bus
 #Supported eventbus types: vertx, kafka. Defaults to vertx if the config is not given
 mosip.regproc.eventbus.type=kafka
 
@@ -373,23 +373,10 @@ mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka.svc.
 # packet receiver stage
 #Supported commmit config: auto, batch, single
 mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
-#Maximum records that can be received in one poll to kafka
 mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
-#Interval between each poll calls to kafka in milli sec
 mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
-#kafka consumer group id, one unique id is required for for every stage
 mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
 
-#securezone-notification-stage
-#Supported commmit config: auto, batch, single
-mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
-#Maximum records that can be received in one poll to kafka
-mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
-#Interval between each poll calls to kafka in milli sec
-mosip.regproc.securezone.notification.eventbus.kafka.poll.frequency=100
-#kafka consumer group id, one unique id is required for for every stage
-mosip.regproc.securezone.notification.eventbus.kafka.group.id=securezone-notification-stage
-
 #camel-bridge
 mosip.regproc.camel.bridge.eventbus.kafka.commit.type=single
 mosip.regproc.camel.bridge.eventbus.kafka.max.poll.records=100
@@ -403,78 +390,91 @@ mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
 mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.uploader.eventbus.kafka.group.id=packet-uploader-stage
+mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #packet-validator-stage
 mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
 mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.validator.eventbus.kafka.group.id=packet-validator-stage
+mosip.regproc.packet.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #packet-classifier-stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
 mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.classifier.eventbus.kafka.group.id=packet-classifier-stage
+mosip.regproc.packet.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #quality-checker-stage
 mosip.regproc.quality.checker.eventbus.kafka.commit.type=single
 mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=100
 mosip.regproc.quality.checker.eventbus.kafka.poll.frequency=100
 mosip.regproc.quality.checker.eventbus.kafka.group.id=quality-checker-stage
+mosip.regproc.quality.checker.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #osi-validator-stage
 mosip.regproc.osi.validator.eventbus.kafka.commit.type=single
 mosip.regproc.osi.validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.osi.validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.osi.validator.eventbus.kafka.group.id=osi-validator-stage
+mosip.regproc.osi.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #external-stage
 mosip.regproc.external.eventbus.kafka.commit.type=single
 mosip.regproc.external.eventbus.kafka.max.poll.records=100
 mosip.regproc.external.eventbus.kafka.poll.frequency=100
 mosip.regproc.external.eventbus.kafka.group.id=external-stage
+mosip.regproc.external.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #demo-dedupe-stage
 mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
+mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
 mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.handler.eventbus.kafka.group.id=abis-handler-stage
+mosip.regproc.abis.handler.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #bio-dedupe-stage
 mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.bio.dedupe.eventbus.kafka.group.id=bio-dedupe-stage
+mosip.regproc.bio.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #manual-verification-stage
 mosip.regproc.manual.verification.eventbus.kafka.commit.type=single
 mosip.regproc.manual.verification.eventbus.kafka.max.poll.records=100
 mosip.regproc.manual.verification.eventbus.kafka.poll.frequency=100
 mosip.regproc.manual.verification.eventbus.kafka.group.id=manual-verification-stage
+mosip.regproc.manual.verification.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #uin-generator-stage
 mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
 mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
 mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
 mosip.regproc.uin.generator.eventbus.kafka.group.id=uin-generator-stage
+mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
+mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
 mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
 mosip.regproc.biometric.authentication.eventbus.kafka.group.id=biometric-authentication-stage
+mosip.regproc.biometric.authentication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #reprocessor-stage
 mosip.regproc.reprocessor.eventbus.kafka.commit.type=single
@@ -487,17 +487,19 @@ mosip.regproc.message.sender.eventbus.kafka.commit.type=single
 mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
 mosip.regproc.message.sender.eventbus.kafka.poll.frequency=100
 mosip.regproc.message.sender.eventbus.kafka.group.id=message-sender-stage
+mosip.regproc.message.sender.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 #printing-stage
 mosip.regproc.printing.eventbus.kafka.commit.type=single
 mosip.regproc.printing.eventbus.kafka.max.poll.records=100
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
-
+mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
 packetmanager.name.source.resident=RESIDENT
 packetmanager.name.source.cnie=CNIE
 packetmanager.name.source.default=REGISTRATION_CLIENT
+object.store.s3.use.account.as.bucketname=true
 
 # default priority for correction packets
 # To define priority use below stage names. For example, field 'gender' has priority in uin-generator-stage. The key for uin-generator-stage is 'uingenerator'. So the key would be 'packetmanager.provider.uingenerator.gender'
@@ -547,19 +549,15 @@ packetmanager.provider.uingenerator.proofOfIdentity=source:CNIE\/process:CORRECT
 packetmanager.provider.uingenerator.proofOfRelationship=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.provider.uingenerator.proofOfException=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 
-#### Stage Specific properties ####
-
 # packet-classifier-stage
-mosip.regproc.packet.classifier.server.port=8092
-mosip.regproc.packet.classifier.eventbus.port=5724
-mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/packetclassifier
-
 # List of tag generator that should be run on every packet
-# Available tag generators MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus
-mosip.regproc.packet.classifier.tag-generators=MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus
+# Available tag generators MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus,MosipExceptionBiometrics
+mosip.regproc.packet.classifier.tag-generators=MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus,MosipExceptionBiometrics
+# The tag value that will be used by default when the packet does not have value for the tag field
+mosip.regproc.packet.classifier.tagging.not-available-tag-value=--TAG_VALUE_NOT_AVAILABLE--
 # These field names should be as in keys of registraion-processor-identity.json file Identity segment
 # and should have proper default source configured
-mosip.regproc.packet.classifier.tagging.idobjectfields.mapping-field-names=gender,city,residenceStatus
+mosip.regproc.packet.classifier.tagging.idobjectfields.mapping-field-names=gender,residenceStatus
 # The tag name that will be prefixed with every idobjectfield tags
 mosip.regproc.packet.classifier.tagging.idobjectfields.tag-name-prefix=ID_OBJECT-
 # The tag name that will be prefixed with every metainfo operationsData tags
@@ -569,11 +567,11 @@ mosip.regproc.packet.classifier.tagging.metainfo.metadata.tag-name-prefix=META_I
 # The tag name that will be prefixed with every metainfo capturedRegisteredDevices tags 
 mosip.regproc.packet.classifier.tagging.metainfo.capturedregistereddevices.tag-name-prefix=META_INFO-CAPTURED_REGISTERED_DEVICES-
 # The labels on metainfo.operationsData array that needs to be tagged
-mosip.regproc.packet.classifier.tagging.metainfo.operationsdata.tag-labels=officerId,supervisorId
+mosip.regproc.packet.classifier.tagging.metainfo.operationsdata.tag-labels=officerId
 # The labels on metainfo.metaData array that needs to be tagged
-mosip.regproc.packet.classifier.tagging.metainfo.metadata.tag-labels=centerId,machineId
+mosip.regproc.packet.classifier.tagging.metainfo.metadata.tag-labels=centerId
 # The serial numbers of devices type on metainfo.capturedRegisteredDevices array that needs to be tagged
-mosip.regproc.packet.classifier.tagging.metainfo.capturedregistereddevices.device-types=Face,Fingerprint
+mosip.regproc.packet.classifier.tagging.metainfo.capturedregistereddevices.device-types=Face,Finger
 # Tag name that will be used while tagging age group
 mosip.regproc.packet.classifier.tagging.agegroup.tag-name=AGE_GROUP
 # Below age ranges map should contain proper age group name and age range, any overlap of the age 
@@ -583,187 +581,9 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'CHILD':'0-17','ADULT':
 mosip.regproc.packet.classifier.tagging.supervisorapprovalstatus.tag-name=SUPERVISOR_APPROVAL_STATUS
 # Tag name that will be used while tagging exception biometrics
 mosip.regproc.packet.classifier.tagging.exceptionbiometrics.tag-name=EXCEPTION_BIOMETRICS
+# This mapping will contain the short words for each missing biometrics, the values will used for concatenating in the tags
+mosip.regproc.packet.classifier.tagging.exceptionbiometrics.bio-value-mapping={'leftLittle':'LL','leftRing':'LR','leftMiddle':'LM','leftIndex':'LI','leftThumb':'LT','rightLittle':'RL','rightRing':'RR','rightMiddle':'RM','rightIndex':'RI','rightThumb':'RT','leftEye':'LE','rightEye':'RE'}
 
-mosip.regproc.packet.classifier.eventbus.kafka.commit.type=${mosip.regproc.packet.classifier.eventbus.kafka.commit.type}
-mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=${mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records}
-mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=${mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency}
-mosip.regproc.packet.classifier.eventbus.kafka.group.id=${mosip.regproc.packet.classifier.eventbus.kafka.group.id}
-
-# Packet Validator
-mosip.regproc.packet.validator.server.port=8088
-mosip.regproc.packet.validator.eventbus.port=5715
-mosip.regproc.packet.validator.server.servlet.path=/registrationprocessor/v1/packetvalidator
-
-mosip.regproc.packet.validator.eventbus.kafka.commit.type=${mosip.regproc.packet.validator.eventbus.kafka.commit.type}
-mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=${mosip.regproc.packet.validator.eventbus.kafka.max.poll.records}
-mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=${mosip.regproc.packet.validator.eventbus.kafka.poll.frequency}
-mosip.regproc.packet.validator.eventbus.kafka.group.id=${mosip.regproc.packet.validator.eventbus.kafka.group.id}
-
-mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT
-mosip.kernel.jsonvalidator.schema-name=mosip-identity-json-schema.json
-mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-
-
-# External Stage
-mosip.regproc.external.eventbus.port=5736
-mosip.regproc.external.server.port=8095
-mosip.regproc.external.server.servlet.path=/registrationprocessor/v1/external
-
-
-mosip.regproc.external.eventbus.kafka.commit.type=${mosip.regproc.external.eventbus.kafka.commit.type}
-mosip.regproc.external.eventbus.kafka.max.poll.records=${mosip.regproc.external.eventbus.kafka.max.poll.records}
-mosip.regproc.external.eventbus.kafka.poll.frequency=${mosip.regproc.external.eventbus.kafka.poll.frequency}
-mosip.regproc.external.eventbus.kafka.group.id=${mosip.regproc.external.eventbus.kafka.group.id}
-
-#Message Sender
-mosip.regproc.message.sender.server.port=8088
-mosip.regproc.message.sender.eventbus.port=5721
-mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sender-stage
-
-mosip.regproc.message.sender.eventbus.kafka.commit.type=${mosip.regproc.message.sender.eventbus.kafka.commit.type}
-mosip.regproc.message.sender.eventbus.kafka.max.poll.records=${mosip.regproc.message.sender.eventbus.kafka.max.poll.records}
-mosip.regproc.message.sender.eventbus.kafka.poll.frequency=${mosip.regproc.message.sender.eventbus.kafka.poll.frequency}
-mosip.regproc.message.sender.eventbus.kafka.group.id=${mosip.regproc.message.sender.eventbus.kafka.group.id}
-
-#OSI Validator
-mosip.regproc.osi.validator.server.port=8089
-mosip.regproc.osi.validator.eventbus.port=5716
-mosip.regproc.osi.validator.server.servlet.path=/registrationprocessor/v1/osivalidator
-
-mosip.regproc.osi.validator.eventbus.kafka.commit.type=${mosip.regproc.osi.validator.eventbus.kafka.commit.type}
-mosip.regproc.osi.validator.eventbus.kafka.max.poll.records=${mosip.regproc.osi.validator.eventbus.kafka.max.poll.records}
-mosip.regproc.osi.validator.eventbus.kafka.poll.frequency=${mosip.regproc.osi.validator.eventbus.kafka.poll.frequency}
-mosip.regproc.osi.validator.eventbus.kafka.group.id=${mosip.regproc.osi.validator.eventbus.kafka.group.id}
-
-
-# packet-uploader-stage properties
-packet.uploader.stage=registration-processor-packet-uploader-stage
-
-mosip.regproc.packet.uploader.server.port=8087
-mosip.regproc.packet.uploader.server.servlet.path=/registrationprocessor/v1/uploader
-mosip.regproc.packet.uploader.eventbus.port=5714
-
-mosip.regproc.packet.uploader.eventbus.kafka.commit.type=${mosip.regproc.packet.uploader.eventbus.kafka.commit.type}
-mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=${mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records}
-mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=${mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency}
-mosip.regproc.packet.uploader.eventbus.kafka.group.id=${mosip.regproc.packet.uploader.eventbus.kafka.group.id}
-
-# Print Stage
-mosip.regproc.printing.server.port=8099
-mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
-mosip.regproc.printing.eventbus.port=5722
-
-mosip.regproc.printing.eventbus.kafka.commit.type=${mosip.regproc.printing.eventbus.kafka.commit.type}
-mosip.regproc.printing.eventbus.kafka.max.poll.records=${mosip.regproc.printing.eventbus.kafka.max.poll.records}
-mosip.regproc.printing.eventbus.kafka.poll.frequency=${mosip.regproc.printing.eventbus.kafka.poll.frequency}
-mosip.regproc.printing.eventbus.kafka.group.id=${mosip.regproc.printing.eventbus.kafka.group.id}
-
-# Quality Checker
-mosip.regproc.quality.checker.server.port=9072
-mosip.regproc.quality.checker.eventbus.port=5727
-mosip.regproc.quality.checker.server.servlet.path=/registrationprocessor/v1/qualitychecker
-
-mosip.regproc.quality.checker.eventbus.kafka.commit.type=${mosip.regproc.quality.checker.eventbus.kafka.commit.type}
-mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=${mosip.regproc.quality.checker.eventbus.kafka.max.poll.records}
-mosip.regproc.quality.checker.eventbus.kafka.poll.frequency=${mosip.regproc.quality.checker.eventbus.kafka.poll.frequency}
-mosip.regproc.quality.checker.eventbus.kafka.group.id=${mosip.regproc.quality.checker.eventbus.kafka.group.id}
-
-# Secure Zone Notification Stage
-mosip.regproc.securezone.notification.server.port=8090
-mosip.regproc.securezone.notification.server.servlet.path=/registrationprocessor/v1/securezone
-mosip.regproc.securezone.notification.eventbus.port=5712
-
-mosip.regproc.securezone.notification.eventbus.kafka.commit.type=${mosip.regproc.securezone.notification.eventbus.kafka.commit.type}
-mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=${mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records}
-mosip.regproc.securezone.notification.eventbus.kafka.poll.frequency=${mosip.regproc.securezone.notification.eventbus.kafka.poll.frequency}
-mosip.regproc.securezone.notification.eventbus.kafka.group.id=${mosip.regproc.securezone.notification.eventbus.kafka.group.id}
-
-mosip.regproc.message.tag.loading.disable=true
-
-# UIN Generator Stage
-mosip.regproc.uin.generator.server.port=8099
-mosip.regproc.uin.generator.eventbus.port=5719
-mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-generator
-
-mosip.regproc.uin.generator.eventbus.kafka.commit.type=${mosip.regproc.uin.generator.eventbus.kafka.commit.type}
-mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=${mosip.regproc.uin.generator.eventbus.kafka.max.poll.records}
-mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=${mosip.regproc.uin.generator.eventbus.kafka.poll.frequency}
-mosip.regproc.uin.generator.eventbus.kafka.group.id=${mosip.regproc.uin.generator.eventbus.kafka.group.id}
-
-# Reporcessor Stage
-mosip.regproc.reprocessor.server.port=8021
-mosip.regproc.reprocessor.eventbus.port=5750
-mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reprocessor
-
-mosip.regproc.reprocessor.eventbus.kafka.commit.type=${mosip.regproc.reprocessor.eventbus.kafka.commit.type}
-mosip.regproc.reprocessor.eventbus.kafka.max.poll.records=${mosip.regproc.reprocessor.eventbus.kafka.max.poll.records}
-mosip.regproc.reprocessor.eventbus.kafka.poll.frequency=${mosip.regproc.reprocessor.eventbus.kafka.poll.frequency}
-mosip.regproc.reprocessor.eventbus.kafka.group.id=${mosip.regproc.reprocessor.eventbus.kafka.group.id}
-
-# Manual Stage
-mosip.regproc.manual.verification.server.servlet.path=/registrationprocessor/v1/manualverification
-mosip.regproc.manual.verification.server.port=8084
-mosip.regproc.manual.verification.eventbus.port=5720
-
-mosip.regproc.manual.verification.eventbus.kafka.commit.type=${mosip.regproc.manual.verification.eventbus.kafka.commit.type}
-mosip.regproc.manual.verification.eventbus.kafka.max.poll.records=${mosip.regproc.manual.verification.eventbus.kafka.max.poll.records}
-mosip.regproc.manual.verification.eventbus.kafka.poll.frequency=${mosip.regproc.manual.verification.eventbus.kafka.poll.frequency}
-mosip.regproc.manual.verification.eventbus.kafka.group.id=${mosip.regproc.manual.verification.eventbus.kafka.group.id}
-
-#Demo Dedupe
-mosip.regproc.demo.dedupe.server.port=8091
-mosip.regproc.demo.dedupe.eventbus.port=5717
-mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedupe
-
-mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=${mosip.regproc.demo.dedupe.eventbus.kafka.commit.type}
-mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=${mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records}
-mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=${mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency}
-mosip.regproc.demo.dedupe.eventbus.kafka.group.id=${mosip.regproc.demo.dedupe.eventbus.kafka.group.id}
-
-# Biometric Auth Stage
-mosip.regproc.biometric.authentication.server.port=8020
-mosip.regproc.biometric.authentication.eventbus.port=5777
-mosip.regproc.biometric.authentication.server.servlet.path=/registrationprocessor/v1/bioauth
-
-mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=${mosip.regproc.biometric.authentication.eventbus.kafka.commit.type}
-mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=${mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records}
-mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=${mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency}
-mosip.regproc.biometric.authentication.eventbus.kafka.group.id=${mosip.regproc.biometric.authentication.eventbus.kafka.group.id}
-
-# Bio Dedupe
-mosip.regproc.bio.dedupe.server.port=9096
-mosip.regproc.bio.dedupe.eventbus.port=5718
-mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
-
-mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=${mosip.regproc.bio.dedupe.eventbus.kafka.commit.type}
-mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=${mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records}
-mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=${mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency}
-mosip.regproc.bio.dedupe.eventbus.kafka.group.id=${mosip.regproc.bio.dedupe.eventbus.kafka.group.id}
-
-# Abis Middleware
-mosip.regproc.abis.middleware.server.port=8091
-mosip.regproc.abis.middleware.eventbus.port=5888
-mosip.regproc.abis.middleware.server.servlet.path=/registrationprocessor/v1/abismiddleware
-
-mosip.regproc.abis.middleware.eventbus.kafka.commit.type=${mosip.regproc.abis.middleware.eventbus.kafka.commit.type}
-mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=${mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records}
-mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=${mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency}
-mosip.regproc.abis.middleware.eventbus.kafka.group.id=${mosip.regproc.abis.middleware.eventbus.kafka.group.id}
-
-# Abis Handler
-mosip.regproc.abis.handler.server.port=9071
-mosip.regproc.abis.handler.eventbus.port=5726
-mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
-
-mosip.regproc.abis.handler.eventbus.kafka.commit.type=${mosip.regproc.abis.handler.eventbus.kafka.commit.type}
-mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=${mosip.regproc.abis.handler.eventbus.kafka.max.poll.records}
-mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=${mosip.regproc.abis.handler.eventbus.kafka.poll.frequency}
-mosip.regproc.abis.handler.eventbus.kafka.group.id=${mosip.regproc.abis.handler.eventbus.kafka.group.id}
-
-
-# Stage Group Configuratoins
-# Default base packages for stage beans to be scanned in a stage group
-mosip.regproc.stage-groups.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor
-# Add any new base package of Stage bean specific to stage group as below
-# mosip.regproc.stage-groups.stage-beans-base-packages.<stage_group_name>=${mosip.regproc.stage-groups.stage-beans-base-packages.default}
-# Example: mosip.regproc.stage-groups.stage-beans-base-packages.stage-group-1=${mosip.regproc.stage-groups.stage-beans-base-packages.default},my.stage.bean.base.package
+## Mock Manual Verification Properties 
+# Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
+mock.mv.decision=APPROVED 

From dc597549bab28103ed61ab3add6b68c939396af9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 11:33:44 +0530
Subject: [PATCH 0090/1358] Reg proc properties updated.

---
 registration-processor-default.properties | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 020f2f962c3..d2b7dbb7c23 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -356,12 +356,17 @@ mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1
 mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 
-## Pring
+## Printing
 mosip.registration.processor.credentialtype=euin
 mosip.registration.processor.encrypt=false
 mosip.registration.processor.issuer=mpartner-default-print 
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
 
+## Stage common
+#After this time intervel, message should be considered as expired (In seconds), 
+#value as 0 and negative will disable message expiry checks
+mosip.regproc.common.stage.message.expiry-time-limit=3600
+
 ## Kafka Event bus
 #Supported eventbus types: vertx, kafka. Defaults to vertx if the config is not given
 mosip.regproc.eventbus.type=kafka

From b88c7e2cff8da50d644a9826ee92695a85d8822a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 11:42:09 +0530
Subject: [PATCH 0091/1358] Hazelcast name corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d2b7dbb7c23..07d32496db1 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -56,7 +56,7 @@ packet.info.storage.service=*
 
 ## Camel bridge
 # Url to cluster manager to enable this stage for joining the cluster in secure zone
-cluster.manager.file.name=hazelcast-default.xml
+cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow

From 3130d601477723d9f99c7b548b14614ff0de6899 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 11:42:56 +0530
Subject: [PATCH 0092/1358] Hazelcast prop corrected.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 58c03731ca0..0b29edc0602 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -317,7 +317,7 @@ objectstore.crypto.name=OnlinePacketCryptoServiceImpl
 default.provider.version=v1.0
 ## posix adapter config
 object.store.base.location=/home/mosip
-hazelcast.config=classpath:hazelcast-default.xml
+hazelcast.config=classpath:hazelcast_default.xml
 
 
 ## S3 object store adapter. TODO: ciphers here must be passed as config-server env variables.

From 61e9d8ac3621702f9e0a0b836ee5649080ba8669 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 11:48:00 +0530
Subject: [PATCH 0093/1358] Zone added.

---
 registration-processor-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 07d32496db1..74d2c640cf3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -7,6 +7,9 @@
 # mosip.api.internal.url
 # keycloak.host
 
+
+registration.processor.zone=default
+
 ## Health check
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=info,health,refresh

From ff7468a2a2ba683f0cd83c6f14490a8939001f5c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 30 May 2021 18:41:15 +0530
Subject: [PATCH 0094/1358] json corrected

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index d81b599cac2..2f0c1476faf 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -9,7 +9,7 @@
         "pingInboundQueueName": "",
         "pingOutboundQueueName": "",
         "userName": "artemis",
-        "password": ${activemq.password},
+        "password": "${activemq.password}",
         "typeOfQueue": "ACTIVEMQ",
         "inboundMessageTTL": 2700
     }]

From 71c4360d742dc3cfb75d14da43a410b459650d73 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 31 May 2021 16:35:34 +0530
Subject: [PATCH 0095/1358] Prereg updated.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c97dd22178c..8df33809a81 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -284,7 +284,7 @@ otp.request.flooding.max-count=3
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
 mail-notification.rest.uri=${mosip.base.url}/v1/notifier/email/send
 sms-notification.rest.uri=${mosip.base.url}/v1/notifier/sms/send
-otp-generate.rest.uri=${mosip.base.url}/v1/otpmanager/otp/generate
+otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template

From a1f3f78903334e13287e41039c7d1f6f8bbfe308 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 1 Jun 2021 07:00:06 +0530
Subject: [PATCH 0096/1358] Language updated in preregistration json.

---
 pre-registration-demographic.json | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pre-registration-demographic.json b/pre-registration-demographic.json
index aba08a857ba..5d7927b38f7 100644
--- a/pre-registration-demographic.json
+++ b/pre-registration-demographic.json
@@ -16,7 +16,6 @@
            "description":"Enter Full Name",
            "labelName":{
            "eng":"Full Name",
-           "ara":"الاسم الكامل",
            "fra":"Nom complet"
            },
            "controlType":"textbox",
@@ -39,7 +38,6 @@
            "description":"Enter DOB",
            "labelName":{
            "eng":"Date Of Birth",
-           "ara":"تاريخ الولادة",
            "fra":"Date de naissance"
            },
            "controlType":"date",
@@ -55,7 +53,6 @@
            "description":"Enter Gender",
            "labelName":{
            "eng":"Gender",
-           "ara":"جنس",
            "fra":"Le genre"
            },
            "controlType":"dropdown",
@@ -72,7 +69,6 @@
            "description":"Residence status",
            "labelName":{
            "eng":"Residence Status",
-           "ara":"حالة الإقامة",
            "fra":"Statut de résidence"
            },
            "controlType":"dropdown",
@@ -89,7 +85,6 @@
            "description":"addressLine1",
            "labelName":{
            "eng":"Address Line1",
-           "ara":"العنوان السطر 1",
            "fra":"Adresse 1"
            },
            "controlType":"textbox",
@@ -112,7 +107,6 @@
            "description":"addressLine2",
            "labelName":{
            "eng":"Address Line2",
-           "ara":"العنوان السطر 2",
            "fra":"Adresse 2"
            },
            "controlType":"textbox",
@@ -135,7 +129,6 @@
            "description":"addressLine3",
            "labelName":{
            "eng":"Address Line3",
-           "ara":"العنوان السطر 3",
            "fra":"Adresse 3"
            },
            "controlType":"textbox",
@@ -158,7 +151,6 @@
            "description":"region",
            "labelName":{
            "eng":"Region",
-           "ara":"منطقة",
            "fra":"Région"
            },
            "controlType":"dropdown",
@@ -181,7 +173,6 @@
            "description":"province",
            "labelName":{
            "eng":"Province",
-           "ara":"المحافظة",
            "fra":"Province"
            },
            "controlType":"dropdown",
@@ -204,7 +195,6 @@
            "description":"city",
            "labelName":{
            "eng":"City",
-           "ara":"مدينة",
            "fra":"Ville"
            },
            "controlType":"dropdown",
@@ -227,7 +217,6 @@
            "description":"zone",
            "labelName":{
            "eng":"Zone",
-           "ara":"منطقة",
            "fra":"Zone"
            },
            "controlType":"dropdown",
@@ -244,7 +233,6 @@
            "description":"postalCode",
            "labelName":{
            "eng":"Postal Code",
-           "ara":"الكود البريدى",
            "fra":"code postal"
            },
            "controlType":"dropdown",
@@ -267,7 +255,6 @@
            "description":"phone",
            "labelName":{
            "eng":"Phone",
-           "ara":"هاتف",
            "fra":"Téléphone"
            },
            "controlType":"textbox",
@@ -290,7 +277,6 @@
            "description":"email",
            "labelName":{
            "eng":"Email",
-           "ara":"البريد الإلكتروني",
            "fra":"Email"
            },
            "controlType":"textbox",

From 330792611da4b9ca9574c6316284cba8371e94e2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 1 Jun 2021 07:02:00 +0530
Subject: [PATCH 0097/1358] Language properties updated.

---
 registration-default.properties | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 80d373e9a6c..172f1da7f05 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -210,10 +210,6 @@ mosip.registration.softwareUpdateCheck_configured_frequency = 300
 mosip.registration.consent_eng=I understand that the data collected about me during registration by the said authority includes my -<br>&#x2022 Name <br> &#x2022 Date of birth <br> &#x2022 Gender <br> &#x2022 Address <br> &#x2022 Contact details <br> &#x2022 Documents <br> I also understand that this information will be stored and processed for the purpose of verifying my identity in order to access various services, or to comply with a legal obligation. I give my consent for the collection of this data for this purpose. 
 
 
-#For Arabic as primary language
-mosip.registration.consent_ara = أدرك أن البيانات التي تم جمعها عني أثناء التسجيل من قِبل السلطة المذكورة تتضمن بياناتي  -  <br> &#x2022 الاسم <br>&#x2022 تاريخ الميلاد <br>&#x2022 نوع الجنس <br>&#x2022 العنوان <br>&#x2022 تفاصيل الاتصال <br>&#x2022  الوثائق <br> كما أفهم أنه سيتم تخزين هذه المعلومات ومعالجتها بغرض التحقق من هويتي من أجل الوصول إلى خدمات مختلفة، أو الامتثال لالتزام قانوني. وأوافق على جمع هذه البيانات لهذا الغرض. 
-
-
 #For French as primary language
 mosip.registration.consent_fra=Je comprends que les données recueillies à mon sujet lors de la enregistrement par ladite autorité comprennent mon -  <br> &#x2022 nom <br>&#x2022 Date de naissance <br>&#x2022 genre <br>&#x2022 adresse <br>&#x2022 coordonnées <br>&#x2022 Documents <br>Je comprends également que ces informations seront stockées et traitées dans le but de vérifier mon identité afin d'accéder à divers services, ou de se conformer à une obligation légale. Je donne mon consentement pour la collecte de ces données à cette fin.
 
@@ -231,9 +227,6 @@ mosip.registration.document_scanner_enabled=No
 #For English language
 mosip.registration.important_guidelines_eng=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
 
-#For Arabic language
-mosip.registration.important_guidelines_ara=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
-
 #For French language
 mosip.registration.important_guidelines_fra=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
 

From 93a1c560485ac0dc689a8408d66c2cc7e7a627fa Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 5 Jun 2021 14:08:33 +0530
Subject: [PATCH 0098/1358] Country code updated.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 0b29edc0602..532e46dc221 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -51,7 +51,7 @@ mosip.idrepo.identity.allowedBioAttributes=individualBiometrics
 ## List of all bio attriutes defined in Identity Schema
 mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometrics
 
-mosip.country.code=CON
+mosip.country.code=MOR
 
 ## Language supported by platform
 mosip.supported-languages=eng,fra

From 9ce90da9d48bafdff2657a5b4e10685a8ff5dd4b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 5 Jun 2021 21:31:27 +0530
Subject: [PATCH 0099/1358] Prereg property corrected.

---
 pre-registration-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 8df33809a81..8a901d47e3a 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -290,7 +290,6 @@ pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
 mosip.primary-language=eng
-id-masterdata-template-service-multilang.rest.uri=${mosip.base.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 
 ## Login service 
 mosip.preregistration.login.service.version=1.0

From 2a74302997142dd97eb0a5d2fbc73b7ad0d838de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 5 Jun 2021 21:47:02 +0530
Subject: [PATCH 0100/1358] Prereg properties upated.

---
 pre-registration-default.properties | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 8a901d47e3a..b015fe80f4a 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -3,7 +3,6 @@
 # helm chart:
 # db.dbuser.password 
 # preregistration.mosip.prereg.client.secret
-# mosip.api.public.url
 # keycloak.host
 
 ## Database properties
@@ -282,8 +281,8 @@ secret_url.version=string
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=3
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-mail-notification.rest.uri=${mosip.base.url}/v1/notifier/email/send
-sms-notification.rest.uri=${mosip.base.url}/v1/notifier/sms/send
+mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
+sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
 otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
@@ -304,7 +303,6 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-mosip.base.url=${mosip.api.public.url}
 iam.base.url=${keycloak.host}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
 validationStatus=success

From 54a98f2dd42b53952dd412beab42e406bffb5743 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 6 Jun 2021 05:01:42 +0530
Subject: [PATCH 0101/1358] Prereg language properties corrected.

---
 pre-registration-default.properties | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index b015fe80f4a..bf35e6c3764 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -288,7 +288,6 @@ pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-mosip.primary-language=eng
 
 ## Login service 
 mosip.preregistration.login.service.version=1.0
@@ -369,10 +368,10 @@ mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.i
 
 ## UI params
 #------------to be removed later -------
-#mosip.mandatory.languages=ara,fra
-#mosip.optional.languages=
-#mosip.min.languages.count=2
-#mosip.max.languages.count=2
+mosip.mandatory-languages=eng,fra
+mosip.optional-languages=0
+mosip.min-languages.count=2
+mosip.max-languages.count=2
 -------------------------------------------
 ## List of keys which UI will consume
 ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version

From 473dcd2ea27119b9501e92aa82665c2bf8b7fa02 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 6 Jun 2021 05:40:56 +0530
Subject: [PATCH 0102/1358] Prereg property updated.

---
 pre-registration-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index bf35e6c3764..764375a58cd 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -189,6 +189,9 @@ mosip.primary-language=eng
 id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
 
 ## Masterdata service
+## Base url is only used for masterdata. We give the in-cluster url here
+mosip.base.url=http://masterdata.kernel
+
 masterdata.service.version=v1
 masterdata.service.env=http://masterdata.kernel
 masterdata.service.contextpath=masterdata

From 11ab50a15004ab1437f1923c959524fd2fa97d00 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 6 Jun 2021 17:10:28 +0530
Subject: [PATCH 0103/1358] IDschema version updated.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 764375a58cd..ac1de3697b8 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -39,7 +39,7 @@ mosip.adult.age=5
 
 ## ID Schema 
 ## This version is set in the ID object created in pre-registration
-mosip.idschema.version=0.1
+mosip.idschema.version=0.2
 
 
 ## Demographic Service 

From 81a9e4ec430901229c7f59614b3e6c69ffdce22f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 6 Jun 2021 18:06:24 +0530
Subject: [PATCH 0104/1358] Prereg demographic json updated.

---
 pre-registration-demographic.json | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pre-registration-demographic.json b/pre-registration-demographic.json
index 5d7927b38f7..313f73f77ac 100644
--- a/pre-registration-demographic.json
+++ b/pre-registration-demographic.json
@@ -1,16 +1,15 @@
 {
    "identity":[
-      
-      {
-        "id": "IDSchemaVersion",
-        "description": "ID Schema Version",
-        "type": "number",
-        "controlType": null,
-        "fieldType": "default",
-        "inputRequired": false,
-        "validators": [],
-        "required": true
-       },
+        {
+          "id": "IDSchemaVersion",
+          "description": "ID Schema Version",
+          "type": "number",
+          "controlType": null,
+          "fieldType": "default",
+          "inputRequired": false,
+          "validators": [],
+          "required": true
+        },
         {
            "id":"fullName",
            "description":"Enter Full Name",
@@ -57,7 +56,7 @@
            },
            "controlType":"dropdown",
            "inputRequired":true,
-           "fieldType":"default",
+           "fieldType":"dynamic",
            "type":"simpleType",
            "validators":[
 
@@ -73,7 +72,7 @@
            },
            "controlType":"dropdown",
            "inputRequired":true,
-           "fieldType":"default",
+           "fieldType":"dynamic",
            "type":"simpleType",
            "validators":[
 

From fc57e6f2850ebb90bf0628e5993ed4cb0290c550 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 15 Jun 2021 11:05:49 +0530
Subject: [PATCH 0105/1358] [MOSIP-15041] Print properties updated.

---
 print-default.properties | 83 ++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 46 deletions(-)

diff --git a/print-default.properties b/print-default.properties
index ef16214ffab..c5d74b1f4ff 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -1,11 +1,16 @@
-dmz.ingress.base.url=http://dmz.ingress:30080
-# Websub base url
-websub.base.url=${dmz.ingress.base.url}
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# mosip.mosip.regproc.client.secret
+# keycloak.host
+
+## Websub
+websub.base.url=http://websub.websub
 mosip.event.hubURL=${websub.base.url}/websub
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
-mosip.event.callBackUrl=${mosipbox.public.url}/v1/print/print/callback/notifyPrint
+mosip.event.callBackUrl=http://print-service.print/v1/print/print/callback/notifyPrint
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
 mosip.event.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
 csrf.disabled=true
@@ -13,92 +18,79 @@ mosip.event.delay=120000
 print-websub-resubscription-delay-secs=7200
 registration.processor.print.textfile=registration-processor-print-text-file.json
 
-#-------------TOKEN GENERATION----------------
-#Token generation request id
+## Token
 token.request.id=io.mosip.registration.processor
-#Token generation app id
 token.request.appid=regproc
-#Token generation username
 token.request.username=registrationprocessor
-#Token generation password
 token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGVnY3M1DIeKGFAeBNfi6jH5qgj1KCUmFONLwSmfcrPx9m6MYXXQMYwyAeq13Msy1fcG1AtZQASKeLbuMCaRwinwdt7C/WYzvVVv47NojD+VmHHVTY3qBXJ4dwZ0/BqmUBPXyYrJPKTcdouxT76bgm5+fXXNcT7lciXgD1aCnWKziL5nDa6Y9dhc+ZPyM0d+I0JfS+emsByt7tWgcZukQkOEx8JWfcCR4eVpERYVa/ps/EAuQRXmxIvnr54GSCc/KKpwnYnjLtKIx/75I6pezBdKU/BBJG1syjQp9VQC9adSI5fdsn3ijkxJjC9TSIFJKDlTHqNCnJaxQXcSBWL4Y=
-#Token generation version
 token.request.version=1.0
-#Token generation Client Id
 token.request.clientId=mosip-regproc-client
-#Token generation secret key
-token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-#Token generation issuer url
-token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+token.request.secretKey= ${mosip.mosip.regproc.client.secret}
+token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
-#Audit Service
-AUDIT=http://kernel-auditmanager-service/v1/auditmanager/audits
+# Audit service
+AUDIT=http://auditmanager.kernel/v1/auditmanager/audits
 mosip.kernel.pdf_owner_password=123456
-#Auth Service
-authmanager.base.url=http://kernel-auth-service
+
+## Auth service
+authmanager.base.url=http://authmanager.kernel
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 
-#Master Data Services
-MASTER=http://kernel-masterdata-service/v1/masterdata
+## Master data services
+MASTER=http://masterdata.kernel/v1/masterdata
 TEMPLATES=${MASTER}/templates
 mosip.print.audit.id=mosip.applicanttype.getApplicantType
 
-#Packet receiver application version
 mosip.print.application.version=1.0
-#Request Date Time format
 mosip.print.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 
-#Encrypt Services
-PDFSIGN=http://kernel-keymanager-service/v1/keymanager/pdf/sign
+## Encrypt services
+PDFSIGN=http://keymanager.keymanager/v1/keymanager/pdf/sign
 
 
-#-------------Printing Service--------------------
 mosip.print.service.id=mosip.print
-#UIN card password
 mosip.print.service.uincard.password=postalCode|fullName
 mosip.print.uin.header.length=75
 
-#Rectangle coordinates for pfd signataured data
+## Rectangle coordinates for pfd signataured data
 mosip.print.service.uincard.lowerleftx=73
 mosip.print.service.uincard.lowerlefty=100
 mosip.print.service.uincard.upperrightx=300
 mosip.print.service.uincard.upperrighty=300
 mosip.print.service.uincard.signature.reason="signing"
 
-#Audit request id
+# #Audit request id
 mosip.print.audit.id=mosip.applicanttype.getApplicantType
 
-#Kernel Crypto signature
+## Kernel Crypto signature
 registration.processor.signature.isEnabled=true
-mosip.country.code=MOR
-
-# Language Supported By Platform - ISO 
-mosip.supported-languages=eng,ara,fra
 
+## Country specific
+mosip.country.code=MOR
+mosip.supported-languages=eng,fra
 mosip.primary-language=eng
-mosip.secondary-language=ara
+mosip.secondary-language=fra
 
-#----------------------- CBEFF Util--------------------------------------------------
+## CBEFF util
 # Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
 mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 # Cbeff XSD file name in config server
 mosip.kernel.xsdfile=mosip-cbeff.xsd
 
-#----------------------------- Applicant Type --------------------------------------------------
-mosip.kernel.applicant.type.age.limit = 5
+mosip.kernel.applicant.type.age.limit=5
 
-#----------------------------- Static PIN --------------------------------------------------
 mosip.kernel.pin.length=6
 
-#-----------------------------TOKEN-ID Properties---------------------------------
-#length of the token id
+## Token id
+## length of the token id
 mosip.kernel.tokenid.length=36
 
-# log level
+## log level
 logging.level.root=WARN
 logging.level.io.mosip=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
-# tomcat access logs
+
+## tomcat access logs
 server.tomcat.accesslog.enabled=true
 server.tomcat.accesslog.directory=/dev
 server.tomcat.accesslog.prefix=stdout
@@ -109,10 +101,9 @@ server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t"
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 registration.processor.unMaskedUin.length=5
 
-#mosip.print.uin.header.length=10
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 IDSchema.Version=1.0
 registration.processor.identityjson=registration-processor-identity.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=http://datashare-service/v1/datashare/create
-DECRYPTPINBASSED=http://kernel-keymanager-service/v1/keymanager/decryptWithPin
+CREATEDATASHARE=http://datashare.datashare/v1/datashare/create
+DECRYPTPINBASSED=http://keymanager.keymanager/v1/keymanager/decryptWithPin

From 1f070af514e87b832205b084c0a18c8046572cb4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 15 Jun 2021 11:06:18 +0530
Subject: [PATCH 0106/1358] Minor update.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 74d2c640cf3..5a8d7ccc446 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -74,7 +74,7 @@ token.request.username=registrationprocessor
 token.request.password=
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
-token.request.secretKey=mosip.mosip.regproc.client.secret
+token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
 token.request.issuerUrl=${keycloak.host}/auth/realms/mosip

From 19cda75b4d38b04838295b97d3ff22aed74aa80c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 19 Jun 2021 19:56:58 +0530
Subject: [PATCH 0107/1358] Updated for api host.

---
 admin-default.properties                  | 4 ++--
 id-authentication-default.properties      | 3 ++-
 partner-management-default.properties     | 6 +++---
 print-default.properties                  | 3 ++-
 registration-processor-default.properties | 4 ++--
 syncdata-default.properties               | 4 ++--
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 3a72cf49c85..bed870dbdb7 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -5,8 +5,9 @@
 # keycloak.host
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.regproc.client.secret
-# mosip.api.internal.url
+# mosip.api.internal.host
 
+mosip.api.internal.url=https://${mosip.api.internal.host}
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
 ## Database properties
@@ -179,7 +180,6 @@ mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
 mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
-# TODO: Admin should have internal access. Change this to internal URL later.
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.admin-services.open-id.login_flow.scope=cls
 mosip.admin-services.open-id.login_flow.scope=email
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 86e10cae44d..d64dc4268b8 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -11,8 +11,9 @@
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # softhsm.ida.pin
-# mosip.api.internal.url
+# mosip.api.internal.host
 
+mosip.api.internal.url=https://${mosip.api.internal.host}
 ## Client
 mosip.ida.auth.clientId=mosip-ida-client
 mosip.ida.auth.secretKey=${mosip.mosip.ida.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 71feccaaaef..f0fdcf43852 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -6,7 +6,7 @@
 ## mosip.mosip.pms.client.secret
 ## keycloak.host
 ## keycloak.admin.password
-# mosip.api.public.url
+## mosip.api.public.url
 
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
@@ -160,8 +160,8 @@ policy.auth.allowed.token.types=random,partner,policy
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret=${mosip.api.public.url}
-mosip.iam.module.redirecturi=${mosip.api.public.url}/v1/partnermanager/login-redirect/
+mosip.iam.module.clientsecret=${mosip.mosip.pms.client.secret}
+mosip.iam.module.redirecturi=https://${mosip.api.public.host}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
diff --git a/print-default.properties b/print-default.properties
index c5d74b1f4ff..dd4cd2e95ea 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -3,6 +3,7 @@
 # helm chart:
 # mosip.mosip.regproc.client.secret
 # keycloak.host
+# print.websub.hub.secret
 
 ## Websub
 websub.base.url=http://websub.websub
@@ -12,7 +13,7 @@ mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
 mosip.event.callBackUrl=http://print-service.print/v1/print/print/callback/notifyPrint
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
-mosip.event.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
+osip.event.secret=${print.websub.hub.secret}
 csrf.disabled=true
 mosip.event.delay=120000
 print-websub-resubscription-delay-secs=7200
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5a8d7ccc446..71d94dc5226 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -4,10 +4,10 @@
 # helm chart:
 # db.dbuser.password 
 # mosip.mosip.regproc.client.secret
-# mosip.api.internal.url
+# mosip.api.internal.host
 # keycloak.host
 
-
+mosip.api.internal.url=https://${mosip.api.internal.host}
 registration.processor.zone=default
 
 ## Health check
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 1fe327ed2e2..a50fa96cd60 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -1,7 +1,7 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# mosip.api.public.url
+# mosip.api.public.host
 # db.dbuser.password 
 # keycloak.host
 # keycloak.admin.password
@@ -385,7 +385,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=${mosip.api.public.url}/v1/syncdata/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=https://${mosip.api.public.host}/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a

From 067b55686a9e077badedad2894a4ababef0af6a7 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Tue, 22 Jun 2021 11:29:27 +0530
Subject: [PATCH 0108/1358] updated schema version

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index ac1de3697b8..764375a58cd 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -39,7 +39,7 @@ mosip.adult.age=5
 
 ## ID Schema 
 ## This version is set in the ID object created in pre-registration
-mosip.idschema.version=0.2
+mosip.idschema.version=0.1
 
 
 ## Demographic Service 

From 3670e960436d37255b849c71a0742ef967233d53 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Jun 2021 12:00:41 +0530
Subject: [PATCH 0109/1358] [MOSIP-11894] Syncdata idschema url corrected.

---
 pre-registration-default.properties | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 764375a58cd..5b5f6992a0c 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -267,12 +267,7 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 
 ## Syncdata service
 ## To fetch the latest ID Schema for the ID object validator
-kernel.syncdata.env=http://syncdata.kernel
-kernel.syncdata.version=v1/syncdata
-latestidschema.service.contextpath=latestidschema
-mosip.preregistration.id-schema=${kernel.syncdata.env}/${kernel.syncdata.version}/${latestidschema.service.contextpath}
-## API to fetch the latest ID schema
-mosip.preregistration.id-schema=http://kernel-syncdata-service/v1/syncdata/latestidschema
+mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
 
 ## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}

From 04bb2ec25d690f8dcd9326bc8b2dbef5226221b5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Jun 2021 14:31:35 +0530
Subject: [PATCH 0110/1358] [MOSIP-11894] Syncdata properties corrected.

---
 syncdata-default.properties | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index a50fa96cd60..162b4156a1b 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -14,7 +14,7 @@
 
 
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
+mosip.kernel.syncdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -24,7 +24,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=http://kernel-masterdata-service/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-idschema-url=http://masterdata.kernel/v1/masterdata/idschema/latest
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -76,13 +76,13 @@ auth.refreshtoken.header=RefreshToken
 auth.jwt.refresh.expiry=86400000
 auth.primary.language=eng
 
-otp.manager.api.generate=http://kernel-otpmanager-service/v1/otpmanager/otp/generate
-otp.manager.api.verify=http://kernel-otpmanager-service/v1/otpmanager/otp/validate
-otp.sender.api.email.send=http://kernel-notification-service/v1/notifier/email/send
-otp.sender.api.sms.send=http://kernel-notification-service/v1/notifier/sms/send
-masterdata.api.template=http://kernel-masterdata-service/v1/masterdata/templates/
+otp.manager.api.generate=http://otpmanager.kernel/v1/otpmanager/otp/generate
+otp.manager.api.verify=http://otpmanager.kernel/v1/otpmanager/otp/validate
+otp.sender.api.email.send=http://notification.kernel/v1/notifier/email/send
+otp.sender.api.sms.send=http://notification.kernel/v1/notifier/sms/send
+masterdata.api.template=http://masterdata.kernel/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=http://idrepo-identity-service/idrepository/v1/identity/uin/{uin}
+idrepo.api.getuindetails=http://identity.idrepo/idrepository/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
@@ -255,7 +255,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
+mosip.authmanager.base-url=http://authmanager.kernel/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -266,11 +266,11 @@ mosip.admin_realm_id=mosip
 
 master.search.maximum.rows=50
 mosip.level=2
-mosip.kernel.masterdata.audit-url= http://kernel-auditmanager-service/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url= http://auditmanager.kernel/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
-mosip.kernel.sign-url=http://kernel-keymanager-service/v1/keymanager/sign
+mosip.kernel.sign-url=http://keymanager.keymanager/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
@@ -288,7 +288,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=http://kernel-auth-service/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
@@ -303,7 +303,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=http://kernel-auth-service/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -355,7 +355,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=http://kernel-masterdata-service/v1/masterdata/machines/%s/eng
+mosip.kernel.syncdata-service-machine-url=http://masterdata.kernel/v1/masterdata/machines/%s/eng
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments
@@ -367,10 +367,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=http://kernel-auth-service/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=http://kernel-auth-service/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=http://kernel-auth-service/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=http://kernel-auth-service/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=http://authmanager.kernel/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=http://authmanager.kernel/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key

From 54f9ad0287cdb38df0d27abdfaabe91ebe96b482 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Jun 2021 05:48:22 +0530
Subject: [PATCH 0111/1358] [MOSIP-11894] Minor format update.

---
 pre-registration-identity-mapping.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pre-registration-identity-mapping.json b/pre-registration-identity-mapping.json
index 5b5336a54e8..b96f70b1b93 100644
--- a/pre-registration-identity-mapping.json
+++ b/pre-registration-identity-mapping.json
@@ -1,14 +1,14 @@
 {
-	"identity": {
-		"name": {
-			"value": "fullName",
-			"isMandatory" : true
-		},
-		"proofOfAddress": {
-			"value" : "proofOfAddress"
-		},
-		"postalCode": {
-			"value" : "postalCode"
-		}
-	}
-}  
\ No newline at end of file
+  "identity": {
+    "name": {
+      "value": "fullName",
+      "isMandatory" : true
+    },
+    "proofOfAddress": {
+      "value" : "proofOfAddress"
+    },
+    "postalCode": {
+      "value" : "postalCode"
+    }
+  }
+}  

From 05a14856bb49e6dcab41f6965989178812860b1d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Jun 2021 12:10:05 +0530
Subject: [PATCH 0112/1358] Fra transliteration removed.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 532e46dc221..0544dca0489 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -235,7 +235,7 @@ mosip.kernel.virus-scanner.port=80
 
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
-mosip.kernel.transliteration.franch-language-code=fra
+mosip.kernel.transliteration.franch-language-code=
 
 ## DOB
 mosip.default.dob.month=01

From 9c6dbb45a844f6e3c3a634aaeb2f41735abd3784 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Jun 2021 12:37:43 +0530
Subject: [PATCH 0113/1358] Unused prop removed.

---
 pre-registration-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 5b5f6992a0c..0a8631739f5 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -362,7 +362,6 @@ por.url=proofOfRelationship
 ## Determines request & response id of transliteration-service
 mosip.pre-registration.transliteration.transliterate.id=mosip.pre-registration.transliteration.transliterate
 mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.transliteration.transliterate
-mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j
 
 ## UI params
 #------------to be removed later -------

From 6ed8de0ed7c8f1ea722d87e6c5749562e040f3dd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Jun 2021 15:30:21 +0530
Subject: [PATCH 0114/1358] Work around for syncdata issue.

---
 pre-registration-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 0a8631739f5..708045a1615 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -267,7 +267,8 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 
 ## Syncdata service
 ## To fetch the latest ID Schema for the ID object validator
-mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
+#mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
+mosip.preregistration.id-schema=http://masterdata.kernel/v1/masterdata/latestidschema
 
 ## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}

From fea28631570e560d6583b67c5afa5aa83fa25b33 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Jun 2021 15:31:11 +0530
Subject: [PATCH 0115/1358] Work around for syncdata issue.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 708045a1615..78cce186f41 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -268,7 +268,7 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 ## Syncdata service
 ## To fetch the latest ID Schema for the ID object validator
 #mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
-mosip.preregistration.id-schema=http://masterdata.kernel/v1/masterdata/latestidschema
+mosip.preregistration.id-schema=http://masterdata.kernel/v1/masterdata/idschema/latest
 
 ## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}

From 2ee38a46c925ecb6cb1a6bec537f3bae24cd4465 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 24 Jun 2021 07:10:55 +0530
Subject: [PATCH 0116/1358] [MOSIP-11894] Formatting improved.

---
 applicanttype-document-mapping.json |  67 ++++----
 applicanttype.mvel                  | 237 ++++++++++++++--------------
 2 files changed, 148 insertions(+), 156 deletions(-)

diff --git a/applicanttype-document-mapping.json b/applicanttype-document-mapping.json
index f196f3d277e..37dd1352fd4 100644
--- a/applicanttype-document-mapping.json
+++ b/applicanttype-document-mapping.json
@@ -1,41 +1,34 @@
 {
-    "applicantCategory": [{
-            "applicantType": "adult",
-            "documentCategory": [{
-                    "key": "proofOfAddress",
-                    "values": [
-                        "DOC001", "DOC013", "DOC014", "DOC015", "DOC005", "DOC005", "DOC006", "DOC016", "DOC017", "DOC018", "DOC008" 
-                    ]
-                },
-                {
-                    "key": "proofOfIdentity",
-                    "values": [
-                        "DOC001", "DOC002", "DOC003", "DOC004", "DOC005", "DOC006", "DOC007", "DOC008", "DOC009", "DOC010", "DOC011", "DOC012"
-                    ]
-                }            
-            ]
+  "applicantCategory": [
+    {
+      "applicantType": "adult",
+      "documentCategory": [
+        {
+          "key": "proofOfAddress",
+          "values": ["DOC001", "DOC013", "DOC014", "DOC015", "DOC005", "DOC005", "DOC006", "DOC016", "DOC017", "DOC018", "DOC008"]
+        },
+        {
+          "key": "proofOfIdentity",
+           "values": ["DOC001", "DOC002", "DOC003", "DOC004", "DOC005", "DOC006", "DOC007", "DOC008", "DOC009", "DOC010", "DOC011", "DOC012"]
+        }            
+      ]
+    },
+    {
+      "applicantType": "child",
+      "documentCategory": [
+        {
+          "key": "proofOfRelation",
+          "values": ["DOC024", "DOC025", "DOC026", "DOC001", "DOC027", "DOC028"]
+        },
+        {
+           "key": "proofOfIdentity",
+           "values": ["DOC001", "DOC006", "DOC009"]
         },
         {
-            "applicantType": "child",
-            "documentCategory": [{
-                    "key": "proofOfRelation",
-                    "values": [
-                        "DOC024", "DOC025", "DOC026", "DOC001", "DOC027", "DOC028"
-                    ]
-                },
-                {
-                    "key": "proofOfIdentity",
-                    "values": [
-                        "DOC001", "DOC006", "DOC009"
-                    ]
-                },
-                {
-                    "key": "proofOfAddress",
-                    "values": [
-                        "DOC001", "DOC013", "DOC014", "DOC006"
-                    ]
-                }
-            ]
-        }
-    ]
+          "key": "proofOfAddress",
+          "values": ["DOC001", "DOC013", "DOC014", "DOC006"]
+              }
+      ]
+    }
+  ]
 }
diff --git a/applicanttype.mvel b/applicanttype.mvel
index e6eaabc9097..1d24e44227d 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -1,121 +1,120 @@
 def getApplicantType(map,a) {
-		 import java.time.LocalDate;
-		 import java.time.LocalDateTime;
-	     import java.time.format.DateTimeFormatter;
-		 import java.time.Period;
-
-  		
-		String itc = null;
-		String dob = null;
-		String genderType = null;
-		boolean isBioExPresent  = false;
-		String FOREIGNER = "FR";
-		String NON_FOREIGNER = "NFR";
-		String MALE = "MLE";
-		String FEMALE = "FLE";
-		String CHILD = "CHL";
-		String ADULT = "ADL";
-		String ATTR_INDIVIDUAL_TYPE = "individualTypeCode";
-		String ATTR_DATE_OF_BIRTH = "dateofbirth";
-		String ATTR_GENDER_TYPE = "genderCode";
-		String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
-		String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-				
-		itc= (String) map[ATTR_INDIVIDUAL_TYPE];
-				
-		dob= (String) map[ATTR_DATE_OF_BIRTH];
-		 
-		if(dob == empty  || dob == null ){
-	       return "KER-MSD-147";
-	     }
-		 
-		int age = -1;
-		LocalDate currentDate = LocalDate.now();
-		
-		LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
-		
-		if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
-			age = Period.between(birthDate, currentDate).getYears();
-		}
-		else{
-		   return age;
-		   }
-		 
-		
-		genderType=(String) map[ATTR_GENDER_TYPE];
-		isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
-		
-		if (((itc == empty  || itc == null)  && (dob == -1 )  && (genderType == empty  || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))  
-          return "KER-MSD-147";
-        if(age >= agelimit)
-           ageCode=ADULT;
-        else if( age >= 0 && age < agelimit)
-           ageCode=CHILD;
-		
-		if (itc == FOREIGNER &&  genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
-			
-			return "001";
-		} else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
-			
-			return "002";
-
-		} else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
-			
-			return "003";
-
-		} else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
-			
-			return "004";
-
-		} else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
-			
-			return "005";
-
-		} else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
-			
-			return "006";
-
-		} else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
-		
-			return "007";
-
-		} else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
-			
-			return "008";
-
-		} else if (itc == FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
-			
-			return "009";
-
-		} else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
-			
-			return "010";
-
-		} else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
-			
-			return "011";
-
-		} else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
-			
-			return "012";
-
-		} else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
-			
-			return "013";
-
-		} else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
-			
-			return "014";
-
-		} else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
-			
-			return "015";
-
-		} else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
-			
-			return "016";
-
-		}
-		return null;
+    import java.time.LocalDate;
+    import java.time.LocalDateTime;
+    import java.time.format.DateTimeFormatter;
+    import java.time.Period;
   
-};
\ No newline at end of file
+    String itc = null;
+    String dob = null;
+    String genderType = null;
+    boolean isBioExPresent  = false;
+    String FOREIGNER = "FR";
+    String NON_FOREIGNER = "NFR";
+    String MALE = "MLE";
+    String FEMALE = "FLE";
+    String CHILD = "CHL";
+    String ADULT = "ADL";
+    String ATTR_INDIVIDUAL_TYPE = "individualTypeCode";
+    String ATTR_DATE_OF_BIRTH = "dateofbirth";
+    String ATTR_GENDER_TYPE = "genderCode";
+    String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
+    String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+            
+    itc= (String) map[ATTR_INDIVIDUAL_TYPE];
+            
+    dob= (String) map[ATTR_DATE_OF_BIRTH];
+     
+    if(dob == empty  || dob == null ){
+       return "KER-MSD-147";
+    }
+   
+    int age = -1;
+    LocalDate currentDate = LocalDate.now();
+    
+    LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
+    
+    if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
+        age = Period.between(birthDate, currentDate).getYears();
+    }
+    else {
+       return age;
+    }
+     
+    
+    genderType=(String) map[ATTR_GENDER_TYPE];
+    isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
+    
+    if (((itc == empty  || itc == null)  && (dob == -1 )  && (genderType == empty  || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))  
+      return "KER-MSD-147";
+    if(age >= agelimit)
+       ageCode=ADULT;
+    else if( age >= 0 && age < agelimit)
+       ageCode=CHILD;
+    
+    if (itc == FOREIGNER &&  genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
+        
+        return "001";
+    } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
+        
+        return "002";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
+        
+        return "003";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
+        
+        return "004";
+   
+    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
+        
+        return "005";
+   
+    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
+        
+        return "006";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
+    
+        return "007";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
+        
+        return "008";
+   
+    } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
+        
+        return "009";
+   
+    } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
+        
+        return "010";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
+        
+        return "011";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
+        
+        return "012";
+   
+    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
+        
+        return "013";
+   
+    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
+        
+        return "014";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
+        
+        return "015";
+   
+    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
+        
+        return "016";
+   
+    }
+    return null;
+
+};

From 8d998dd80ffac08dcf72b98692f91e8ae9ea2c54 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 24 Jun 2021 21:36:50 +0530
Subject: [PATCH 0117/1358] [MOSIP-11894] Applicant type made non-integer.

---
 applicanttype.mvel | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 1d24e44227d..14b24a9702c 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -53,66 +53,66 @@ def getApplicantType(map,a) {
     
     if (itc == FOREIGNER &&  genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
         
-        return "001";
+        return "A001";
     } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
         
-        return "002";
+        return "A002";
    
     } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
         
-        return "003";
+        return "A003";
    
     } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
         
-        return "004";
+        return "A004";
    
     } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
         
-        return "005";
+        return "A005";
    
     } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
         
-        return "006";
+        return "A006";
    
     } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
     
-        return "007";
+        return "A007";
    
     } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
         
-        return "008";
+        return "A008";
    
     } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
         
-        return "009";
+        return "A009";
    
     } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
         
-        return "010";
+        return "A010";
    
     } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
         
-        return "011";
+        return "A011";
    
     } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
         
-        return "012";
+        return "A012";
    
     } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
         
-        return "013";
+        return "A013";
    
     } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
         
-        return "014";
+        return "A014";
    
     } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
         
-        return "015";
+        return "A015";
    
     } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
         
-        return "016";
+        return "A016";
    
     }
     return null;

From b6dde38ea597aac1ebf43037c09a376620ac49c7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 27 Jun 2021 07:48:58 +0530
Subject: [PATCH 0118/1358] [MOSIP-11894] Partner management properties
 corrected.

---
 partner-management-default.properties | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index f0fdcf43852..28f8c054f8b 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -99,9 +99,12 @@ pmp.partner.partnerId.max.length=36
 ## Time difference between request creation and request processing
 masterdata.registerdevice.timestamp.validate=+5
 
+## Keymanager
+keymanager.base.url=http://keymanager.keymanager
+mosip.kernel.sign-url=${keymanager.base.url}/v1/keymanager/jwtSign
+
 ## Kernel services
 mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
-mosip.kernel.sign-url=http://keymanager.kernel/v1/keymanager/jwtSign
 
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
@@ -112,10 +115,10 @@ mosip.pmp.auth.secretKey= ${mosip.mosiop.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
-pmp.ca.certificaticate.upload.rest.uri=http://keymanager.kernel/v1/keymanager/uploadCACertificate
-pmp.partner.certificaticate.upload.rest.uri=http://keymanager.kernel/v1/keymanager/uploadPartnerCertificate
-pmp.partner.certificaticate.get.rest.uri=http://keymanager.kernel/v1/keymanager/getPartnerCertificate/{partnerCertId}
-pmp-keymanager.upload.other.domain.cert.rest.uri=http://keymanager.kernel/v1/keymanager/uploadOtherDomainCertificate
+pmp.ca.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadCACertificate
+pmp.partner.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadPartnerCertificate
+pmp.partner.certificaticate.get.rest.uri=${keymanager.base.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
+pmp-keymanager.upload.other.domain.cert.rest.uri=${keymanager.base.url}/v1/keymanager/uploadOtherDomainCertificate
 
 ## Keycloak
 # These configurations are used to create user in keycloak and map to a role.

From 370e3cb324d2b589cbb833cdd4e8ab29d226273e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 30 Jun 2021 05:08:40 +0530
Subject: [PATCH 0119/1358] Comment added.

---
 pre-registration-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 78cce186f41..fbeb8044c95 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -267,6 +267,7 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 
 ## Syncdata service
 ## To fetch the latest ID Schema for the ID object validator
+# WORKAROUND: TODO restore
 #mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
 mosip.preregistration.id-schema=http://masterdata.kernel/v1/masterdata/idschema/latest
 

From aaa956e4ea6aecef2a79132c4d610064f774bd85 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 7 Jul 2021 12:21:00 +0530
Subject: [PATCH 0120/1358] Disabling cache for testing.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index a4255630c8e..ec5264e2f59 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -352,7 +352,7 @@ datastores=db_1_DS,db_2_DS
 mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 
 # Keymanager service keystore cache properties
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 # API to get machine based on machine id
 mosip.kernel.syncdata-service-machine-url=http://masterdata.kernel/v1/masterdata/machines/%s/eng

From fc0500f67ad27a542f6d5ee5ddcbef27d98363ff Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 7 Jul 2021 12:47:32 +0530
Subject: [PATCH 0121/1358] Syncdata websub time increased.

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 162b4156a1b..aa52bf1ff73 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -393,7 +393,7 @@ syncdata.websub.resubscription.retry.count=3
 # this property value is set to 0 that disables this workaround.
 # To enable the resubscrition scheduling, this property should be assigned with a positive
 # number like 1 * 60 * 60 = 3600 for one hour
-syncdata.websub.resubscription.delay.secs=7200
+syncdata.websub.resubscription.delay.secs=7200000
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000
 

From f8d499da27f02afae0d9b21e2437c83e7878ce18 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 16 Jul 2021 15:15:17 +0530
Subject: [PATCH 0122/1358] PMS property corrected.

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 28f8c054f8b..3c13d0ab595 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -111,7 +111,7 @@ mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
 mosip.pmp.auth.clientId=mosip-partner-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.mosiop.partner.client.secret}
+mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey

From fa6b529448ce0f2309db0083e19923fb92cd1b23 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 16 Jul 2021 19:18:17 +0530
Subject: [PATCH 0123/1358] Syncdata websub property updated.

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index aa52bf1ff73..ca573e06526 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -385,7 +385,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=https://${mosip.api.public.host}/v1/syncdata/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a

From 24f4a73e757b764f365a4e40a35c314d50032beb Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 16 Jul 2021 19:26:45 +0530
Subject: [PATCH 0124/1358] Syncdata websub properties updated.

---
 syncdata-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index ca573e06526..e4d7979f308 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -385,7 +385,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/websub/callback/cacert
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a
@@ -393,7 +393,7 @@ syncdata.websub.resubscription.retry.count=3
 # this property value is set to 0 that disables this workaround.
 # To enable the resubscrition scheduling, this property should be assigned with a positive
 # number like 1 * 60 * 60 = 3600 for one hour
-syncdata.websub.resubscription.delay.secs=7200000
+syncdata.websub.resubscription.delay.secs=41100000
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000
 

From 0d92dc4dd163144fb8f1b1a8b551bb495f4363b6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 20 Jul 2021 05:37:24 +0530
Subject: [PATCH 0125/1358] Regclient properties updated.

---
 registration-default.properties | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/registration-default.properties b/registration-default.properties
index 172f1da7f05..eab8d429dac 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -460,3 +460,23 @@ mosip.registration.replace_sdk_quality_score=N
 
 #URL for reset password
 mosip.registration.reset_password_url=https://dev.mosip.net/keycloak/auth/realms/mosip/account/
+
+# camera used as document scanner resolution
+mosip.camera.resolution.width = 2592
+mosip.camera.resolution.height = 1944
+
+# Face threshold and retry attempts
+mosip.registration.num_of_face_retries=3
+mosip.registration.face_threshold=60
+
+# scanner configuration
+mosip.registration.DOCUMENT_SCANNER_DEPTH=100
+
+#used to fill env in the MDM rcapture request
+mosip.registration.server_profile=Staging
+
+# domain used for MDM trust validation
+mosip.registration.mdm.trust.domain.rcapture=DEVICE
+mosip.registration.mdm.trust.domain.digitalId=DEVICE
+mosip.registration.mdm.trust.domain.deviceinfo=DEVICE
+

From 14c11e7e56a00c6f4a3eb416d1ac2a2d02f38cf2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 20 Jul 2021 06:13:16 +0530
Subject: [PATCH 0126/1358] Minor comment.

---
 registration-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-default.properties b/registration-default.properties
index eab8d429dac..6210fb3b5fb 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -476,6 +476,7 @@ mosip.registration.DOCUMENT_SCANNER_DEPTH=100
 mosip.registration.server_profile=Staging
 
 # domain used for MDM trust validation
+# For L1 devices this should be FTM
 mosip.registration.mdm.trust.domain.rcapture=DEVICE
 mosip.registration.mdm.trust.domain.digitalId=DEVICE
 mosip.registration.mdm.trust.domain.deviceinfo=DEVICE

From d1b95f9f812ed00c6cd572bf3ac31f789e678419 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 20 Jul 2021 14:51:30 +0530
Subject: [PATCH 0127/1358] Clamav host name corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 71d94dc5226..efc03f48006 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -219,7 +219,7 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav
+mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=80
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10

From 0b272b569405d5b44ccabc4cc8f39daae2818633 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 20 Jul 2021 21:39:24 +0530
Subject: [PATCH 0128/1358] Space removed.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 0544dca0489..d3af80f4c59 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -230,7 +230,7 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav.clamav 
+mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=80
 
 ## Transliteration

From 01bd360f404587bb588205575c6993bedf3247a3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 21 Jul 2021 12:13:19 +0530
Subject: [PATCH 0129/1358] Reprocess time reduced for testing.

---
 registration-processor-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index efc03f48006..8dfc326c0a0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -290,13 +290,13 @@ mosip.registration.processor.print.service.uincard.signature.reason="signing"
 registration.processor.reprocess.fetchsize=100
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=7200
+registration.processor.reprocess.elapse.time=30
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron
 registration.processor.reprocess.seconds=0
-# Frequency for reprocess has been updated to every 5 minutes for pause/resume feature
-registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
+# TODO: time reduced for testing.  Revert for production.
+registration.processor.reprocess.minutes=*
 registration.processor.reprocess.hours=*
 registration.processor.reprocess.days_of_month=*
 registration.processor.reprocess.months=*

From 49e58ab94ef9e5ff2d3ab568c13d0e63673b96ad Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Jul 2021 07:10:14 +0530
Subject: [PATCH 0130/1358] [MOSIP-15956] s3 properties updated.

---
 application-default.properties | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d3af80f4c59..6b5d4470e63 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -1,7 +1,11 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# keycloak.host
+#   keycloak.host
+#   object.store.s3.accesskey 
+#   object.store.s3.region
+#   object.store.s3.secretkey
+
 aplication.configuration.level.version=1.1.4
 
 ## Idobject validator
@@ -320,12 +324,12 @@ object.store.base.location=/home/mosip
 hazelcast.config=classpath:hazelcast_default.xml
 
 
-## S3 object store adapter. TODO: ciphers here must be passed as config-server env variables.
-object.store.s3.accesskey=admin
-object.store.s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
-## Below url assumes minio is running in the cluster itself.
-object.store.s3.url=http://minio.minio:9000
-object.store.s3.region=
+## S3 object store adapter. 
+object.store.s3.accesskey=${object.store.s3.accesskey}
+object.store.s3.secretkey=${object.store.s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000. Leave blank for S3
+object.store.s3.url=
+object.store.s3.region=${object.store.s3.region}
 object.store.s3.readlimit=10000000
 
 ## Swift

From 5006b65956f2ec01a850a61930c282102bd5250f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Jul 2021 07:20:34 +0530
Subject: [PATCH 0131/1358] [MOSIP-15956] Dummy url added for s3.

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 6b5d4470e63..1e2b04c9622 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -328,7 +328,8 @@ hazelcast.config=classpath:hazelcast_default.xml
 object.store.s3.accesskey=${object.store.s3.accesskey}
 object.store.s3.secretkey=${object.store.s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000. Leave blank for S3
-object.store.s3.url=
+## Dummy url for s3
+object.store.s3.url=http://s3.com
 object.store.s3.region=${object.store.s3.region}
 object.store.s3.readlimit=10000000
 

From fb94948bc8ccd94cdc1635e3f26343c0cfc84759 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Jul 2021 12:50:04 +0530
Subject: [PATCH 0132/1358] Log level changed to DEBUG.

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 1e2b04c9622..f669e4362cd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -352,7 +352,8 @@ mosip.stage.environment=Developer
 
 ## Log level
 logging.level.root=WARN
--logging.level.io.mosip=INFO
+## TODO: Change to INFO in production
+-logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 77f388a14db4f4effc12e9ccb5b39aa1dedfe426 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Jul 2021 12:52:39 +0530
Subject: [PATCH 0133/1358] Corrected DEBUG property.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index f669e4362cd..5f8458825d0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -353,7 +353,7 @@ mosip.stage.environment=Developer
 ## Log level
 logging.level.root=WARN
 ## TODO: Change to INFO in production
--logging.level.io.mosip=DEBUG
+logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 2ad7ce3068be3c8175b666a9ac561f3f1d11e81d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Jul 2021 12:55:07 +0530
Subject: [PATCH 0134/1358] Nginx property corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8dfc326c0a0..2feef28ea46 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -54,7 +54,7 @@ schema.default.fieldCategory=pvt,none
 # The IDSchemaVersion used to create packets in reg-proc
 IDSchema.Version=0.1
 ## TODO: correct this
-NGINXURL=http://regproc-pktserver.regproc/
+NGINXDMZURL=http://regproc-pktserver.regproc/
 packet.info.storage.service=*
 
 ## Camel bridge

From 983435299f50daba8f0b8eab6800d6b334da90f4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 22 Jul 2021 22:13:52 +0530
Subject: [PATCH 0135/1358] Update s3 properties.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 5f8458825d0..7ed0fe1237d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -329,7 +329,7 @@ object.store.s3.accesskey=${object.store.s3.accesskey}
 object.store.s3.secretkey=${object.store.s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000. Leave blank for S3
 ## Dummy url for s3
-object.store.s3.url=http://s3.com
+object.store.s3.url=s3.${object.store.s3.region}.amazonaws.com
 object.store.s3.region=${object.store.s3.region}
 object.store.s3.readlimit=10000000
 

From 6184b970a307be7c8f81f81b0aa31079eff1e234 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 05:52:51 +0530
Subject: [PATCH 0136/1358] Log level changed to DEBUG.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 7ed0fe1237d..49c34c04d3e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -351,8 +351,8 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 ## Log level
-logging.level.root=WARN
 ## TODO: Change to INFO in production
+logging.level.root=DEBUG
 logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO

From 82da7b598885ddff941dd94dc7b63273cc7155ed Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 06:01:08 +0530
Subject: [PATCH 0137/1358] Restored log level settings.

---
 application-default.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 49c34c04d3e..a002e7f76e8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -351,9 +351,8 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 ## Log level
-## TODO: Change to INFO in production
-logging.level.root=DEBUG
-logging.level.io.mosip=DEBUG
+logging.level.root=WARN
+logging.level.io.mosip=INFO
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 2681005ec953b67891769429b2ee0c40aa7d0e81 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 10:37:46 +0530
Subject: [PATCH 0138/1358] s3 properties updated.

---
 application-default.properties | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index a002e7f76e8..73393e19fd7 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -2,9 +2,9 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 #   keycloak.host
-#   object.store.s3.accesskey 
-#   object.store.s3.region
-#   object.store.s3.secretkey
+#   s3.accesskey 
+#   s3.region
+#   s3.secretkey
 
 aplication.configuration.level.version=1.1.4
 
@@ -325,12 +325,12 @@ hazelcast.config=classpath:hazelcast_default.xml
 
 
 ## S3 object store adapter. 
-object.store.s3.accesskey=${object.store.s3.accesskey}
-object.store.s3.secretkey=${object.store.s3.secretkey}
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000. Leave blank for S3
 ## Dummy url for s3
-object.store.s3.url=s3.${object.store.s3.region}.amazonaws.com
-object.store.s3.region=${object.store.s3.region}
+object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
 ## Swift

From 2b7878543f07164a7bcd7c13c9ce0de8f158eefe Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 13:58:59 +0530
Subject: [PATCH 0139/1358] Log level changed to DEBUG.

---
 application-default.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 73393e19fd7..4f6dee62cdd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -327,8 +327,7 @@ hazelcast.config=classpath:hazelcast_default.xml
 ## S3 object store adapter. 
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000. Leave blank for S3
-## Dummy url for s3
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000. 
 object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
@@ -352,7 +351,7 @@ mosip.stage.environment=Developer
 
 ## Log level
 logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From 16ea38b22990f15162ffb0c9e80946dbb3dfbfc3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 14:53:07 +0530
Subject: [PATCH 0140/1358] Account name corrected.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 4f6dee62cdd..42ae9a4d181 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -337,7 +337,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=PACKET_MANAGER_ACCOUNT
+packet.manager.account.name=packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.keymanager.base.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.keymanager.base.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.masterdata.base.url}/v1/masterdata/idschema/latest

From cee873060967847874c19279f402a89e461fb8b9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 17:25:19 +0530
Subject: [PATCH 0141/1358] Log level reverted.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 42ae9a4d181..e2284fb4216 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -351,7 +351,7 @@ mosip.stage.environment=Developer
 
 ## Log level
 logging.level.root=WARN
-logging.level.io.mosip=DEBUG
+logging.level.io.mosip=INFO
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From c77ef5cb92e47c727bd2eb4b049a0b8dd31a367d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 23 Jul 2021 17:57:46 +0530
Subject: [PATCH 0142/1358] UMC check removed.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2feef28ea46..794839ff58a 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -196,7 +196,7 @@ mosip.identity.auth.internal.requestid=mosip.identity.auth.internal
 registration.processor.validate.introducer=true
 mosip.kernel.device.validate.history.id=""
 ## UMC: User, Machine, Center
-mosip.registartion.processor.validateUMC=true
+mosip.registartion.processor.validateUMC=false
 auth.PrependThumbprint.enable=false
 
 ## Packet receiver

From 5c47ef5735e1d878c57db7d64d0f8ff2eb6cfc6a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 05:56:38 +0530
Subject: [PATCH 0143/1358] EIS property updated.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 794839ff58a..596282066df 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -141,7 +141,7 @@ CRYPTOMANAGERDECRYPT=${KEYMANAGER}/v1/keymanager/decrypt
 crypto.PrependThumbprint.enable=true
 
 ## External Service
-EISERVICE=http://regproc-external.regproc/registrationprocessor/v1/eis/registration-processor/external-integration-service/v1.0
+EISERVICE=http://regproc-eis.regproc/registrationprocessor/v1/eis/registration-processor/external-integration-service/v1.0
 
 ## RID Generation Service
 RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid

From b1dcaa10e9f7830c28f482efd6d7fbcc979636b9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 10:54:21 +0530
Subject: [PATCH 0144/1358] Minor comment added.

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 596282066df..f64e7b289ba 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -348,6 +348,7 @@ PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
 DATASHARE=http://datashare.datashare
 DATASHARECREATEURL=${DATASHARE}/v1/datashare/create
 DATASHAREGETEURL=${DATASHARE}/v1/datashare/get
+# Default abis is mock-abis provided by MOSIP
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
 

From 22ec70ce7a05d88f9d3098f885afb5dc5f9683d5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 13:07:43 +0530
Subject: [PATCH 0145/1358] Idrepo url updated.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f64e7b289ba..6e93d65fab8 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -120,7 +120,7 @@ IDREPOGETIDBYUIN=${IDREPOIDENTITY}/idvid
 UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
 RETRIEVEIDENTITYFROMRID=${IDREPOIDENTITY}/idvid
 RETRIEVEIDENTITY=${IDREPOIDENTITY}/idvid
-IDREPOVID=http://idrepo-vid.idrepo
+IDREPOVID=http://vid.idrepo
 CREATEVID=${IDREPOVID}/idrepository/v1/vid
 GETUINBYVID=${IDREPOVID}/idrepository/v1/idvid
 CREDENTIALREQUEST=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator

From b02194d9968d72e5577f2d49bd67cd3dc68ab548 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 13:31:05 +0530
Subject: [PATCH 0146/1358] Biosdk url updated.

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 9927265fd0a..93ac37dcbcd 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -266,7 +266,7 @@ PARTNER_EXTRACTION_POLICY=http://pms-partner.pms/v1/partnermanager/partners/{par
 credential.service.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
 # BioSDK service
-mosip.biosdk.default.host=http://13.233.66.241
+mosip.biosdk.default.host=http://biosdk-service.biosdk
 mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
 
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 

From 6cdbdafce8c4c1562b207cfc4435dbecfa79a61f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 14:47:41 +0530
Subject: [PATCH 0147/1358] DEBUG log level added.

---
 id-repository-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 93ac37dcbcd..f2b73e3e137 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -304,3 +304,5 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
+# TODO: revert later.
+logging.level.io.mosip.idrepository.core.httpfilter.BaseIdRepoFilter=DEBUG

From 4a61d437164ad21feef73e79143b701185b9974d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 14:52:10 +0530
Subject: [PATCH 0148/1358] DEBUG level.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index e2284fb4216..42ae9a4d181 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -351,7 +351,7 @@ mosip.stage.environment=Developer
 
 ## Log level
 logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From d839b4ba27392adcb56ccf6618c61717fd17db65 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 14:59:42 +0530
Subject: [PATCH 0149/1358] Idrepo property updated.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ec5264e2f59..14f59ab4680 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -81,7 +81,7 @@ otp.sender.api.email.send=http://notifier.kernel/v1/notifier/email/send
 otp.sender.api.sms.send=http://notifier.kernel/v1/notifier/sms/send
 masterdata.api.template=http://masterdata.kernel/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=http://idrepo-identity-service/idrepository/v1/identity/uin/{uin}
+idrepo.api.getuindetails=http://identity.idrepo/idrepository/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client

From 7f0d92a3f7d3ee3acfae3252ea32692e9fdb50d6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 17:45:37 +0530
Subject: [PATCH 0150/1358] DEBUG log level

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 42ae9a4d181..4992eaa4f4f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -256,7 +256,8 @@ mosip.kernel.auth.proxy-email=true
 mosip.notification.language-type=BOTH
 
 ## System 
-logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
+## TODO: Revert to INFO
+logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=DEBUG
 
 ## Admin
 mosip.min-digit-longitude-latitude=4

From c350c06e8ea4a62e97efe1be7930e7c37b38657c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 17:49:49 +0530
Subject: [PATCH 0151/1358] Previous change reverted back.

---
 application-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 4992eaa4f4f..42ae9a4d181 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -256,8 +256,7 @@ mosip.kernel.auth.proxy-email=true
 mosip.notification.language-type=BOTH
 
 ## System 
-## TODO: Revert to INFO
-logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=DEBUG
+logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 
 ## Admin
 mosip.min-digit-longitude-latitude=4

From 45d5eb993caa15b58ca3d201004e4a2fe50b1343 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 18:30:39 +0530
Subject: [PATCH 0152/1358] DEBUG for regproc.

---
 application-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 42ae9a4d181..a30fabc65f7 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -350,10 +350,13 @@ schema.default.fieldCategory=pvt,none
 mosip.stage.environment=Developer
 
 ## Log level
+
 logging.level.root=WARN
 logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
+#TODO: remove later
+logging.level.io.mosip.registration.processor=DEBUG
 
 ## Tomcat access logs
 server.tomcat.accesslog.enabled=true

From 45ae712c84b2afdb0964030997d217220b3dc349 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 18:45:58 +0530
Subject: [PATCH 0153/1358] Reverted back DEBUG log for regproc.

---
 application-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index a30fabc65f7..772d7f16bf9 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -355,8 +355,6 @@ logging.level.root=WARN
 logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
-#TODO: remove later
-logging.level.io.mosip.registration.processor=DEBUG
 
 ## Tomcat access logs
 server.tomcat.accesslog.enabled=true

From 8772d525d8ae0eb12faae03b35d2c211295d73a2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 24 Jul 2021 23:09:09 +0530
Subject: [PATCH 0154/1358] Hazelcast discovery disabled.

---
 hazelcast_default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hazelcast_default.xml b/hazelcast_default.xml
index 040c52de759..be574a0ccf6 100644
--- a/hazelcast_default.xml
+++ b/hazelcast_default.xml
@@ -13,7 +13,7 @@
 	xmlns="http://www.hazelcast.com/schema/config"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  <properties>
-   <property name="hazelcast.discovery.enabled">true</property>
+   <property name="hazelcast.discovery.enabled">false</property>
    <property name="hazelcast.logging.type">slf4j</property>
  </properties>
 <group>
@@ -25,7 +25,7 @@
      <multicast enabled="false"/>
      <tcp-ip enabled="false" />
      <discovery-strategies>
-       <discovery-strategy enabled="true"
+       <discovery-strategy enabled="false"
            class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
          <properties>
            <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>

From ea211daaaeb2d5ac88c6c34666e00a74f47d69a1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 25 Jul 2021 17:20:25 +0530
Subject: [PATCH 0155/1358] Debug log property reverted back.

---
 id-repository-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index f2b73e3e137..93ac37dcbcd 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -304,5 +304,3 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
-# TODO: revert later.
-logging.level.io.mosip.idrepository.core.httpfilter.BaseIdRepoFilter=DEBUG

From 49caca91f4cc9f52deb1bc7fcc4c381f9668f34a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 25 Jul 2021 18:56:02 +0530
Subject: [PATCH 0156/1358] Minor change in url.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 6e93d65fab8..aa94dc91917 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -115,7 +115,7 @@ IDSCHEMA=${MASTER}/idschema/latest
 
 ## ID Repository Services
 
-IDREPOIDENTITY=http://identity.idrepo/idrepository/v1/identity/
+IDREPOIDENTITY=http://identity.idrepo/idrepository/v1/identity
 IDREPOGETIDBYUIN=${IDREPOIDENTITY}/idvid
 UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
 RETRIEVEIDENTITYFROMRID=${IDREPOIDENTITY}/idvid

From e833887bbf7da9c93f7fc6238b75e0fd7443f059 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 25 Jul 2021 19:08:49 +0530
Subject: [PATCH 0157/1358] ID repo params corrected.

---
 registration-processor-default.properties | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index aa94dc91917..679d3712c2f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -114,17 +114,15 @@ DEVICEVALIDATEHISTORY=http://pms-partner.pms/v1/partnermanager/deviceproviderman
 IDSCHEMA=${MASTER}/idschema/latest
 
 ## ID Repository Services
-
-IDREPOIDENTITY=http://identity.idrepo/idrepository/v1/identity
-IDREPOGETIDBYUIN=${IDREPOIDENTITY}/idvid
-UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
-RETRIEVEIDENTITYFROMRID=${IDREPOIDENTITY}/idvid
-RETRIEVEIDENTITY=${IDREPOIDENTITY}/idvid
-IDREPOVID=http://vid.idrepo
-CREATEVID=${IDREPOVID}/idrepository/v1/vid
-GETUINBYVID=${IDREPOVID}/idrepository/v1/idvid
-CREDENTIALREQUEST=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
-GETVIDSBYUIN=${IDREPOVID}/idrepository/v1/vid/uin
+IDREPOSITORY=http://identity.idrepo/idrepository/v1/identity/
+IDREPOGETIDBYUIN=http://identity.idrepo/idrepository/v1/identity/idvid
+UINGENERATOR=http://kernel-idgenerator-service/v1/idgenerator/uin
+RETRIEVEIDENTITYFROMRID=http://identity.idrepo/idrepository/v1/identity/idvid
+RETRIEVEIDENTITY=http://identity.idrepo/idrepository/v1/identity/idvid
+CREATEVID=http://vid.idrepo/idrepository/v1/vid
+GETUINBYVID=http://vid.idrepo/idrepository/v1/idvid
+CREDENTIALREQUEST=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
+GETVIDSBYUIN=http://vid.idrepo/idrepository/v1/vid/uin
 
 ## Encrypt Services
 KEYMANAGER=http://keymanager.keymanager/

From 710229705cdd4b34ebe01119de90204b2b8f7978 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 25 Jul 2021 19:13:08 +0530
Subject: [PATCH 0158/1358] idrepo property corrected

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 679d3712c2f..926351db392 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -116,7 +116,7 @@ IDSCHEMA=${MASTER}/idschema/latest
 ## ID Repository Services
 IDREPOSITORY=http://identity.idrepo/idrepository/v1/identity/
 IDREPOGETIDBYUIN=http://identity.idrepo/idrepository/v1/identity/idvid
-UINGENERATOR=http://kernel-idgenerator-service/v1/idgenerator/uin
+UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
 RETRIEVEIDENTITYFROMRID=http://identity.idrepo/idrepository/v1/identity/idvid
 RETRIEVEIDENTITY=http://identity.idrepo/idrepository/v1/identity/idvid
 CREATEVID=http://vid.idrepo/idrepository/v1/vid

From b90077bef9bdbf634fdb0ac1e53f8a09ca66c484 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 13:27:51 +0530
Subject: [PATCH 0159/1358] Minor cleanup.

---
 registration-default.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 6210fb3b5fb..c0c7ca83b16 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -408,9 +408,6 @@ mosip.registration.mds.face.dedup.enable.flag=N
 #Storage Location of the Identity Schema. LOCAL specifies the schema is stored within the application. Should not be modified
 mosip.kernel.idobjectvalidator.file-storage-uri=LOCAL
 
-#File name of the Identity Schema. Should not be modified
-mosip.kernel.idobjectvalidator.schema-name=mosip-identity-json-schema.json
-
 #Property Source of the Identity Schema. Should not be modified
 mosip.kernel.idobjectvalidator.property-source=LOCAL
 

From a80c959c59977a43561f4e9432a7735db2b42c99 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 16:28:23 +0530
Subject: [PATCH 0160/1358] Object validation disabled for a few properties as
 their urls don't work anymore.

---
 application-default.properties | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 772d7f16bf9..a6697c42af8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,7 +14,8 @@ mosip.masterdata.base.url = http://masterdata.kernel
 # Commenting/removing below property will disable all masterdata validations as supported languages are required for all other validations
 mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
 # commenting/removing below property will disable Gender masterdata validation
-mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
+## Removed as API no longer valid
+#mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
 # commenting/removing below properties will disable Document Type masterdata validation
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
@@ -22,7 +23,9 @@ mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterd
 mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
 # commenting/removing below properties will disable individualtype/resident status masterdata validations
-mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
+## Removed as API no longer valid
+#mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
+#mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
 
 # List of Location Hierarchy mappings for which the provided fields are from identity schema 
 # and its values are validated against mapped location hierarchy masterdata.

From 05d929b27dbe460efdce1820ee4ec41d13aa516a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 17:40:14 +0530
Subject: [PATCH 0161/1358] Commented out properties for testing.

---
 application-default.properties | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index a6697c42af8..3ff56470056 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -20,8 +20,10 @@ mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
 # commenting/removing below properties will disable location and location hierarchy masterdata validations
-mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
+## TODO: Revert later
+#mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
+## TODO: Revert later
+#mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
 # commenting/removing below properties will disable individualtype/resident status masterdata validations
 ## Removed as API no longer valid
 #mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes

From 55d294dad8dd86a5e4cb2c51aef727107bb8774d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 17:49:20 +0530
Subject: [PATCH 0162/1358] Testing related changes.

---
 id-repository-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 93ac37dcbcd..e206991c2cc 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -21,7 +21,9 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepo
+#mosip.idrepo.objectstore.bucket-name=idrepo
+## TODO: temp change for testing.
+mosip.idrepo.objectstore.bucket-name=idrepository
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 # For auditing

From 774cb535f9cd9ff7cf2b8f79685fcdbcc7b46d8f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 17:57:30 +0530
Subject: [PATCH 0163/1358] Reverted previous testing related changes.

---
 application-default.properties   | 6 ++----
 id-repository-default.properties | 2 --
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 3ff56470056..a6697c42af8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -20,10 +20,8 @@ mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
 # commenting/removing below properties will disable location and location hierarchy masterdata validations
-## TODO: Revert later
-#mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
-## TODO: Revert later
-#mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
+mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
+mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
 # commenting/removing below properties will disable individualtype/resident status masterdata validations
 ## Removed as API no longer valid
 #mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
diff --git a/id-repository-default.properties b/id-repository-default.properties
index e206991c2cc..5c594cf6d34 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -21,8 +21,6 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-#mosip.idrepo.objectstore.bucket-name=idrepo
-## TODO: temp change for testing.
 mosip.idrepo.objectstore.bucket-name=idrepository
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 

From f405cb73576565adc23db10bfced90b53b38bf86 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 20:00:04 +0530
Subject: [PATCH 0164/1358] Resident properties corrected. Still WIP.

---
 resident-default.properties | 38 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index fd01880cba8..120bc1e83b6 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -22,47 +22,41 @@ vid.revoke.id=mosip.vid.deactivate
 resident.revokevid.id=mosip.resident.vidstatus
 PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
-DECRYPT_API_URL=http://kernel-keymanager-service/v1/keymanager/decrypt
+DECRYPT_API_URL=http://keymanager.keymanager/v1/keymanager/decrypt
 
 #-------------TOKEN GENERATION----------------
-#Token generation request id
 token.request.id=io.mosip.resident
-#Token generation app id
 resident.appid=resident
-#Token generation version
 token.request.version=1.0
-# Kernel auth client ID for IDA
 resident.clientId=mosip-resident-client
-# Kernel auth secret key for IDA
 resident.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-#Token genration issue url
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 #--------------URI--------------------------
 #Auth Services
-KERNELAUTHMANAGER=http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
+KERNELAUTHMANAGER=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=http://regproc-print-service/registrationprocessor/v1/print/uincard
-INTERNALAUTH=http://ida-internal-service/idauthentication/v1/internal/auth
-INTERNALAUTHTRANSACTIONS=http://ida-internal-service/idauthentication/v1/internal/authTransactions
-KERNELENCRYPTIONSERVICE=http://ida-internal-service/idauthentication/v1/internal/getCertificate
-IDAUTHCREATEVID=http://idrepo-vid-service/idrepository/v1/vid
-IDAUTHREVOKEVID=http://idrepo-vid-service/idrepository/v1/vid/deactivate
+INTERNALAUTH=http://ida-internal.ida/idauthentication/v1/internal/auth
+INTERNALAUTHTRANSACTIONS=http://ida-internal.ida/idauthentication/v1/internal/authTransactions
+KERNELENCRYPTIONSERVICE=http://ida-internal.ida/idauthentication/v1/internal/getCertificate
+IDAUTHCREATEVID=http://vid.idrepo/idrepository/v1/vid
+IDAUTHREVOKEVID=http://vid.idrepo/idrepository/v1/vid/deactivate
 #Notification service
-IDREPOGETIDBYUIN=http://idrepo-identity-service/idrepository/v1/identity/idvid
-IDREPOGETIDBYRID=http://idrepo-identity-service/idrepository/v1/identity/idvid
-GETUINBYVID=http://idrepo-vid-service/idrepository/v1/vid
+IDREPOGETIDBYUIN=http://identity.idrepo/idrepository/v1/identity/idvid
+IDREPOGETIDBYRID=http://identity.idrepo/idrepository/v1/identity/idvid
+GETUINBYVID=http://vid.idrepo/idrepository/v1/vid
 resident.notification.emails=mosiptestuser@gmail.com
 resident.notification.message=Notification has been sent to the provided contact detail(s)
 #templates
-MASTER=http://kernel-masterdata-service/v1/masterdata
+MASTER=http://masterdata.kernel/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
-RIDGENERATION=http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
-CREATEVID=http://idrepo-vid-service/idrepository/v1/vid
+RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
+CREATEVID=http://vid.idrepo/idrepository/v1/vid
 IDREPOSITORY=http://idrepo-identity-service/idrepository/v1/identity/
-ENCRYPTURL=http://kernel-keymanager-service/v1/keymanager/encrypt
-MIDSCHEMAURL=http://kernel-syncdata-service/v1/syncdata/latestidschema
+ENCRYPTURL=http://keymanager.keymanager/v1/keymanager/encrypt
+MIDSCHEMAURL=http://syncdata.kernel/v1/syncdata/latestidschema
 # DMZ service call
 dmz.ingress.base.url=http://dmz.ingress:30080
 SYNCSERVICE=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/sync
@@ -77,7 +71,7 @@ resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service
 POLICY_REQ_URL=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-OTP_GEN_URL=http://ida-internal-service/idauthentication/v1/internal/otp
+OTP_GEN_URL=http://ida-internal.ida/idauthentication/v1/internal/otp
 CREDENTIAL_STATUS_URL=http://idrepo-credential-request-generator/v1/credentialrequest/get/
 CREDENTIAL_REQ_URL=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
 CREDENTIAL_CANCELREQ_URL=http://idrepo-credential-request-generator/v1/credentialrequest/cancel/

From 20f8d98debf3bb8f01e4ff22f5f1738a95ea0765 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 27 Jul 2021 20:03:01 +0530
Subject: [PATCH 0165/1358] Credential request generator properties updated.

---
 registration-processor-default.properties | 2 +-
 resident-default.properties               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 926351db392..0efd3edd553 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -121,7 +121,7 @@ RETRIEVEIDENTITYFROMRID=http://identity.idrepo/idrepository/v1/identity/idvid
 RETRIEVEIDENTITY=http://identity.idrepo/idrepository/v1/identity/idvid
 CREATEVID=http://vid.idrepo/idrepository/v1/vid
 GETUINBYVID=http://vid.idrepo/idrepository/v1/idvid
-CREDENTIALREQUEST=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
+CREDENTIALREQUEST=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
 GETVIDSBYUIN=http://vid.idrepo/idrepository/v1/vid/uin
 
 ## Encrypt Services
diff --git a/resident-default.properties b/resident-default.properties
index 120bc1e83b6..bba2df0b66b 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -72,9 +72,9 @@ resident.machine.id=10001
 #Credential Req service
 POLICY_REQ_URL=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 OTP_GEN_URL=http://ida-internal.ida/idauthentication/v1/internal/otp
-CREDENTIAL_STATUS_URL=http://idrepo-credential-request-generator/v1/credentialrequest/get/
-CREDENTIAL_REQ_URL=http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
-CREDENTIAL_CANCELREQ_URL=http://idrepo-credential-request-generator/v1/credentialrequest/cancel/
+CREDENTIAL_STATUS_URL=http://credentialrequest.idrepo/v1/credentialrequest/get/
+CREDENTIAL_REQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
+CREDENTIAL_CANCELREQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/cancel/
 CREDENTIAL_TYPES_URL=http://idrepo-credential-service/v1/credentialservice/types
 PARTNER_API_URL=http://pms-partner-manager-service/v1/partnermanager/partners
 mosip.kernel.masterdata.audit-url=http://kernel-auditmanager-service/v1/auditmanager/audits

From 1661a67d86280eecb38fb66331aac810f0d0b22e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 28 Jul 2021 05:59:43 +0530
Subject: [PATCH 0166/1358] Credential request client secret corrected.

---
 id-repository-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 5c594cf6d34..666f1b56424 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# mosip.mosip.creqreq.client.secret
+# mosip.mosip.crereq.client.secret
 # mosip.mosip.creser.client.secret
 # keycloak.host
 # mosip.kernel.tokenid.uin.salt
@@ -182,7 +182,7 @@ hibernate.show_sql=false
 # Token generator properties 
 credential.request.token.request.appid=crereq
 credential.request.token.request.clientId=mosip-crereq-client
-credential.request.token.request.secretKey=${mosip.mosip.creqreq.client.secret}
+credential.request.token.request.secretKey=${mosip.mosip.crereq.client.secret}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
 credential.request.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip

From 9a0824df2e41665ecd519735e649edcdec891010 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 28 Jul 2021 08:43:38 +0530
Subject: [PATCH 0167/1358] Minor format cleanup.

---
 registration-processor-print-text-file.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/registration-processor-print-text-file.json b/registration-processor-print-text-file.json
index 9de84ed605a..c37f180e1e7 100644
--- a/registration-processor-print-text-file.json
+++ b/registration-processor-print-text-file.json
@@ -1,9 +1,9 @@
 {
-	"name": "fullName,LastName",
-	"address": "addressLine1,addressLine2,addressLine3",
-	"region": "region",
-	"province": "province",
-	"city": "city",
-	"postalCode": "postalCode",
-	"phoneNumber": "phone"
+    "name": "fullName,LastName",
+    "address": "addressLine1,addressLine2,addressLine3",
+    "region": "region",
+    "province": "province",
+    "city": "city",
+    "postalCode": "postalCode",
+    "phoneNumber": "phone"
 }

From 744e4b3391f5abf61a4ee63aef404158e070256b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 29 Jul 2021 06:03:58 +0530
Subject: [PATCH 0168/1358] INFO mode reverted back.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index a6697c42af8..c2a1c22427a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -355,7 +355,7 @@ mosip.stage.environment=Developer
 ## Log level
 
 logging.level.root=WARN
-logging.level.io.mosip=DEBUG
+logging.level.io.mosip=INFO
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From d45ad53e2d7f3965669d240b3948e49099b0f3e3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 30 Jul 2021 11:21:55 +0530
Subject: [PATCH 0169/1358] Mock abis property updated.

---
 mock-abis-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 9b768f5aecb..429350c87f5 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,3 +7,4 @@ management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
 abis.return.duplicate=false
+secret_url=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey

From f7ed8b8de08d7a0810dc36857d419fa1ff6e8fef Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 30 Jul 2021 11:42:55 +0530
Subject: [PATCH 0170/1358] Mock abis properties updated.

---
 mock-abis-default.properties | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 429350c87f5..e2103da97c3 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -1,10 +1,15 @@
-#spring.cloud.config.uri=https://dev.mosip.net/config
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+#   mosip.mosip.regproc.client.secret
 spring.cloud.config.name=mock-abis
-#spring.profiles.active=mz
-#spring.cloud.config.label=1.1.2
 spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
 abis.return.duplicate=false
 secret_url=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+secret_url.clientnId=mosip-regproc-client
+secret_url.id=string
+secret_url.secretKey=${mosip.mosip.regproc.client.secret}
+secret_url.appId=regproc

From 97c4d6c4470ac3124a7e5b7fcb99aaa8955c3ca4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 30 Jul 2021 18:05:38 +0530
Subject: [PATCH 0171/1358] Property added for testing.

---
 id-authentication-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d64dc4268b8..eeb62131687 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -479,3 +479,7 @@ mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.
 mosip.kernel.keymanager.autogen.basekeys.list=${application.id}:${internal.reference.id},${application.id}:${partner.reference.id},${application.id}:${partner.biometric.reference.id},${application.id}:${mosip.kernel.zkcrypto.publickey.reference.id},${application.id}:${ida-auth-partner-id}
 zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
+
+## TODO: For testing. Revert in production
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+

From 6680ebf6bfb02d26bd5fd867714a6e40b0837585 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 12 Aug 2021 22:21:22 +0530
Subject: [PATCH 0172/1358] [MOSIP-16645] Updated for 1.2.0

---
 application-default.properties | 71 ++++++++++++++++++----------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index c2a1c22427a..bde6f3aa61f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -6,51 +6,40 @@
 #   s3.region
 #   s3.secretkey
 
-aplication.configuration.level.version=1.1.4
+aplication.configuration.level.version=LTS
 
 ## Idobject validator
-mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable=NA
+# This config is used for loading recommended centers based on the value of the config. 
+# The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
+mosip.recommended.centers.locCode=5
+
 mosip.masterdata.base.url = http://masterdata.kernel
-# Commenting/removing below property will disable all masterdata validations as supported languages are required for all other validations
-mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
-# commenting/removing below property will disable Gender masterdata validation
-## Removed as API no longer valid
-#mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
-# commenting/removing below properties will disable Document Type masterdata validation
-mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
-mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
-# commenting/removing below properties will disable location and location hierarchy masterdata validations
-mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
-# commenting/removing below properties will disable individualtype/resident status masterdata validations
-## Removed as API no longer valid
-#mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
-#mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
-
-# List of Location Hierarchy mappings for which the provided fields are from identity schema 
-# and its values are validated against mapped location hierarchy masterdata.
-# Needs to be updated when Identity Schema has been updated.
-mosip.kernel.idobjectvalidator.locationhierarchy.mapping.0=country
-mosip.kernel.idobjectvalidator.locationhierarchy.mapping.1=region
-mosip.kernel.idobjectvalidator.locationhierarchy.mapping.2=province
-mosip.kernel.idobjectvalidator.locationhierarchy.mapping.3=city
-mosip.kernel.idobjectvalidator.locationhierarchy.mapping.4=zone
-mosip.kernel.idobjectvalidator.locationhierarchy.mapping.5=postalCode
+mosip.syncdata.base.url=http://syncdata.kernel
+
+# masterdata field data url
+mosip.idobjectvalidator.masterdata.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/possiblevalues/{subType}
+# Path to IDSchemaVersion. Path is defined as per JsonPath.compile.
+mosip.kernel.idobjectvalidator.identity.id-schema-version-path=identity.IDSchemaVersion
+# Path to dateOfBirth field. Path is defined as per JsonPath.compile.
+mosip.kernel.idobjectvalidator.identity.dob-path = identity.dateOfBirth
+
+# Refresh cache only once for a particular subType for each request, when a value is not found  for that subType. By default, it is false
+mosip.idobjectvalidator.refresh-cache-on-unknown-value=false
 
 # Date format expected in identity json. commenting/removing below property will disable dob format validation in identity json.
 mosip.kernel.idobjectvalidator.date-format=uuuu/MM/dd
-
 ## Properties that need to be updated when Identity Schema has been updated
 mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone
 mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.update-uin=IDSchemaVersion,UIN
-mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.child-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.child-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.other=IDSchemaVersion,UIN
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.lost=IDSchemaVersion
+mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.biometric_correction=IDSchemaVersion
+# Value used in IdObjectReferenceValidator when value is not available
+mosip.kernel.idobjectvalidator.masterdata.value-not-available=NA
 
 ## Bio attribute allowed to be stored in IDRepo as per Identity Schema
 mosip.idrepo.identity.allowedBioAttributes=individualBiometrics
@@ -202,6 +191,8 @@ mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keym
 mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
 mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
 mosip.kernel.keymanager.cert.url=${mosip.keymanager.base.url}/v1/keymanager/getCertificate
+mosip.kernel.keymanager-service-CsSign-url=${mosip.keymanager.base.url}/v1/keymanager/cssign
+mosip.kernel.keymanager.cert.url=${mosip.keymanager.base.url}/v1/keymanager/getCertificate
 mosip.sign.applicationid=KERNEL
 mosip.sign.refid=SIGN
 mosip.kernel.cryptomanager.request_id=CRYPTOMANAGER.REQUEST
@@ -301,6 +292,7 @@ management.metrics.export.prometheus.enabled=true
 
 mosip.kernel.syncdata-service-idschema-url=${mosip.masterdata.base.url}/v1/masterdata/idschema/latest
 mosip.kernel.syncdata-service-dynamicfield-url=${mosip.masterdata.base.url}/v1/masterdata/dynamicfields
+mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.syncdata.base.url}/v1/syncdata/tpm/publickey/
 mosip.kernel.keymanager-service-validate-url=${mosip.keymanager.base.url}/v1/keymanager/validate
 
 ## GPS
@@ -311,12 +303,13 @@ mosip.registration.gps_device_enable_flag=n
 ## 1. 'exception' : it will throw exception.
 ## 2.  'defaultPriority' : use default priority packetmanager.default.priority.
 packetmanager.default.read.strategy=defaultPriority
-packetmanager.default.priority=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
+packetmanager.packet.signature.disable-verification=false
 mosip.commons.packetnames=id,evidence,optional
-provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
+provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
 provider.packetreader.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketReaderImpl
-provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|CORRECTION,classname:io.mosip.commons.packet.impl.PacketWriterImpl
+provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -373,3 +366,15 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.base.url=http://websub.websub
 websub.hub.url=${websub.base.url}/websub/hub
 websub.publish.url=${websub.base.url}/websub/publish
+websub.failed.messages.sync.url=${websub.base.url}/websub/sync/failedmessage
+
+mosip.mandatory-languages=eng
+mosip.optional-languages=ara,fra
+mosip.min-languages.count=2
+mosip.max-languages.count=3
+
+# These are default languages used for sending notifications
+mosip.default.template-languages=eng,ara
+
+#Config key to pick the preferred language for communicating to the Resident
+mosip.default.user-preferred-language-attribute=preferredLang

From e2f3206fcc26c1b757225ccc1df4688cdb329784 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 13 Aug 2021 11:05:49 +0530
Subject: [PATCH 0173/1358] [MOSIP-16645] Updated for 1.2.0

---
 kernel-default.properties | 392 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 387 insertions(+), 5 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 14f59ab4680..9af3230c831 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -342,7 +342,7 @@ datastores=ldap_1_DS,db_1_DS,db_2_DS
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
 ## List of keys to auto generate.
-mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS
+mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES
 
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
@@ -388,16 +388,398 @@ syncdata.websub.callback.url.path.ca-cert=/callback/partner/ca_certificate
 syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
+# Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
+subscriptions-delay-on-startup=120000
+
+# Flag to identify the support of no thumbprint in 1.1.3 version. 
+# Added this for backward compatability. default is false, means support is not required.
+# Make it to true if support is required.
+mosip.kernel.keymanager.113nothumbprint.support=false
+
+# Pause & resume api proeprties
+PACKET_RESUME_API=http://regproc-workflowmanager/registrationprocessor/v1/workflowmanager/workflowaction
+PACKET_PAUSE_API=http://regproc-workflowmanager/registrationprocessor/v1/workflowmanager/workflow/search
+KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+
+## resubscription and subscription initial delay for masterdata service
+masterdata.websub.resubscription.delay.millis=48000000
+masterdata.subscriptions-delay-on-startup=120000
+
 # The time interval in seconds to schedule subscription of topics which is done as a
 # work-around for the bug: MOSIP-9496. By default the
 # this property value is set to 0 that disables this workaround.
 # To enable the resubscrition scheduling, this property should be assigned with a positive
-# number like 1 * 60 * 60 = 3600 for one hour
-syncdata.websub.resubscription.delay.secs=7200
-# Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
-subscriptions-delay-on-startup=120000
+# number like 1 * 60 * 60 * 1000 = 3600000 for one hour
+syncdata.websub.resubscription.delay.millis=48000000
+
+## Admin UI
+## this pattern like --> display column : configKey. 
+## We can provide multiple values with ";" separated 
+mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
+
+## Used to get IAM user details. 
+mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
+mosip.kernel.masterdata.auth-user-details=/userdetails
+
+## identity schema backward compatability ########
+mosip.ui.spec.default.domain=registration-client
+
+#scheduler do it's job at 2am
+scheduling.job.cron=0 0 2 * * ?
+
+## Admin roles
+mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getapplicationtypeslangcode=RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.postapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postbiometricattributes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getblocklistedwordslangcode=INDIVIDUAL,ID_AUTHENTICATION,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getdocumentcategories=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdocumentcategorieslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdocumentcategoriescode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesall=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getdocumenttypesdocumentcategorycode=INDIVIDUAL,ID_AUTHENTICATION,ZONAL_ADMIN,PARTNER,PARTNER_ADMIN,PRE_REGISTRATION,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+#mosip.role.admin.masterdata.getdocumenttypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+#mosip.role.admin.masterdata.getdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,INDIVIDUAL,Default
+#mosip.role.admin.masterdata.getdistinct=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN,Default
+mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+
+#mosip.role.admin.masterdata.getexceptionalholidaysregistrationcenterid=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+
+mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+
+#mosip.role.admin.masterdata.getgendertypes=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
+#mosip.role.admin.masterdata.getgendertypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getgendertypesvalidategendername=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,CENTRAL_ADMIN
+mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+
+mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
+
+#mosip.role.admin.masterdata.getidtypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+
+#mosip.role.admin.masterdata.getindividualtypes=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+
+#mosip.role.admin.masterdata.getlanguages=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,Default
+mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,GLOBAL_ADMIN
+
+#mosip.role.admin.masterdata.getlocationslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getlocationslocationcodelangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
+#mosip.role.admin.masterdata.getlocationsinfolocationcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
+#mosip.role.admin.masterdata.getlocationslocationhierarchy=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getlocationsimmediatechildrenlocationcodelangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
+#mosip.role.admin.masterdata.getlocationsvalidatelocationname=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
+
+#mosip.role.admin.masterdata.getlocationhierarchylevelslevellangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_PROCESSOR,INDIVIDUAL
+mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
+#mosip.role.admin.masterdata.getlocationhierarchylevelslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_PROCESSOR,INDIVIDUAL
+
+mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.admin.masterdata.getmachineslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getmachines=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN
+
+mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+
+mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.postpacketrejectionreasonsreasoncategory=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+
+mosip.role.admin.masterdata.postpacketresume=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postpacketsearch=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
+
+mosip.role.admin.masterdata.postregistereddevices=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
+
+mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN
+
+mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
+
+mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT
+mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+
+mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemaall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemalatest=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
+
+#mosip.role.admin.masterdata.gettemplates=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
+#mosip.role.admin.masterdata.gettemplateslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
+#mosip.role.admin.masterdata.gettemplateslangcodetemplatetypecode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
+mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
+mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatesall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.posttemplatetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+#mosip.role.admin.masterdata.gettemplatetypescodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,ID_AUTHENTICATION,INDIVIDUAL,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_SUPERVISOR,DEVICE_MANAGER,DEVICE_MANAGER,AUTH_PARTNER,PARTNER,PARTNER_ADMIN,PRE_REGISTRATION
+#mosip.role.admin.masterdata.gettemplatetypeslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+
+#mosip.role.admin.masterdata.gettitle=GLOBAL_ADMIN,ZONAL_ADMIN,ID_AUTHENTICATION,INDIVIDUAL,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_SUPERVISOR,DEVICE_MANAGER,DEVICE_MANAGER,AUTH_PARTNER,PARTNER,PARTNER_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION
+#mosip.role.admin.masterdata.gettitlelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_OPERATOR,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.admin.masterdata.posttitle=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettitleall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.postuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postuispecpublish=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getuispecall=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+#mosip.role.admin.masterdata.getuispecdomainlatest=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
+
+mosip.role.admin.masterdata.getusersid=ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusers=ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserdetails=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
+
+mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+#mosip.role.admin.masterdata.getvaliddocumentslanguagecode=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,RESIDENT,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,PARTNER,PARTNER_ADMIN,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+#mosip.role.admin.masterdata.getvaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,RESIDENT,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,PARTNER,PARTNER_ADMIN,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+
+#mosip.role.admin.masterdata.getweekdaysregistrationcenteridlangcode=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+#mosip.role.admin.masterdata.getworkingdaysregistrationcenteridlangcode=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+#mosip.role.admin.masterdata.getworkingdayslangcode=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+
+mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+#mosip.role.admin.masterdata.getzonesleafslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneuserhistoryuserid=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+
+## Kernel roles
+mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postcsverifysign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postcssign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postdecryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postencryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postdecryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postencryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postgeneratesymmetrickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadotherdomaincertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postgeneratecsr=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postgeneratemasterkeyobjecttype=KEY_MAKER,TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postmigratebasekey=KEY_MIGRATION_ADMIN
+mosip.role.kernel.getgetzktempcertificate=KEY_MIGRATION_ADMIN
+mosip.role.kernel.postmigratezkkeys=KEY_MIGRATION_ADMIN
+mosip.role.kernel.postverifycertificatetrust=MS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
+mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
+mosip.role.kernel.postuploadpartnercertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
+mosip.role.kernel.postuploadcacertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
+mosip.role.kernel.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
+mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postzkreencryptrandomkey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL

From 65788b167c1e4011b6a23169178421466abdbedc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 13 Aug 2021 12:56:42 +0530
Subject: [PATCH 0174/1358] [MOSIP-16645] Pre-registration updated for 1.2.0

---
 pre-registration-default.properties | 75 ++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 13 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index fbeb8044c95..0258d3e9fcc 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -34,7 +34,7 @@ version=1.0
 
 ## Age to be an adult
 ## Used in UI to identify the applicant type 
-mosip.adult.age=5
+mosip.adult.age=${mosip.kernel.applicant.type.age.limit}
 
 
 ## ID Schema 
@@ -125,6 +125,10 @@ mosip.preregistration.booking.exception.id=mosip.preregistration.booking.parse.e
 
 mosip.preregistration.booking.id.book=mosip.pre-registration.booking.book
 
+# Sync
+mosip.preregistration.sync.sign.appid=KERNEL
+mosip.preregistration.sync.sign.refid=SIGN
+
 ## Booking 
 ## Sync every n days 
 preregistration.availability.sync=37
@@ -181,7 +185,7 @@ datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
 mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
 sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
 otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
-pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
+pre.reg.login.otp.sms.template=otp-sms-template
 pre.reg.login.otp.mail.subject.template=pre-reg-login-email-subject-template
 pre.reg.login.otp.mail.content.template=pre-reg-login-email-content-template
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
@@ -199,8 +203,8 @@ masterdata.resource.url=${masterdata.service.env}/${masterdata.service.version}/
 regCenter.url=${masterdata.resource.url}/registrationcenters
 holiday.url=${masterdata.resource.url}/getregistrationcenterholidays/
 holiday.exceptional.url=${masterdata.resource.url}/exceptionalholidays
-working.day.url=${masterdata.resource.url}/workingdays
-mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/{langcode}
+working.day.url=${masterdata.resource.url}/weekdays
+mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/all?pageSize
 ##Kernel Service URL for fetching templates
 resource.template.url=${masterdata.resource.url}/templates
 mosip.pre-registration.notification.id=mosip.pre-registration.notification.notify
@@ -266,10 +270,9 @@ kernel.prid.contextpath=pridgenerator
 mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid.contextpath}/prid
 
 ## Syncdata service
-## To fetch the latest ID Schema for the ID object validator
-# WORKAROUND: TODO restore
-#mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
+latestidschema.service.contextpath=latestidschemafetch the latest ID Schema for the ID object validator
 mosip.preregistration.id-schema=http://masterdata.kernel/v1/masterdata/idschema/latest
+syncdata.resource.url=http://syncdata.kernel/v1/syncdata
 
 ## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}
@@ -364,6 +367,7 @@ por.url=proofOfRelationship
 ## Determines request & response id of transliteration-service
 mosip.pre-registration.transliteration.transliterate.id=mosip.pre-registration.transliteration.transliterate
 mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.transliteration.transliterate
+mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j
 
 ## UI params
 #------------to be removed later -------
@@ -373,7 +377,7 @@ mosip.min-languages.count=2
 mosip.max-languages.count=2
 -------------------------------------------
 ## List of keys which UI will consume
-ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.supported-languages,mosip.primary-language,mosip.secondary-language,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,google.recaptcha.site.key,mosip.adult.age,mosip.idschema.version,enable-captcha,preregistartion.identity.name,preregistration.ui.version
+ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,mosip.preregistration.captcha.sitekey,mosip.adult.age,mosip.idschema.version,mosip.preregistration.captcha.enable,preregistartion.identity.name,preregistration.ui.version,preregistartion.contact.email,preregistartion.contact.phone
 ## This config is used for loading recommended centers based on the value of the config. 
 ## The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 preregistration.recommended.centers.locCode=5
@@ -389,7 +393,11 @@ preregistration.documentupload.allowed.file.size = 2000000
 mosip.preregistration.auto.logout.idle=180
 # Determines pop up timer(in seconds)
 mosip.preregistration.auto.logout.timeout=60
-preregistration.ui.version=1.1.5
+preregistration.ui.version=1.2.0
+
+preregistartion.contact.email=contact@dev.mosip.net
+preregistartion.contact.phone=9999999999
+
 # Determines to maintain iternal cycle & make sure value is not null (any value greater than zero)
 mosip.preregistration.auto.logout.ping=30
 
@@ -401,14 +409,18 @@ mosip.preregistration.auto.logout.ping=30
 #preregistration.workflow.booking=true/false 
 
 mosip.id.validation.identity.dateOfBirth=^\d{4}[\-\/\s]?((((0[13578])|(1[02]))[\-\/\s]?(([0-2][0-9])|(3[01])))|(((0[469])|(11))[\-\/\s]?(([0-2][0-9])|(30)))|(02[\-\/\s]?[0-2][0-9]))$
+mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
+mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-google.recaptcha.site.key=sitekey
-google.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
-google.recaptcha.secret.key=secret
 mosip.preregistration.captcha.id.validate = mosip.pre-registration.captcha.id.validate
-enable-captcha=false
+mosip.preregistration.captcha.sitekey=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
+mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
+mosip.preregistration.captcha.secretkey=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
+
+# Enable or Disable Captch - true to enable & false to disable
+mosip.preregistration.captcha.enable=true
 
 ## Security 
 mosip.security.csrf-enable:false
@@ -419,3 +431,40 @@ mosip.security.secure-cookie:false
 
 ## for prereg booking notification name validation
 preregistration.notification.nameFormat=fullName
+
+## Minio
+object.store.s3.use.account.as.bucketname=true
+
+## Spring cache
+spring.cache.type=none
+
+## Roles
+mosip.role.prereg.postapplications=INDIVIDUAL
+mosip.role.prereg.putapplications=INDIVIDUAL
+mosip.role.prereg.getapplications=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.putapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getapplicationsall=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.deleteapplications=INDIVIDUAL
+mosip.role.prereg.postapplicationsupdatedtime=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getapplicationsconfig=INDIVIDUAL
+mosip.role.prereg.getapplicationsinfo=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postlogaudit=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postdocumentspreregistrationid=INDIVIDUAL
+mosip.role.prereg.putdocumentspreregistrationid=INDIVIDUAL
+mosip.role.prereg.getdocumentsdocumentid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.getdocumentspreregistrationid=REGISTRATION_OFFICER,INDIVIDUAL
+mosip.role.prereg.deletedocumentsdocumentid=INDIVIDUAL
+mosip.role.prereg.deletedocumentspreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.putdocumentsdocumentid=INDIVIDUAL
+mosip.role.prereg.postqrcodegenerate=INDIVIDUAL
+mosip.role.prereg.getrefreshconfig=PRE_REGISTRATION_ADMIN
+mosip.role.prereg.postnotificationnotify=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.postnotification=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.posttransliterationtransliterate=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.getuispeclatest=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.getuispecall=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.postpreregsync=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getsyncpreregistrationid=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getsyncpreregistrationidmachineid=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postsyncconsumedpreregids=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN

From 2e4f7bc0169dcdfbd9b5febc75732c2a59f5b3ff Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 16 Aug 2021 12:40:17 +0530
Subject: [PATCH 0175/1358] [MOSIP-16645] Registration Processor config updated
 for 1.2.0. WIP.

---
 registration-processor-default.properties | 264 +++++++++++++---------
 1 file changed, 163 insertions(+), 101 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 0efd3edd553..a4eaa880ce0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -63,15 +63,11 @@ cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
-camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml
+camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
 
 ## Token generation
 token.request.id=io.mosip.registration.processor
 token.request.appid=regproc
-## TODO: unused, remove
-token.request.username=registrationprocessor
-## TODO: unused, remove
-token.request.password=
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
@@ -84,12 +80,12 @@ AUDIT=http://auditmanager.kernel/v1/auditmanager/audits
 
 ## Auth Service
 authmanager.base.url=http://authmanager.kernel
-PASSWORDBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/useridPwd
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateToken
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
 IDAINTERNAL=http://ida-internal.ida
 INTERNALAUTH=${IDAINTERNAL}/idauthentication/v1/internal/auth
+GETINDIVIDUALIDFROMUSERID=${authmanager.base.url}/v1/authmanager/individualId
 
 ## Master Data Services
 MASTER=http://masterdata.kernel/v1/masterdata
@@ -102,11 +98,6 @@ MACHINEDETAILS=${MASTER}/machines
 DEVICESHISTORIES=${MASTER}/deviceshistories
 REGISTRATIONCENTERDEVICEHISTORY=${MASTER}/registrationcenterdevicehistory
 REGISTRATIONCENTERTIMESTAMP=${MASTER}/registrationcenters/validate
-GENDER=${MASTER}/gendertypes/validate
-REGION=${MASTER}/locations/validate
-CITY=${MASTER}/locations/validate
-POSTALCODE=${MASTER}/locations/validate
-PROVINCE=${MASTER}/locations/validate
 USERDETAILS=${MASTER}/users
 TEMPLATES=${MASTER}/templates
 DEVICEVALIDATEHISTORY=http://pms-partner.pms/v1/partnermanager/deviceprovidermanagement/validate
@@ -128,26 +119,18 @@ GETVIDSBYUIN=http://vid.idrepo/idrepository/v1/vid/uin
 KEYMANAGER=http://keymanager.keymanager/
 ENCRYPTURL=${KEYMANAGER}/v1/keymanager/encrypt
 ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
-PDFSIGN=${KEYMANAGER}/v1/keymanager/pdf/sign
 
 ## Digital Signature Service
 DIGITALSIGNATURE=${KEYMANAGER}/v1/keymanager/sign
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
+# Validate hostlisted devices
+DEVICEHOTLIST=http://admin-hotlist-service/v1/hotlist
+JWTVERIFY=http://${KEYMANAGER}/v1/keymanager/jwtVerify
 
 ## Crypto
 CRYPTOMANAGERDECRYPT=${KEYMANAGER}/v1/keymanager/decrypt
 crypto.PrependThumbprint.enable=true
 
-## External Service
-EISERVICE=http://regproc-eis.regproc/registrationprocessor/v1/eis/registration-processor/external-integration-service/v1.0
-
-## RID Generation Service
-RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
-
-## Registration Processor Status Services
-SYNCSERVICE=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=http://regproc-receiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
-
 ## SMS and EMAIL notification services
 NOTIFIER=http://notifier.kernel
 SMSNOTIFIER=${NOTIFIER}/v1/notifier/sms/send
@@ -164,9 +147,12 @@ mosip.registration.processor.registration.transaction.id=mosip.registration.tran
 mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.registration.status.version=1.0
 mosip.registration.processor.transaction.version=1.0
+mosip.registration.processor.lostrid.id=mosip.registration.lostrid
+mosip.registration.processor.sync.version=1.0
+
+# this property is used in lostrid api to get postal code
+mosip.registration.processor.postalcode.req.url=${MASTER}/registrationcenters
 
-## Demo dedupe
-application.id=REGISTRATION
 # Status for matched records in demo dedupe stage
 registration.processor.demodedupe.manualverification.status=REJECTED
 mosip.registration.processor.demographic.deduplication.enable=true
@@ -183,18 +169,15 @@ registration.processor.queue.manualverification.request.messageTTL=5400
 registration.processor.manual.verification.reprocess.buffer.time=900
 registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
 registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
-registration.processor.manual.adjudication.json=registration-processor-abis.json
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 ## OSI validate
-mosip.workinghour.validation.required=true
 registration.processor.applicant.dob.format=yyyy/MM/dd
 mosip.identity.auth.internal.requestid=mosip.identity.auth.internal
-registration.processor.validate.introducer=true
+#Internal Auth env
+mosip.identity.auth.internal.env=Staging
 mosip.kernel.device.validate.history.id=""
-## UMC: User, Machine, Center
-mosip.registartion.processor.validateUMC=false
 auth.PrependThumbprint.enable=false
 
 ## Packet receiver
@@ -205,8 +188,6 @@ mosip.registration.processor.timezone=GMT
 mosip.registration.processor.packet.id=mosip.registration.packet
 mosip.registration.processor.grace.period=10800
 
-registration.processor.wait.period=1
-
 ## UIN generation
 registration.processor.id.repo.create=mosip.id.create
 registration.processor.id.repo.read=mosip.id.read
@@ -225,11 +206,25 @@ registration.processor.rid.machineidsubstring=10
 ## Message sender
 # Mapping identity json to map with the applicant id json
 registration.processor.identityjson=registration-processor-identity.json
-registration.processor.print.textfile=registration-processor-print-text-file.json
 registration.processor.abis.json=registration-processor-abis.json
 registration.processor.demographic.identity=identity
 registration.processor.notification.emails=
 
+## Notification service
+registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
+registration.processor.notification_service_subscriber_callback_url=${mosipbox.public.url}/registrationprocessor/v1/notification/callback/notify
+registration.processor.notification_service_pausedforadditonalinfo_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
+mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_workflow_paused_for_additional_info_event
+registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosipbox.public.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
+
+# Email template code for PauseForAdditionalInfo
+mosip.regproc.notification_service.biometric_correction.email=RPR_PAUSED_FOR_ADDITIONAL_INFO_EMAIL
+# SMS template code for PauseForAdditionalInfo
+mosip.regproc.notification_service.biometric_correction.sms=RPR_PAUSED_FOR_ADDITIONAL_INFO_SMS
+# SUBJECT template code for PauseForAdditionalInfo
+mosip.regproc.notification_service.biometric_correction.subject=Requesting the additional details for progressing on the application of UIN
+
+
 ## Email
 registration.processor.uin.generated.subject=UIN Generated
 registration.processor.duplicate.uin.subject=Registration Failed because you have already Registered
@@ -243,45 +238,12 @@ registration.processor.queue.username=admin
 registration.processor.queue.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
 registration.processor.queue.url=tcp://${mosip.api.internal.url}:61616
 registration.processor.queue.typeOfQueue=ACTIVEMQ
-registration.processor.queue.address = print-service
-registration.processor.queue.printpostaladdress = postal-service
-
-# Enable proxy postal service response for test environments where actual postal service wont be available
-# IMPORTANT : This should always be set as false in actual production environment
-registration.processor.enable.proxy.postalservice=true
 
 ## Packet validator
-registration.processor.masterdata.validation.attributes = gender,region,province,city
-registration.processor.validateSchema=true
-registration.processor.validateFile=true
-registration.processor.validateChecksum=true
-registration.processor.validateApplicantDocument=true
-registration.processor.validateMasterData=false
-registration-processor.validatemandotary=true
-registration.processor.document.category=idobject-document-category-mapping.json
 registration.processor.applicant.type=applicanttype-document-mapping.json
-
-## Packet generator
-registration.processor.audit.applicationId=PACGEN
-registration.processor.audit.applicationName=PACKET_GENERATOR
-mosip.registration.processor.registration.packetgenerator.id=mosip.registration.packetgenerator
-mosip.registration.processor.uincard.reprint.id = mosip.uincard.reprint
-mosip.registration.processor.packetgenerator.version=1.0
-mosip.registration.processor.resident.service.id=mosip.registration.update
-mosip.registration.processor.lost.id=mosip.registration.lost
-
-## Print stage
-mosip.registration.processor.print.service.id=mosip.registration.print
-registration.processor.unMaskedUin.length=4
-mosip.registration.processor.print.service.uincard.password=postalCode|fullName
-# Header length to be removed from iso image to get actual image
-mosip.print.uin.header.length=73
-# Rectangle coordinates for pfd signataured data
-mosip.registration.processor.print.service.uincard.lowerleftx=73
-mosip.registration.processor.print.service.uincard.lowerlefty=100
-mosip.registration.processor.print.service.uincard.upperrightx=300
-mosip.registration.processor.print.service.uincard.upperrighty=300
-mosip.registration.processor.print.service.uincard.signature.reason="signing"
+mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT
+mosip.kernel.jsonvalidator.schema-name=mosip-identity-json-schema.json
+mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 ## Reprocessor stage
 # Number of the reprocess records to be fetched at a time
@@ -294,7 +256,7 @@ registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron
 registration.processor.reprocess.seconds=0
 # TODO: time reduced for testing.  Revert for production.
-registration.processor.reprocess.minutes=*
+registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
 registration.processor.reprocess.hours=*
 registration.processor.reprocess.days_of_month=*
 registration.processor.reprocess.months=*
@@ -315,8 +277,6 @@ mosip.registration.processor.audit.id=mosip.applicanttype.getApplicantType
 mosip.registration.processor.crypto.decrypt.id=mosip.cryptomanager.decrypt
 #SMS notification request id
 mosip.registration.processor.sms.id=mosip.sms.send
-#Email notification request id
-mosip.registration.processor.email.id=mosip.email.send
 
 #Kernel Crypto signature
 registration.processor.signature.isEnabled=true
@@ -343,20 +303,41 @@ PACKETMANAGER_SEARCH_AUDITS=${packetmanager.base.url}/v1/packetmanager/audits
 PACKETMANAGER_INFO=${packetmanager.base.url}/v1/packetmanager/info
 PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdateTag
 PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
+PACKETMANAGER_GET_TAGS=${packetmanager.base.url}/v1/packetmanager/getTags
 DATASHARE=http://datashare.datashare
-DATASHARECREATEURL=${DATASHARE}/v1/datashare/create
+DATASHARECREATEURL=/v1/datashare/create
 DATASHAREGETEURL=${DATASHARE}/v1/datashare/get
 # Default abis is mock-abis provided by MOSIP
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
 
+mosip.regproc.data.share.internal.domain.name=datashare.datashare
+mosip.regproc.data.share.protocol=http
+
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
+mosip.biosdk.default.host= http://biosdk-service.biosdk
+mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
 mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.biometric.sdk.provider.finger.version=0.9
+mosip.biometric.sdk.provider.finger.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+# The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
+# If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
+# If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
+mosip.biometric.sdk.provider.finger.format.url.default=${mosip.biosdk.default.service.url}
+# The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
+# This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+# The version of the BIO SDK API implemeted for Iris modality
+mosip.biometric.sdk.provider.iris.version=0.9
+mosip.biometric.sdk.provider.iris.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+# The fully qualified Class Name of the BIO SDK API implemented for Face modality 
+# This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.biometric.sdk.provider.face.version=0.9
+mosip.biometric.sdk.provider.face.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
 ## Printing
 mosip.registration.processor.credentialtype=euin
@@ -377,6 +358,10 @@ mosip.regproc.eventbus.type=kafka
 #Kafka cluster servers comma separated, common for all stages and camel
 mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka.svc.cluster.local:9092,kafka-1.kafka-headless.kafka.svc.cluster.local:9092,kafka-2.kafka-headless.kafka.svc.cluster.local:9092
 
+# Stage Group Configuratoins
+# Default base packages for stage beans to be scanned in a stage group
+mosip.regproc.mosip-stage-executor.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor,io.mosip.registartion.processor
+
 # packet receiver stage
 #Supported commmit config: auto, batch, single
 mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
@@ -390,7 +375,9 @@ mosip.regproc.camel.bridge.eventbus.kafka.max.poll.records=100
 mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends 
 #MosipVerticleAPIManager
-mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-brdige-mz
+mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'CHILD' && @['ID_OBJECT-residenceStatus'] == 'nonResident')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.endpoint-prefix=eventbus://
 
 #packet-uploader-stage
 mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
@@ -398,6 +385,9 @@ mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.uploader.eventbus.kafka.group.id=packet-uploader-stage
 mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.packet.uploader.server.port=8087
+mosip.regproc.packet.uploader.server.servlet.path=/registrationprocessor/v1/uploader
+mosip.regproc.packet.uploader.eventbus.port=5714
 
 #packet-validator-stage
 mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
@@ -405,34 +395,65 @@ mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.validator.eventbus.kafka.group.id=packet-validator-stage
 mosip.regproc.packet.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-
-#packet-classifier-stage
+mosip.regproc.packet.validator.server.port=8088
+mosip.regproc.packet.validator.eventbus.port=5715
+mosip.regproc.packet.validator.server.servlet.path=/registrationprocessor/v1/packetvalidator
+mosip.regproc.packet.validator.validate-applicant-document=true
+mosip.regproc.packet.validator.validate-applicant-document.processes=NEW,UPDATE,LOST,BIOMETRIC_CORRECTION
+
+## Operator validator
+mosip.regproc.operator-validator.eventbus.kafka.commit.type=single
+mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.operator-validator.eventbus.kafka.poll.frequency=100
+mosip.regproc.operator-validator.eventbus.kafka.group.id=operator-validator-stage
+mosip.regproc.operator-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.operator-validator.server.port=8093
+mosip.regproc.operator-validator.eventbus.port=5723
+mosip.regproc.operator-validator.server.servlet.path=/registrationprocessor/v1/operatorvalidator
+
+# Command validator
+mosip.regproc.cmd-validator.eventbus.kafka.commit.type=single
+mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.cmd-validator.eventbus.kafka.poll.frequency=100
+mosip.regproc.cmd-validator.eventbus.kafka.group.id=cmd-validator-stage
+mosip.regproc.cmd-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.cmd-validator.server.port=8089
+mosip.regproc.cmd-validator.eventbus.port=5716
+mosip.regproc.cmd-validator.server.servlet.path=/registrationprocessor/v1/cmdvalidator
+# Processes to enable center validation, for processes not mentioned here center validation will be skipped
+mosip.regproc.cmd-validator.center-validation.processes=NEW,UPDATE,LOST,BIOMETRIC_CORRECTION
+# Processes to enable machine validation, for processes not mentioned here machine validation will be skipped
+mosip.regproc.cmd-validator.machine-validation.processes=NEW,UPDATE,LOST,BIOMETRIC_CORRECTION
+# Processes to enable device validation, for processes not mentioned here device validation will be skipped
+mosip.regproc.cmd-validator.device-validation.processes=NEW,UPDATE,LOST,BIOMETRIC_CORRECTION
+# To enable or disable the Center working hour validation
+mosip.regproc.cmd-validator.working-hour-validation-required=true
+# To enable/disable trust validation of a digital id signature of a device
+mosip.regproc.cmd-validator.device.disable-trust-validation=false
+# Maximum duration in minutes permissible between digital id timestamp and packet creation time
+mosip.regproc.cmd-validator.device.allowed-digital-id-timestamp-variation=30
+# Timestamp format followed in digital id and biometrics payload
+mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:mm:ss'Z'
+
+## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
 mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.classifier.eventbus.kafka.group.id=packet-classifier-stage
 mosip.regproc.packet.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-
-#quality-checker-stage
-mosip.regproc.quality.checker.eventbus.kafka.commit.type=single
-mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=100
-mosip.regproc.quality.checker.eventbus.kafka.poll.frequency=100
-mosip.regproc.quality.checker.eventbus.kafka.group.id=quality-checker-stage
-mosip.regproc.quality.checker.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-
-#osi-validator-stage
-mosip.regproc.osi.validator.eventbus.kafka.commit.type=single
-mosip.regproc.osi.validator.eventbus.kafka.max.poll.records=100
-mosip.regproc.osi.validator.eventbus.kafka.poll.frequency=100
-mosip.regproc.osi.validator.eventbus.kafka.group.id=osi-validator-stage
-mosip.regproc.osi.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-
-#external-stage
-mosip.regproc.external.eventbus.kafka.commit.type=single
-mosip.regproc.external.eventbus.kafka.max.poll.records=100
-mosip.regproc.external.eventbus.kafka.poll.frequency=100
-mosip.regproc.external.eventbus.kafka.group.id=external-stage
-mosip.regproc.external.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.packet.classifier.server.port=8092
+mosip.regproc.packet.classifier.eventbus.port=5724
+mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/packetclassifier
+
+## Introducer validator stage
+mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
+mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.introducer-validator.eventbus.kafka.poll.frequency=100
+mosip.regproc.introducer-validator.eventbus.kafka.group.id=introducer-validator-stage
+mosip.regproc.introducer-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.introducer-validator.server.port=8095
+mosip.regproc.introducer-validator.eventbus.port=5728
+mosip.regproc.introducer-validator.server.servlet.path=/registrationprocessor/v1/introducervalidator
 
 #demo-dedupe-stage
 mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
@@ -440,6 +461,9 @@ mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
 mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.demo.dedupe.server.port=8091
+mosip.regproc.demo.dedupe.eventbus.port=5717
+mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedupe
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
@@ -447,6 +471,11 @@ mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.handler.eventbus.kafka.group.id=abis-handler-stage
 mosip.regproc.abis.handler.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.abis.handler.server.port=9071
+mosip.regproc.abis.handler.eventbus.port=5726
+mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
+mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye','Face' : 'face'}
 
 #bio-dedupe-stage
 mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
@@ -454,13 +483,19 @@ mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.bio.dedupe.eventbus.kafka.group.id=bio-dedupe-stage
 mosip.regproc.bio.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.bio.dedupe.server.port=9096
+mosip.regproc.bio.dedupe.eventbus.port=5718
+mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
-#manual-verification-stage
+## Manual verification
 mosip.regproc.manual.verification.eventbus.kafka.commit.type=single
 mosip.regproc.manual.verification.eventbus.kafka.max.poll.records=100
 mosip.regproc.manual.verification.eventbus.kafka.poll.frequency=100
 mosip.regproc.manual.verification.eventbus.kafka.group.id=manual-verification-stage
 mosip.regproc.manual.verification.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.manual.verification.server.servlet.path=/registrationprocessor/v1/manualverification
+mosip.regproc.manual.verification.server.port=8084
+mosip.regproc.manual.verification.eventbus.port=5720
 
 #uin-generator-stage
 mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
@@ -475,6 +510,9 @@ mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
 mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.abis.middleware.server.port=8091
+mosip.regproc.abis.middleware.eventbus.port=5888
+mosip.regproc.abis.middleware.server.servlet.path=/registrationprocessor/v1/abismiddleware
 
 #biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
@@ -482,6 +520,9 @@ mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
 mosip.regproc.biometric.authentication.eventbus.kafka.group.id=biometric-authentication-stage
 mosip.regproc.biometric.authentication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.biometric.authentication.server.port=8020
+mosip.regproc.biometric.authentication.eventbus.port=5777
+mosip.regproc.biometric.authentication.server.servlet.path=/registrationprocessor/v1/bioauth
 
 #reprocessor-stage
 mosip.regproc.reprocessor.eventbus.kafka.commit.type=single
@@ -489,12 +530,15 @@ mosip.regproc.reprocessor.eventbus.kafka.max.poll.records=100
 mosip.regproc.reprocessor.eventbus.kafka.poll.frequency=100
 mosip.regproc.reprocessor.eventbus.kafka.group.id=reprocessor-stage
 
-#message-sender-stage
+## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
 mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
 mosip.regproc.message.sender.eventbus.kafka.poll.frequency=100
 mosip.regproc.message.sender.eventbus.kafka.group.id=message-sender-stage
 mosip.regproc.message.sender.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.message.sender.server.port=8088
+mosip.regproc.message.sender.eventbus.port=5721
+mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sender-stage
 
 #printing-stage
 mosip.regproc.printing.eventbus.kafka.commit.type=single
@@ -559,7 +603,7 @@ packetmanager.provider.uingenerator.proofOfException=source:CNIE\/process:CORREC
 # packet-classifier-stage
 # List of tag generator that should be run on every packet
 # Available tag generators MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus,MosipExceptionBiometrics
-mosip.regproc.packet.classifier.tag-generators=MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus,MosipExceptionBiometrics
+mosip.regproc.packet.classifier.tag-generators=MosipIDObjectFields,MosipMetaInfo,MosipAgeGroup,MosipSupervisorApprovalStatus,MosipExceptionBiometrics,MosipIDObjectDataAvailability
 # The tag value that will be used by default when the packet does not have value for the tag field
 mosip.regproc.packet.classifier.tagging.not-available-tag-value=--TAG_VALUE_NOT_AVAILABLE--
 # These field names should be as in keys of registraion-processor-identity.json file Identity segment
@@ -574,7 +618,7 @@ mosip.regproc.packet.classifier.tagging.metainfo.metadata.tag-name-prefix=META_I
 # The tag name that will be prefixed with every metainfo capturedRegisteredDevices tags 
 mosip.regproc.packet.classifier.tagging.metainfo.capturedregistereddevices.tag-name-prefix=META_INFO-CAPTURED_REGISTERED_DEVICES-
 # The labels on metainfo.operationsData array that needs to be tagged
-mosip.regproc.packet.classifier.tagging.metainfo.operationsdata.tag-labels=officerId
+mosip.regproc.packet.classifier.tagging.metainfo.operationsdata.tag-labels=officerId,supervisorId
 # The labels on metainfo.metaData array that needs to be tagged
 mosip.regproc.packet.classifier.tagging.metainfo.metadata.tag-labels=centerId
 # The serial numbers of devices type on metainfo.capturedRegisteredDevices array that needs to be tagged
@@ -583,14 +627,32 @@ mosip.regproc.packet.classifier.tagging.metainfo.capturedregistereddevices.devic
 mosip.regproc.packet.classifier.tagging.agegroup.tag-name=AGE_GROUP
 # Below age ranges map should contain proper age group name and age range, any overlap of the age 
 # range will result in a random behaviour of tagging. In range, upper and lower values are inclusive.
-mosip.regproc.packet.classifier.tagging.agegroup.ranges={'CHILD':'0-17','ADULT':'18-59','SENIOR_CITIZEN':'60-200'}
+mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':'6-17','ADULT':'18-200'}
 # Tag name that will be used while tagging supervisor approval status
 mosip.regproc.packet.classifier.tagging.supervisorapprovalstatus.tag-name=SUPERVISOR_APPROVAL_STATUS
 # Tag name that will be used while tagging exception biometrics
 mosip.regproc.packet.classifier.tagging.exceptionbiometrics.tag-name=EXCEPTION_BIOMETRICS
 # This mapping will contain the short words for each missing biometrics, the values will used for concatenating in the tags
 mosip.regproc.packet.classifier.tagging.exceptionbiometrics.bio-value-mapping={'leftLittle':'LL','leftRing':'LR','leftMiddle':'LM','leftIndex':'LI','leftThumb':'LT','rightLittle':'RL','rightRing':'RR','rightMiddle':'RM','rightIndex':'RI','rightThumb':'RT','leftEye':'LE','rightEye':'RE'}
+# file Identity segment and should have proper default source configured
+mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-expression-map={'INTRODUCER_AVAILABILITY':'introducerUIN || introducerRID || introducerVID'}
+
 
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
 mock.mv.decision=APPROVED 
+
+# salt generation properties
+mosip.regproc.db.url=${javax.persistence.jdbc.url}
+mosip.regproc.db.username=${javax.persistence.jdbc.user}
+mosip.regproc.db.password=${javax.persistence.jdbc.password}
+mosip.regproc.db.driverClassName=${javax.persistence.jdbc.driver}
+mosip.kernel.salt-generator.chunk-size=10
+mosip.kernel.salt-generator.start-sequence=0
+mosip.kernel.salt-generator.end-sequence=9999
+mosip.kernel.salt-generator.db.key-alias=mosip.regproc.db
+mosip.kernel.salt-generator.schemaName=regprc
+mosip.kernel.salt-generator.tableName=crypto_salt
+
+# List of old reg client versions with others attribute not present but currently supported for registration, this is required to take care of the backward compatibility checks
+mosip.regproc.common.before-cbeff-others-attibute.reg-client-versions=1.1.3,1.1.4,1.1.5

From 58f0904b71f52453707749aa185687cab3df8390 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 17 Aug 2021 15:18:13 +0530
Subject: [PATCH 0176/1358] [MOSIP-16645] Registration Processor config updated
 for 1.2.0.

---
 registration-processor-default.properties | 101 ++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a4eaa880ce0..5bffb65d09f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -65,6 +65,11 @@ worker.pool.size=10
 # Route files corresponding to the secure flow
 camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
 
+# main processor used in stages
+registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE
+# sub processor used in stages
+registration.processor.sub-processes=BIOMETRIC_CORRECTION
+
 ## Token generation
 token.request.id=io.mosip.registration.processor
 token.request.appid=regproc
@@ -165,6 +170,10 @@ mosip.registration.processor.manual.verification.demographic.id=mosip.manual.ver
 mosip.registration.processor.manual.verification.packetinfo.id=mosip.manual.verification.packetinfo
 # Manual verification queue message expiry in seconds, if given 0 then message will never expire
 registration.processor.queue.manualverification.request.messageTTL=5400
+# queue name where mosip will send request to external mv system
+registration.processor.queue.manualverification.request=mosip-to-mv
+# queue name where mosip will receive response from external mv system
+registration.processor.queue.manualverification.response=mv-to-mosip
 # Buffer time above the expiry queue to allow reprocessing (in seconds)
 registration.processor.manual.verification.reprocess.buffer.time=900
 registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
@@ -202,6 +211,7 @@ mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=80
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
+mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl
 
 ## Message sender
 # Mapping identity json to map with the applicant id json
@@ -269,6 +279,53 @@ mosip.regproc.workflow.action.hotlisted-tag=HOTLISTED
 mosip.regproc.workflow.action.resumefrombeginning.stage=PacketUploaderStage
 #WorkflowAction service  websub topic name
 mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
+mosip.regproc.workflow.action.job.server.port=8026
+mosip.regproc.workflow.action.job.eventbus.port=5754
+mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/workflowmanager
+mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
+mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
+mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
+mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
+mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
+
+## Workflow manager
+mosip.regproc.workflow-manager.action.api-id=mosip.registration.processor.workflow.action
+mosip.regproc.workflow-manager.action.version=1.0
+mosip.regproc.workflow-manager.search.api-id=mosip.registration.processor.workflow.search
+mosip.regproc.workflow-manager.search.version=v1
+mosip.regproc.workflow-manager.action.resumefrombeginning.stage=PacketUploaderStage
+#Number of the WorkflowAction job records to be fetched at a time
+mosip.regproc.workflow-manager.action.job.fetchsize=100
+#Maximum  number of iterations allowed for pause and request additional info default
+mosip.regproc.workflow-manager.internal.action.max-allowed-iteration=5
+#Maximum  number of iterations allowed for pause and request additional info for BIOMETRIC_CORRECTION
+mosip.regproc.workflow-manager.internal.action.max-allowed-iteration.BIOMETRIC_CORRECTION=5
+
+# The  WorkflowAction  scheduler configurations
+# WorkflowAction scheduler type
+mosip.regproc.workflow-manager.action.job.type=cron
+#schedular seconds configuration
+mosip.regproc.workflow-manager.action.job.seconds=*
+#schedular minutes configuration
+mosip.regproc.workflow-manager.action.job.minutes=0,5,10,15,20,25,30,35,40,45,50,55
+#schedular hours configuration
+mosip.regproc.workflow-manager.action.job.hours=*
+#schedular days configuration
+mosip.regproc.workflow-manager.action.job.days_of_month=*
+#schedular months configuration
+mosip.regproc.workflow-manager.action.job.months=*
+#schedular weeks configuration
+mosip.regproc.workflow-manager.action.job.days_of_week=*
+
+mosip.regproc.workflow.action.job.server.port=8026
+mosip.regproc.workflow.action.job.eventbus.port=5754
+mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/workflowmanager
+
+mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
+mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
+mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
+mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
+
 
 #Service Ids
 #Audit request id
@@ -389,6 +446,8 @@ mosip.regproc.packet.uploader.server.port=8087
 mosip.regproc.packet.uploader.server.servlet.path=/registrationprocessor/v1/uploader
 mosip.regproc.packet.uploader.eventbus.port=5714
 
+packet.uploader.stage=registration-processor-packet-uploader-stage
+
 #packet-validator-stage
 mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
 mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
@@ -445,6 +504,27 @@ mosip.regproc.packet.classifier.server.port=8092
 mosip.regproc.packet.classifier.eventbus.port=5724
 mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/packetclassifier
 
+
+## Quality classifier stage
+
+mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
+mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
+mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
+mosip.regproc.quality.classifier.eventbus.kafka.group.id=quality-classifier-stage
+mosip.regproc.quality.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.quality.classifier.server.port=9072
+mosip.regproc.quality.classifier.eventbus.port=5727
+mosip.regproc.quality.classifier.server.servlet.path=/registrationprocessor/v1/qualityclassifier
+# Below quality ranges map should contain proper quality group name and quality range, any overlap of the quality 
+# range will result in a random behaviour of tagging. In range, upper and lower values are inclusive.
+mosip.regproc.quality.classifier.tagging.quality.ranges={'Poor':'0-29','Average':'30-69','Good':'70-100'}
+# Quality Tag Prefix
+mosip.regproc.quality.classifier.tagging.quality.prefix=Biometric_Quality-
+# The tag value that will be used by default when the packet does not have biometrics
+mosip.regproc.quality.classifier.tagging.quality.biometric-not-available-tag-value=--Biometrics-Not-Available--
+# modality arrays that needs to be tagged
+mosip.regproc.quality.classifier.tagging.quality.modalities=Iris,Finger,Face
+
 ## Introducer validator stage
 mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
 mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
@@ -503,6 +583,9 @@ mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
 mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
 mosip.regproc.uin.generator.eventbus.kafka.group.id=uin-generator-stage
 mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.uin.generator.server.port=8099
+mosip.regproc.uin.generator.eventbus.port=5719
+mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-generator
 
 #abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
@@ -529,6 +612,21 @@ mosip.regproc.reprocessor.eventbus.kafka.commit.type=single
 mosip.regproc.reprocessor.eventbus.kafka.max.poll.records=100
 mosip.regproc.reprocessor.eventbus.kafka.poll.frequency=100
 mosip.regproc.reprocessor.eventbus.kafka.group.id=reprocessor-stage
+mosip.regproc.reprocessor.server.port=8021
+mosip.regproc.reprocessor.eventbus.port=5750
+mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reprocessor
+
+## Supervisor validator stage
+
+mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
+mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
+mosip.regproc.supervisor-validator.eventbus.kafka.group.id=supervisor-validator-stage
+mosip.regproc.supervisor-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.supervisor-validator.server.port=8094
+mosip.regproc.supervisor-validator.eventbus.port=5725
+mosip.regproc.supervisor-validator.server.servlet.path=/registrationprocessor/v1/supervisorvalidator
+
 
 ## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
@@ -546,6 +644,9 @@ mosip.regproc.printing.eventbus.kafka.max.poll.records=100
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
 mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.printing.server.port=8099
+mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
+mosip.regproc.printing.eventbus.port=5722
 
 packetmanager.name.source.resident=RESIDENT
 packetmanager.name.source.cnie=CNIE

From 7bda8f455e635f216980774ba1701974312d539b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 17 Aug 2021 16:03:57 +0530
Subject: [PATCH 0177/1358] [MOSIP-16645] Registration Processor camel routes
 updated for 1.2.0.

---
 ...ion-processor-camel-routes-new-default.xml | 651 +++++++++++-------
 1 file changed, 396 insertions(+), 255 deletions(-)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 065d346ce50..529adba3de1 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -1,273 +1,414 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- packet-receiver to securezone notifiation -->
+    <!-- packet-receiver to packet uploader -->
     <route id="packet-receiver->packet-uploader new route">
-        <from uri="eventbus:packet-receiver-new-bus-out" />
-        <log
-                message="packet-receiver-->packet-uploader new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
+      <from uri="eventbus:packet-receiver-new-bus-out" />
+        <log message="packet-receiver-->packet-uploader new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
     </route>
 
     <!-- packet-uploader to packet-validator Route -->
     <route id="packet-uploader-->packet-validator new route">
     <from uri="eventbus:packet-uploader-new-bus-out" />
-    <log
-            message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
+    <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
     </route>
+
     <!-- Packet Validator to Packet classifier Route -->
     <route id="packet-validator-->packet-classifier new route">
         <from uri="eventbus:packet-validator-new-bus-out" />
-        <log
-            message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-classifier-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
+        <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-classifier-bus-in" />
+         </otherwise>
+      </choice>
     </route>
+
     <!-- Packet Classifier to Quality Checker Route -->
     <route id="packet-classifier-->quality-checker new route">
         <from uri="eventbus:packet-classifier-new-bus-out" />
-        <log
-            message="packet-classifier-->quality-checker new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:quality-checker-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="quality-checker-->osi-validator new route">
-        <from uri="eventbus:quality-checker-new-bus-out" />
-        <log
-            message="quality-checker-->osi-validator new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:o-s-i-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="osi-validator-->external-stage new route">
-        <from uri="eventbus:o-s-i-validator-new-bus-out" />
-        <log
-            message="osi-validator-->external-stage new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:external-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="external-stage-->demo-dedupe new route">
-        <from uri="eventbus:external-new-bus-out" />
-        <log
-                message="external-stage-->demo-dedupe new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:demo-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="demo-dedupe-->bio-dedupe new route">
-        <from uri="eventbus:demo-dedupe-new-bus-out" />
-        <log
-            message="demo-dedupe-->bio-dedupe new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-handler-bus-in"'</simple>
-                <to uri="eventbus:abis-handler-bus-in" />
-            </when>
-			<when>
-                <simple>${bodyAs(String)} contains '"address":"manual-verification-bus-in"'</simple>
-                <to uri="vertx:manual-verification-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in"/>
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-handler-->abis-middleware new route">
-        <from uri="eventbus:abis-handler-new-bus-out" />
-        <log
-            message="abis-handler-->abis-middleware new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-middle-ware-bus-in"'</simple>
-                <to uri="eventbus:abis-middle-ware-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"demo-dedupe-bus-in"'</simple>
-                <to uri="eventbus:demo-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"bio-dedupe-bus-in"'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in"/>
-            </when>
-        </choice>
-    </route>
-    <route id="bio-dedupe-->uin-generation new route">
-        <from uri="eventbus:bio-dedupe-new-bus-out" />
-        <log
-            message="bio-dedupe-->uin-generation new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-handler-bus-in"'</simple>
-                <to uri="eventbus:abis-handler-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"manual-verification-bus-in"'</simple>
-                <to uri="vertx:manual-verification-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="manual-verification-->uin-generation new route">
-        <from uri="eventbus:manual-verification-new-bus-out" />
-        <log
-            message="manual-verification-->uin-generation new route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- UIN Generator to Printing and Message Sender Route -->
-    <route id="uin-generation route-->printing-stage-->message-sender new route">
-        <from uri="eventbus:uin-generator-new-bus-out" />
-        <log
-            message="uin-generation-->printing-stage and message-sender-stage route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-middleware route-->abis-handler new route">
-        <from uri="eventbus:abis-middle-ware-new-bus-out" />
-        <log
-            message="abis-middleware route-->abis-handler new route ${bodyAs(String)}" />
-           <to uri="eventbus:abis-handler-bus-in" />
+        <log message="packet-classifier-->quality-checker new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://quality-classifier-bus-in" />
+         </otherwise>
+      </choice>
     </route>
+
+   <route id="quality-classifier-->cmd-validator new route">
+      <from uri="eventbus://quality-classifier-new-bus-out" />
+      <log message="quality-classifier-->cmd-validator new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+	  <when>
+             <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
+           <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+           <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+           <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
+            <to uri="eventbus://c-m-d-validator-bus-in" />
+         </when>
+		  <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+           <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+		    <!-- PAUSE_FOR is in seconds -->
+           <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+           <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="cmd-validator-->operator-validator new route">
+      <from uri="eventbus://c-m-d-validator-new-bus-out" />
+      <log message="cmd-validator-->operator-validator/supervisor-validator new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://operator-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="operator-validator-->supervisor-validator new route">
+      <from uri="eventbus://operator-validator-new-bus-out" />
+      <log message="operator-validator-->supervisor-validator/introducer-validator/demo-dedupe new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="supervisor-validator-->introducer-validator new route">
+      <from uri="eventbus://supervisor-validator-new-bus-out" />
+      <log message="supervisor-validator-->introducer-validator/demo-dedupe new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="introducer-validator-->demo-dedupe new route">
+      <from uri="eventbus://introducer-validator-new-bus-out" />
+      <log message="introducer-validator-->demo-dedupe new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="demo-dedupe-->bio-dedupe new route">
+      <from uri="eventbus://demo-dedupe-new-bus-out" />
+      <log message="demo-dedupe-->bio-dedupe new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-verification-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-handler-->abis-middleware new route">
+      <from uri="eventbus://abis-handler-new-bus-out" />
+      <log message="abis-handler-->abis-middleware new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+          <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-middle-ware-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'demo-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'bio-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </when>
+		 <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="bio-dedupe-->uin-generation new route">
+      <from uri="eventbus://bio-dedupe-new-bus-out" />
+      <log message="bio-dedupe-->uin-generation new route ${bodyAs(String)}" />
+      <choice>
+        <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when> 
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-verification-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-middleware route-->abis-handler new route">
+      <from uri="eventbus://abis-middle-ware-new-bus-out" />
+      <log message="abis-middleware route-->abis-handler new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="manual-verification-->uin-generation new route">
+      <from uri="eventbus://manual-verification-new-bus-out" />
+      <log message="manual-verification-->uin-generation new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- UIN Generator to Printing Route -->
+   <route id="uin-generation route-->printing-stage new route">
+      <from uri="eventbus://uin-generator-new-bus-out" />
+      <log message="uin-generation-->printing-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage--> new route">
+      <from uri="eventbus://printing-new-bus-out" />
+      <log message="printing-stage--> route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
 </routes>
 

From ec79f246a3e16680ab0b9facd76375807d1c458a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 17 Aug 2021 16:09:12 +0530
Subject: [PATCH 0178/1358] [MOSIP-16645] Registration Processor identity json
 updated for 1.2.0.

---
 registration-processor-identity.json | 209 +++++----------------------
 1 file changed, 39 insertions(+), 170 deletions(-)

diff --git a/registration-processor-identity.json b/registration-processor-identity.json
index aa024e5a1d9..5401557e24c 100644
--- a/registration-processor-identity.json
+++ b/registration-processor-identity.json
@@ -1,213 +1,82 @@
 {
    "identity":{
       "IDSchemaVersion":{
-         "value":"IDSchemaVersion",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"IDSchemaVersion"
       },
       "name":{
-         "value":"fullName",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ],
-         "isMandatory":true
+         "value":"fullName"
       },
       "gender":{
-         "value":"gender",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ],
-         "isMandatory":true
+         "value":"gender"
       },
       "dob":{
-         "value":"dateOfBirth",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ],
-         "isMandatory":true
+         "value":"dateOfBirth"
       },
       "age":{
-         "value":"age",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "parentOrGuardianRID":{
-         "value":"parentOrGuardianRID",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "parentOrGuardianUIN":{
-         "value":"parentOrGuardianUIN",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "parentOrGuardianName":{
-         "value":"parentOrGuardianName",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "address":{
-         "value":"addressLine1,addressLine2,addressLine3,region,province,postalCode",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "city":{
-         "value":"city",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-	"phone":{
-        "value":"phone",
-         "provider":[
-			"source:RESIDENT,process:RES_CORRECTION",
-            "source:REGISTRATION_CLIENT,process:CORRECTION|NEW|UPDATE",
-			"source:RESIDENT,process:RES_UPDATE"
-         ]
-      },
-      "phone_user_provided":{
-         "value":"phone",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE",
-            "source:RESIDENT,process:RES_UPDATE",
-			"source:REGISTRATION_CLIENT,process:LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_REPRINT"
-         ]
-      },
-	  "phone_validation_source":{
-         "value":"phone",
-         "provider":[
-			"source:CNIE,process:CORRECTION2|CORRECTION1|VALIDATION"
-         ]
+         "value":"age"
+      },
+      "introducerRID":{
+         "value":"introducerRID"
+      },
+      "introducerUIN":{
+         "value":"introducerUIN"
+      },
+      "introducerVID":{
+         "value":"introducerVID"
+      },
+      "introducerName":{
+         "value":"introducerName"
+      },
+      "phone":{
+         "value":"phone"
       },
       "email":{
-         "value":"email",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "localAdministrativeAuthority":{
-         "value":"localAdministrativeAuthority",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"email"
       },
       "uin":{
-         "value":"UIN",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-	  "individualBiometrics":{
-         "value":"individualBiometrics",
-         "provider":[	
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
-      },
-      "parentOrGuardianBiometrics":{
-         "value":"parentOrGuardianBiometrics",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"UIN"
+      },
+      "individualBiometrics":{
+         "value":"individualBiometrics"
+      },
+      "introducerBiometrics":{
+         "value":"introducerBiometrics"
       },
       "individualAuthBiometrics":{
-         "value":"individualAuthBiometrics",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"individualAuthBiometrics"
       },
       "officerBiometricFileName":{
-         "value":"officerBiometricFileName",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST"
-         ]
+         "value":"officerBiometricFileName"
       },
       "supervisorBiometricFileName":{
-         "value":"supervisorBiometricFileName",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST"
-         ]
+         "value":"supervisorBiometricFileName"
       },
       "residenceStatus":{
-         "value":"residenceStatus",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"residenceStatus"
       }
 
    },
    "metaInfo":{
-      "value":"metaInfo",
-      "provider":[
-         "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-         "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-      ]
+      "value":"metaInfo"
    },
    "audits":{
-      "value":"audits",
-      "provider":[
-         "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-         "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-      ]
+      "value":"audits"
    },
    "documents":{
       "poa":{
-         "value":"proofOfAddress",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"proofOfAddress"
       },
       "poi":{
-         "value":"proofOfIdentity",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"proofOfIdentity"
       },
       "por":{
-         "value":"proofOfRelationship",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"proofOfRelationship"
       },
       "pob":{
-         "value":"proofOfDateOfBirth",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"proofOfDateOfBirth"
       },
       "poe":{
-         "value":"proofOfException",
-         "provider":[
-            "source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST",
-            "source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT"
-         ]
+         "value":"proofOfException"
       }
    }
 }

From 1614b48afbfc25565f898814db78b228468e0311 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 17 Aug 2021 16:12:54 +0530
Subject: [PATCH 0179/1358] [MOSIP-16645] Unused file removed.

---
 registration-processor-print-text-file.json | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 registration-processor-print-text-file.json

diff --git a/registration-processor-print-text-file.json b/registration-processor-print-text-file.json
deleted file mode 100644
index c37f180e1e7..00000000000
--- a/registration-processor-print-text-file.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "name": "fullName,LastName",
-    "address": "addressLine1,addressLine2,addressLine3",
-    "region": "region",
-    "province": "province",
-    "city": "city",
-    "postalCode": "postalCode",
-    "phoneNumber": "phone"
-}

From 0ab6ad78e2a1e68a0086586688b7f500d766f356 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 06:25:58 +0530
Subject: [PATCH 0180/1358] [MOSIP-16645] Idrepo properties updated for 1.2.0.

---
 id-repository-default.properties | 36 +++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 666f1b56424..91ee5d1f42a 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -4,9 +4,11 @@
 # db.dbuser.password 
 # mosip.mosip.crereq.client.secret
 # mosip.mosip.creser.client.secret
+# mosip.mosip.regproc.client.secret
 # keycloak.host
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
+#idrepo.websub.vid.credential.update.secret
 
 management.endpoint.restart.enabled=true
 
@@ -151,12 +153,20 @@ mosip.idrepo.syncdata-service.rest.timeout=100
 mosip.idrepo.pmp.partner.rest.uri=http://pms-partner.pms/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 mosip.idrepo.pmp.partner.rest.httpMethod=GET
 mosip.idrepo.pmp.partner.rest.headers.mediaType=application/json
-mosip.idrepo.pmp.partner.rest.timeout=10
+mosip.idrepo.pmp.partner.rest.timeout=100
 
 mosip.idrepo.credential.request.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
 mosip.idrepo.credential.request.rest.httpMethod=POST
 mosip.idrepo.credential.request.rest.headers.mediaType=application/json
-mosip.idrepo.credential.request.rest.timeout=10
+mosip.idrepo.credential.request.rest.timeout=100
+mosip.idrepo.credential.cancel-request.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/cancel/{requestId}
+mosip.idrepo.credential.cancel-request.rest.httpMethod=GET
+mosip.idrepo.credential.cancel-request.rest.headers.mediaType=application/json
+mosip.idrepo.credential.cancel-request.rest.timeout=100
+
+## Credential status job
+# Fixed delay time after which job will be triggered again to process the created/updated credential details.
+mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 
 mosip.idrepo.retrieve-by-uin.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
@@ -168,6 +178,17 @@ mosip.idrepo.vid-generator.rest.httpMethod=GET
 mosip.idrepo.vid-generator.rest.headers.mediaType=application/json
 mosip.idrepo.vid-generator.rest.timeout=100
 
+## Websub
+mosip.idrepo.websub.vid-credential-update.callback-url=http://identity.idrepo/idrepository/v1/identity/callback/vid_credential_status_update
+mosip.idrepo.websub.vid-credential-update.topic=VID_CRED_STATUS_UPDATE
+mosip.idrepo.websub.vid-credential-update.secret= ${idrepo.websub.vid.credential.update.secret}
+mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
+
+mosip.idrepo.uin-generator.rest.uri=http://idgenerator.kernel/v1/idgenerator/uin
+mosip.idrepo.uin-generator.rest.httpMethod=GET
+mosip.idrepo.uin-generator.rest.headers.mediaType=application/json
+mosip.idrepo.uin-generator.rest.timeout=100
+
 ## Credential request generator
 mosip.credential.service.database.hostname=postgres-postgresql.postgres.svc.cluster.local
 mosip.credential.service.database.port=5432
@@ -220,7 +241,7 @@ subscription-delay-secs=120000
 # this property value is set to 0 that disables this workaround.
 # To enable the resubscrition scheduling, this property should be assigned with a positive
 # number like 1 * 60 * 60 = 3600 for one hour
-resubscription-delay-secs=7200
+resubscription-delay-secs=43200
 WEBSUBSECRET=test
 
 # Credential service
@@ -256,6 +277,7 @@ mosip.credential.service.retry.maxDelay=100
 
 IDREPOGETIDBYID=http://identity.idrepo/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
+mosip.data.share.internal.domain.name=datashare.datashare
 CREATEDATASHARE=/v1/datashare/create
 KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
@@ -304,3 +326,11 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
+## Auth token generator 
+auth-token-generator.rest.uri=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+auth-token-generator.rest.appId=regproc
+auth-token-generator.rest.clientId=mosip-regproc-client
+auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
+
+# Enabling below property will start logging performance logs in identity and vid service
+mosip.idrepo.aspect-logging.enabled=false

From 2fcd46677000354c4870505d7f569ab5e42b68de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 06:33:28 +0530
Subject: [PATCH 0181/1358] [MOSIP-16645] Partner properties updated for 1.2.0.

---
 partner-management-default.properties | 93 +++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 3c13d0ab595..9615410bd5b 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -95,6 +95,7 @@ pmp.credentialissuance.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-po
 pmp.misp.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$
 pmp.partner.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$
 pmp.partner.partnerId.max.length=36
+pmp.partner.mobileNumbe.max.length=16
 
 ## Time difference between request creation and request processing
 masterdata.registerdevice.timestamp.validate=+5
@@ -119,6 +120,11 @@ pmp.ca.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uplo
 pmp.partner.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadPartnerCertificate
 pmp.partner.certificaticate.get.rest.uri=${keymanager.base.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
 pmp-keymanager.upload.other.domain.cert.rest.uri=${keymanager.base.url}/v1/keymanager/uploadOtherDomainCertificate
+# Used to get data share url to publish to websub
+pmp.certificaticate.datashare.rest.uri=http://datashare.datashare/v1/datashare/create
+# Used for generating the datashare url
+pms.certs.datashare.policyId=mpolicy-default-cert
+pms.certs.datashare.subscriberId=mpartner-default-cert
 
 ## Keycloak
 # These configurations are used to create user in keycloak and map to a role.
@@ -184,3 +190,90 @@ token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/cl
 token.request.clientId=admin
 PASSWORDBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/useridPwd
 application.env.local=false
+
+# Notifications
+emailResourse.url=http://notification.kernel/v1/notifier/email/send
+resource.template.url=http://masterdata.kernel/v1/masterdata/templates/{langcode}/{templatetypecode}
+notifications.sent.before.days = 3
+partner.registration.sub-template = partner-reg-sub-template
+partner.reg.content-template=partner-reg-content-template
+partner.status.sub-template=partner-status-sub-template
+partner.status.content-template=partner-status-content-template
+partner.apikey.status.sub-template=partner-apikey-status-sub-template
+apikey.status.content-template=apikey-status-content-template
+pms.notifications-schedule.init-delay = 24
+pms.notifications-schedule.fixed-rate=24
+
+## Roles
+mosip.role.pms.postpoliciesgroupnew=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.putpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpolicies=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciespolicyidgrouppublish=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.putpoliciespolicyid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.patchpoliciespolicyidgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpolicies=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciespolicyid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesapikey=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciespolicyidpartnerpartnerid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesgroupall=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciesgroupsearch=PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciessearch=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesconfigkey=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciesgroupfiltervalues=PARTNER_ADMIN,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
+mosip.role.pms.postpoliciesfiltervalues=PARTNER_ADMIN,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
+mosip.role.pms.postdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.putdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.patchdevicedetail=PARTNER_ADMIN
+mosip.role.pms.postdevicedetailsearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetaildevicetypesearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetailfiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetaildevicetypefiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetaildevicesubtypefiltervalues=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
+mosip.role.pms.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.pms.postftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.putftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.patchftpchipdetail=PARTNER_ADMIN
+mosip.role.pms.postftpchipdetailuploadcertificate=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.getftpchipdetailgetpartnercertificate=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.postftpchipdetailsearch=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.postregistereddevices=PARTNER_ADMIN,FTM_PROVIDER,ZONAL_ADMIN
+mosip.role.pms.postregistereddevicesderegister=PARTNER_ADMIN,FTM_PROVIDER,ZONAL_ADMIN
+mosip.role.pms.postregistereddevicessearch=PARTNER,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION
+mosip.role.pms.postsecurebiometricinterface=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
+mosip.role.pms.putsecurebiometricinterface=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
+mosip.role.pms.patchsecurebiometricinterface=PARTNER_ADMIN
+mosip.role.pms.postsecurebiometricinterfacesearch=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
+mosip.role.pms.postpartners=PARTNER,PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER
+mosip.role.pms.patchpartnerspartneridapikeyrequest=PARTNER_ADMIN,AUTH_PARTNER,PARTNER,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_PARTNER
+mosip.role.pms.postpartnerspartneridbioextractorspolicyid=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
+mosip.role.pms.getpartnerspartneridbioextractorspolicyid=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
+mosip.role.pms.postpartnerspartneridcredentialtypepolicyid=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
+mosip.role.pms.getpartnerspartneridcredentialtypepolicies=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
+mosip.role.pms.postpartnerspartneridcontactadd=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
+mosip.role.pms.putpartnerspartnerid=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER
+mosip.role.pms.getpartnerspartnerid=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER,RESIDENT
+mosip.role.pms.getpartnerspartneridapikeyrequest=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER
+mosip.role.pms.getpartnerspartneridapikeyapikeyreqid=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER
+mosip.role.pms.postpartnerscertificatecaupload=PARTNER_ADMIN,FTM_PROVIDER,AUTH_PARTNER,PMS_USER,ONLINE_VERIFICATION_PARTNER,PARTNERMANAGER
+mosip.role.pms.postpartnerscertificateupload=PARTNER_ADMIN,PARTNER_ADMIN,FTM_PROVIDER,AUTH_PARTNER,PMS_USER,ONLINE_VERIFICATION_PARTNER,PARTNERMANAGER,ID_AUTHENTICATION,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
+mosip.role.pms.getpartnerspartneridcertificate=PARTNER_ADMIN,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerssearch=PARTNER_ADMIN,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerspartnertypesearch=PARTNER_ADMIN,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersfiltervalues=PARTNER_ADMIN,PARTNER,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersapikeyrequestfiltervalues=PARTNER_ADMIN,FTM_PROVIDER,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER
+mosip.role.pms.postpartnersapikeyrequestsearch=PARTNER_ADMIN,FTM_PROVIDER,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,DEVICE_PROVIDER,PMS_USER,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersapikeysearch=PARTNER_ADMIN,FTM_PROVIDER,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,DEVICE_PROVIDER,ONLINE_VERIFICATION_PARTNER,PMS_USER
+mosip.role.pms.putpartnerspartneridapikeypolicies=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.patchpartnerspartnerid=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.patchpartnerspartneridapikey=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getpartnerspartneridapikeymisplicensekey=PARTNERMANAGER,PARTNER_ADMIN,ID_AUTHENTICATION,CREDENTIAL_ISSUANCE
+mosip.role.pms.patchpartnersapikey=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getpartners=REGISTRATION_PROCESSOR,RESIDENT,PARTNER_ADMIN,ID_AUTHENTICATION,CREDENTIAL_ISSUANCE,PARTNERMANAGER
+mosip.role.pms.getpartnerspartneridapikey=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getpartnersapikey=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getpartnersapikeykey=PARTNER_ADMIN,PARTNERMANAGER
+mosip.role.pms.postmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
+mosip.role.pms.putmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
+mosip.role.pms.getmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
+mosip.role.pms.getmispsmispidlicensekey=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER

From 0e7f2392fe41c5b6b0b2788eb80ef45ba89cfd29 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 06:56:21 +0530
Subject: [PATCH 0182/1358] [MOSIP-16645] IDA properties updated for 1.2.0.

---
 id-authentication-default.properties | 112 ++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 28 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index eeb62131687..0a0164b96b6 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -12,6 +12,8 @@
 # mosip.kernel.tokenid.partnercode.salt
 # softhsm.ida.pin
 # mosip.api.internal.host
+# ida.websub.masterdata.templates.callback.secret
+# ida.websub.masterdata.titles.callback.secret
 
 mosip.api.internal.url=https://${mosip.api.internal.host}
 ## Client
@@ -151,12 +153,6 @@ sms-notification.rest.httpMethod=POST
 sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
-## Get RID for USERID - Used in Internal Auth based on User ID
-userid-rid.rest.uri=http://authmanager.kernel/v1/authmanager/rid/{appId}/{uid}
-userid-rid.rest.httpMethod=GET
-userid-rid.rest.headers.mediaType=${mosip.ida.request.mediaType}
-userid-rid.rest.timeout=${mosip.ida.request.timeout.secs}
-
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
 rid-uin.rest.uri=http://idrepo-identity.idrepo/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
@@ -213,6 +209,8 @@ ida-websub-credential-issue-callback-secret=${ida.websub.credential.issue.callba
 ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback.secret}
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
+ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
+ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 
 ida-websub-auth-type-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/authTypeCallback/{partnerId}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
@@ -223,9 +221,8 @@ ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servle
 ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
-
-## Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
-subscriptions-delay-on-startup=120000
+#Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
+subscriptions-delay-on-startup_millisecs=120000
 
 # The time interval in seconds to schedule subscription of topics which is done as a
 # work-around for the bug: MOSIP-9496. By default the
@@ -234,6 +231,8 @@ subscriptions-delay-on-startup=120000
 # number like 1 * 60 * 60 = 3600 for one hour
 ida-websub-resubscription-delay-secs=7200
 
+delay-to-pull-missing-credential-after-topic-subscription_millisecs=60000
+
 ## Websub even topics
 ida-topic-auth-type-status-updated=${ida-auth-partner-id}/AUTH_TYPE_STATUS_UPDATE
 ## Topic for Credential Issueance Event (for UIN/VID create/update events)
@@ -244,12 +243,23 @@ ida-topic-remove-id=${ida-auth-partner-id}/REMOVE_ID
 ida-topic-deactivate-id=${ida-auth-partner-id}/DEACTIVATE_ID
 ## Topic for ID Activate Event (UIN/VID activate events) 
 ida-topic-activate-id=${ida-auth-partner-id}/ACTIVATE_ID
-ida-topic-pmp-misp-updated=MISP_UPDATED
 ida-topic-pmp-partner-updated=PARTNER_UPDATED
 ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
 ida-topic-pmp-policy-updated=POLICY_UPDATED
 ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
 ida-topic-hotlist=MOSIP_HOTLIST
+ida-topic-credential-status-update=CREDENTIAL_STATUS_UPDATE
+ida-topic-auth-type-status-update-acknowledge=AUTH_TYPE_STATUS_UPDATE_ACK
+ida-topic-auth-transaction-status=AUTHENTICATION_TRANSACTION_STATUS
+ida-topic-masterdata-templates=masterdata/idauthentication_templates
+ida-topic-masterdata-titles=masterdata/titles
+ida-topic-pmp-misp-license-generated=MISP_LICENSE_GENERATED
+ida-topic-pmp-misp-license-updated=MISP_LICENSE_UPDATED
+ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
+ida-topic-pmp-partner-updated=PARTNER_UPDATED
+ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
+ida-topic-pmp-policy-updated=POLICY_UPDATED
+ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
 
 ## IDA cache
 ## IDA cache Time to live in days - To clear cache scheduled based on the days provided.
@@ -302,12 +312,6 @@ ida.demo.common.normalization.regex.any[0]=[\\.|,|\\-|\\*|\\(|\\)|\\[|\\]|`|\\'|
 ida.demo.common.normalization.regex.any[1]=\\s+${ida.norm.sep} .
 ida.demo.common.normalization.regex.any[2]=\\.${ida.norm.sep}
 
-## Admin
-## Configure N time period threshold for accepting auth/OTP/KYC request for a country
-authrequest.received-time-allowed.minutes=30
-# Configuration for +/- time period adjustment in minutes for the request time validation, so that 
-# The requests originating from a system that is not in time-sync will be accepted for the time period
-authrequest.received-time-adjustment.minutes=5
 # Language Code
 ida.errormessages.default-lang=en
 
@@ -341,7 +345,7 @@ ekyc.auth.types.allowed=demo,otp,bio-Finger,bio-Iris,bio-Face
 internal.auth.types.allowed=otp,bio-Finger,bio-Iris,bio-Face
 
 ## Allowed IdTypes for hotlisting 
-mosip.ida.internal.hotlist.idtypes.allowed=UIN,VID,PARTNER
+mosip.ida.internal.hotlist.idtypes.allowed=UIN,VID,PARTNER_ID,DEVICE,DEVICE_PROVIDER
 
 ## Datetime
 #Example allowed date time formats: "2020-10-23T12:21:38.660Z" , 2019-03-28T10:01:57.086+05:30
@@ -376,17 +380,14 @@ static.token.enable=true
 ## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
 request.idtypes.allowed=VID,UIN
 ## The ID types to be supported for Internal Authentication/OTP Requests
-request.idtypes.allowed.internalauth=UIN,USERID,VID
+request.idtypes.allowed.internalauth=UIN,VID
 
 ## Encrypted Credential Attributes list
 ## The list of attributes in identity that are Zero Knowledge encrpted in IDA while storing the credential in DB.
 ## This list is used to identify the attributes to decrypt when fetching the records from DB
-ida-zero-knowledge-encrypted-credential-attributes=individualBiometrics,fullName,dateOfBirth,phone,email
+ida-zero-knowledge-encrypted-credential-attributes=individualBiometrics,fullName,dateOfBirth,phone,email,postalCode
 
 ## Cryptograpic/Signature verificate related configurations
-mosip.ida.auth.trust-validation-required=true
-mosip.ida.kyc.trust-validation-required=true
-mosip.ida.otp.trust-validation-required=true
 mosip.ida.internal.thumbprint-validation-required=false
 mosip.ida.internal.trust-validation-required=false
 
@@ -425,12 +426,6 @@ mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.ida.pin}
 
-## Titles/Templates master data stored as configuration ---------- 
-## UNUSED. TODO: remove them later
-maste.data.titles=
-# SMS and Email templates for OTP notification and Authentication notification
-master.data.ida-templates=
-
 ## Security - used in Internal Authentication Services by default Kernel Auth Adapter
 mosip.security.csrf-enable=false
 mosip.security.cors-enable=false
@@ -483,3 +478,64 @@ keymanager.persistence.jdbc.schema=ida
 ## TODO: For testing. Revert in production
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
+## Admin
+# Configure N time period threshold for accepting auth/OTP/KYC request for a country
+authrequest.received-time-allowed.seconds=30
+# Configuration for +/- time period adjustment in minutes for the request time validation, so that 
+# The requests originating from a system that is not in time-sync will be accepted for the time period
+authrequest.received-time-adjustment.seconds=30
+#Configuration for time period difference between each biometric segment and digital Id capture
+authrequest.biometrics.allowed-segment-time-difference-in-seconds=120
+
+# Credential Request API to get Request IDs for the given status, pageStart and page
+cred-request-service-get-request-ids.pageSize=10
+cred-request-service-get-request-ids.statusCode=ISSUED
+ida-max-credential-pull-window-days=2
+ida-max-websub-messages-pull-window-days=2
+cred-request-service-get-request-ids.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/getRequestIds?direction=ASC&orderBy=updateDateTime&pageNumber={pageNumber}&pageSize=${cred-request-service-get-request-ids.pageSize}&statusCode=${cred-request-service-get-request-ids.statusCode}&effectivedtimes={effectivedtimes}
+cred-request-service-get-request-ids.rest.httpMethod=GET
+cred-request-service-get-request-ids.rest.headers.mediaType=${mosip.ida.request.mediaType}
+cred-request-service-get-request-ids.rest.timeout=${mosip.ida.request.timeout.secs}
+
+# Credential Request API to get Request IDs for the given status, pageStart and page
+cred-request-service-retrigger-cred-issuance.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/retrigger/{requestId}
+cred-request-service-retrigger-cred-issuance.rest.httpMethod=PUT
+cred-request-service-retrigger-cred-issuance.rest.headers.mediaType=${mosip.ida.request.mediaType}
+cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.timeout.secs}
+
+# Child Auth Filter configurations
+ida.child-auth-filter.date-of-birth.attribute.name=dateOfBirth
+ida.child-auth-filter.date-of-birth.pattern=yyyy/MM/dd
+ida.child-auth-filter.child.max.age=5
+ida.child-auth-filter.factors.denied=otp,bio
+
+# The chunk size of failed message items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.
+ida.fetch.failed.websub.messages.chunk.size=10
+
+## Auth filters
+# Comma Seperated list of fully qualified classes of the auth filters in the order in which they have to be executed.
+# If validation with one filter fails with an error, the rest of the filter in the sequence will be skipped 
+# and error will be returned in the auth response.
+
+#Auth Filters for external auth
+ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
+#Auth Filters for internal auth
+ida.mosip.kyc.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
+#Auth Filters for kyc auth
+ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
+
+## Demo SDK integration
+mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
+
+#Fixed delay in which cleanup will be done in Hours
+mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
+
+# The target enviornment. This values should be comma separted.
+#Ex.Staging,Developer
+mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
+# Allowed domain Uris. This values should be comma separted.
+#Ex. https://dev.mosip.net,https://qa2.mosip.net
+mosip.ida.allowed.domain.uris=${mosipbox.public.url}
+# Biometrics attribute name present in data-share policy
+mosip.ida.credential.biometric.attribute.name=individualBiometrics

From e806b4c35bd224cf5dc4f5ec7a9f96b2328bd650 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 10:11:57 +0530
Subject: [PATCH 0183/1358] [MOSIP-16645] Regclient properties updated for
 1.2.0.

---
 registration-default.properties | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index c0c7ca83b16..2ba31980ae8 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -60,8 +60,8 @@ mosip.registration.geo.capture.frequency=n
 #Admin Setting to turn Document Scan On or Off. If y, documents scan view is turned on. If n, documents scan view turned off.
 mosip.registration.document_enable_flag=y
 
-#Supervisor Authentication for Biometric Exceptions. If y, iris is turned on. If n, iris is turned off.
-mosip.registration.supervisor_authentication_configuration=Y
+#Reviewer Authentication for Biometric Exceptions. If y, iris is turned on. If n, iris is turned off.
+mosip.registration.reviewer_authentication_configuration=Y
 
 #Maximum length of the Password to be entered
 mosip.registration.username_pwd_length=50
@@ -106,8 +106,8 @@ mosip.registration.reg_pak_max_cnt_apprv_limit=100
 #Maximum no. of days for a packet pending EOD approval beyond which client is frozen for registration
 mosip.registration.reg_pak_max_time_apprv_limit=50
 
-#Enable EOD feature. If y, EOD feature will be enabled, else, will be disbaled
-mosip.registration.eod_process_config_flag=Y
+#Enable supervisor authentication feature. If y, supervisor approval will be enabled, else, will be disbaled
+mosip.registration.supervisor_approval_config_flag=Y
 
 #No. of days beyond audit creation date to delete audits
 mosip.registration.audit_log_deletion_configured_days=10
@@ -178,10 +178,8 @@ mosip.registration.registration_pre_reg_packet_location=..//PreRegPacketStore
 #Mode of Communicating the OTP to User. Possible Values email or mobile
 mosip.registration.otp_channels=email
 
-
-
 #Time in Seconds for forced log-out of user, if user is idle for the specified duration
-mosip.registration.ideal_time = 900
+mosip.registration.idle_time = 900
 
 #Time in Seconds to diplay the warning message pop-up to user, if user is idle for the specified duration
 mosip.registration.refreshed_login_time = 600
@@ -457,17 +455,15 @@ mosip.registration.replace_sdk_quality_score=N
 
 #URL for reset password
 mosip.registration.reset_password_url=https://dev.mosip.net/keycloak/auth/realms/mosip/account/
+#Flag to check / bypass device cert validation
 
-# camera used as document scanner resolution
-mosip.camera.resolution.width = 2592
-mosip.camera.resolution.height = 1944
+mosip.registration.mdm.validate.trust=true
 
-# Face threshold and retry attempts
-mosip.registration.num_of_face_retries=3
-mosip.registration.face_threshold=60
+#Batch size for RID Sync Job
+mosip.registration.rid_sync_batch_size=5
 
-# scanner configuration
-mosip.registration.DOCUMENT_SCANNER_DEPTH=100
+#Batch size for Packet Upload Job
+mosip.registration.packet_upload_batch_size=5
 
 #used to fill env in the MDM rcapture request
 mosip.registration.server_profile=Staging
@@ -478,3 +474,6 @@ mosip.registration.mdm.trust.domain.rcapture=DEVICE
 mosip.registration.mdm.trust.domain.digitalId=DEVICE
 mosip.registration.mdm.trust.domain.deviceinfo=DEVICE
 
+# Below age ranges map should contain proper age group name and age range, any overlap of the age 
+# range will result in a random behaviour of tagging. In range, upper and lower values are inclusive.
+mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':'6-17','ADULT':'18-200'}

From e0b6355c319426b392ec2e2626eddb42dc4050f0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 10:15:20 +0530
Subject: [PATCH 0184/1358] [MOSIP-16645] Resident properties updated for
 1.2.0.

---
 resident-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index bba2df0b66b..8927519d930 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -16,7 +16,7 @@ resident.rid.id=mosip.resident.rid
 resident.updateuin.id=mosip.resident.updateuin
 resident.authunlock.id=mosip.resident.authunlock
 resident.authhistory.id=mosip.resident.authhistory
-mosip.resident.service.status.check.id=mosip.registration.status
+mosip.resident.service.status.check.id=mosip.registration.external.status
 mosip.resident.service.status.check.version=1.0
 vid.revoke.id=mosip.vid.deactivate
 resident.revokevid.id=mosip.resident.vidstatus
@@ -66,11 +66,11 @@ EMAILNOTIFIER=http://kernel-notification-service/v1/notifier/email/send
 AUTHTYPESTATUSUPDATE=http://idrepo-identity-service/idrepository/v1/identity/authtypes/status
 #Regitstration processor reprint service
 #Registration status service
-REGISTRATIONSTATUSSEARCH=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/search
+REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
 resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service
-POLICY_REQ_URL=http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+POLICY_REQ_URL=http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 OTP_GEN_URL=http://ida-internal.ida/idauthentication/v1/internal/otp
 CREDENTIAL_STATUS_URL=http://credentialrequest.idrepo/v1/credentialrequest/get/
 CREDENTIAL_REQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator

From 1a3bd1f5dd192563833fbff3efd29497c1a8b81a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 10:25:45 +0530
Subject: [PATCH 0185/1358] [MOSIP-16645] Syncdata properties updated for
 1.2.0.

---
 syncdata-default.properties | 38 ++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index e4d7979f308..91a99d19cd0 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -25,6 +25,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
 mosip.kernel.syncdata-service-idschema-url=http://masterdata.kernel/v1/masterdata/idschema/latest
+mosip.kernel.masterdata.locationhierarchylevels.uri = http://masterdata.kernel/v1/masterdata/locationHierarchyLevels
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -217,6 +218,16 @@ mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
+#Self token resttemplate related to configuration
+mosip.iam.adapter.clientid=mosip-reg-client
+mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
+mosip.iam.adapter.appid=registrationclient
+mosip.iam.adapter.issuerURL=${mosip.iam.base-url}/auth/realms/mosip
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
+mosip.iam.adapter.validate-expiry-check-rate=15
+mosip.iam.adapter.renewal-before-expiry-interval=15
+mosip.iam.adapter.self-token-renewal-enable=true
+
 keycloak.realm=registration-client
 keycloak.resource=account
 keycloak.auth-server-url=${mosip.iam.base-url}
@@ -270,7 +281,7 @@ mosip.kernel.masterdata.audit-url= http://auditmanager.kernel/v1/auditmanager/au
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
-mosip.kernel.sign-url=http://keymanager.keymanager/v1/keymanager/sign
+mosip.kernel.keymanager-service-sign-url=http://keymanager.keymanager/v1/keymanager/jwtSign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
@@ -393,11 +404,32 @@ syncdata.websub.resubscription.retry.count=3
 # this property value is set to 0 that disables this workaround.
 # To enable the resubscrition scheduling, this property should be assigned with a positive
 # number like 1 * 60 * 60 = 3600 for one hour
-syncdata.websub.resubscription.delay.secs=41100000
-# Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
+syncdata.websub.resubscription.delay.millis=43200000
 subscriptions-delay-on-startup=120000
 
+#Property to fetch location hierarchies during client settings sync
+mosip.kernel.masterdata.locationhierarchylevels.uri=http://masterdata.kernel/v1/masterdata/locationHierarchyLevels
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
+
+
+## Roles
+mosip.role.admin.syncdata.getconfigs=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getglobalconfigs=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN
+mosip.role.admin.syncdata.getregistrationcenterconfigregistrationcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getconfigurationregistrationcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getclientsettingsregcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getroles=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getuserdetailsregcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getusersaltregid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.gettpmpublickeyverify=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getlatestidschema=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default,REGISTRATION_PROCESSOR,INDIVIDUAL,RESIDENT,ID_AUTHENTICATION
+mosip.role.admin.syncdata.getgetcertificate=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.gettpmpublickeymachineid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getconfigsmachinename=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getuserdetails=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getgetcacertificates=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From c29bb26484dcf14732369a1827e42b0bd9610fe2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 11:42:12 +0530
Subject: [PATCH 0186/1358] [MOSIP-16645] Print properties updated for 1.2.0.

---
 print-default.properties | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/print-default.properties b/print-default.properties
index dd4cd2e95ea..bd8392a73f6 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -16,7 +16,7 @@ mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
 osip.event.secret=${print.websub.hub.secret}
 csrf.disabled=true
 mosip.event.delay=120000
-print-websub-resubscription-delay-secs=7200
+print-websub-resubscription-delay-secs=43200
 registration.processor.print.textfile=registration-processor-print-text-file.json
 
 ## Token
@@ -69,8 +69,9 @@ registration.processor.signature.isEnabled=true
 ## Country specific
 mosip.country.code=MOR
 mosip.supported-languages=eng,fra
-mosip.primary-language=eng
-mosip.secondary-language=fra
+mosip.template-language=eng
+mosip.optional-languages=fra,ara
+mosip.mandatory-languages=eng
 
 ## CBEFF util
 # Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
@@ -108,3 +109,4 @@ registration.processor.identityjson=registration-processor-identity.json
 registration.processor.demographic.identity=identity
 CREATEDATASHARE=http://datashare.datashare/v1/datashare/create
 DECRYPTPINBASSED=http://keymanager.keymanager/v1/keymanager/decryptWithPin
+mosip.print.prependThumbprint=true

From 0342541997dbf5a96c9caee480760e124d43d673 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 18 Aug 2021 11:42:49 +0530
Subject: [PATCH 0187/1358] [MOSIP-16645] Hotlist properties updated for 1.2.0.

---
 hotlist-default.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hotlist-default.properties b/hotlist-default.properties
index cd7e18bf639..643d36e9c9d 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -23,7 +23,7 @@ mosip.hotlist.db.driverClassName=org.postgresql.Driver
 mosip.hotlist.db.dialect=org.hibernate.dialect.PostgreSQL92Dialect
 
 #------------------------- Data validation properties -----------------------------------------------------#
-mosip.hotlist.allowedIdTypes=UIN,VID,MACHINE_ID,PARTNER_API_KEY,OPERATOR_ID,CENTER_ID,DEVICE_ID,DEVICE_MODEL,FTM_PUBLIC_KEY
+mosip.hotlist.allowedIdTypes=UIN,VID,MACHINE_ID,PARTNER_ID,OPERATOR_ID,CENTER_ID,DEVICE,DEVICE_MODEL,FTM_PUBLIC_KEY,DEVICE_PROVIDER
 
 #------------------------- Data Source properties ---------------------------------------------------------#
 mosip.hotlist.datasource.driverClassName=${mosip.hotlist.db.driverClassName}
@@ -34,14 +34,14 @@ mosip.hotlist.datasource.dialect=${mosip.hotlist.db.dialect}
 
 #------------------------- Web sub properties -------------------------------------------------------------#
 #Web sub topic
-mosip.hotlist.topic-to-publish=HOTLIST
+mosip.hotlist.topic-to-publish=MOSIP_HOTLIST
 
 #------------------------- Encryption/Decryption properties -----------------------------------------------#
 # App Id for Encryption/Decryption
-mosip.hotlist.crypto.app-id=hotlist
+mosip.hotlist.crypto.app-id=ADMIN_SERVICES
 
 # Ref Id for Encryption/Decryption
-mosip.hotlist.crypto.app-id=id_encrypt_decrypt
+mosip.hotlist.crypto.ref-id=hotlist_service
 
 #-------------------------Hotlist cleanup schedule details ------------------------------------------------#
 # Initial delay in Hours
@@ -78,4 +78,4 @@ kernel.retry.traverse.root.cause.enabled=false
 #Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.retryable.exceptions=io.mosip.hotlist.exception.HotlistRetryException
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.nonretryable.exceptions=
\ No newline at end of file
+kernel.retry.nonretryable.exceptions=

From 8d9e99399aecd9f57e50241b94e2c752d3d5cd8c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 19 Aug 2021 12:32:03 +0530
Subject: [PATCH 0188/1358] Commented out property uncommented.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index bde6f3aa61f..553cad88789 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -53,7 +53,7 @@ mosip.country.code=MOR
 mosip.supported-languages=eng,fra
 mosip.primary-language=eng
 mosip.secondary-language=fra
-#mosip.right_to_left_orientation=ara
+mosip.right_to_left_orientation=
 mosip.left_to_right_orientation=eng,fra
 
 ## Application IDs

From 2487a4f74ef1b89a1ef426119729e0564d5ba673 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 20 Aug 2021 12:33:21 +0530
Subject: [PATCH 0189/1358] [MOSIP-16645] Updated for 1.2.0.

---
 websub-default.conf | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 websub-default.conf

diff --git a/websub-default.conf b/websub-default.conf
new file mode 100644
index 00000000000..26f1a2d807d
--- /dev/null
+++ b/websub-default.conf
@@ -0,0 +1,31 @@
+
+[b7a.jdbc.pool]
+maximumPoolSize=250
+
+[mosip.hub]
+datasource-url="jdbc:postgresql://postgres-postresql.postgres:5432/mosip_websub"
+datasource-username="websubuser"
+datasource-password="${db.dbuser.password}"
+port=9191
+retry_count=0
+retry_interval=5
+retry_backoff_factor=1.0
+retry_max_wait_interval=6000
+restart_republish_time_offset="2021-07-08T06:39:00.000Z"
+restart_republish_time_limit=59
+
+[mosip.hub.cron-task.unsent-messages-republish]
+enable=false
+seconds="0"
+minutes="0/1"
+hours="*"
+days-of-month="?"
+months="*"
+days-of-week="*"
+year="*"
+
+[mosip.auth]
+base_url="http://authmanager.kernel/v1/authmanager"
+validate_token_url="/authorize/admin/validateToken"
+filter_disable=true
+

From 8112d74e0344408a87c60353f3fdb8c0cb4383cf Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 20 Aug 2021 12:37:03 +0530
Subject: [PATCH 0190/1358] [MOSIP-16645] "svc.cluster..."  removed to make dns
 resolution application for other named clusters.

---
 admin-default.properties                  | 2 +-
 hazelcast_default.xml                     | 2 +-
 hazelcast_dmz.xml                         | 2 +-
 id-authentication-default.properties      | 2 +-
 id-repository-default.properties          | 4 ++--
 kernel-default.properties                 | 4 ++--
 partner-management-default.properties     | 6 +++---
 pre-registration-default.properties       | 2 +-
 registration-processor-default.properties | 4 ++--
 syncdata-default.properties               | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index bed870dbdb7..3478b0cd956 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -13,7 +13,7 @@ mosip.admin.request-id=ADMIN.REQUEST
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
 ## Account management
diff --git a/hazelcast_default.xml b/hazelcast_default.xml
index be574a0ccf6..b817639f0be 100644
--- a/hazelcast_default.xml
+++ b/hazelcast_default.xml
@@ -28,7 +28,7 @@
        <discovery-strategy enabled="false"
            class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
          <properties>
-           <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
+           <property name="service-dns">service-hazelcast-server.default</property>
          </properties>
        </discovery-strategy>
      </discovery-strategies>
diff --git a/hazelcast_dmz.xml b/hazelcast_dmz.xml
index 040c52de759..eb7592617d5 100644
--- a/hazelcast_dmz.xml
+++ b/hazelcast_dmz.xml
@@ -28,7 +28,7 @@
        <discovery-strategy enabled="true"
            class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
          <properties>
-           <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
+           <property name="service-dns">service-hazelcast-server.default</property>
          </properties>
        </discovery-strategy>
      </discovery-strategies>
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 0a0164b96b6..d3975fdc990 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -24,7 +24,7 @@ mosip.ida.auth.appId=ida
 ## Database
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.ida.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.ida.database.hostname=postgres-postgresql.postgres
 mosip.ida.database.port=5432
 mosip.ida.database.user=idauser
 mosip.ida.database.password=${db.dbuser.password}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 91ee5d1f42a..244b7e4728e 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -14,7 +14,7 @@ management.endpoint.restart.enabled=true
 
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.idrepo.db.url=postgres-postgresql.postgres.svc.cluster.local
+mosip.idrepo.db.url=postgres-postgresql.postgres
 mosip.idrepo.db.port=5432
 mosip.idrepo.db.identity.db-name=mosip_idrepo
 mosip.idrepo.db.identity.username=idrepouser
@@ -190,7 +190,7 @@ mosip.idrepo.uin-generator.rest.headers.mediaType=application/json
 mosip.idrepo.uin-generator.rest.timeout=100
 
 ## Credential request generator
-mosip.credential.service.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.credential.service.database.hostname=postgres-postgresql.postgres
 mosip.credential.service.database.port=5432
 mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.database.hostname}:${mosip.credential.service.database.port}/mosip_credential?currentSchema=credential
 mosip.credential.service.jdbc.user=credentialuser
diff --git a/kernel-default.properties b/kernel-default.properties
index 9af3230c831..5ad9ce99dbe 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -131,7 +131,7 @@ kernel.prid.revoke-scheduler-days_of_week=*
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
 javax.persistence.jdbc.driver=org.postgresql.Driver
@@ -147,7 +147,7 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
 logging.level.org.hibernate.SQL=ERROR
-logging.level.org.hibernate.type=ERROR
+ogging.level.org.hibernate.type=ERROR
 
 admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 admin_database_username=kerneluser
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 9615410bd5b..b149114dd31 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -11,19 +11,19 @@
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 ## If database is external to production, provide the DNS or ip of the host and port 
-mosip.pmp.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.pmp.database.hostname=postgres-postgresql.postgres
 mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
 
 ## Auth device
-mosip.authdevice.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.authdevice.database.hostname=postgres-postgresql.postgres
 mosip.authdevice.database.port=5432
 mosip.authdevice.database.user=authdeviceuser
 mosip.authdevice.database.password=${db.dbuser.password}
 
 ## Reg device
-mosip.regdevice.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.regdevice.database.hostname=postgres-postgresql.postgres
 mosip.regdevice.database.port=5432
 mosip.regdevice.database.user=regdeviceuser
 mosip.regdevice.database.password=${db.dbuser.password}
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 0258d3e9fcc..a7b84d26a2b 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -9,7 +9,7 @@
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
 javax.persistence.jdbc.driver=org.postgresql.Driver
-mosip.database.ip=postgres-postgresql.postgres.svc.cluster.local
+mosip.database.ip=postgres-postgresql.postgres
 mosip.database.port=5432
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_prereg?useSSL=false
 javax.persistence.jdbc.user=prereguser
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5bffb65d09f..1f9247f45a3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -28,7 +28,7 @@ registration.processor.bio.dedupe.reprocess.buffer.time=900
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.registration.processor.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.registration.processor.database.hostname=postgres-postgresql.postgres
 mosip.registration.processor.database.port=5432
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
@@ -413,7 +413,7 @@ mosip.regproc.eventbus.type=kafka
 
 #Kafka event bus config, will be used only when the type is kafka
 #Kafka cluster servers comma separated, common for all stages and camel
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka.svc.cluster.local:9092,kafka-1.kafka-headless.kafka.svc.cluster.local:9092,kafka-2.kafka-headless.kafka.svc.cluster.local:9092
+mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka:9092,kafka-1.kafka-headless.kafka:9092,kafka-2.kafka-headless.kafka:9092
 
 # Stage Group Configuratoins
 # Default base packages for stage beans to be scanned in a stage group
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 91a99d19cd0..f7991350c4c 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -133,7 +133,7 @@ kernel.prid.revoke-scheduler-days_of_week=*
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres.svc.cluster.local
+mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
 javax.persistence.jdbc.driver=org.postgresql.Driver

From 99ee70083056b3ae1a4daf460cef509f39fb1f53 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 20 Aug 2021 12:46:26 +0530
Subject: [PATCH 0191/1358] [MOSIP-16645] Updated for 1.2.0.

---
 websub-default.conf => websub.conf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename websub-default.conf => websub.conf (100%)

diff --git a/websub-default.conf b/websub.conf
similarity index 100%
rename from websub-default.conf
rename to websub.conf

From c603ee8cfca6f4e6ca3fdd4c31f1d29f04ca4780 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 20 Aug 2021 13:24:11 +0530
Subject: [PATCH 0192/1358] Correction.

---
 websub.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub.conf b/websub.conf
index 26f1a2d807d..52637511975 100644
--- a/websub.conf
+++ b/websub.conf
@@ -3,7 +3,7 @@
 maximumPoolSize=250
 
 [mosip.hub]
-datasource-url="jdbc:postgresql://postgres-postresql.postgres:5432/mosip_websub"
+datasource-url="jdbc:postgresql://postgres-postgresql.postgres:5432/mosip_websub"
 datasource-username="websubuser"
 datasource-password="${db.dbuser.password}"
 port=9191

From 36f70cb398e4b274158e532a30f5908514ece132 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 20 Aug 2021 21:54:25 +0530
Subject: [PATCH 0193/1358] [MOSIP-16645] Updated for 1.2.0.

---
 registration-processor-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1f9247f45a3..7e382861b8f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -425,6 +425,11 @@ mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
 mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
+mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
+mosip.regproc.packet.receiver.server.port=8081
+mosip.regproc.packet.receiver.eventbus.port=5711
+# Flag to disable the copying of tags from the packet manger to the message event
+mosip.regproc.packet.receiver.message.tag.loading.disable=true
 
 #camel-bridge
 mosip.regproc.camel.bridge.eventbus.kafka.commit.type=single

From f02bd1037195cc76452cdcb288fb75b0985fba0b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 20 Aug 2021 22:26:31 +0530
Subject: [PATCH 0194/1358] [MOSIP-16645] Missing property added.

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 7e382861b8f..4a89e6d89e6 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -154,6 +154,7 @@ mosip.registration.processor.registration.status.version=1.0
 mosip.registration.processor.transaction.version=1.0
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.sync.version=1.0
+mosip.registration.processor.lostrid.version=1.0
 
 # this property is used in lostrid api to get postal code
 mosip.registration.processor.postalcode.req.url=${MASTER}/registrationcenters

From 593301a273cca86ed05066a30717a4ca6f0648ce Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 09:25:29 +0530
Subject: [PATCH 0195/1358] only one camel flow for debugging.

---
 registration-processor-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 4a89e6d89e6..4e8162ed67d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -63,7 +63,8 @@ cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
-camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
+#camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
+camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml
 
 # main processor used in stages
 registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE

From 4bb08929cc1b03ba5128e22e6c9e51228d2ba08e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 09:32:13 +0530
Subject: [PATCH 0196/1358] Unused file removed.

---
 hazelcast_dmz.xml | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 hazelcast_dmz.xml

diff --git a/hazelcast_dmz.xml b/hazelcast_dmz.xml
deleted file mode 100644
index eb7592617d5..00000000000
--- a/hazelcast_dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright 2017 Red Hat, Inc. ~ ~ Red Hat licenses this file to you 
-     	under the Apache License, version 2.0 ~ (the "License"); you may not use 
-	this file except in compliance with the ~ License. You may obtain a copy 
-	of the License at: ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless 
-	required by applicable law or agreed to in writing, software ~ distributed 
-	under the License is distributed on an "AS IS" BASIS, WITHOUT ~ WARRANTIES 
-	OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
-	the specific language governing permissions and limitations ~ under the License. -->
-
-<hazelcast
-	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-	xmlns="http://www.hazelcast.com/schema/config"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <properties>
-   <property name="hazelcast.discovery.enabled">true</property>
-   <property name="hazelcast.logging.type">slf4j</property>
- </properties>
-<group>
-		<name>k8s</name>
-		<password/>
-	</group>
- <network>
-   <join>
-     <multicast enabled="false"/>
-     <tcp-ip enabled="false" />
-     <discovery-strategies>
-       <discovery-strategy enabled="true"
-           class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
-         <properties>
-           <property name="service-dns">service-hazelcast-server.default</property>
-         </properties>
-       </discovery-strategy>
-     </discovery-strategies>
-   </join>
- </network>
-</hazelcast>

From ee76f78f7e9b20742dc7f33a7f261a04fdd7d1c8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 10:56:10 +0530
Subject: [PATCH 0197/1358] Securezone properties added back for successful
 start of group2.

---
 registration-processor-default.properties | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 4e8162ed67d..edd4ac92070 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -443,6 +443,17 @@ mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'CHILD' && @['ID_OBJECT-residenceStatus'] == 'nonResident')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
 
+## Securzone stage (NOTE:  not used in V3, but need this for service to start)
+mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
+mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
+mosip.regproc.securezone.notification.eventbus.kafka.poll.frequency=100
+mosip.regproc.securezone.notification.eventbus.kafka.group.id=securezone-notification-stage
+mosip.regproc.securezone.notification.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.securezone.notification.server.port=8090
+mosip.regproc.securezone.notification.server.servlet.path=/registrationprocessor/v1/securezone
+mosip.regproc.securezone.notification.eventbus.port=5712
+mosip.regproc.securezone.notification.message.tag.loading.disable=true
+
 #packet-uploader-stage
 mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
 mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100

From 642c3cfc4feaa4c2b6809179e7c5c10b02964fcb Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 11:01:02 +0530
Subject: [PATCH 0198/1358] Missing properties added.

---
 registration-processor-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index edd4ac92070..e407535d050 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -250,6 +250,10 @@ registration.processor.queue.username=admin
 registration.processor.queue.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
 registration.processor.queue.url=tcp://${mosip.api.internal.url}:61616
 registration.processor.queue.typeOfQueue=ACTIVEMQ
+registration.processor.queue.address = print-service
+registration.processor.queue.printpostaladdress = postal-service
+
+registration.processor.document.category=idobject-document-category-mapping.json
 
 ## Packet validator
 registration.processor.applicant.type=applicanttype-document-mapping.json

From d813f540d053591cbb9c489a87197b39c814d83a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 11:04:36 +0530
Subject: [PATCH 0199/1358] Missing property and file added.

---
 registration-processor-default.properties   | 1 +
 registration-processor-print-text-file.json | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 registration-processor-print-text-file.json

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e407535d050..37c11620423 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -221,6 +221,7 @@ registration.processor.identityjson=registration-processor-identity.json
 registration.processor.abis.json=registration-processor-abis.json
 registration.processor.demographic.identity=identity
 registration.processor.notification.emails=
+registration.processor.print.textfile=registration-processor-print-text-file.json
 
 ## Notification service
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
diff --git a/registration-processor-print-text-file.json b/registration-processor-print-text-file.json
new file mode 100644
index 00000000000..9de84ed605a
--- /dev/null
+++ b/registration-processor-print-text-file.json
@@ -0,0 +1,9 @@
+{
+	"name": "fullName,LastName",
+	"address": "addressLine1,addressLine2,addressLine3",
+	"region": "region",
+	"province": "province",
+	"city": "city",
+	"postalCode": "postalCode",
+	"phoneNumber": "phone"
+}

From 7165c42f440bc6cef3498d92c9f861b3455f8df3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 11:12:24 +0530
Subject: [PATCH 0200/1358] Minor.

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 37c11620423..8b2d78828a3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -63,6 +63,7 @@ cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
+## TODO: Revert to all flows
 #camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
 camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml
 

From 704dc302f94d8512a1b5ab8fd0f90cff6ad92af0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 21 Aug 2021 14:41:51 +0530
Subject: [PATCH 0201/1358] Regproc updated.

---
 registration-processor-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8b2d78828a3..0057c7e1fe4 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -518,6 +518,10 @@ mosip.regproc.cmd-validator.device.allowed-digital-id-timestamp-variation=30
 # Timestamp format followed in digital id and biometrics payload
 mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:mm:ss'Z'
 
+mosip.registration.processor.validate-machine=true
+mosip.registration.processor.validate-device=true
+mosip.registration.processor.validate-center=true
+
 ## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
 mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100

From f6d09b153e55667fd4534e41091ee54535228292 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 23 Aug 2021 07:03:51 +0530
Subject: [PATCH 0202/1358] Updated.

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 0057c7e1fe4..f328ccb96f6 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -226,10 +226,10 @@ registration.processor.print.textfile=registration-processor-print-text-file.jso
 
 ## Notification service
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
-registration.processor.notification_service_subscriber_callback_url=${mosipbox.public.url}/registrationprocessor/v1/notification/callback/notify
+registration.processor.notification_service_subscriber_callback_url=http://regproc-notifier.regproc/registrationprocessor/v1/notification/callback/notify
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_workflow_paused_for_additional_info_event
-registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosipbox.public.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
+registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=http://regproc-notifier.regproc/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
 
 # Email template code for PauseForAdditionalInfo
 mosip.regproc.notification_service.biometric_correction.email=RPR_PAUSED_FOR_ADDITIONAL_INFO_EMAIL

From 7abc9e0437dc49a3bbc4266de5442f3f17e8bcb1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 24 Aug 2021 21:27:51 +0530
Subject: [PATCH 0203/1358] Prereg properties synchronised with 1.2.0-rc1.

---
 pre-registration-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index a7b84d26a2b..476f39068ac 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -377,7 +377,7 @@ mosip.min-languages.count=2
 mosip.max-languages.count=2
 -------------------------------------------
 ## List of keys which UI will consume
-ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,mosip.preregistration.captcha.sitekey,mosip.adult.age,mosip.idschema.version,mosip.preregistration.captcha.enable,preregistartion.identity.name,preregistration.ui.version,preregistartion.contact.email,preregistartion.contact.phone
+ui.config.params=preregistartion.contact.email,preregistartion.contact.phone,preregistration.availability.sync,preregistration.availability.noOfDays,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,mosip.preregistration.captcha.sitekey,mosip.adult.age,mosip.idschema.version,mosip.preregistration.captcha.enable,preregistartion.identity.name,preregistration.ui.version
 ## This config is used for loading recommended centers based on the value of the config. 
 ## The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 preregistration.recommended.centers.locCode=5
@@ -420,7 +420,7 @@ mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recapt
 mosip.preregistration.captcha.secretkey=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 
 # Enable or Disable Captch - true to enable & false to disable
-mosip.preregistration.captcha.enable=true
+mosip.preregistration.captcha.enable=false
 
 ## Security 
 mosip.security.csrf-enable:false

From cbb196df51b0aed40b51915a773d78b78c12ddc0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 25 Aug 2021 06:46:10 +0530
Subject: [PATCH 0204/1358] PreReg language properties updated.

---
 pre-registration-default.properties | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 476f39068ac..f828bfe12f9 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -189,7 +189,6 @@ pre.reg.login.otp.sms.template=otp-sms-template
 pre.reg.login.otp.mail.subject.template=pre-reg-login-email-subject-template
 pre.reg.login.otp.mail.content.template=pre-reg-login-email-content-template
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-mosip.primary-language=eng
 id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
 
 ## Masterdata service
@@ -369,13 +368,6 @@ mosip.pre-registration.transliteration.transliterate.id=mosip.pre-registration.t
 mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.transliteration.transliterate
 mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j
 
-## UI params
-#------------to be removed later -------
-mosip.mandatory-languages=eng,fra
-mosip.optional-languages=0
-mosip.min-languages.count=2
-mosip.max-languages.count=2
--------------------------------------------
 ## List of keys which UI will consume
 ui.config.params=preregistartion.contact.email,preregistartion.contact.phone,preregistration.availability.sync,preregistration.availability.noOfDays,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,mosip.preregistration.captcha.sitekey,mosip.adult.age,mosip.idschema.version,mosip.preregistration.captcha.enable,preregistartion.identity.name,preregistration.ui.version
 ## This config is used for loading recommended centers based on the value of the config. 

From e11aeef0670dc3f0ba6ae6fa71e1e9211f0378ec Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 25 Aug 2021 09:49:09 +0530
Subject: [PATCH 0205/1358] Minor update.

---
 application-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 553cad88789..94daf697ba0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -368,10 +368,10 @@ websub.hub.url=${websub.base.url}/websub/hub
 websub.publish.url=${websub.base.url}/websub/publish
 websub.failed.messages.sync.url=${websub.base.url}/websub/sync/failedmessage
 
-mosip.mandatory-languages=eng
-mosip.optional-languages=ara,fra
+mosip.mandatory-languages=eng,fra
+mosip.optional-languages=
 mosip.min-languages.count=2
-mosip.max-languages.count=3
+mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
 mosip.default.template-languages=eng,ara

From 709766e744c1384f04ed145f6235b558f213ce22 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 26 Aug 2021 11:14:07 +0530
Subject: [PATCH 0206/1358] Activemq properties updated.

---
 registration-processor-default.properties | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f328ccb96f6..1920c1aee44 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -6,6 +6,8 @@
 # mosip.mosip.regproc.client.secret
 # mosip.api.internal.host
 # keycloak.host
+# activemq.host
+# activemq.core.port
 
 mosip.api.internal.url=https://${mosip.api.internal.host}
 registration.processor.zone=default
@@ -248,9 +250,9 @@ registration.processor.uin.deactivated.subject=Uin is deactivated
 registration.processor.updated.subject=UIN Details Updated
 
 ## Queue
-registration.processor.queue.username=admin
-registration.processor.queue.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
-registration.processor.queue.url=tcp://${mosip.api.internal.url}:61616
+registration.processor.queue.username=artemis
+registration.processor.queue.password=${activemq.password}
+registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
 registration.processor.queue.address = print-service
 registration.processor.queue.printpostaladdress = postal-service

From 88af612ced9a22d00a7824334cbd8838f1d049bf Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 26 Aug 2021 13:57:50 +0530
Subject: [PATCH 0207/1358] Email properties updated.

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 5ad9ce99dbe..336b1ea7084 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -39,9 +39,9 @@ mosip.kernel.sms.sender=sender
 mosip.kernel.sms.unicode=unicode
 
 ## Email notification
-mosip.kernel.notification.email.from=mosipuser@gmail.com
-spring.mail.host=smtphost
-spring.mail.username=username
+mosip.kernel.notification.email.from=info@mosip.io
+spring.mail.host=smtp.sendgrid.net
+spring.mail.username=apikey
 spring.mail.password=password
 spring.mail.port=587
 spring.mail.properties.mail.transport.protocol=smtp

From 1d2753a95f7d111f76634b62ea838275913be575 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 26 Aug 2021 15:26:38 +0530
Subject: [PATCH 0208/1358] SMTP properties updated.

---
 kernel-default.properties | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 336b1ea7084..7b33a272cd0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -10,7 +10,9 @@
 # mosip.mosip.reg.client.secret
 # preregistration.mosip.prereg.client.secret
 # softhsm.kernel.pin
-
+# email.smtp.host
+# email.smtp.username
+# email.smtp.secret
 
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
@@ -40,9 +42,9 @@ mosip.kernel.sms.unicode=unicode
 
 ## Email notification
 mosip.kernel.notification.email.from=info@mosip.io
-spring.mail.host=smtp.sendgrid.net
-spring.mail.username=apikey
-spring.mail.password=password
+spring.mail.host=${email.smtp.host}
+spring.mail.username=${email.smtp.username}
+spring.mail.password=${email.smtp.secret}
 spring.mail.port=587
 spring.mail.properties.mail.transport.protocol=smtp
 spring.mail.properties.mail.smtp.starttls.required=true

From 0a03a5e42d052921eabcb661ad55666333e79e51 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 26 Aug 2021 15:43:48 +0530
Subject: [PATCH 0209/1358] Captcha enabled.

---
 pre-registration-default.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index f828bfe12f9..357bfe9c5bb 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -406,14 +406,12 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
+mosip.preregistration.captcha.enable=true
 mosip.preregistration.captcha.id.validate = mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
 mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
 mosip.preregistration.captcha.secretkey=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 
-# Enable or Disable Captch - true to enable & false to disable
-mosip.preregistration.captcha.enable=false
-
 ## Security 
 mosip.security.csrf-enable:false
 mosip.security.cors-enable:false

From cdd6097c73e59a292db62bad33098e1dbde4b3d0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 26 Aug 2021 19:43:02 +0530
Subject: [PATCH 0210/1358] Captcha disabled.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 357bfe9c5bb..f4d1561b876 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -406,7 +406,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=true
+mosip.preregistration.captcha.enable=false
 mosip.preregistration.captcha.id.validate = mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
 mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify

From 4468b9360c79388f9960c844a53df12dc4ef0e95 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 05:13:01 +0530
Subject: [PATCH 0211/1358] Prereg prop updated.

---
 pre-registration-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index f4d1561b876..18da3396aa8 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -407,10 +407,10 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 ## Captcha service
 ## Configuration for google re-captcha
 mosip.preregistration.captcha.enable=false
-mosip.preregistration.captcha.id.validate = mosip.pre-registration.captcha.id.validate
-mosip.preregistration.captcha.sitekey=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
+mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
+mosip.preregistration.captcha.sitekey=
 mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
-mosip.preregistration.captcha.secretkey=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
+mosip.preregistration.captcha.secretkey=
 
 ## Security 
 mosip.security.csrf-enable:false

From 2519357523100868ae8459dc6b4a412dd1e0cbb6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 10:43:13 +0530
Subject: [PATCH 0212/1358] Captcha variables added.

---
 pre-registration-default.properties | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 18da3396aa8..4e387c29cfd 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -4,6 +4,8 @@
 # db.dbuser.password 
 # preregistration.mosip.prereg.client.secret
 # keycloak.host
+# prereg.captcha.site.key
+# prereg.captcha.secret.key
 
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
@@ -408,9 +410,10 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 ## Configuration for google re-captcha
 mosip.preregistration.captcha.enable=false
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
-mosip.preregistration.captcha.sitekey=
+mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
+mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}
+mosip.preregistration.captcha.resourse.url=http://prereg-captcha.prereg/preregistration/v1/captcha/validatecaptcha
 mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
-mosip.preregistration.captcha.secretkey=
 
 ## Security 
 mosip.security.csrf-enable:false

From 6c047e14db0c33a9ee31ceba94e7884cfab70823 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 10:52:04 +0530
Subject: [PATCH 0213/1358] Captcha enabled.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 4e387c29cfd..12a00e8b52e 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -408,7 +408,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=false
+mosip.preregistration.captcha.enable=true
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}

From 8c8a0e3b6452ec261312576748720a47fb6d42d3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 11:47:40 +0530
Subject: [PATCH 0214/1358] Notification type set to SMS for testing.

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 94daf697ba0..b28c0c36d51 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -242,7 +242,8 @@ mosip.login.mode= email,mobile
 
 ## Notification
 mosip.registration.processor.notification.types=EMAIL
-mosip.notificationtype=SMS|EMAIL
+#mosip.notificationtype=SMS|EMAIL
+mosip.notificationtype=SMS
 mosip.kernel.sms.proxy-sms=true
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true

From 3c6b4424d23085e6751ac7f8eb639f38f3eec89b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 11:50:36 +0530
Subject: [PATCH 0215/1358] Previous change reverted.

---
 application-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index b28c0c36d51..94daf697ba0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -242,8 +242,7 @@ mosip.login.mode= email,mobile
 
 ## Notification
 mosip.registration.processor.notification.types=EMAIL
-#mosip.notificationtype=SMS|EMAIL
-mosip.notificationtype=SMS
+mosip.notificationtype=SMS|EMAIL
 mosip.kernel.sms.proxy-sms=true
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true

From 0f8523a9223fe2ba39a99ab3517ce1086678e9c8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 11:52:05 +0530
Subject: [PATCH 0216/1358] Prereg templates corrected

---
 pre-registration-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 12a00e8b52e..4704c1f01b1 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -188,8 +188,9 @@ mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
 sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
 otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=otp-sms-template
-pre.reg.login.otp.mail.subject.template=pre-reg-login-email-subject-template
-pre.reg.login.otp.mail.content.template=pre-reg-login-email-content-template
+pre.reg.login.otp.mail.subject.template=otp-email-subject-template
+pre.reg.login.otp.mail.content.template=otp-email-content-template
+
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
 id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
 

From 2b91c36ebebeb74b71efd048587f483b23915fbb Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 12:16:27 +0530
Subject: [PATCH 0217/1358] Securzone added back.

---
 ...ion-processor-camel-routes-new-default.xml | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 529adba3de1..c24fba42682 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -1,8 +1,41 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- packet-receiver to packet uploader -->
-    <route id="packet-receiver->packet-uploader new route">
-      <from uri="eventbus:packet-receiver-new-bus-out" />
-        <log message="packet-receiver-->packet-uploader new route ${bodyAs(String)}" />
+   <route id="packet-receiver-->securezone-notification new route">
+      <from uri="eventbus://packet-receiver-new-bus-out" />
+      <log message="packet-receiver-->securezone-notification new ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="securezone-notification-->packet-uploader new route">
+      <from uri="eventbus://securezone-notification-new-bus-out" />
+      <log message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -20,8 +53,7 @@
             <to uri="eventbus://packet-uploader-bus-in" />
          </otherwise>
       </choice>
-    </route>
-
+   </route>
     <!-- packet-uploader to packet-validator Route -->
     <route id="packet-uploader-->packet-validator new route">
     <from uri="eventbus:packet-uploader-new-bus-out" />

From b0a542a54acff3b061d787f2f7c32c39e6156723 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 27 Aug 2021 17:58:15 +0530
Subject: [PATCH 0218/1358] Url corrected.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 4704c1f01b1..641d722be38 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -192,7 +192,7 @@ pre.reg.login.otp.mail.subject.template=otp-email-subject-template
 pre.reg.login.otp.mail.content.template=otp-email-content-template
 
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
+id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/{langcode}/{templatetypecode}
 
 ## Masterdata service
 ## Base url is only used for masterdata. We give the in-cluster url here

From ff441c1a09cdc0402fccf021a69781fcf1656bc7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 30 Aug 2021 11:48:54 +0530
Subject: [PATCH 0219/1358] IDA prop added.

---
 id-authentication-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d3975fdc990..4cc9753a705 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -260,6 +260,7 @@ ida-topic-pmp-partner-updated=PARTNER_UPDATED
 ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
 ida-topic-pmp-policy-updated=POLICY_UPDATED
 ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
+ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 
 ## IDA cache
 ## IDA cache Time to live in days - To clear cache scheduled based on the days provided.

From 415e5469801fdcb8819f109ef706388f081f15da Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 30 Aug 2021 12:00:12 +0530
Subject: [PATCH 0220/1358] IDA prop updated.

---
 id-authentication-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4cc9753a705..f5cc759603a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -12,6 +12,7 @@
 # mosip.kernel.tokenid.partnercode.salt
 # softhsm.ida.pin
 # mosip.api.internal.host
+# mosip.api.public.host
 # ida.websub.masterdata.templates.callback.secret
 # ida.websub.masterdata.titles.callback.secret
 
@@ -537,6 +538,6 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosipbox.public.url}
+mosip.ida.allowed.domain.uris=https://${mosip.api.public.host}
 # Biometrics attribute name present in data-share policy
 mosip.ida.credential.biometric.attribute.name=individualBiometrics

From 3b15683503f3e962a687caf99cec96ac98f82f70 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 11:21:36 +0530
Subject: [PATCH 0221/1358] .mvel file updated.

---
 applicanttype.mvel             | 210 +++++++++++++++------------------
 application-default.properties |   1 +
 2 files changed, 94 insertions(+), 117 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 14b24a9702c..b8d74497466 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -1,120 +1,96 @@
 def getApplicantType(map,a) {
-    import java.time.LocalDate;
-    import java.time.LocalDateTime;
-    import java.time.format.DateTimeFormatter;
-    import java.time.Period;
-  
-    String itc = null;
-    String dob = null;
-    String genderType = null;
-    boolean isBioExPresent  = false;
-    String FOREIGNER = "FR";
-    String NON_FOREIGNER = "NFR";
-    String MALE = "MLE";
-    String FEMALE = "FLE";
-    String CHILD = "CHL";
-    String ADULT = "ADL";
-    String ATTR_INDIVIDUAL_TYPE = "individualTypeCode";
-    String ATTR_DATE_OF_BIRTH = "dateofbirth";
-    String ATTR_GENDER_TYPE = "genderCode";
-    String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
-    String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-            
-    itc= (String) map[ATTR_INDIVIDUAL_TYPE];
-            
-    dob= (String) map[ATTR_DATE_OF_BIRTH];
-     
-    if(dob == empty  || dob == null ){
-       return "KER-MSD-147";
-    }
-   
-    int age = -1;
-    LocalDate currentDate = LocalDate.now();
-    
-    LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
-    
-    if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
-        age = Period.between(birthDate, currentDate).getYears();
-    }
-    else {
-       return age;
-    }
-     
-    
-    genderType=(String) map[ATTR_GENDER_TYPE];
-    isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
-    
-    if (((itc == empty  || itc == null)  && (dob == -1 )  && (genderType == empty  || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))  
-      return "KER-MSD-147";
-    if(age >= agelimit)
-       ageCode=ADULT;
-    else if( age >= 0 && age < agelimit)
-       ageCode=CHILD;
-    
-    if (itc == FOREIGNER &&  genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
-        
-        return "A001";
-    } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
-        
-        return "A002";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && !isBioExPresent )  {
-        
-        return "A003";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && !isBioExPresent )  {
-        
-        return "A004";
-   
-    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
-        
-        return "A005";
-   
-    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
-        
-        return "A006";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && !isBioExPresent )  {
-    
-        return "A007";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && !isBioExPresent )  {
-        
-        return "A008";
-   
-    } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
-        
-        return "A009";
-   
-    } else if (itc == FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
-        
-        return "A010";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == CHILD  && isBioExPresent )  {
-        
-        return "A011";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == MALE  && ageCode == ADULT  && isBioExPresent )  {
-        
-        return "A012";
-   
-    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
-        
-        return "A013";
-   
-    } else if (itc == FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
-        
-        return "A014";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == CHILD  && isBioExPresent )  {
-        
-        return "A015";
-   
-    } else if (itc == NON_FOREIGNER  && genderType == FEMALE  && ageCode == ADULT  && isBioExPresent )  {
-        
-        return "A016";
-   
-    }
-    return null;
+                 import java.time.LocalDate;
+                 import java.time.LocalDateTime;
+                 import java.time.format.DateTimeFormatter;
+                 import java.time.Period;
+                 import java.util.List;
+                //String itc = null;
+                String dob = null;
+                String genderType = null;
+                boolean isBioExPresent = false;
+                String NonResident = "FR";
+                String Resident = "NFR";
+                String MALE = "MLE";
+                String FEMALE = "FLE";
+                String Others = "OTH";
+                String CHILD = "CHL";
+                String ADULT = "ADL";
+             // String ATTR_INDIVIDUAL_TYPE = "residenceStatus";
+                String ATTR_DATE_OF_BIRTH = "dateOfBirth";
+                String ATTR_GENDER_TYPE = "gender";
+                String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
+                String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+              //itc= (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
 
+                dob= (String) map[ATTR_DATE_OF_BIRTH];
+                if(dob == empty || dob == null ){
+               return "KER-MSD-147";
+             }
+                int age = -1;
+                LocalDate currentDate = LocalDate.now();
+                LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
+                if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
+                        age = Period.between(birthDate, currentDate).getYears();
+                }
+                else{
+                   return age;
+                   }
+                genderType= (String) ((List) map[ATTR_GENDER_TYPE]).get(0).value;
+                isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
+                if (((dob == -1 ) && (genderType == empty || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))
+          return "KER-MSD-147";
+        if(age >= agelimit)
+           ageCode=ADULT;
+        else if( age >= 0 && age < agelimit)
+           ageCode=CHILD;
+                if ( genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "001";
+                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "002";
+                } else if (genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "003";
+                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "004";
+                } else if ( genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "005";
+                } else if ( genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "006";
+                } else if (genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "007";
+                } else if (genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "008";
+                } else if ( genderType == Others && ageCode == CHILD && !isBioExPresent ) {
+                        return "005";
+                } else if ( genderType == Others && ageCode == ADULT && !isBioExPresent ) {
+                        return "006";
+                } else if (genderType == Others && ageCode == CHILD && !isBioExPresent ) {
+                        return "007";
+                } else if (genderType == Others && ageCode == ADULT && !isBioExPresent ) {
+                        return "008";
+                } else if ( genderType == MALE && ageCode == CHILD && isBioExPresent ) {
+                        return "009";
+                } else if ( genderType == MALE && ageCode == ADULT && isBioExPresent ) {
+                        return "010";
+                } else if (genderType == MALE && ageCode == CHILD && isBioExPresent ) {
+                        return "011";
+                } else if (genderType == MALE && ageCode == ADULT && isBioExPresent ) {
+                        return "012";
+                } else if ( genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
+                        return "013";
+                } else if ( genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
+                        return "014";
+                } else if (genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
+                        return "015";
+                } else if (genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
+                        return "016";
+                } else if ( genderType == Others && ageCode == CHILD && isBioExPresent ) {
+                        return "013";
+                } else if ( genderType == Others && ageCode == ADULT && isBioExPresent ) {
+                        return "014";
+                } else if (genderType == Others && ageCode == CHILD && isBioExPresent ) {
+                        return "015";
+                } else if (genderType == Others && ageCode == ADULT && isBioExPresent ) {
+                        return "016";
+                }
+                return null;
 };
diff --git a/application-default.properties b/application-default.properties
index 94daf697ba0..320392524c7 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -369,6 +369,7 @@ websub.publish.url=${websub.base.url}/websub/publish
 websub.failed.messages.sync.url=${websub.base.url}/websub/sync/failedmessage
 
 mosip.mandatory-languages=eng,fra
+## Leave blank if no optional langauges
 mosip.optional-languages=
 mosip.min-languages.count=2
 mosip.max-languages.count=2

From 565a1d16d2bebe560dd28995f93e0f8d6aa7052a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 12:10:12 +0530
Subject: [PATCH 0222/1358] Unused file removed.

---
 pre-registration-demographic.json | 364 ------------------------------
 1 file changed, 364 deletions(-)
 delete mode 100644 pre-registration-demographic.json

diff --git a/pre-registration-demographic.json b/pre-registration-demographic.json
deleted file mode 100644
index 313f73f77ac..00000000000
--- a/pre-registration-demographic.json
+++ /dev/null
@@ -1,364 +0,0 @@
-{
-   "identity":[
-        {
-          "id": "IDSchemaVersion",
-          "description": "ID Schema Version",
-          "type": "number",
-          "controlType": null,
-          "fieldType": "default",
-          "inputRequired": false,
-          "validators": [],
-          "required": true
-        },
-        {
-           "id":"fullName",
-           "description":"Enter Full Name",
-           "labelName":{
-           "eng":"Full Name",
-           "fra":"Nom complet"
-           },
-           "controlType":"textbox",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"dateOfBirth",
-           "description":"Enter DOB",
-           "labelName":{
-           "eng":"Date Of Birth",
-           "fra":"Date de naissance"
-           },
-           "controlType":"date",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"string",
-           "validators":[
-           ],
-           "required":true
-        },
-        {
-           "id":"gender",
-           "description":"Enter Gender",
-           "labelName":{
-           "eng":"Gender",
-           "fra":"Le genre"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"dynamic",
-           "type":"simpleType",
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"residenceStatus",
-           "description":"Residence status",
-           "labelName":{
-           "eng":"Residence Status",
-           "fra":"Statut de résidence"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"dynamic",
-           "type":"simpleType",
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"addressLine1",
-           "description":"addressLine1",
-           "labelName":{
-           "eng":"Address Line1",
-           "fra":"Adresse 1"
-           },
-           "controlType":"textbox",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"addressLine2",
-           "description":"addressLine2",
-           "labelName":{
-           "eng":"Address Line2",
-           "fra":"Adresse 2"
-           },
-           "controlType":"textbox",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":false
-        },
-        {
-           "id":"addressLine3",
-           "description":"addressLine3",
-           "labelName":{
-           "eng":"Address Line3",
-           "fra":"Adresse 3"
-           },
-           "controlType":"textbox",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":false
-        },
-        {
-           "id":"region",
-           "description":"region",
-           "labelName":{
-           "eng":"Region",
-           "fra":"Région"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"province",
-           "description":"province",
-           "labelName":{
-           "eng":"Province",
-           "fra":"Province"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"city",
-           "description":"city",
-           "labelName":{
-           "eng":"City",
-           "fra":"Ville"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^(?=.{0,50}$).*",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"zone",
-           "description":"zone",
-           "labelName":{
-           "eng":"Zone",
-           "fra":"Zone"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"simpleType",
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"postalCode",
-           "description":"postalCode",
-           "labelName":{
-           "eng":"Postal Code",
-           "fra":"code postal"
-           },
-           "controlType":"dropdown",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"string",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^[(?i)A-Z0-9]{5}$|^NA$",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"phone",
-           "description":"phone",
-           "labelName":{
-           "eng":"Phone",
-           "fra":"Téléphone"
-           },
-           "controlType":"textbox",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"string",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^([6-9]{1})([0-9]{9})$",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"email",
-           "description":"email",
-           "labelName":{
-           "eng":"Email",
-           "fra":"Email"
-           },
-           "controlType":"textbox",
-           "inputRequired":true,
-           "fieldType":"default",
-           "type":"string",
-           "validators":[
-              {
-                 "type":"regex",
-                 "validator":"^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-                 "arguments":[
-
-                 ]
-              }
-           ],
-           "required":true
-        },
-        {
-           "id":"proofOfAddress",
-           "description":"proofOfAddress",
-           "labelName":[{"value":"Address Proof","language":"eng"}],
-           "controlType":"fileupload",
-           "inputRequired":true,
-           "validators":[
-
-           ],
-           "required":false
-        },
-        {
-           "id":"proofOfIdentity",
-           "description":"proofOfIdentity",
-           "labelName": [{"value":"Identity Proof","language":"eng"}],
-           "controlType":"fileupload",
-           "inputRequired":true,
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"proofOfRelationship",
-           "description":"proofOfRelationship",
-           "labelName":[{"value":"Relationship Proof","language":"eng"}],
-           "controlType":"fileupload",
-           "inputRequired":true,
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"proofOfDateOfBirth",
-           "description":"proofOfDateOfBirth",
-           "labelName":[{"value":"DOB Proof","language":"eng"}],
-           "controlType":"fileupload",
-           "inputRequired":true,
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"proofOfException",
-           "description":"proofOfException",
-           "labelName": [{"value":"Exception Proof","language":"eng"}],
-           "controlType":"fileupload",
-           "inputRequired":true,
-           "validators":[
-
-           ],
-           "required":true
-        },
-        {
-           "id":"proofOfException-1",
-           "description":"proofOfException",
-           "labelName":[{"value":"Exception Proof 2","language":"eng"}],
-           "controlType":"fileupload",
-           "inputRequired":true,
-           "validators":[
-
-           ],
-           "required":true
-        }
-   ],
-   "locationHierarchy": ["region", "province","city","zone","postalCode"]
-}

From 5052a0e6b6508338e3afa09d3c9215e66706e4ab Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 12:45:09 +0530
Subject: [PATCH 0223/1358] [MOSIP-16645] mvel file taken from develop branch.

---
 applicanttype.mvel | 204 ++++++++++++++++++++++++---------------------
 1 file changed, 110 insertions(+), 94 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index b8d74497466..7d50e6fe61a 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -1,96 +1,112 @@
-def getApplicantType(map,a) {
-                 import java.time.LocalDate;
-                 import java.time.LocalDateTime;
-                 import java.time.format.DateTimeFormatter;
-                 import java.time.Period;
-                 import java.util.List;
-                //String itc = null;
-                String dob = null;
-                String genderType = null;
-                boolean isBioExPresent = false;
-                String NonResident = "FR";
-                String Resident = "NFR";
-                String MALE = "MLE";
-                String FEMALE = "FLE";
-                String Others = "OTH";
-                String CHILD = "CHL";
-                String ADULT = "ADL";
-             // String ATTR_INDIVIDUAL_TYPE = "residenceStatus";
-                String ATTR_DATE_OF_BIRTH = "dateOfBirth";
-                String ATTR_GENDER_TYPE = "gender";
-                String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
-                String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-              //itc= (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
+def getApplicantType(map, agelimit) {
+  import java.time.LocalDate;
+  import java.time.LocalDateTime;
+  import java.time.format.DateTimeFormatter;
+  import java.time.Period;
+  import java.util.List;
+  String itc = null;
+  String dob = null;
+  String genderType = null;
+  String isboolean=null;
+  boolean isBioExPresent = false;
+  String NonResident = "FR";
+  String Resident = "NFR";
+  String MALE = "MLE";
+  String FEMALE = "FLE";
+  String Others = "OTH";
+  String CHILD = "CHL";
+  String ADULT = "ADL";
+  String ATTR_INDIVIDUAL_TYPE = "residenceStatus";
+  String ATTR_DATE_OF_BIRTH = "dateOfBirth";
+  String ATTR_GENDER_TYPE = "gender";
+  String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
+  String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 
-                dob= (String) map[ATTR_DATE_OF_BIRTH];
-                if(dob == empty || dob == null ){
-               return "KER-MSD-147";
-             }
-                int age = -1;
-                LocalDate currentDate = LocalDate.now();
-                LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
-                if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
-                        age = Period.between(birthDate, currentDate).getYears();
-                }
-                else{
-                   return age;
-                   }
-                genderType= (String) ((List) map[ATTR_GENDER_TYPE]).get(0).value;
-                isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
-                if (((dob == -1 ) && (genderType == empty || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))
-          return "KER-MSD-147";
-        if(age >= agelimit)
-           ageCode=ADULT;
-        else if( age >= 0 && age < agelimit)
-           ageCode=CHILD;
-                if ( genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "001";
-                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "002";
-                } else if (genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "003";
-                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "004";
-                } else if ( genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "005";
-                } else if ( genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "006";
-                } else if (genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "007";
-                } else if (genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "008";
-                } else if ( genderType == Others && ageCode == CHILD && !isBioExPresent ) {
-                        return "005";
-                } else if ( genderType == Others && ageCode == ADULT && !isBioExPresent ) {
-                        return "006";
-                } else if (genderType == Others && ageCode == CHILD && !isBioExPresent ) {
-                        return "007";
-                } else if (genderType == Others && ageCode == ADULT && !isBioExPresent ) {
-                        return "008";
-                } else if ( genderType == MALE && ageCode == CHILD && isBioExPresent ) {
-                        return "009";
-                } else if ( genderType == MALE && ageCode == ADULT && isBioExPresent ) {
-                        return "010";
-                } else if (genderType == MALE && ageCode == CHILD && isBioExPresent ) {
-                        return "011";
-                } else if (genderType == MALE && ageCode == ADULT && isBioExPresent ) {
-                        return "012";
-                } else if ( genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
-                        return "013";
-                } else if ( genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
-                        return "014";
-                } else if (genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
-                        return "015";
-                } else if (genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
-                        return "016";
-                } else if ( genderType == Others && ageCode == CHILD && isBioExPresent ) {
-                        return "013";
-                } else if ( genderType == Others && ageCode == ADULT && isBioExPresent ) {
-                        return "014";
-                } else if (genderType == Others && ageCode == CHILD && isBioExPresent ) {
-                        return "015";
-                } else if (genderType == Others && ageCode == ADULT && isBioExPresent ) {
-                        return "016";
-                }
-                return null;
+  itc = (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
+
+  genderType = (String)((List) map[ATTR_GENDER_TYPE]).get(0).value;
+  
+  isboolean = map[ATTR_BIOMETRIC_EXCEPTION_TYPE].toString();
+  
+  dob=map[ATTR_DATE_OF_BIRTH].toString();
+
+  if (((itc.isEmpty() || itc == null) || (dob.isEmpty() || dob == null) || (genderType.isEmpty() || genderType == null) || (map[ATTR_BIOMETRIC_EXCEPTION_TYPE].toString().isEmpty() || map[ATTR_BIOMETRIC_EXCEPTION_TYPE] == null))) {
+    return "KER-MSD-147";
+  }
+  
+  if (!((isboolean.equalsIgnoreCase("true") || isboolean.equalsIgnoreCase("false")) && (genderType.equals(FEMALE) || genderType.equals(MALE) || genderType.equals(Others)) && (itc.equals(Resident) || itc.equals(NonResident)))) {
+    return "KER-MSD-147";
+  }
+  
+  isBioExPresent=Boolean.parseBoolean(isboolean);
+  
+  dob = (String) map[ATTR_DATE_OF_BIRTH];
+
+  int age = -1;
+  LocalDate currentDate = LocalDate.now();
+
+  LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
+  if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
+    age = Period.between(birthDate, currentDate).getYears();
+  } else {
+    return "KER-MSD-151";
+  }
+
+  Integer ageItd = Integer.toString(agelimit);
+  
+  if (age >= ageItd)
+    ageCode = ADULT;
+  else if (age >= 0 && age < ageItd)
+    ageCode = CHILD;
+    
+  if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
+    return "001";
+  } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
+    return "002";
+  } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
+    return "003";
+  } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
+    return "004";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
+    return "005";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
+    return "006";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
+    return "007";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
+    return "008";
+  } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
+    return "005";
+  } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
+    return "006";
+  } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
+    return "007";
+  } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
+    return "008";
+  } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
+    return "009";
+  } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
+    return "010";
+  } else if (itc == Resident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
+    return "011";
+  } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
+    return "012";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
+    return "013";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
+    return "015";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
+    return "016";
+  } else if (itc == NonResident && genderType == Others && ageCode == CHILD && isBioExPresent) {
+    return "013";
+  } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == Others && ageCode == CHILD && isBioExPresent) {
+    return "015";
+  } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
+    return "016";
+  }
+  return null;
 };

From 06854729cbaba55e1b89f5d269f2acd3904e0bbc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 13:01:27 +0530
Subject: [PATCH 0224/1358] mvel file updated.

---
 applicanttype.mvel | 140 +++++++++++++++++++++++++++------------------
 1 file changed, 83 insertions(+), 57 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 7d50e6fe61a..1a901aaf151 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -1,64 +1,90 @@
-def getApplicantType(map, agelimit) {
-  import java.time.LocalDate;
-  import java.time.LocalDateTime;
-  import java.time.format.DateTimeFormatter;
-  import java.time.Period;
-  import java.util.List;
-  String itc = null;
-  String dob = null;
-  String genderType = null;
-  String isboolean=null;
-  boolean isBioExPresent = false;
-  String NonResident = "FR";
-  String Resident = "NFR";
-  String MALE = "MLE";
-  String FEMALE = "FLE";
-  String Others = "OTH";
-  String CHILD = "CHL";
-  String ADULT = "ADL";
-  String ATTR_INDIVIDUAL_TYPE = "residenceStatus";
-  String ATTR_DATE_OF_BIRTH = "dateOfBirth";
-  String ATTR_GENDER_TYPE = "gender";
-  String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
-  String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.Period;
+import java.util.List;
+import java.time.ZoneId;
+import java.time.temporal.ValueRange;
 
-  itc = (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
+String CHILD = "CHL";
+String ADULT = "ADL";
+String MALE = 'MLE';
+String FEMALE = 'FLE';
+String NonResident = "FR";
+String Resident = "NFR";
+String Others = "OTH";
+String DATE_PATTERN = "yyyy/MM/dd";
 
-  genderType = (String)((List) map[ATTR_GENDER_TYPE]).get(0).value;
-  
-  isboolean = map[ATTR_BIOMETRIC_EXCEPTION_TYPE].toString();
-  
-  dob=map[ATTR_DATE_OF_BIRTH].toString();
+def getResidenceStatus(identity) {
+    if(identity.containsKey('residenceStatusCode')) {
+        return identity.getOrDefault('residenceStatusCode', null);
+    }
 
-  if (((itc.isEmpty() || itc == null) || (dob.isEmpty() || dob == null) || (genderType.isEmpty() || genderType == null) || (map[ATTR_BIOMETRIC_EXCEPTION_TYPE].toString().isEmpty() || map[ATTR_BIOMETRIC_EXCEPTION_TYPE] == null))) {
-    return "KER-MSD-147";
-  }
-  
-  if (!((isboolean.equalsIgnoreCase("true") || isboolean.equalsIgnoreCase("false")) && (genderType.equals(FEMALE) || genderType.equals(MALE) || genderType.equals(Others)) && (itc.equals(Resident) || itc.equals(NonResident)))) {
-    return "KER-MSD-147";
-  }
-  
-  isBioExPresent=Boolean.parseBoolean(isboolean);
-  
-  dob = (String) map[ATTR_DATE_OF_BIRTH];
+    if(identity.containsKey('residenceStatus')) {
+        Object val = identity.getOrDefault('residenceStatus', null);
+        return val == null ? null :
+            (val instanceof String ? ; (String)val : (String) ((List)val).get(0).value);
+    }
 
-  int age = -1;
-  LocalDate currentDate = LocalDate.now();
+    return null;
+}
 
-  LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
-  if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
-    age = Period.between(birthDate, currentDate).getYears();
-  } else {
-    return "KER-MSD-151";
-  }
+def getGenderType(identity) {
+    if(identity.containsKey('genderCode')) {
+        return identity.getOrDefault('genderCode', null);
+    }
+
+    if(identity.containsKey('gender')) {
+        Object val = identity.getOrDefault('gender', null);
+        return val == null ? null :
+            (val instanceof String ? ; (String)val : (String) ((List)val).get(0).value);
+    }
+
+    return null;
+}
+
+def getAgeCode(identity) {
+    if(ageGroups == null || !identity.containsKey('dateOfBirth'))
+        return null;
+
+    String dob = identity.get('dateOfBirth');
+    LocalDate date = LocalDate.parse(dob, DateTimeFormatter.ofPattern(DATE_PATTERN));
+    LocalDate currentDate = LocalDate.now(ZoneId.of("UTC"));
+     int  ageInYears = -1;
+     if (!date.isAfter(currentDate)) {
+         ageInYears = Period.between(date, currentDate).getYears();
+    } else {
+            return "KER-MSD-151";
+     }
+    String ageGroup = null;
+    for(String groupName : ageGroups.keySet()) {
+        String[] range = ((String)ageGroups.get(groupName)).split('-');
+        if(ValueRange.of(Long.valueOf(range[0]), Long.valueOf(range[1])).isValidIntValue(ageInYears)) {
+            ageGroup = groupName;
+        }
+    }
+
+   return ageGroup == null ? null : (ageGroup == 'INFANT' ? CHILD : ADULT);
+}
+
+
+def getBioExceptionFlag(identity) {
+    return identity.containsKey('isBioException') ? (Boolean) identity.get('isBioException') : false;
+}
+
+def getApplicantType() {
+  System.out.println("AgeGroups:" + ageGroups);
+  String itc = getResidenceStatus(identity);
+  System.out.println("Resident Status:" + itc);
+  String genderType = getGenderType(identity);
+  System.out.println("Gender Type:" + genderType);
+  String ageCode = getAgeCode(identity);
+  System.out.println("AgeCode:" + ageCode);
+  boolean isBioExPresent = getBioExceptionFlag(identity);
+
+  if(itc == null || genderType == null || ageCode == null)
+    return "KER-MSD-147";
 
-  Integer ageItd = Integer.toString(agelimit);
-  
-  if (age >= ageItd)
-    ageCode = ADULT;
-  else if (age >= 0 && age < ageItd)
-    ageCode = CHILD;
-    
   if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
     return "001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
@@ -108,5 +134,5 @@ def getApplicantType(map, agelimit) {
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
     return "016";
   }
-  return null;
-};
+  return "KER-MSD-147";
+}

From 39b9ca1e7239e0ad22be5f15d0b8ae875d053f76 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 15:08:08 +0530
Subject: [PATCH 0225/1358] Datetime pattern check correctec in mvel.

---
 applicanttype.mvel | 232 +++++++++++++++++++--------------------------
 1 file changed, 95 insertions(+), 137 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 1a901aaf151..83c09c2bc7e 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -1,138 +1,96 @@
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.Period;
-import java.util.List;
-import java.time.ZoneId;
-import java.time.temporal.ValueRange;
+def getApplicantType(map,a) {
+                 import java.time.LocalDate;
+                 import java.time.LocalDateTime;
+                 import java.time.format.DateTimeFormatter;
+                 import java.time.Period;
+                 import java.util.List;
+                //String itc = null;
+                String dob = null;
+                String genderType = null;
+                boolean isBioExPresent = false;
+                String NonResident = "FR";
+                String Resident = "NFR";
+                String MALE = "MLE";
+                String FEMALE = "FLE";
+                String Others = "OTH";
+                String CHILD = "CHL";
+                String ADULT = "ADL";
+             // String ATTR_INDIVIDUAL_TYPE = "residenceStatus";
+                String ATTR_DATE_OF_BIRTH = "dateOfBirth";
+                String ATTR_GENDER_TYPE = "gender";
+                String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
+                String UTC_DATETIME_PATTERN = ""yyyy/MM/dd";
+              //itc= (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
 
-String CHILD = "CHL";
-String ADULT = "ADL";
-String MALE = 'MLE';
-String FEMALE = 'FLE';
-String NonResident = "FR";
-String Resident = "NFR";
-String Others = "OTH";
-String DATE_PATTERN = "yyyy/MM/dd";
-
-def getResidenceStatus(identity) {
-    if(identity.containsKey('residenceStatusCode')) {
-        return identity.getOrDefault('residenceStatusCode', null);
-    }
-
-    if(identity.containsKey('residenceStatus')) {
-        Object val = identity.getOrDefault('residenceStatus', null);
-        return val == null ? null :
-            (val instanceof String ? ; (String)val : (String) ((List)val).get(0).value);
-    }
-
-    return null;
-}
-
-def getGenderType(identity) {
-    if(identity.containsKey('genderCode')) {
-        return identity.getOrDefault('genderCode', null);
-    }
-
-    if(identity.containsKey('gender')) {
-        Object val = identity.getOrDefault('gender', null);
-        return val == null ? null :
-            (val instanceof String ? ; (String)val : (String) ((List)val).get(0).value);
-    }
-
-    return null;
-}
-
-def getAgeCode(identity) {
-    if(ageGroups == null || !identity.containsKey('dateOfBirth'))
-        return null;
-
-    String dob = identity.get('dateOfBirth');
-    LocalDate date = LocalDate.parse(dob, DateTimeFormatter.ofPattern(DATE_PATTERN));
-    LocalDate currentDate = LocalDate.now(ZoneId.of("UTC"));
-     int  ageInYears = -1;
-     if (!date.isAfter(currentDate)) {
-         ageInYears = Period.between(date, currentDate).getYears();
-    } else {
-            return "KER-MSD-151";
-     }
-    String ageGroup = null;
-    for(String groupName : ageGroups.keySet()) {
-        String[] range = ((String)ageGroups.get(groupName)).split('-');
-        if(ValueRange.of(Long.valueOf(range[0]), Long.valueOf(range[1])).isValidIntValue(ageInYears)) {
-            ageGroup = groupName;
-        }
-    }
-
-   return ageGroup == null ? null : (ageGroup == 'INFANT' ? CHILD : ADULT);
-}
-
-
-def getBioExceptionFlag(identity) {
-    return identity.containsKey('isBioException') ? (Boolean) identity.get('isBioException') : false;
-}
-
-def getApplicantType() {
-  System.out.println("AgeGroups:" + ageGroups);
-  String itc = getResidenceStatus(identity);
-  System.out.println("Resident Status:" + itc);
-  String genderType = getGenderType(identity);
-  System.out.println("Gender Type:" + genderType);
-  String ageCode = getAgeCode(identity);
-  System.out.println("AgeCode:" + ageCode);
-  boolean isBioExPresent = getBioExceptionFlag(identity);
-
-  if(itc == null || genderType == null || ageCode == null)
-    return "KER-MSD-147";
-
-  if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "001";
-  } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "002";
-  } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "003";
-  } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "004";
-  } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "005";
-  } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "006";
-  } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "007";
-  } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "008";
-  } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "005";
-  } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "006";
-  } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "007";
-  } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "008";
-  } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "009";
-  } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "010";
-  } else if (itc == Resident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "011";
-  } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "012";
-  } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "013";
-  } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "014";
-  } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "015";
-  } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "016";
-  } else if (itc == NonResident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "013";
-  } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "014";
-  } else if (itc == Resident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "015";
-  } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "016";
-  }
-  return "KER-MSD-147";
-}
+                dob= (String) map[ATTR_DATE_OF_BIRTH];
+                if(dob == empty || dob == null ){
+               return "KER-MSD-147";
+             }
+                int age = -1;
+                LocalDate currentDate = LocalDate.now();
+                LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
+                if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
+                        age = Period.between(birthDate, currentDate).getYears();
+                }
+                else{
+                   return age;
+                   }
+                genderType= (String) ((List) map[ATTR_GENDER_TYPE]).get(0).value;
+                isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
+                if (((dob == -1 ) && (genderType == empty || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))
+          return "KER-MSD-147";
+        if(age >= agelimit)
+           ageCode=ADULT;
+        else if( age >= 0 && age < agelimit)
+           ageCode=CHILD;
+                if ( genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "001";
+                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "002";
+                } else if (genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "003";
+                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "004";
+                } else if ( genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "005";
+                } else if ( genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "006";
+                } else if (genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
+                        return "007";
+                } else if (genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
+                        return "008";
+                } else if ( genderType == Others && ageCode == CHILD && !isBioExPresent ) {
+                        return "005";
+                } else if ( genderType == Others && ageCode == ADULT && !isBioExPresent ) {
+                        return "006";
+                } else if (genderType == Others && ageCode == CHILD && !isBioExPresent ) {
+                        return "007";
+                } else if (genderType == Others && ageCode == ADULT && !isBioExPresent ) {
+                        return "008";
+                } else if ( genderType == MALE && ageCode == CHILD && isBioExPresent ) {
+                        return "009";
+                } else if ( genderType == MALE && ageCode == ADULT && isBioExPresent ) {
+                        return "010";
+                } else if (genderType == MALE && ageCode == CHILD && isBioExPresent ) {
+                        return "011";
+                } else if (genderType == MALE && ageCode == ADULT && isBioExPresent ) {
+                        return "012";
+                } else if ( genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
+                        return "013";
+                } else if ( genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
+                        return "014";
+                } else if (genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
+                        return "015";
+                } else if (genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
+                        return "016";
+                } else if ( genderType == Others && ageCode == CHILD && isBioExPresent ) {
+                        return "013";
+                } else if ( genderType == Others && ageCode == ADULT && isBioExPresent ) {
+                        return "014";
+                } else if (genderType == Others && ageCode == CHILD && isBioExPresent ) {
+                        return "015";
+                } else if (genderType == Others && ageCode == ADULT && isBioExPresent ) {
+                        return "016";
+                }
+                return null;
+};

From fbe0dd8db74e717e81d015c01e74286c481184ef Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 15:11:22 +0530
Subject: [PATCH 0226/1358] mvel corrected.

---
 applicanttype.mvel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 83c09c2bc7e..de620ce183b 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -19,7 +19,7 @@ def getApplicantType(map,a) {
                 String ATTR_DATE_OF_BIRTH = "dateOfBirth";
                 String ATTR_GENDER_TYPE = "gender";
                 String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
-                String UTC_DATETIME_PATTERN = ""yyyy/MM/dd";
+                String UTC_DATETIME_PATTERN = "yyyy/MM/dd";
               //itc= (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
 
                 dob= (String) map[ATTR_DATE_OF_BIRTH];

From bc931c980f179fe2634d859e117f238b748945ee Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 31 Aug 2021 15:16:40 +0530
Subject: [PATCH 0227/1358] Correction in date compute in mvel.

---
 applicanttype.mvel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index de620ce183b..92147fc3c72 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -28,7 +28,7 @@ def getApplicantType(map,a) {
              }
                 int age = -1;
                 LocalDate currentDate = LocalDate.now();
-                LocalDate birthDate = LocalDateTime.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN)).toLocalDate();
+                LocalDate birthDate = LocalDate.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN));
                 if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
                         age = Period.between(birthDate, currentDate).getYears();
                 }

From b95b7cc9143d5c9eb8fd096bf7653befb30c59e3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Sep 2021 10:07:36 +0530
Subject: [PATCH 0228/1358] Applicanttype updated.

---
 applicanttype.mvel | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 92147fc3c72..309c6c25c34 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -44,53 +44,53 @@ def getApplicantType(map,a) {
         else if( age >= 0 && age < agelimit)
            ageCode=CHILD;
                 if ( genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "001";
+                        return "A001";
                 } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "002";
+                        return "A002";
                 } else if (genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "003";
+                        return "A003";
                 } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "004";
+                        return "A004";
                 } else if ( genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "005";
+                        return "A005";
                 } else if ( genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "006";
+                        return "A006";
                 } else if (genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "007";
+                        return "A007";
                 } else if (genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "008";
+                        return "A008";
                 } else if ( genderType == Others && ageCode == CHILD && !isBioExPresent ) {
-                        return "005";
+                        return "A005";
                 } else if ( genderType == Others && ageCode == ADULT && !isBioExPresent ) {
-                        return "006";
+                        return "A006";
                 } else if (genderType == Others && ageCode == CHILD && !isBioExPresent ) {
-                        return "007";
+                        return "A007";
                 } else if (genderType == Others && ageCode == ADULT && !isBioExPresent ) {
-                        return "008";
+                        return "A008";
                 } else if ( genderType == MALE && ageCode == CHILD && isBioExPresent ) {
-                        return "009";
+                        return "A009";
                 } else if ( genderType == MALE && ageCode == ADULT && isBioExPresent ) {
-                        return "010";
+                        return "A010";
                 } else if (genderType == MALE && ageCode == CHILD && isBioExPresent ) {
-                        return "011";
+                        return "A011";
                 } else if (genderType == MALE && ageCode == ADULT && isBioExPresent ) {
-                        return "012";
+                        return "A012";
                 } else if ( genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
-                        return "013";
+                        return "A013";
                 } else if ( genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
-                        return "014";
+                        return "A014";
                 } else if (genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
-                        return "015";
+                        return "A015";
                 } else if (genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
-                        return "016";
+                        return "A016";
                 } else if ( genderType == Others && ageCode == CHILD && isBioExPresent ) {
-                        return "013";
+                        return "A013";
                 } else if ( genderType == Others && ageCode == ADULT && isBioExPresent ) {
-                        return "014";
+                        return "A014";
                 } else if (genderType == Others && ageCode == CHILD && isBioExPresent ) {
-                        return "015";
+                        return "A015";
                 } else if (genderType == Others && ageCode == ADULT && isBioExPresent ) {
-                        return "016";
+                        return "A016";
                 }
                 return null;
 };

From cedeffea4e42e9cca9f70849a888b88aacd98982 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Sep 2021 10:40:17 +0530
Subject: [PATCH 0229/1358] IDA properties added.

---
 id-authentication-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f5cc759603a..f858fba9618 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -222,6 +222,9 @@ ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servle
 ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
 

From e29ce3562e03ff123fd2ac2df06f1b2196224818 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Sep 2021 11:28:48 +0530
Subject: [PATCH 0230/1358] [MOSIP-16645] Admin updated.

---
 admin-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-default.properties b/admin-default.properties
index 3478b0cd956..560dc348cba 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -71,6 +71,7 @@ mosip.admin.security.policy.userrole-auth-url=${authmanager.base.url}/role/{appI
 ## Masterdata cards
 
 mosip.admin.masterdata.lang-code=eng,ara,fra
+mosip.admin-services.required.roles=GLOBAL_ADMIN
 
 #masterdata machine
 mosip.admin.masterdata.card.machines-eng=Machines

From 09e4912c50318abab36398c86c9a496003dea6e5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Sep 2021 17:29:27 +0530
Subject: [PATCH 0231/1358] Hotlist properties updated.

---
 hotlist-default.properties | 56 ++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 33 deletions(-)

diff --git a/hotlist-default.properties b/hotlist-default.properties
index 643d36e9c9d..c440e8e486a 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -1,71 +1,61 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
 spring.application.name=HOTLIST
 
-#------------------------- Dynamic properties ------------------------------------------------------------#
-# Hotlist database url
-mosip.hotlist.db.url=postgres
-
-# Hotlist database port
-mosip.hotlist.db.port=80
-
-# Hotlist database name
+## DB
+mosip.hotlist.db.url=postgres-postgresql.postgres
+mosip.hotlist.db.port=5432
 mosip.hotlist.db.db-name=mosip_hotlist
-
-# Hotlist database username
 mosip.hotlist.db.username=hotlistuser
-
-# Hotlist database password (encrypted)
-mosip.hotlist.db.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
-# Hotlist database drive class name
+mosip.hotlist.db.password=${db.dbuser.password}
 mosip.hotlist.db.driverClassName=org.postgresql.Driver
-
-# Hotlist database dialect
 mosip.hotlist.db.dialect=org.hibernate.dialect.PostgreSQL92Dialect
 
-#------------------------- Data validation properties -----------------------------------------------------#
-mosip.hotlist.allowedIdTypes=UIN,VID,MACHINE_ID,PARTNER_ID,OPERATOR_ID,CENTER_ID,DEVICE,DEVICE_MODEL,FTM_PUBLIC_KEY,DEVICE_PROVIDER
+## Data validation
+mosip.hotlist.allowedIdTypes=UIN,VID,MACHINE_ID,PARTNER_ID,OPERATOR_ID,CENTER_ID,DEVICE,DEVICE_MODEL,FTM_PUBLIC_KEY
 
-#------------------------- Data Source properties ---------------------------------------------------------#
+## Data source
 mosip.hotlist.datasource.driverClassName=${mosip.hotlist.db.driverClassName}
 mosip.hotlist.datasource.username=${mosip.hotlist.db.username}
 mosip.hotlist.datasource.password=${mosip.hotlist.db.password}
 mosip.hotlist.datasource.url=jdbc:postgresql://${mosip.hotlist.db.url}:${mosip.hotlist.db.port}/${mosip.hotlist.db.db-name}
 mosip.hotlist.datasource.dialect=${mosip.hotlist.db.dialect}
 
-#------------------------- Web sub properties -------------------------------------------------------------#
-#Web sub topic
+# Websub
 mosip.hotlist.topic-to-publish=MOSIP_HOTLIST
 
-#------------------------- Encryption/Decryption properties -----------------------------------------------#
-# App Id for Encryption/Decryption
+## Encryption/decyrption
 mosip.hotlist.crypto.app-id=ADMIN_SERVICES
-
-# Ref Id for Encryption/Decryption
 mosip.hotlist.crypto.ref-id=hotlist_service
 
-#-------------------------Hotlist cleanup schedule details ------------------------------------------------#
+## Cleanup schedule
 # Initial delay in Hours
 mosip.hotlist.cleanup-schedule.init-delay=24
-
 #Fixed delay in which cleanup will be done in Hours
 mosip.hotlist.cleanup-schedule.fixed-rate=24
 
-#----------------------------------REST-services ----------------------------------------------------------#
-mosip.idrepo.audit.rest.uri=http://kernel-auditmanager-service/v1/auditmanager/audits
+## REST services
+mosip.idrepo.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
 mosip.idrepo.audit.rest.headers.mediaType=application/json
 
-mosip.hotlist.encryptor.rest.uri=http://kernel-keymanager-service/v1/keymanager/encrypt
+mosip.hotlist.encryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/encrypt
 mosip.hotlist.encryptor.rest.httpMethod=POST
 mosip.hotlist.encryptor.rest.headers.mediaType=application/json
 mosip.hotlist.encryptor.rest.timeout=100
 
-mosip.hotlist.decryptor.rest.uri=http://kernel-keymanager-service/v1/keymanager/decrypt
+mosip.hotlist.decryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/decrypt
 mosip.hotlist.decryptor.rest.httpMethod=POST
 mosip.hotlist.decryptor.rest.headers.mediaType=application/json
 mosip.hotlist.decryptor.rest.timeout=100
 
-#----------------------------------Kernel Retry Configurations --------------------------------------------#
+mosip.hotlist.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.hotlist.audit.rest.httpMethod=POST
+mosip.hotlist.audit.rest.headers.mediaType=application/json
+
+## Retry configs
 # The retry limit excluding the first attempt before attempting for retries. Default is set to 5.
 kernel.retry.attempts.limit=5
 # The initial interval to be used for exponential backoff in milli seconds. If the exponential backoff is disabled by setting 'kernel.retry.exponential.backoff.multiplier' value as 1, this initial interval will be used as the fixed backoff interval for every retries. Default value is 200 millisecs

From 6d6f9a4606c71c0eec85022273ba7f71dbe221cd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 2 Sep 2021 16:58:50 +0530
Subject: [PATCH 0232/1358] Properties modified for testing. Revert later.

---
 admin-default.properties | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 560dc348cba..afff909e674 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -181,8 +181,9 @@ mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
 mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
-mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
-#mosip.admin-services.open-id.login_flow.scope=cls
+tempuri=https://admin.v3box1.mosip.net
+#mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
+mosip.admin-services.redirecturi=${tempuri}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
@@ -201,7 +202,8 @@ mosip.security.secure-cookie=false
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
 mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
+#mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
+mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code

From e40ec92b758270085654d006ea339e2b94c80e05 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 14 Sep 2021 05:58:50 +0530
Subject: [PATCH 0233/1358] [MOSIP-16645] Updated.

---
 ...rocessor-camel-routes-activate-default.xml |  93 +--
 ...cessor-camel-routes-deactivate-default.xml | 123 ++--
 ...on-processor-camel-routes-lost-default.xml | 545 ++++++++------
 ...essor-camel-routes-res-reprint-default.xml | 103 ++-
 ...cessor-camel-routes-res-update-default.xml | 332 +++++----
 ...-processor-camel-routes-update-default.xml | 681 +++++++++++-------
 6 files changed, 1093 insertions(+), 784 deletions(-)

diff --git a/registration-processor-camel-routes-activate-default.xml b/registration-processor-camel-routes-activate-default.xml
index aaae157a867..28eb1ba4264 100644
--- a/registration-processor-camel-routes-activate-default.xml
+++ b/registration-processor-camel-routes-activate-default.xml
@@ -1,60 +1,37 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- securezone-notification to packet-uploader Route -->
-    <route id="securezone-notification-->packet-uploader activated route">
-        <from uri="eventbus:securezone-notification-activated-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader activated route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- Packet uploader to uin-generator Route -->
-    <route id="packet-uploader-->uin-generator activated route">
-        <from uri="eventbus:packet-uploader-activated-bus-out" />
-        <log
-            message="packet-uploader-->uin-generator activated route ${bodyAs(String)}" />
-        <choice>
-            <when>
-              <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-              <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- UIN Generator to Printing and Message Sender Route -->
-    <route id="uin-generation route-->printing-stage-->message-sender activated route">
-        <from uri="eventbus:uin-generator-activated-bus-out" />
-        <log
-            message="uin-generation-->printing-stage and message-sender-stage activated route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification activated route">
+      <from uri="eventbus://packet-receiver-activated-bus-out" />
+      <log message="packet-reciever-->securezone-notification activated-route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
 </routes>
diff --git a/registration-processor-camel-routes-deactivate-default.xml b/registration-processor-camel-routes-deactivate-default.xml
index 01aaba5c1f6..c46836dbe9d 100644
--- a/registration-processor-camel-routes-deactivate-default.xml
+++ b/registration-processor-camel-routes-deactivate-default.xml
@@ -1,59 +1,66 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <route id="securezone-notification-->packet-uploader deactivated route">
-        <from uri="eventbus:securezone-notification-deactivated-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader deactivated route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- Packet uploader to uin-generator Route -->
-    <route id="packet-uploader-->uin-generator deactivated route">
-        <from uri="eventbus:packet-uploader-deactivated-bus-out" />
-        <log
-            message="packet-uploader-->uin-generator deactivated route ${bodyAs(String)}" />
-        <choice>
-            <when>
-              <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-              <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- UIN Generator to Printing and Message Sender Route -->
-    <route id="uin-generation route-->printing-stage-->message-sender deactivated route">
-        <from uri="eventbus:uin-generator-deactivated-bus-out" />
-        <log
-            message="uin-generation-->printing-stage and message-sender-stage deactivated route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
+   <route id="securezone-notification-->packet-uploader deactivated route">
+      <from uri="eventbus://securezone-notification-deactivated-bus-out" />
+      <log message="securezone-notification-->packet-uploader deactivated route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- Packet uploader to uin-generator Route -->
+   <route id="packet-uploader-->uin-generator deactivated route">
+      <from uri="eventbus://packet-uploader-deactivated-bus-out" />
+      <log message="packet-uploader-->uin-generator deactivated route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="uin-generation route--> deactivated route">
+      <from uri="eventbus://uin-generator-deactivated-bus-out" />
+      <log message="uin-generation--> deactivated route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index 5e98ac12e38..f7de0a5fb73 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -1,217 +1,330 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- securezone-notification to packet-uploader Route -->
-    <route id="securezone-notification-->packet-uploader lost route">
-        <from uri="eventbus:securezone-notification-lost-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- packet-uploader to packet-validator Route -->
-    <route id="packet-uploader-->packet-validator lost route">
-        <from uri="eventbus:packet-uploader-lost-bus-out" />
-        <log
-                message="packet-uploader-->packet-validator lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- Packet Validator to Packet classifier Route -->
-    <route id="packet-validator-->packet-classifier lost route">
-        <from uri="eventbus:packet-validator-lost-bus-out" />
-        <log
-                message="packet-validator-->packet-classifier lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-classifier-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- Packet classifier to Quality Checker Route -->
-    <route id="packet-classifier-->quality-checker lost route">
-        <from uri="eventbus:packet-classifier-lost-bus-out" />
-        <log
-                message="packet-classifier-->quality-checker lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:quality-checker-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="quality-checker-->osi-validator lost route">
-        <from uri="eventbus:quality-checker-lost-bus-out" />
-        <log
-                message="quality-checker-->osi-validator lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:o-s-i-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="osi-validator-lost-->bio-dedupe lost route">
-        <from uri="eventbus:o-s-i-validator-lost-bus-out" />
-        <log
-                message="osi-validator-lost-->bio-dedupe lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="bio-dedupe-lost-->uin-generation lost route">
-        <from uri="eventbus:bio-dedupe-lost-bus-out" />
-        <log
-                message="bio-dedupe-->uin-generation lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-handler-bus-in"'</simple>
-                <to uri="eventbus:abis-handler-bus-in" />
-            </when>
-			<when>
-                <simple>${bodyAs(String)} contains '"address":"manual-verification-bus-in"'</simple>
-                <to uri="vertx:manual-verification-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-handler-->abis-middleware lost route">
-        <from uri="eventbus:abis-handler-lost-bus-out" />
-        <log
-                message="abis-handler-->abis-middleware lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-middle-ware-bus-in"'</simple>
-                <to uri="eventbus:abis-middle-ware-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"bio-dedupe-bus-in"'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in"/>
-            </when>
-        </choice>
-    </route>
-    <route id="uin-generation-lost-->message-sender-stage-->printing-stage lost route">
-        <from uri="eventbus:uin-generator-lost-bus-out" />
-        <log
-                message="uin-generation-lost-->message-sender-stage lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="manual-verification-lost-->uin-generation lost route">
-        <from uri="eventbus:manual-verification-lost-bus-out" />
-        <log
-                message="manual-verification-lost-->uin-generation lost route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-middleware route-->abis-handler lost route">
-        <from uri="eventbus:abis-middle-ware-lost-bus-out" />
-        <log message="abis-middleware route-->abis-handler lost route ${bodyAs(String)}" />
-        <to uri="eventbus:abis-handler-bus-in" />
-    </route>
-</routes>
+   <!-- securezone-notification to packet-uploader Route -->
+   <route id="securezone-notification-->packet-uploader lost route">
+      <from uri="eventbus://securezone-notification-lost-bus-out" />
+      <log message="securezone-notification-->packet-uploader lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- packet-uploader to packet-validator Route -->
+   <route id="packet-uploader-->packet-validator lost route">
+      <from uri="eventbus://packet-uploader-lost-bus-out" />
+      <log message="packet-uploader-->packet-validator lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- Packet Validator to Packet classifier Route -->
+   <route id="packet-validator-->packet-classifier lost route">
+      <from uri="eventbus://packet-validator-lost-bus-out" />
+      <log message="packet-validator-->packet-classifier lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- Packet classifier to Quality Classifier Route -->
+   <route id="packet-classifier-->quality-classifier lost route">
+      <from uri="eventbus://packet-classifier-lost-bus-out" />
+      <log message="packet-classifier-->quality-classifier lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://quality-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="quality-classifier-->cmd-validator lost route">
+      <from uri="eventbus://quality-classifier-lost-bus-out" />
+      <log message="quality-classifier-->cmd-validator lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
+            <to uri="eventbus://c-m-d-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="cmd-validator-->operator-validator lost route">
+      <from uri="eventbus://c-m-d-validator-lost-bus-out" />
+      <log message="cmd-validator-->operator-validator/supervisor-validator lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://operator-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="operator-validator-->supervisor-validator lost route">
+      <from uri="eventbus://operator-validator-lost-bus-out" />
+      <log message="operator-validator-->supervisor-validator/bio-dedupe lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="supervisor-validator-->bio-dedupe lost route">
+      <from uri="eventbus://supervisor-validator-lost-bus-out" />
+      <log message="supervisor-validator-->bio-dedupe lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="bio-dedupe-lost-->uin-generation lost route">
+      <from uri="eventbus://bio-dedupe-lost-bus-out" />
+      <log message="bio-dedupe-->uin-generation lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-verification-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-handler-->abis-middleware lost route">
+      <from uri="eventbus://abis-handler-lost-bus-out" />
+      <log message="abis-handler-->abis-middleware lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-middle-ware-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'bio-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </when>
+		 <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-middleware route-->abis-handler lost route">
+      <from uri="eventbus://abis-middle-ware-lost-bus-out" />
+      <log message="abis-middleware route-->abis-handler lost route ${bodyAs(String)}" />
+      <when>
+         <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+         <to uri="workflow-cmd://complete-as-failed" />
+      </when>
+      <when>
+         <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+         <to uri="workflow-cmd://mark-as-reprocess" />
+      </when>
+      <when>
+         <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+         <to uri="workflow-cmd://complete-as-failed" />
+      </when>
+      <otherwise>
+         <to uri="eventbus://abis-handler-bus-in" />
+      </otherwise>
+   </route>
+   <route id="manual-verification-lost-->uin-generation lost route">
+      <from uri="eventbus://manual-verification-lost-bus-out" />
+      <log message="manual-verification-lost-->uin-generation lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="uin-generation-lost-->printing-stage lost route">
+      <from uri="eventbus://uin-generator-lost-bus-out" />
+      <log message="uin-generation-lost-->printing-stage lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage--> lost route">
+      <from uri="eventbus://printing-lost-bus-out" />
+      <log message="printing-stage--> route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index 7628a247ff2..e8112afcc0e 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -1,40 +1,67 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- securezone-notification to packet-uploader Route -->
-    <route id="securezone-notification-->packet-uploader res_reprint route">
-        <from uri="eventbus:securezone-notification-res_reprint-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader res_reprint route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- packet-uploader to printing-stage Route -->
-    <route id="packet-uploader-->printing-stage res_reprint route">
-    <from uri="eventbus:packet-uploader-res_reprint-bus-out" />
-    <log
-            message="packet-uploader-->printing-stage res_reprint route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
+   <!-- securezone-notification to packet-uploader Route -->
+   <route id="securezone-notification-->packet-uploader res_reprint route">
+      <from uri="eventbus://securezone-notification-res_reprint-bus-out" />
+      <log message="securezone-notification-->packet-uploader res_reprint route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- packet-uploader to printing-stage Route -->
+   <route id="packet-uploader-->printing-stage res_reprint route">
+      <from uri="eventbus://packet-uploader-res_reprint-bus-out" />
+      <log message="packet-uploader-->printing-stage res_reprint route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage--> res_reprint route">
+      <from uri="eventbus://printing-res_reprint-bus-out" />
+      <log message="printing-stage--> route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
 </routes>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index c754531e86e..78673948a4b 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -1,145 +1,189 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- securezone-notification to packet-uploader Route -->
-    <route id="securezone-notification-->packet-uploader res_update route">
-        <from uri="eventbus:securezone-notification-res_update-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- packet-uploader to packet-validator Route -->
-    <route id="packet-uploader-->packet-validator res_update route">
-    <from uri="eventbus:packet-uploader-res_update-bus-out" />
-    <log
-            message="packet-uploader-->packet-validator res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="packet-validator-->demo-dedupe res_update route">
-        <from uri="eventbus:packet-validator-res_update-bus-out" />
-        <log
-                message="packet-validator-->demo-dedupe res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:demo-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="demo-dedupe-->uin-generation res_update route">
-        <from uri="eventbus:demo-dedupe-res_update-bus-out" />
-        <log
-            message="demo-dedupe-->uin-generation res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-handler-bus-in"'</simple>
-                <to uri="eventbus:abis-handler-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in"/>
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-handler-->abis-middleware res_update route">
-        <from uri="eventbus:abis-handler-res_update-bus-out" />
-        <log
-            message="abis-handler-->abis-middleware res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-middle-ware-bus-in"'</simple>
-                <to uri="eventbus:abis-middle-ware-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"demo-dedupe-bus-in"'</simple>
-                <to uri="eventbus:demo-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"bio-dedupe-bus-in"'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in"/>
-            </when>
-        </choice>
-    </route>
-    <route id="manual-verification-->uin-generation res_update route">
-        <from uri="eventbus:manual-verification-res_update-bus-out" />
-        <log
-            message="manual-verification-->uin-generation res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- UIN Generator to Printing and Message Sender Route -->
-    <route id="uin-generation route-->printing-stage-->message-sender res_update route">
-        <from uri="eventbus:uin-generator-res_update-bus-out" />
-        <log
-            message="uin-generation-->printing-stage and message-sender-stage res_update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-</routes>
+   <!-- securezone-notification to packet-uploader Route -->
+   <route id="securezone-notification-->packet-uploader res_update route">
+      <from uri="eventbus://securezone-notification-res_update-bus-out" />
+      <log message="securezone-notification-->packet-uploader res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- packet-uploader to packet-validator Route -->
+   <route id="packet-uploader-->packet-validator res_update route">
+      <from uri="eventbus://packet-uploader-res_update-bus-out" />
+      <log message="packet-uploader-->packet-validator res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-validator-->demo-dedupe res_update route">
+      <from uri="eventbus://packet-validator-res_update-bus-out" />
+      <log message="packet-validator-->demo-dedupe res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="demo-dedupe-->uin-generation res_update route">
+      <from uri="eventbus://demo-dedupe-res_update-bus-out" />
+      <log message="demo-dedupe-->uin-generation res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-handler-->abis-middleware res_update route">
+      <from uri="eventbus://abis-handler-res_update-bus-out" />
+      <log message="abis-handler-->abis-middleware res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-middle-ware-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'demo-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'bio-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </when>
+		 <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="manual-verification-->uin-generation res_update route">
+      <from uri="eventbus://manual-verification-res_update-bus-out" />
+      <log message="manual-verification-->uin-generation res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- UIN Generator to Printing Route -->
+   <route id="uin-generation route-->printing-stage res_update route">
+      <from uri="eventbus://uin-generator-res_update-bus-out" />
+      <log message="uin-generation-->printing-stage res_update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage--> res_update route">
+      <from uri="eventbus://printing-res_update-bus-out" />
+      <log message="printing-stage--> route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 2c21a1039ee..49e7e1d9264 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -1,271 +1,412 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
-    <!-- securezone-notification to packet-uploader Route -->
-    <route id="securezone-notification-->packet-uploader update route">
-        <from uri="eventbus:securezone-notification-update-bus-out" />
-        <log
-                message="securezone-notification-->packet-uploader update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-uploader-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- packet-uploader to packet-validator Route -->
-    <route id="packet-uploader-->packet-validator update route">
-    <from uri="eventbus:packet-uploader-update-bus-out" />
-    <log
-            message="packet-uploader-->packet-validator update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:packet-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- Packet Validator to Packet Classifier Route -->
-    <route id="packet-validator-->packet-classifier update route">
-        <from uri="eventbus:packet-validator-update-bus-out" />
-        <log
-            message="packet-validator-->packet-classifier update route ${bodyAs(String)}" />
-        <choice>
-              <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                   <to uri="eventbus:packet-classifier-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- Packet Classifier to Quality Checker Route -->
-    <route id="packet-classifier-->quality-checker update route">
-        <from uri="eventbus:packet-classifier-update-bus-out" />
-        <log
-            message="packet-classifier-->quality-checker update route ${bodyAs(String)}" />
-        <choice>
-              <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                   <to uri="eventbus:quality-checker-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="quality-checker-->osi-validator update route">
-        <from uri="eventbus:quality-checker-update-bus-out" />
-        <log
-            message="quality-checker-->osi-validator update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:o-s-i-validator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="osi-validator-->biometric-authentication-stage update route">
-        <from uri="eventbus:o-s-i-validator-update-bus-out" />
-        <log
-            message="osi-validator-->biometric-authentication-stage update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:biometric-authentication-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="biometric-authentication-stage-->demo-dedupe update route">
-        <from uri="eventbus:biometric-authentication-update-bus-out" />
-        <log
-                message="biometric-authentication-stage-->demo-dedupe update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:demo-dedupe-bus-in" />
-            </when>
-            <when>
-               <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-               <to uri="eventbus:message-sender-bus-in" />
-            </when>
-             <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="demo-dedupe-->bio-dedupe update update route">
-        <from uri="eventbus:demo-dedupe-update-bus-out" />
-        <log
-            message="demo-dedupe-->bio-dedupe update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-handler-bus-in"'</simple>
-                <to uri="eventbus:abis-handler-bus-in" />
-            </when>
-			<when>
-                <simple>${bodyAs(String)} contains '"address":"manual-verification-bus-in"'</simple>
-                <to uri="vertx:manual-verification-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in"/>
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-handler-->abis-middleware update route">
-        <from uri="eventbus:abis-handler-update-bus-out" />
-        <log
-            message="abis-handler-->abis-middleware update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-middle-ware-bus-in"'</simple>
-                <to uri="eventbus:abis-middle-ware-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"demo-dedupe-bus-in"'</simple>
-                <to uri="eventbus:demo-dedupe-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"bio-dedupe-bus-in"'</simple>
-                <to uri="eventbus:bio-dedupe-bus-in"/>
-            </when>
-        </choice>
-    </route>
-    <route id="bio-dedupe-->uin-generation update route">
-        <from uri="eventbus:bio-dedupe-update-bus-out" />
-        <log
-            message="bio-dedupe-->uin-generation update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"address":"abis-handler-bus-in"'</simple>
-                <to uri="eventbus:abis-handler-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="manual-verification-->uin-generation update route">
-        <from uri="eventbus:manual-verification-update-bus-out" />
-        <log
-            message="manual-verification-->uin-generation update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:uin-generator-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":false' and ${bodyAs(String)} contains '"internalError":false'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <!-- UIN Generator to Printing and Message Sender Route -->
-    <route id="uin-generation route-->printing-stage-->message-sender update route">
-        <from uri="eventbus:uin-generator-update-bus-out" />
-        <log
-            message="uin-generation-->printing-stage and message-sender-stage update route ${bodyAs(String)}" />
-        <choice>
-            <when>
-                <simple>${bodyAs(String)} contains '"isValid":true'</simple>
-                <to uri="eventbus:message-sender-bus-in" />
-                <to uri="eventbus:printing-bus-in" />
-            </when>
-            <when>
-                <simple>${bodyAs(String)} contains '"internalError":true'</simple>
-                <to uri="eventbus:retry-bus-in" />
-            </when>
-            <otherwise>
-                <to uri="eventbus:error-bus-in" />
-            </otherwise>
-        </choice>
-    </route>
-    <route id="abis-middleware route-->abis-handler update route">
-        <from uri="eventbus:abis-middle-ware-update-bus-out" />
-        <log
-            message="abis-middleware route-->abis-handler update route ${bodyAs(String)}" />
-           <to uri="eventbus:abis-handler-bus-in" />
-    </route>
-</routes>
+   <!-- securezone-notification to packet-uploader Route -->
+   <route id="securezone-notification-->packet-uploader update route">
+      <from uri="eventbus://securezone-notification-update-bus-out" />
+      <log message="securezone-notification-->packet-uploader update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- packet-uploader to packet-validator Route -->
+   <route id="packet-uploader-->packet-validator update route">
+      <from uri="eventbus://packet-uploader-update-bus-out" />
+      <log message="packet-uploader-->packet-validator update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- Packet Validator to Packet Classifier Route -->
+   <route id="packet-validator-->packet-classifier update route">
+      <from uri="eventbus://packet-validator-update-bus-out" />
+      <log message="packet-validator-->packet-classifier update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- Packet Classifier to Quality Classifier Route -->
+   <route id="packet-classifier-->quality-classifier update route">
+      <from uri="eventbus://packet-classifier-update-bus-out" />
+      <log message="packet-classifier-->quality-classifier update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://quality-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="quality-classifier-->cmd-validator update route">
+      <from uri="eventbus://quality-classifier-update-bus-out" />
+      <log message="quality-classifier-->cmd-validator update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
+            <to uri="eventbus://c-m-d-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="cmd-validator-->operator-validator update route">
+      <from uri="eventbus://c-m-d-validator-update-bus-out" />
+      <log message="cmd-validator-->operator-validator/supervisor-validator update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://operator-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="operator-validator-->supervisor-validator update route">
+      <from uri="eventbus://operator-validator-update-bus-out" />
+      <log message="operator-validator-->supervisor-validator/introducer-validator/biometric-authentication-stage update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-authentication-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="supervisor-validator-->introducer-validator update route">
+      <from uri="eventbus://supervisor-validator-update-bus-out" />
+      <log message="supervisor-validator-->introducer-validator/biometric-authentication-stage update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-authentication-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="introducer-validator-->biometric-authentication-stage update route">
+      <from uri="eventbus://introducer-validator-update-bus-out" />
+      <log message="introducer-validator-->biometric-authentication-stage update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-authentication-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="biometric-authentication-stage-->demo-dedupe update route">
+      <from uri="eventbus://biometric-authentication-update-bus-out" />
+      <log message="biometric-authentication-stage-->demo-dedupe update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="demo-dedupe-->bio-dedupe update update route">
+      <from uri="eventbus://demo-dedupe-update-bus-out" />
+      <log message="demo-dedupe-->bio-dedupe update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-verification-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-handler-->abis-middleware update route">
+      <from uri="eventbus://abis-handler-update-bus-out" />
+      <log message="abis-handler-->abis-middleware update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-middle-ware-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'demo-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'bio-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </when>
+		 <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="bio-dedupe-->uin-generation update route">
+      <from uri="eventbus://bio-dedupe-update-bus-out" />
+      <log message="bio-dedupe-->uin-generation update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-middleware route-->abis-handler update route">
+      <from uri="eventbus://abis-middle-ware-update-bus-out" />
+      <log message="abis-middleware route-->abis-handler update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="manual-verification-->uin-generation update route">
+      <from uri="eventbus://manual-verification-update-bus-out" />
+      <log message="manual-verification-->uin-generation update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- UIN Generator to Printing Route -->
+   <route id="uin-generation route-->printing-stage update route">
+      <from uri="eventbus://uin-generator-update-bus-out" />
+      <log message="uin-generation-->printing-stage update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage--> update route">
+      <from uri="eventbus://printing-update-bus-out" />
+      <log message="printing-stage--> route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file

From 8af47f7238ef451e0f49f039cf9bb5c713c6c667 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 22 Sep 2021 06:01:58 +0530
Subject: [PATCH 0234/1358] [MOSIP-15428] Prereg property restored.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 641d722be38..d52f8299c0d 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -273,7 +273,7 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 
 ## Syncdata service
 latestidschema.service.contextpath=latestidschemafetch the latest ID Schema for the ID object validator
-mosip.preregistration.id-schema=http://masterdata.kernel/v1/masterdata/idschema/latest
+mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
 syncdata.resource.url=http://syncdata.kernel/v1/syncdata
 
 ## OTP 

From c6a864093855bcbee9aabf7bcb98867c622af9ef Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 29 Sep 2021 15:02:21 +0530
Subject: [PATCH 0235/1358] [MOSIP-17836] Changes for 1.2.0-rc2

---
 kernel-default.properties | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 7b33a272cd0..c735de5fade 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -32,7 +32,7 @@ mosip.kernel.sms.enabled=false
 mosip.kernel.sms.country.code=91
 mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
-mosip.kernel.sms.gateway=gateway
+mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
 mosip.kernel.sms.api=smsapi
 mosip.kernel.sms.authkey=authkey
@@ -431,8 +431,15 @@ mosip.kernel.masterdata.auth-user-details=/userdetails
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
 
-#scheduler do it's job at 2am
+## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=200
+
+# masterdata swagger openApi
+openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
+openapi.masterdata.servers[0].description=Admin Masterdata url
+#To fetch user details based on user id and user name in zone API's 
+zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
 ## Admin roles
 mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN

From ca15b703a42ff6b6a7c7c9751fb60fd117a21a20 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 12:21:25 +0530
Subject: [PATCH 0236/1358] Correction to property name.

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index bd8392a73f6..190a8f798ff 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -13,7 +13,7 @@ mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
 mosip.event.callBackUrl=http://print-service.print/v1/print/print/callback/notifyPrint
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
-osip.event.secret=${print.websub.hub.secret}
+mosip.event.secret=${print.websub.hub.secret}
 csrf.disabled=true
 mosip.event.delay=120000
 print-websub-resubscription-delay-secs=43200

From 8973ebc0bd7a2f6cb246667c2f0953cea93b02f8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 13:22:09 +0530
Subject: [PATCH 0237/1358] Roles updated.

---
 pre-registration-default.properties | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index d52f8299c0d..c9e53010b04 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -433,14 +433,14 @@ object.store.s3.use.account.as.bucketname=true
 spring.cache.type=none
 
 ## Roles
-mosip.role.prereg.postapplications=INDIVIDUAL
-mosip.role.prereg.putapplications=INDIVIDUAL
-mosip.role.prereg.getapplications=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-mosip.role.prereg.putapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.putapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getapplications=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.prereg.putapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.getapplicationsall=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-mosip.role.prereg.getapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-mosip.role.prereg.deleteapplications=INDIVIDUAL
-mosip.role.prereg.postapplicationsupdatedtime=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.prereg.deleteapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postapplicationsupdatedtime=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.prereg.getapplicationsconfig=INDIVIDUAL
 mosip.role.prereg.getapplicationsinfo=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postlogaudit=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
@@ -449,16 +449,16 @@ mosip.role.prereg.putdocumentspreregistrationid=INDIVIDUAL
 mosip.role.prereg.getdocumentsdocumentid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
 mosip.role.prereg.getdocumentspreregistrationid=REGISTRATION_OFFICER,INDIVIDUAL
 mosip.role.prereg.deletedocumentsdocumentid=INDIVIDUAL
-mosip.role.prereg.deletedocumentspreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
-mosip.role.prereg.putdocumentsdocumentid=INDIVIDUAL
+mosip.role.prereg.deletedocumentspreregistrationid=INDIVIDUAL
+mosip.role.prereg.putdocumentsdocumentid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postqrcodegenerate=INDIVIDUAL
 mosip.role.prereg.getrefreshconfig=PRE_REGISTRATION_ADMIN
-mosip.role.prereg.postnotificationnotify=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
-mosip.role.prereg.postnotification=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.postnotificationnotify=INDIVIDUAL,PRE_REGISTRATION_ADMIN
+mosip.role.prereg.postnotification=INDIVIDUAL,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.posttransliterationtransliterate=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
 mosip.role.prereg.getuispeclatest=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
 mosip.role.prereg.getuispecall=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
-mosip.role.prereg.postpreregsync=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-mosip.role.prereg.getsyncpreregistrationid=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-mosip.role.prereg.getsyncpreregistrationidmachineid=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-mosip.role.prereg.postsyncconsumedpreregids=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postpreregsync=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getsyncpreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getsyncpreregistrationidmachineid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.postsyncconsumedpreregids=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,REGISTRATION_PROCESSOR

From fca866fac1654713cb2669dcdb39e3ea62a75ef7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 16:04:07 +0530
Subject: [PATCH 0238/1358] Roles updated.

---
 kernel-default.properties | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index c735de5fade..17eba9d52c3 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -441,7 +441,10 @@ openapi.masterdata.servers[0].description=Admin Masterdata url
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
-## Admin roles
+
+## Roles
+#mosip.role.admin.masterdata.postgetapplicanttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,REGISTRATION_SUPERVISOR,PRE_REGISTRATION,REGISTRATION_OFFICER
+#mosip.role.admin.masterdata.getapplicanttypeapplicantidlanguages=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -513,6 +516,7 @@ mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADM
 mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 #mosip.role.admin.masterdata.getdocumenttypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 #mosip.role.admin.masterdata.getdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,INDIVIDUAL,Default
 #mosip.role.admin.masterdata.getdistinct=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN,Default
 mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -540,7 +544,7 @@ mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 
 mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
 mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -626,8 +630,8 @@ mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZO
 mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
 
-mosip.role.admin.masterdata.postpacketresume=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postpacketsearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postpacketresume=GLOBAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postpacketsearch=GLOBAL_ADMIN,REGISTRATION_ADMIN
 
 mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
 
@@ -683,9 +687,9 @@ mosip.role.admin.masterdata.getidschemalatest=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRAT
 #mosip.role.admin.masterdata.gettemplateslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
 #mosip.role.admin.masterdata.gettemplateslangcodetemplatetypecode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
 mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
+mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.gettemplatesall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -753,10 +757,16 @@ mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneuserhistoryuserid=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
 mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
+
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+
+#Adding the property files of commons-kernel-key manager service.
 
-## Kernel roles
 mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
@@ -792,3 +802,8 @@ mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,R
 mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postzkreencryptrandomkey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT

From b9c73cbfc0fc617b84bffab81f28e843513c2c4d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 16:29:09 +0530
Subject: [PATCH 0239/1358] Websub, applicanttype updated.

---
 applicanttype.mvel               | 241 +++++++++++++++++++------------
 websub-consolidator-default.toml |  23 +++
 websub-service-default.toml      |  48 ++++++
 websub.conf                      |  31 ----
 4 files changed, 216 insertions(+), 127 deletions(-)
 create mode 100644 websub-consolidator-default.toml
 create mode 100644 websub-service-default.toml
 delete mode 100644 websub.conf

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 309c6c25c34..a27065c5e4a 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -1,96 +1,145 @@
-def getApplicantType(map,a) {
-                 import java.time.LocalDate;
-                 import java.time.LocalDateTime;
-                 import java.time.format.DateTimeFormatter;
-                 import java.time.Period;
-                 import java.util.List;
-                //String itc = null;
-                String dob = null;
-                String genderType = null;
-                boolean isBioExPresent = false;
-                String NonResident = "FR";
-                String Resident = "NFR";
-                String MALE = "MLE";
-                String FEMALE = "FLE";
-                String Others = "OTH";
-                String CHILD = "CHL";
-                String ADULT = "ADL";
-             // String ATTR_INDIVIDUAL_TYPE = "residenceStatus";
-                String ATTR_DATE_OF_BIRTH = "dateOfBirth";
-                String ATTR_GENDER_TYPE = "gender";
-                String ATTR_BIOMETRIC_EXCEPTION_TYPE = "biometricAvailable";
-                String UTC_DATETIME_PATTERN = "yyyy/MM/dd";
-              //itc= (String)((List) map[ATTR_INDIVIDUAL_TYPE]).get(0).value;
-
-                dob= (String) map[ATTR_DATE_OF_BIRTH];
-                if(dob == empty || dob == null ){
-               return "KER-MSD-147";
-             }
-                int age = -1;
-                LocalDate currentDate = LocalDate.now();
-                LocalDate birthDate = LocalDate.parse(dob, DateTimeFormatter.ofPattern(UTC_DATETIME_PATTERN));
-                if (birthDate != null && currentDate != null && !birthDate.isAfter(currentDate)) {
-                        age = Period.between(birthDate, currentDate).getYears();
-                }
-                else{
-                   return age;
-                   }
-                genderType= (String) ((List) map[ATTR_GENDER_TYPE]).get(0).value;
-                isBioExPresent =(Boolean)map[ATTR_BIOMETRIC_EXCEPTION_TYPE];
-                if (((dob == -1 ) && (genderType == empty || genderType == null ) && (isBioExPresent == empty || isBioExPresent == null)))
-          return "KER-MSD-147";
-        if(age >= agelimit)
-           ageCode=ADULT;
-        else if( age >= 0 && age < agelimit)
-           ageCode=CHILD;
-                if ( genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "A001";
-                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "A002";
-                } else if (genderType == MALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "A003";
-                } else if (genderType == MALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "A004";
-                } else if ( genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "A005";
-                } else if ( genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "A006";
-                } else if (genderType == FEMALE && ageCode == CHILD && !isBioExPresent ) {
-                        return "A007";
-                } else if (genderType == FEMALE && ageCode == ADULT && !isBioExPresent ) {
-                        return "A008";
-                } else if ( genderType == Others && ageCode == CHILD && !isBioExPresent ) {
-                        return "A005";
-                } else if ( genderType == Others && ageCode == ADULT && !isBioExPresent ) {
-                        return "A006";
-                } else if (genderType == Others && ageCode == CHILD && !isBioExPresent ) {
-                        return "A007";
-                } else if (genderType == Others && ageCode == ADULT && !isBioExPresent ) {
-                        return "A008";
-                } else if ( genderType == MALE && ageCode == CHILD && isBioExPresent ) {
-                        return "A009";
-                } else if ( genderType == MALE && ageCode == ADULT && isBioExPresent ) {
-                        return "A010";
-                } else if (genderType == MALE && ageCode == CHILD && isBioExPresent ) {
-                        return "A011";
-                } else if (genderType == MALE && ageCode == ADULT && isBioExPresent ) {
-                        return "A012";
-                } else if ( genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
-                        return "A013";
-                } else if ( genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
-                        return "A014";
-                } else if (genderType == FEMALE && ageCode == CHILD && isBioExPresent ) {
-                        return "A015";
-                } else if (genderType == FEMALE && ageCode == ADULT && isBioExPresent ) {
-                        return "A016";
-                } else if ( genderType == Others && ageCode == CHILD && isBioExPresent ) {
-                        return "A013";
-                } else if ( genderType == Others && ageCode == ADULT && isBioExPresent ) {
-                        return "A014";
-                } else if (genderType == Others && ageCode == CHILD && isBioExPresent ) {
-                        return "A015";
-                } else if (genderType == Others && ageCode == ADULT && isBioExPresent ) {
-                        return "A016";
-                }
-                return null;
-};
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.Period;
+import java.util.List;
+import java.time.ZoneId;
+import java.time.temporal.ValueRange;
+
+String CHILD = "INFANT";
+String MINOR = "MINOR";
+String ADULT = "ADULT";
+String MALE = 'MLE';
+String FEMALE = 'FLE';
+String NonResident = "FR";
+String Resident = "NFR";
+String Others = "OTH";
+String DATE_PATTERN = "yyyy/MM/dd";
+
+def isUpdateFlow(identity) {
+  Object val = identity.get('_flow');
+  if(val != null) {
+    return ((String)val).equals('Update') ? true : false;
+  }
+
+  val = identity.getOrDefault('isUpdate', false);
+  return val == null ? false : (Boolean) val;  
+}
+
+def getResidenceStatus(identity) {
+    if(identity.containsKey('residenceStatusCode')) {
+        return identity.getOrDefault('residenceStatusCode', null);
+    }
+
+    if(identity.containsKey('residenceStatus')) {
+        Object val = identity.getOrDefault('residenceStatus', null);
+        return val == null ? null :
+            (val instanceof String ? ; (String)val : (String) ((List)val).get(0).value);
+    }
+
+    return null;
+}
+
+def getGenderType(identity) {
+    if(identity.containsKey('genderCode')) {
+        return identity.getOrDefault('genderCode', null);
+    }
+
+    if(identity.containsKey('gender')) {
+        Object val = identity.getOrDefault('gender', null);
+        return val == null ? null :
+            (val instanceof String ? ; (String)val : (String) ((List)val).get(0).value);
+    }
+
+    return null;
+}
+
+def getAgeCode(identity) {
+    if(ageGroups == null || !identity.containsKey('dateOfBirth'))
+        return null;
+
+    String dob = identity.get('dateOfBirth');
+    LocalDate date = LocalDate.parse(dob, DateTimeFormatter.ofPattern(DATE_PATTERN));
+    LocalDate currentDate = LocalDate.now(ZoneId.of("UTC"));
+     int  ageInYears = -1;
+     if (!date.isAfter(currentDate)) {
+         ageInYears = Period.between(date, currentDate).getYears();
+    } else {
+            return "KER-MSD-151";
+     }
+    String ageGroup = null;
+    for(String groupName : ageGroups.keySet()) {
+        String[] range = ((String)ageGroups.get(groupName)).split('-');
+        if(ValueRange.of(Long.valueOf(range[0]), Long.valueOf(range[1])).isValidIntValue(ageInYears)) {
+            ageGroup = groupName;
+        }
+    }
+
+   return ageGroup;
+}
+
+
+def getBioExceptionFlag(identity) {
+    return identity.containsKey('isBioException') ? (Boolean) identity.get('isBioException') : false;
+}
+
+def getApplicantType() {
+  String itc = getResidenceStatus(identity);
+  String genderType = getGenderType(identity);
+  String ageCode = getAgeCode(identity);
+  boolean isBioExPresent = getBioExceptionFlag(identity);
+
+  if(itc == null || genderType == null || ageCode == null)
+    return isUpdateFlow(identity) ? "000" : "KER-MSD-147";
+
+  if (itc == NonResident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+    return "001";
+  } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
+    return "002";
+  } else if (itc == Resident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+    return "003";
+  } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
+    return "004";
+  } else if (itc == NonResident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+    return "005";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
+    return "006";
+  } else if (itc == Resident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+    return "007";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
+    return "008";
+  } else if (itc == NonResident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+    return "005";
+  } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
+    return "006";
+  } else if (itc == Resident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+    return "007";
+  } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
+    return "008";
+  } else if (itc == NonResident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+    return "009";
+  } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
+    return "010";
+  } else if (itc == Resident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+    return "011";
+  } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
+    return "012";
+  } else if (itc == NonResident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+    return "013";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+    return "015";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
+    return "016";
+  } else if (itc == NonResident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+    return "013";
+  } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+    return "015";
+  } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
+    return "016";
+  }
+  return "000";
+}
diff --git a/websub-consolidator-default.toml b/websub-consolidator-default.toml
new file mode 100644
index 00000000000..dcccde82d82
--- /dev/null
+++ b/websub-consolidator-default.toml
@@ -0,0 +1,23 @@
+[consolidatorService.config]
+# IP and Port of the Kafka bootstrap node
+KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
+
+# Kafka topic which will get notified for websub topic registration/deregistration
+# All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration
+REGISTERED_WEBSUB_TOPICS_TOPIC = "registered-websub-topics"
+
+# Kafka topic which stores consolidated websub topics for the hub
+CONSOLIDATED_WEBSUB_TOPICS_TOPIC = "consolidated-websub-topics"
+
+# Kafka topic which will get notified for websub subscription/unsubscription
+# All the hubs must be pointed to the same Kafka topic to notify websub subscription/unsubscription
+WEBSUB_SUBSCRIBERS_TOPIC = "registered-websub-subscribers"
+
+# Kafka topic which is stores consolidated websub subscribers for this server
+CONSOLIDATED_WEBSUB_SUBSCRIBERS_TOPIC = "consolidated-websub-subscribers"
+
+# The interval in which Kafka consumers wait for new messages
+POLLING_INTERVAL = 10.0
+
+# The period in which Kafka close method waits to complete
+GRACEFUL_CLOSE_PERIOD = 5.0
diff --git a/websub-service-default.toml b/websub-service-default.toml
new file mode 100644
index 00000000000..b5b3398c836
--- /dev/null
+++ b/websub-service-default.toml
@@ -0,0 +1,48 @@
+[kafkaHub.config]
+# Flag to check whether to enable/disable security
+SECURITY_ON = false
+
+# Server ID is is used to uniquely identify each server
+# Each server must have a unique ID
+SERVER_ID = "server-1"
+
+# IP and Port of the Kafka bootstrap node
+KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
+
+# Kafka topic which will get notified for websub topic registration/deregistration
+# All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration
+REGISTERED_WEBSUB_TOPICS_TOPIC = "registered-websub-topics"
+
+# Kafka topic which stores consolidated websub topics for the hub
+CONSOLIDATED_WEBSUB_TOPICS_TOPIC = "consolidated-websub-topics"
+
+# Kafka topic which will get notified for websub subscription/unsubscription
+# All the hubs must be pointed to the same Kafka topic to notify websub subscription/unsubscription
+WEBSUB_SUBSCRIBERS_TOPIC = "registered-websub-subscribers"
+
+# Kafka topic which is stores consolidated websub subscribers for this server
+CONSOLIDATED_WEBSUB_SUBSCRIBERS_TOPIC = "consolidated-websub-subscribers"
+
+# The interval in which Kafka consumers wait for new messages
+POLLING_INTERVAL = 10.0
+
+# The period in which Kafka close method waits to complete
+GRACEFUL_CLOSE_PERIOD = 5.0
+
+# The port that is used to start the hub
+HUB_PORT = 9191
+
+# The period between retry requests
+MESSAGE_DELIVERY_RETRY_INTERVAL = 3.0
+
+# The maximum retry count
+MESSAGE_DELIVERY_COUNT = 3
+
+# The message delivery timeout
+MESSAGE_DELIVERY_TIMEOUT = 10.0
+
+# The base URL of IDP
+MOSIP_AUTH_BASE_URL = "https://host/"
+
+# The token validation URL of IDP
+MOSIP_AUTH_VALIDATE_TOKEN_URL = "https://host/oauth2/token"
diff --git a/websub.conf b/websub.conf
deleted file mode 100644
index 52637511975..00000000000
--- a/websub.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-
-[b7a.jdbc.pool]
-maximumPoolSize=250
-
-[mosip.hub]
-datasource-url="jdbc:postgresql://postgres-postgresql.postgres:5432/mosip_websub"
-datasource-username="websubuser"
-datasource-password="${db.dbuser.password}"
-port=9191
-retry_count=0
-retry_interval=5
-retry_backoff_factor=1.0
-retry_max_wait_interval=6000
-restart_republish_time_offset="2021-07-08T06:39:00.000Z"
-restart_republish_time_limit=59
-
-[mosip.hub.cron-task.unsent-messages-republish]
-enable=false
-seconds="0"
-minutes="0/1"
-hours="*"
-days-of-month="?"
-months="*"
-days-of-week="*"
-year="*"
-
-[mosip.auth]
-base_url="http://authmanager.kernel/v1/authmanager"
-validate_token_url="/authorize/admin/validateToken"
-filter_disable=true
-

From d63d4d4b34278340d90db4085c136a3b5261ebd6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 17:07:23 +0530
Subject: [PATCH 0240/1358] Applicant type updated - prefix added.

---
 applicanttype.mvel | 52 +++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index a27065c5e4a..37839f68830 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -90,56 +90,56 @@ def getApplicantType() {
   boolean isBioExPresent = getBioExceptionFlag(identity);
 
   if(itc == null || genderType == null || ageCode == null)
-    return isUpdateFlow(identity) ? "000" : "KER-MSD-147";
+    return isUpdateFlow(identity) ? "A000" : "KER-MSD-147";
 
   if (itc == NonResident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
-    return "001";
+    return "A001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "002";
+    return "A002";
   } else if (itc == Resident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
-    return "003";
+    return "A003";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "004";
+    return "A004";
   } else if (itc == NonResident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
-    return "005";
+    return "A005";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "006";
+    return "A006";
   } else if (itc == Resident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
-    return "007";
+    return "A007";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "008";
+    return "A008";
   } else if (itc == NonResident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
-    return "005";
+    return "A005";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "006";
+    return "A006";
   } else if (itc == Resident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
-    return "007";
+    return "A007";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "008";
+    return "A008";
   } else if (itc == NonResident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
-    return "009";
+    return "A009";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "010";
+    return "A010";
   } else if (itc == Resident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
-    return "011";
+    return "A011";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "012";
+    return "A012";
   } else if (itc == NonResident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
-    return "013";
+    return "A013";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
-    return "015";
+    return "A015";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "016";
+    return "A016";
   } else if (itc == NonResident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
-    return "013";
+    return "A013";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
-    return "015";
+    return "A015";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "016";
+    return "A016";
   }
-  return "000";
+  return "A000";
 }

From 506e4110f15ad8e9c79b5969e2244ba1eecf48ae Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 18:51:20 +0530
Subject: [PATCH 0241/1358] Prereg props updated.

---
 pre-registration-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c9e53010b04..41571421a45 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -432,6 +432,11 @@ object.store.s3.use.account.as.bucketname=true
 ## Spring cache
 spring.cache.type=none
 
+mosip.preregistration.appointment.getavailablity.url=http://prereg-booking.prereg/preregistration/v1/appointment/availability/{registrationCenterId}
+mosip.preregistration.appointment.book.url=http://prereg-booking.prereg/preregistration/v1/appointment/{preRegistrationId}
+mosip.preregistration.appointment.multi.book.url=http://prereg-booking.prereg/preregistration/v1/appointment
+
+
 ## Roles
 mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.putapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN

From ccf98b05d856918ff04696dce88c115539f4f7a6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 18:53:28 +0530
Subject: [PATCH 0242/1358] Prereg props updated.

---
 pre-registration-default.properties | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 41571421a45..a908f5f68a4 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -436,6 +436,13 @@ mosip.preregistration.appointment.getavailablity.url=http://prereg-booking.prere
 mosip.preregistration.appointment.book.url=http://prereg-booking.prereg/preregistration/v1/appointment/{preRegistrationId}
 mosip.preregistration.appointment.multi.book.url=http://prereg-booking.prereg/preregistration/v1/appointment
 
+mosip.preregistration.applications.status.get = mosip.preregistration.applications.status
+mosip.preregistration.applications.details.get = mosip.preregistration.applications.detail.info
+
+mosip.preregistration.uispec.latest=mosip.preregistration.uispec.latest
+mosip.preregistration.uispec.all=mosip.preregistration.uispec.all
+
+preregistration.cookie.contextpath=/
 
 ## Roles
 mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN

From c49c00da1e3f7cf741fd9f0ceab36513342ed874 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 22:15:45 +0530
Subject: [PATCH 0243/1358] [MOSIP-17836] Updated for 1.2.0-rc2

---
 application-default.properties |  5 +-
 identity-mapping.json          | 87 ++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 identity-mapping.json

diff --git a/application-default.properties b/application-default.properties
index 320392524c7..21eba034700 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -377,5 +377,8 @@ mosip.max-languages.count=2
 # These are default languages used for sending notifications
 mosip.default.template-languages=eng,ara
 
-#Config key to pick the preferred language for communicating to the Resident
+# Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
+
+# Path to identity mapping json file
+mosip.identity.mapping-file=${mosip.kernel.xsdstorage-uri}/identity-mapping.json
diff --git a/identity-mapping.json b/identity-mapping.json
new file mode 100644
index 00000000000..dd54babc19b
--- /dev/null
+++ b/identity-mapping.json
@@ -0,0 +1,87 @@
+{
+    "identity": {
+        "IDSchemaVersion": {
+            "value": "IDSchemaVersion"
+        },
+        "name": {
+            "value": "fullName"
+        },
+        "gender": {
+            "value": "gender"
+        },
+        "dob": {
+            "value": "dateOfBirth"
+        },
+        "age": {
+            "value": "age"
+        },
+        "introducerRID": {
+            "value": "introducerRID"
+        },
+        "introducerUIN": {
+            "value": "introducerUIN"
+        },
+        "introducerVID": {
+            "value": "introducerVID"
+        },
+        "introducerName": {
+            "value": "introducerName"
+        },
+        "phone": {
+            "value": "phone"
+        },
+        "email": {
+            "value": "email"
+        },
+        "uin": {
+            "value": "UIN"
+        },
+        "individualBiometrics": {
+            "value": "individualBiometrics"
+        },
+        "introducerBiometrics": {
+            "value": "introducerBiometrics"
+        },
+        "individualAuthBiometrics": {
+            "value": "individualAuthBiometrics"
+        },
+        "officerBiometricFileName": {
+            "value": "officerBiometricFileName"
+        },
+        "supervisorBiometricFileName": {
+            "value": "supervisorBiometricFileName"
+        },
+        "residenceStatus": {
+            "value": "residenceStatus"
+        },
+        "preferredLanguage": {
+            "value": "preferredLang"
+        },
+        "locationHierarchyForProfiling": {
+            "value": "zone,postalCode"
+        }
+    },
+    "metaInfo": {
+        "value": "metaInfo"
+    },
+    "audits": {
+        "value": "audits"
+    },
+    "documents": {
+        "poa": {
+            "value": "proofOfAddress"
+        },
+        "poi": {
+            "value": "proofOfIdentity"
+        },
+        "por": {
+            "value": "proofOfRelationship"
+        },
+        "pob": {
+            "value": "proofOfDateOfBirth"
+        },
+        "poe": {
+            "value": "proofOfException"
+        }
+    }
+}

From 9d0f5c47ca3a083b9a599b9951ef88d3d4b4f0bf Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 22:42:04 +0530
Subject: [PATCH 0244/1358] Websub filenames updated.

---
 websub-consolidator-default.toml => websub-consolidator.toml | 0
 websub-service-default.toml => websub-service.toml           | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename websub-consolidator-default.toml => websub-consolidator.toml (100%)
 rename websub-service-default.toml => websub-service.toml (100%)

diff --git a/websub-consolidator-default.toml b/websub-consolidator.toml
similarity index 100%
rename from websub-consolidator-default.toml
rename to websub-consolidator.toml
diff --git a/websub-service-default.toml b/websub-service.toml
similarity index 100%
rename from websub-service-default.toml
rename to websub-service.toml

From 36e331086938e66657f097acf9a6c0ed1c25c270 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 30 Sep 2021 23:02:19 +0530
Subject: [PATCH 0245/1358] Websub urls corrected.

---
 application-default.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 21eba034700..1993c6c327e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -364,9 +364,8 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
 ## Websub (internal url)
 websub.base.url=http://websub.websub
-websub.hub.url=${websub.base.url}/websub/hub
-websub.publish.url=${websub.base.url}/websub/publish
-websub.failed.messages.sync.url=${websub.base.url}/websub/sync/failedmessage
+websub.hub.url=${websub.base.url}/hub
+websub.publish.url=${websub.base.url}/hub
 
 mosip.mandatory-languages=eng,fra
 ## Leave blank if no optional langauges

From b3761bf388430320ae92747600977f439cc55bae Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 11:19:57 +0530
Subject: [PATCH 0246/1358] Minor update.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 1993c6c327e..4b59a2b910f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -364,8 +364,8 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
 ## Websub (internal url)
 websub.base.url=http://websub.websub
-websub.hub.url=${websub.base.url}/hub
-websub.publish.url=${websub.base.url}/hub
+websub.hub.url=${websub.base.url}/hub/
+websub.publish.url=${websub.base.url}/hub/
 
 mosip.mandatory-languages=eng,fra
 ## Leave blank if no optional langauges

From 3ec8615b9f36ed357ca11c59fb9f2d3d710de283 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 12:23:50 +0530
Subject: [PATCH 0247/1358] [MOSIP-17836] Missing prop added.

---
 registration-processor-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1920c1aee44..b21a658bb76 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -441,6 +441,9 @@ mosip.regproc.packet.receiver.eventbus.port=5711
 # Flag to disable the copying of tags from the packet manger to the message event
 mosip.regproc.packet.receiver.message.tag.loading.disable=true
 
+#Event bus address for anonymous profile
+mosip.anonymous.profile.eventbus.address=anonymous-profile-bus-in
+
 #camel-bridge
 mosip.regproc.camel.bridge.eventbus.kafka.commit.type=single
 mosip.regproc.camel.bridge.eventbus.kafka.max.poll.records=100

From b74313f0d2e60ddf95387e18e02917d5325da81f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 12:36:42 +0530
Subject: [PATCH 0248/1358] Updated.

---
 registration-processor-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b21a658bb76..9df71252b0c 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -587,7 +587,9 @@ mosip.regproc.abis.handler.message.expiry-time-limit=${mosip.regproc.common.stag
 mosip.regproc.abis.handler.server.port=9071
 mosip.regproc.abis.handler.eventbus.port=5726
 mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
-mosip.regproc.abis.handler.biometric-modalities-segments-mapping={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping.INFANT={'Face':{'Face'}}
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping.MINOR={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye','Face' : 'face'}
 
 #bio-dedupe-stage

From e9f0224e731f44f2287c072de3c23997f7cea05c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 12:40:16 +0530
Subject: [PATCH 0249/1358] Updated.

---
 registration-processor-default.properties | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 9df71252b0c..e972795b2e2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -632,6 +632,27 @@ mosip.regproc.abis.middleware.server.port=8091
 mosip.regproc.abis.middleware.eventbus.port=5888
 mosip.regproc.abis.middleware.server.servlet.path=/registrationprocessor/v1/abismiddleware
 
+# Biometric extraction stage
+mosip.regproc.biometric.extraction.eventbus.kafka.commit.type=single
+mosip.regproc.biometric.extraction.eventbus.kafka.max.poll.records=100
+mosip.regproc.biometric.extraction.eventbus.kafka.poll.frequency=100
+mosip.regproc.biometric.extraction.eventbus.kafka.group.id=biometric-extraction-stage
+biometric.extraction.default.partner.policy.ids=[{'partnerId':'mpartner-default-auth','policyId':'mpolicy-default-auth'},{'partnerId':'mpartner-default-print','policyId':'mpolicy-default-print'},{'partnerId':'mpartner-default-print','policyId':'mpolicy-default-qrcode'},{'partnerId':'mpartner-default-print','policyId':'mpolicy-default-euin'}]
+mosip.regproc.biometric.extraction.server.port=9181
+mosip.regproc.biometric.extraction.eventbus.port=5727
+mosip.regproc.biometric.extraction.server.servlet.path=/registrationprocessor/v1/biometricextraction
+mosip.regproc.biometric.extraction.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+
+## Finalization stage
+mosip.regproc.finalization.eventbus.kafka.commit.type=single
+mosip.regproc.finalization.eventbus.kafka.max.poll.records=100
+mosip.regproc.finalization.eventbus.kafka.poll.frequency=100
+mosip.regproc.finalization.eventbus.kafka.group.id=finalization-stage
+mosip.regproc.finalization.server.port=9182
+mosip.regproc.finalization.eventbus.port=5728
+mosip.regproc.finalization.server.servlet.path=/registrationprocessor/v1/finalization
+mosip.regproc.finalization.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+
 #biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
 mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100

From 738ffcb8252973e7bc86cb24b2f14e2e128a5e94 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 14:33:32 +0530
Subject: [PATCH 0250/1358] Minor cleanup.

---
 pre-registration-default.properties | 30 +----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index a908f5f68a4..b7917ba7d3e 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -29,21 +29,14 @@ logging.level.com.zaxxer.hikari=DEBUG
 ## Project Version for the API response 
 version=1.0
 
-##Not in use, to be removed after verification -----------------
-#application.id=pre-registration
-#preregistration.preid.regex=[0-9]+
-
-
 ## Age to be an adult
 ## Used in UI to identify the applicant type 
 mosip.adult.age=${mosip.kernel.applicant.type.age.limit}
 
-
 ## ID Schema 
 ## This version is set in the ID object created in pre-registration
 mosip.idschema.version=0.1
 
-
 ## Demographic Service 
 demographic.service.version=v1
 demographic.service.env=http://prereg-application.prereg
@@ -66,11 +59,6 @@ mosip.id.preregistration.demographic.create=mosip.pre-registration.demographic.c
 mosip.id.preregistration.demographic.update=mosip.pre-registration.demographic.update
 mosip.id.preregistration.demographic.retrieve.date=mosip.pre-registration.demographic.retrieve.date
 
-
-# Not in use, to be removed after verification 
-#mosip.pregistration.pagesize=20
-
-
 ## Document Service
 document.service.version=v1
 document.service.env=http://prereg-application.prereg
@@ -84,7 +72,6 @@ mosip.preregistration.document.fetch.metadata.id=mosip.pre-registration.document
 mosip.preregistration.document.fetch.content.id=mosip.pre-registration.document.fetch.content
 mosip.preregistration.document.delete.id=mosip.pre-registration.document.delete
 mosip.preregistration.document.delete.specific.id=mosip.pre-registration.document.delete.specific
-
 mosip.preregistration.document.id.upload=mosip.pre-registration.document.upload
 mosip.preregistration.document.update.docrefId.id=mosip.preregistration.docrefId.update
 
@@ -92,10 +79,6 @@ mosip.preregistration.document.update.docrefId.id=mosip.preregistration.docrefId
 # Maximum size of file allowed uploaded in document service API (in mb)
 max.file.size=2
 
-# Not in use, to be removed after verification -----------------
-#spring.servlet.multipart.max-file-size=-1
-#spring.servlet.multipart.max-request-size=-1
-
 # Allowed formats for documents
 preregistration.document.extention=PDF,JPEG,PNG,JPG
 
@@ -112,7 +95,6 @@ booking.service.env=http://prereg-booking.prereg
 booking.service.contextpath=preregistration/${booking.service.version}
 booking.resource.url=${booking.service.env}/${booking.service.contextpath}
 appointmentResourse.url=${booking.resource.url}
-
 mosip.preregistration.booking.availability.sync.id=mosip.pre-registration.appointment.availability.sync
 mosip.preregistration.booking.book.id=mosip.pre-registration.booking.book
 mosip.preregistration.booking.fetch.booking.id=mosip.pre-registration.appointment.fetch
@@ -124,7 +106,6 @@ mosip.preregistration.booking.availability.increase.id=mosip.preregistration.boo
 mosip.preregistration.booking.availability.check.id=mosip.preregistration.booking.availability.check
 mosip.preregistration.booking.delete.old.id=mosip.preregistration.booking.delete.old
 mosip.preregistration.booking.exception.id=mosip.preregistration.booking.parse.exception
-
 mosip.preregistration.booking.id.book=mosip.pre-registration.booking.book
 
 # Sync
@@ -350,7 +331,7 @@ mosip.pre-registration.qrcode.generate.id=mosip.pre-registration.qrcode.generate
 mosip.pre-registration.qrcode.service.version=1.0
 qrversion=V1
 mosip.pre-registration.qrcode.id.generate=mosip.pre-registration.qrcode.generate
-mosip.id.pre-registration.qrcode.generate: mosip.pre-registration.qrcode.generate
+mosip.id.pre-registration.qrcode.generate=mosip.pre-registration.qrcode.generate
 
 ## Data sync with registration client
 mosip.id.preregistration.datasync.fetch.ids=mosip.pre-registration.datasync.fetch.ids
@@ -396,13 +377,6 @@ preregistartion.contact.phone=9999999999
 # Determines to maintain iternal cycle & make sure value is not null (any value greater than zero)
 mosip.preregistration.auto.logout.ping=30
 
-## Not in use, to be removed after verification -----------------
-## UI Modularity config files (Not used yet)
-## Determines which stages of Pre-Registration can be switched off and switched on
-#preregistration.workflow.demographic=true/false
-#preregistration.workflow.documentupload=true/false
-#preregistration.workflow.booking=true/false 
-
 mosip.id.validation.identity.dateOfBirth=^\d{4}[\-\/\s]?((((0[13578])|(1[02]))[\-\/\s]?(([0-2][0-9])|(3[01])))|(((0[469])|(11))[\-\/\s]?(([0-2][0-9])|(30)))|(02[\-\/\s]?[0-2][0-9]))$
 mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
 mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
@@ -435,10 +409,8 @@ spring.cache.type=none
 mosip.preregistration.appointment.getavailablity.url=http://prereg-booking.prereg/preregistration/v1/appointment/availability/{registrationCenterId}
 mosip.preregistration.appointment.book.url=http://prereg-booking.prereg/preregistration/v1/appointment/{preRegistrationId}
 mosip.preregistration.appointment.multi.book.url=http://prereg-booking.prereg/preregistration/v1/appointment
-
 mosip.preregistration.applications.status.get = mosip.preregistration.applications.status
 mosip.preregistration.applications.details.get = mosip.preregistration.applications.detail.info
-
 mosip.preregistration.uispec.latest=mosip.preregistration.uispec.latest
 mosip.preregistration.uispec.all=mosip.preregistration.uispec.all
 

From a83cef8f32f5198efc7035006126e02957c17b5a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 14:52:09 +0530
Subject: [PATCH 0251/1358] Identity json updated.

---
 pre-registration-identity-mapping.json | 44 ++++++++++++++++++--------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/pre-registration-identity-mapping.json b/pre-registration-identity-mapping.json
index b96f70b1b93..dc80849d182 100644
--- a/pre-registration-identity-mapping.json
+++ b/pre-registration-identity-mapping.json
@@ -1,14 +1,32 @@
 {
-  "identity": {
-    "name": {
-      "value": "fullName",
-      "isMandatory" : true
-    },
-    "proofOfAddress": {
-      "value" : "proofOfAddress"
-    },
-    "postalCode": {
-      "value" : "postalCode"
-    }
-  }
-}  
+	"identity": {
+		"name": {
+			"value": "fullName",
+			"isMandatory": true
+		},
+		"proofOfAddress": {
+			"value": "proofOfAddress"
+		},
+		"postalCode": {
+			"value": "postalCode"
+		},
+		"dateOfBirth": {
+			"value": "dateOfBirth"
+		},
+		"gender": {
+			"value": "gender"
+		},
+		"preferredLanguage": {
+			"value": "preferredLang"
+		},
+		"locationHierarchyForProfiling": {
+			"value": "region,province,city"
+		},
+		"phone": {
+			"value": "phone"
+		},
+		"email": {
+			"value": "email"
+		}
+	}
+}

From bbdac7e4652832f483cbde9b3018291ed82b7542 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 15:21:38 +0530
Subject: [PATCH 0252/1358] Minor format fix.

---
 pre-registration-identity-mapping.json | 60 +++++++++++++-------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/pre-registration-identity-mapping.json b/pre-registration-identity-mapping.json
index dc80849d182..839aee24c35 100644
--- a/pre-registration-identity-mapping.json
+++ b/pre-registration-identity-mapping.json
@@ -1,32 +1,32 @@
 {
-	"identity": {
-		"name": {
-			"value": "fullName",
-			"isMandatory": true
-		},
-		"proofOfAddress": {
-			"value": "proofOfAddress"
-		},
-		"postalCode": {
-			"value": "postalCode"
-		},
-		"dateOfBirth": {
-			"value": "dateOfBirth"
-		},
-		"gender": {
-			"value": "gender"
-		},
-		"preferredLanguage": {
-			"value": "preferredLang"
-		},
-		"locationHierarchyForProfiling": {
-			"value": "region,province,city"
-		},
-		"phone": {
-			"value": "phone"
-		},
-		"email": {
-			"value": "email"
-		}
-	}
+    "identity": {
+        "name": {
+            "value": "fullName",
+            "isMandatory": true
+        },
+        "proofOfAddress": {
+            "value": "proofOfAddress"
+        },
+        "postalCode": {
+            "value": "postalCode"
+        },
+        "dateOfBirth": {
+            "value": "dateOfBirth"
+        },
+        "gender": {
+            "value": "gender"
+        },
+        "preferredLanguage": {
+            "value": "preferredLang"
+        },
+        "locationHierarchyForProfiling": {
+            "value": "region,province,city"
+        },
+        "phone": {
+            "value": "phone"
+        },
+        "email": {
+            "value": "email"
+        }
+    }
 }

From 7bb1d467c22f1e1fc33d82ce242d3a05208c817e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 20:46:44 +0530
Subject: [PATCH 0253/1358] Identity prop updated.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index b7917ba7d3e..f10870f3f78 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -313,7 +313,7 @@ mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalida
 global.config.file=application-${spring.profiles.active}.properties
 pre.reg.config.file=pre-registration-${spring.profiles.active}.properties
 ## Mapping file for Pre-registration & ID Object
-preregistartion.config.identityjson=pre-registration-identity-mapping.json 
+preregistartion.config.identityjson=identity-mapping.json 
 
 # UI scheme json
 preregistration.demographic.idschema-json-filename=pre-registration-demographic.json

From a3254ddb7728e124de79f04ad6751e5478d5e787 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 1 Oct 2021 20:50:09 +0530
Subject: [PATCH 0254/1358] Unused file removed.

---
 pre-registration-identity-mapping.json | 32 --------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 pre-registration-identity-mapping.json

diff --git a/pre-registration-identity-mapping.json b/pre-registration-identity-mapping.json
deleted file mode 100644
index 839aee24c35..00000000000
--- a/pre-registration-identity-mapping.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "identity": {
-        "name": {
-            "value": "fullName",
-            "isMandatory": true
-        },
-        "proofOfAddress": {
-            "value": "proofOfAddress"
-        },
-        "postalCode": {
-            "value": "postalCode"
-        },
-        "dateOfBirth": {
-            "value": "dateOfBirth"
-        },
-        "gender": {
-            "value": "gender"
-        },
-        "preferredLanguage": {
-            "value": "preferredLang"
-        },
-        "locationHierarchyForProfiling": {
-            "value": "region,province,city"
-        },
-        "phone": {
-            "value": "phone"
-        },
-        "email": {
-            "value": "email"
-        }
-    }
-}

From fa1b6249e5c458f1cd95ff3b3c97fce0bdf81a77 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 4 Oct 2021 17:15:10 +0530
Subject: [PATCH 0255/1358] IDA updated.

---
 id-authentication-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f858fba9618..34f58f37fd7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -265,6 +265,7 @@ ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
 ida-topic-pmp-policy-updated=POLICY_UPDATED
 ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
+ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
 
 ## IDA cache
 ## IDA cache Time to live in days - To clear cache scheduled based on the days provided.

From 787ae4224548d4e1f2de226419de96948296f2be Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 4 Oct 2021 17:17:28 +0530
Subject: [PATCH 0256/1358] IDA prop updated.

---
 id-authentication-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 34f58f37fd7..74b68fe3c7e 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -97,6 +97,11 @@ ida.mapping.json.filename=id-authentication-mapping.json
 mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${ida.mapping.json.filename} 
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 
+# The attribute name in the Mapping Json used to fetch Anonymous profile preferred language attribute
+mosip.preferred.language.attribute.name=preferredLanguage
+# The attribute name in the Mapping Json used to fetch Anonymous profile location attributes
+mosip.location.profile.attribute.name=locationProfile
+
 ## Biosdk. Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=http://biosdk-service.biosdk/biosdk-service
 

From a2e911be2e8c2d5100b7a625c358da287904e83a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 5 Oct 2021 06:57:03 +0530
Subject: [PATCH 0257/1358] [MOSIP-17836] Resident properties updated.

---
 resident-default.properties | 51 +++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 8927519d930..ca951f7b07d 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -1,3 +1,8 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# mosip.mosip.resident.client.secret
+# mosip.mosip.regproc.client.secret
 #--------------ID and Version --------------
 auth.internal.id=mosip.identity.auth.internal
 auth.internal.version=1.0
@@ -22,18 +27,18 @@ vid.revoke.id=mosip.vid.deactivate
 resident.revokevid.id=mosip.resident.vidstatus
 PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
-DECRYPT_API_URL=http://keymanager.keymanager/v1/keymanager/decrypt
+DECRYPT_API_URL=http://keymanager.kernel/v1/keymanager/decrypt
 
-#-------------TOKEN GENERATION----------------
+## Token generation
 token.request.id=io.mosip.resident
 resident.appid=resident
 token.request.version=1.0
 resident.clientId=mosip-resident-client
-resident.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+resident.secretKey=${mosip.mosip.resident.client.secret}
+# TODO. Below prop
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
-#--------------URI--------------------------
-#Auth Services
+## Auth Services
 KERNELAUTHMANAGER=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=http://regproc-print-service/registrationprocessor/v1/print/uincard
 INTERNALAUTH=http://ida-internal.ida/idauthentication/v1/internal/auth
@@ -41,29 +46,28 @@ INTERNALAUTHTRANSACTIONS=http://ida-internal.ida/idauthentication/v1/internal/au
 KERNELENCRYPTIONSERVICE=http://ida-internal.ida/idauthentication/v1/internal/getCertificate
 IDAUTHCREATEVID=http://vid.idrepo/idrepository/v1/vid
 IDAUTHREVOKEVID=http://vid.idrepo/idrepository/v1/vid/deactivate
-#Notification service
+## Notification service
 IDREPOGETIDBYUIN=http://identity.idrepo/idrepository/v1/identity/idvid
 IDREPOGETIDBYRID=http://identity.idrepo/idrepository/v1/identity/idvid
 GETUINBYVID=http://vid.idrepo/idrepository/v1/vid
 resident.notification.emails=mosiptestuser@gmail.com
 resident.notification.message=Notification has been sent to the provided contact detail(s)
-#templates
+## templates
 MASTER=http://masterdata.kernel/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
-RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
+RIDGENERATION=http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
 CREATEVID=http://vid.idrepo/idrepository/v1/vid
-IDREPOSITORY=http://idrepo-identity-service/idrepository/v1/identity/
-ENCRYPTURL=http://keymanager.keymanager/v1/keymanager/encrypt
+IDREPOSITORY=http://identity.idrepo/idrepository/v1/identity/
+ENCRYPTURL=http://keymanager.kernel/v1/keymanager/encrypt
 MIDSCHEMAURL=http://syncdata.kernel/v1/syncdata/latestidschema
 # DMZ service call
-dmz.ingress.base.url=http://dmz.ingress:30080
-SYNCSERVICE=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/registrationpackets
-SMSNOTIFIER=http://kernel-notification-service/v1/notifier/sms/send
-EMAILNOTIFIER=http://kernel-notification-service/v1/notifier/email/send
-AUTHTYPESTATUSUPDATE=http://idrepo-identity-service/idrepository/v1/identity/authtypes/status
+SYNCSERVICE=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=http://regproc-group1/registrationprocessor/v1/packetreceiver/registrationpackets
+SMSNOTIFIER=http://notifier.kernel/v1/notifier/sms/send
+EMAILNOTIFIER=http://notifier.kernel/v1/notifier/email/send
+AUTHTYPESTATUSUPDATE=http://identity.idrepo/idrepository/v1/identity/authtypes/status
 #Regitstration processor reprint service
 #Registration status service
 REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
@@ -75,11 +79,11 @@ OTP_GEN_URL=http://ida-internal.ida/idauthentication/v1/internal/otp
 CREDENTIAL_STATUS_URL=http://credentialrequest.idrepo/v1/credentialrequest/get/
 CREDENTIAL_REQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
 CREDENTIAL_CANCELREQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/cancel/
-CREDENTIAL_TYPES_URL=http://idrepo-credential-service/v1/credentialservice/types
-PARTNER_API_URL=http://pms-partner-manager-service/v1/partnermanager/partners
-mosip.kernel.masterdata.audit-url=http://kernel-auditmanager-service/v1/auditmanager/audits
+CREDENTIAL_TYPES_URL=http://credential.idrepo/v1/credentialservice/types
+PARTNER_API_URL=http://pms-partner.pms/v1/partnermanager/partners
+mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
 
-#----------------------config data---------------------
+## Config data
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 auth.types.allowed=demo,bio-Finger,bio-Iris,bio-FACE
 
@@ -87,11 +91,8 @@ resident.identityjson=registration-processor-identity.json
 mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
 
--------Security properties-----------------
-#CSRF switch
+## Security
 mosip.security.csrf-enable:false
-
-#secure cookie switch
 mosip.security.secure-cookie:false
 
 IDSchema.Version=0.1
@@ -100,5 +101,5 @@ mosip.registration.processor.registration.sync.id=mosip.registration.sync
 id.repo.vidType=Perpetual
 token.request.appid=regproc
 token.request.clientId=mosip-regproc-client
-token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+token.request.secretKey=${mosip.mosip.regproc.client.secret}
 objectstore.adapter.name=PosixAdapter

From ea9182a80709205304b7a10fa123b46449b2bb08 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 5 Oct 2021 11:39:15 +0530
Subject: [PATCH 0258/1358] Updated for Resident.

---
 application-default.properties | 2 ++
 resident-default.properties    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 4b59a2b910f..32ae9b20836 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -165,6 +165,8 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 ## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth-token-generator.rest.issuerUrl=${keycloak.host}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
+
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
diff --git a/resident-default.properties b/resident-default.properties
index ca951f7b07d..89564d46ba9 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -35,7 +35,7 @@ resident.appid=resident
 token.request.version=1.0
 resident.clientId=mosip-resident-client
 resident.secretKey=${mosip.mosip.resident.client.secret}
-# TODO. Below prop
+# Below is defined in application properties
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services

From 6a78854ddec1e62d3ffe07d7ed08b6f8c90b6f08 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 8 Oct 2021 11:29:08 +0530
Subject: [PATCH 0259/1358] ID Auth updated.

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 74b68fe3c7e..7a7b1eec593 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -547,6 +547,6 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=https://${mosip.api.public.host}
+mosip.ida.allowed.domain.uris=https://${mosip.api.public.host},https://${mosip.api.internal.host}
 # Biometrics attribute name present in data-share policy
 mosip.ida.credential.biometric.attribute.name=individualBiometrics

From 2d0a753fb2a7ed8ca1d0670c28f6714dd955753c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 8 Oct 2021 12:24:51 +0530
Subject: [PATCH 0260/1358] IDA mapping json updated.

---
 id-authentication-mapping.json | 127 ++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 59 deletions(-)

diff --git a/id-authentication-mapping.json b/id-authentication-mapping.json
index 33818b75f91..430504860af 100644
--- a/id-authentication-mapping.json
+++ b/id-authentication-mapping.json
@@ -1,61 +1,70 @@
 {
-  "ida-mapping": {
-    "name": [
-      "fullName"
-    ],
-    "dob": [
-      "dateOfBirth"
-    ],
-    "age": [
-      "dateOfBirth"
-    ],
-    "gender": [
-      "gender"
-    ],
-    "phoneNumber": [
-      "phone"
-    ],
-    "emailId": [
-      "email"
-    ],
-    "addressLine1": [
-      "addressLine1"
-    ],
-    "addressLine2": [
-      "addressLine2"
-    ],
-    "addressLine3": [
-      "addressLine3"
-    ],
-    "location1": [
-      "city"
-    ],
-    "location2": [
-      "region"
-    ],
-    "location3": [
-      "province"
-    ],
-    "postalCode": [
-      "postalCode"
-    ],
-    "fullAddress": [
-      "addressLine1",
-      "addressLine2",
-      "addressLine3",
-      "city",
-      "region",
-      "province",
-      "postalCode"
-    ],
-    "iris": [
-      "CBEFF"
-    ],
-    "fingerprint": [
-      "CBEFF"
-    ],
-    "face": [
-      "CBEFF"
-    ]
-  }
+    "ida-mapping": {
+        "name": [
+            "fullName"
+        ],
+        "dob": [
+            "dateOfBirth"
+        ],
+        "age": [
+            "dateOfBirth"
+        ],
+        "gender": [
+            "gender"
+        ],
+        "phoneNumber": [
+            "phone"
+        ],
+        "emailId": [
+            "email"
+        ],
+        "addressLine1": [
+            "addressLine1"
+        ],
+        "addressLine2": [
+            "addressLine2"
+        ],
+        "addressLine3": [
+            "addressLine3"
+        ],
+        "location1": [
+            "city"
+        ],
+        "location2": [
+            "region"
+        ],
+        "location3": [
+            "province"
+        ],
+        "postalCode": [
+            "postalCode"
+        ],
+        "fullAddress": [
+            "addressLine1",
+            "addressLine2",
+            "addressLine3",
+            "city",
+            "region",
+            "province",
+            "postalCode"
+        ],
+        "iris": [
+            "CBEFF"
+        ],
+        "fingerprint": [
+            "CBEFF"
+        ],
+        "face": [
+            "CBEFF"
+        ],
+        "location4" : [ "zone" ],
+        "residenceStatus" : ["residenceStatus" ],
+        "preferredLanguage" : ["preferredLang" ],
+        "locationProfile": [
+            "city",
+            "region",
+            "province",
+            "zone"
+        ]
+    }
 }

From 19501333c59df7be8141cc634a057e3f204b6eb4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 8 Oct 2021 14:08:53 +0530
Subject: [PATCH 0261/1358] IDA updated.

---
 id-authentication-default.properties | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 7a7b1eec593..f1c18f5859e 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -238,7 +238,7 @@ subscriptions-delay-on-startup_millisecs=120000
 # this property value is set to 0 that disables this workaround.
 # To enable the resubscrition scheduling, this property should be assigned with a positive
 # number like 1 * 60 * 60 = 3600 for one hour
-ida-websub-resubscription-delay-secs=7200
+ida-websub-resubscription-delay-secs=43200
 
 delay-to-pull-missing-credential-after-topic-subscription_millisecs=60000
 
@@ -328,8 +328,8 @@ ida.errormessages.default-lang=en
 
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
-otp.request.flooding.duration=3
-otp.request.flooding.max-count=3
+otp.request.flooding.duration=1
+otp.request.flooding.max-count=100
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content
@@ -396,7 +396,7 @@ request.idtypes.allowed.internalauth=UIN,VID
 ## Encrypted Credential Attributes list
 ## The list of attributes in identity that are Zero Knowledge encrpted in IDA while storing the credential in DB.
 ## This list is used to identify the attributes to decrypt when fetching the records from DB
-ida-zero-knowledge-encrypted-credential-attributes=individualBiometrics,fullName,dateOfBirth,phone,email,postalCode
+ida-zero-knowledge-encrypted-credential-attributes=individualBiometrics,fullName,dateOfBirth,phone,email,postalCode,city,region,province,zone
 
 ## Cryptograpic/Signature verificate related configurations
 mosip.ida.internal.thumbprint-validation-required=false
@@ -550,3 +550,5 @@ mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 mosip.ida.allowed.domain.uris=https://${mosip.api.public.host},https://${mosip.api.internal.host}
 # Biometrics attribute name present in data-share policy
 mosip.ida.credential.biometric.attribute.name=individualBiometrics
+
+biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX

From 73406a9be3890ef73e9f94a29a86f6c73409f260 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 9 Oct 2021 11:39:51 +0530
Subject: [PATCH 0262/1358] Log level changed to DEBUG.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 32ae9b20836..014710a5db1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -350,7 +350,7 @@ mosip.stage.environment=Developer
 ## Log level
 
 logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 

From bb04c7cd6afaac0fb86ab1ad43ccbefee8767b7a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 9 Oct 2021 13:18:35 +0530
Subject: [PATCH 0263/1358] IDA properties synchronized with qa-double-rc2
 branch.

---
 id-authentication-default.properties | 58 ++++++++++++++++------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f1c18f5859e..a9295a6097c 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -101,33 +101,35 @@ ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 mosip.preferred.language.attribute.name=preferredLanguage
 # The attribute name in the Mapping Json used to fetch Anonymous profile location attributes
 mosip.location.profile.attribute.name=locationProfile
+# Used in Child Auth Filter
+mosip.date-of-birth.attribute.name=dateOfBirth
+# Used in DOB matching and Child Auth filter
+mosip.date-of-birth.pattern=yyyy/MM/dd
 
-## Biosdk. Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
+## Biosdk
+## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=http://biosdk-service.biosdk/biosdk-service
-
-## The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
-## This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-## The version of the BIO SDK API implemeted for Finger modality
-mosip.biometric.sdk.provider.finger.version=0.9
-## The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
-## If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
-## If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
-mosip.biometric.sdk.provider.finger.format.url.default=${mosip.biosdk.default.service.url}
-
-## The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
-## This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-## The version of the BIO SDK API implemeted for Iris modality
-mosip.biometric.sdk.provider.iris.version=0.9
-mosip.biometric.sdk.provider.iris.format.url.default=${mosip.biosdk.default.service.url}
-
-## The fully qualified Class Name of the BIO SDK API implemented for Face modality 
-## This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-## The version of the BIO SDK API implemeted for Face modality
-mosip.biometric.sdk.provider.face.version=0.9
-mosip.biometric.sdk.provider.face.format.url.default=${mosip.biosdk.default.service.url}
+# The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
+# This class will be loaded in runtime, the containing jar should be available in classpath
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+# The version of the BIO SDK API implemeted for Finger modality
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.version=0.9
+# The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
+# If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
+# If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
+# The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
+# This class will be loaded in runtime, the containing jar should be available in classpath
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+# The version of the BIO SDK API implemeted for Iris modality
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
+# The fully qualified Class Name of the BIO SDK API implemented for Face modality 
+# This class will be loaded in runtime, the containing jar should be available in classpath
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+# The version of the BIO SDK API implemeted for Face modality
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
 
 ## Kernel-Audit
 audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
@@ -552,3 +554,9 @@ mosip.ida.allowed.domain.uris=https://${mosip.api.public.host},https://${mosip.a
 mosip.ida.credential.biometric.attribute.name=individualBiometrics
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
+
+## Roles
+mosip.role.idauth.postotp=RESIDENT
+mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.idauth.postverifyidentity=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.idauth.getauthtransactionsindividualid=RESIDENT

From 27f97d24724fce490d88f4f19d24a4d18fdb5d40 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 11 Oct 2021 11:26:16 +0530
Subject: [PATCH 0264/1358] Resident prop corrected.

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 89564d46ba9..d7b5af01aa7 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -57,7 +57,7 @@ MASTER=http://masterdata.kernel/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
-RIDGENERATION=http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
+RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
 CREATEVID=http://vid.idrepo/idrepository/v1/vid
 IDREPOSITORY=http://identity.idrepo/idrepository/v1/identity/
 ENCRYPTURL=http://keymanager.kernel/v1/keymanager/encrypt

From 1138c17b1bd367f790acfe391a2858e7ed4800ac Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 11 Oct 2021 12:09:34 +0530
Subject: [PATCH 0265/1358] Resident properties updated.

---
 resident-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index d7b5af01aa7..a0733c94b45 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -23,7 +23,7 @@ resident.authunlock.id=mosip.resident.authunlock
 resident.authhistory.id=mosip.resident.authhistory
 mosip.resident.service.status.check.id=mosip.registration.external.status
 mosip.resident.service.status.check.version=1.0
-vid.revoke.id=mosip.vid.deactivate
+vid.revoke.id=mosip.vid.update
 resident.revokevid.id=mosip.resident.vidstatus
 PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
@@ -99,7 +99,7 @@ IDSchema.Version=0.1
 id.repo.update=mosip.id.update
 mosip.registration.processor.registration.sync.id=mosip.registration.sync
 id.repo.vidType=Perpetual
-token.request.appid=regproc
-token.request.clientId=mosip-regproc-client
-token.request.secretKey=${mosip.mosip.regproc.client.secret}
+token.request.appid=resident
+token.request.clientId=mosip-resident-client
+token.request.secretKey=${mosip.mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter

From 193971c4668ac664de3637e46f5b67306950def8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 11 Oct 2021 12:47:13 +0530
Subject: [PATCH 0266/1358] Cleanup.

---
 kernel-default.properties | 77 ---------------------------------------
 1 file changed, 77 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 17eba9d52c3..a51d96f99be 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -443,8 +443,6 @@ zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
 
 ## Roles
-#mosip.role.admin.masterdata.postgetapplicanttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,REGISTRATION_SUPERVISOR,PRE_REGISTRATION,REGISTRATION_OFFICER
-#mosip.role.admin.masterdata.getapplicanttypeapplicantidlanguages=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -457,7 +455,6 @@ mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getblocklistedwordslangcode=INDIVIDUAL,ID_AUTHENTICATION,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -497,7 +494,6 @@ mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MA
 mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getdocumentcategories=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdocumentcategorieslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdocumentcategoriescode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -507,18 +503,14 @@ mosip.role.admin.masterdata.getdocumentcategoriesall=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getdocumenttypesdocumentcategorycode=INDIVIDUAL,ID_AUTHENTICATION,ZONAL_ADMIN,PARTNER,PARTNER_ADMIN,PRE_REGISTRATION,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdocumenttypesall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-#mosip.role.admin.masterdata.getdocumenttypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-#mosip.role.admin.masterdata.getdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,INDIVIDUAL,Default
-#mosip.role.admin.masterdata.getdistinct=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN,Default
 mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -526,22 +518,14 @@ mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-
-#mosip.role.admin.masterdata.getexceptionalholidaysregistrationcenterid=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-
 mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-
-#mosip.role.admin.masterdata.getgendertypes=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
-#mosip.role.admin.masterdata.getgendertypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getgendertypesvalidategendername=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,CENTRAL_ADMIN
 mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-
 mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
@@ -553,43 +537,26 @@ mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
-
-#mosip.role.admin.masterdata.getidtypeslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-
-#mosip.role.admin.masterdata.getindividualtypes=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-
-#mosip.role.admin.masterdata.getlanguages=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,Default
 mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,GLOBAL_ADMIN
-
-#mosip.role.admin.masterdata.getlocationslangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getlocationslocationcodelangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
-#mosip.role.admin.masterdata.getlocationsinfolocationcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
-#mosip.role.admin.masterdata.getlocationslocationhierarchy=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getlocationsimmediatechildrenlocationcodelangcode=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT,REGISTRATION_ADMIN
-#mosip.role.admin.masterdata.getlocationsvalidatelocationname=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
-
-#mosip.role.admin.masterdata.getlocationhierarchylevelslevellangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_PROCESSOR,INDIVIDUAL
 mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
-#mosip.role.admin.masterdata.getlocationhierarchylevelslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_PROCESSOR,INDIVIDUAL
-
 mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR,RESIDENT
 mosip.role.admin.masterdata.getmachineslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.getmachines=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
@@ -601,9 +568,7 @@ mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_
 mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN
-
 mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -611,34 +576,26 @@ mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADM
 mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-
 mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.postpacketrejectionreasonsreasoncategory=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-
 mosip.role.admin.masterdata.postpacketresume=GLOBAL_ADMIN,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postpacketsearch=GLOBAL_ADMIN,REGISTRATION_ADMIN
-
 mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
-
 mosip.role.admin.masterdata.postregistereddevices=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
 mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
 mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
@@ -660,11 +617,8 @@ mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_AD
 mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
-
 mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN
-
 mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
-
 mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -673,19 +627,13 @@ mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-
 mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getidschemaall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getidschemalatest=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
-
-#mosip.role.admin.masterdata.gettemplates=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
-#mosip.role.admin.masterdata.gettemplateslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
-#mosip.role.admin.masterdata.gettemplateslangcodetemplatetypecode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PRE_REGISTRATION,AUTH,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,REGISTRATION_OFFICER,ID_AUTHENTICATION,INDIVIDUAL,PRE_REGISTRATION_ADMIN,PARTNER_ADMIN,AUTH_PARTNER,PARTNER
 mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -695,34 +643,24 @@ mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.gettemplatesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.gettemplatefileformatslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.patchtemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.posttemplatetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-#mosip.role.admin.masterdata.gettemplatetypescodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,ID_AUTHENTICATION,INDIVIDUAL,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_SUPERVISOR,DEVICE_MANAGER,DEVICE_MANAGER,AUTH_PARTNER,PARTNER,PARTNER_ADMIN,PRE_REGISTRATION
-#mosip.role.admin.masterdata.gettemplatetypeslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-
-#mosip.role.admin.masterdata.gettitle=GLOBAL_ADMIN,ZONAL_ADMIN,ID_AUTHENTICATION,INDIVIDUAL,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_SUPERVISOR,DEVICE_MANAGER,DEVICE_MANAGER,AUTH_PARTNER,PARTNER,PARTNER_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION
-#mosip.role.admin.masterdata.gettitlelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_OPERATOR,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.admin.masterdata.posttitle=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.gettitleall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.postuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postuispecpublish=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getuispecall=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-#mosip.role.admin.masterdata.getuispecdomainlatest=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
-
 mosip.role.admin.masterdata.getusersid=ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.getusers=ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.getusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -731,42 +669,27 @@ mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getuserdetails=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getuserssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
-
 mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-#mosip.role.admin.masterdata.getvaliddocumentslanguagecode=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,RESIDENT,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,PARTNER,PARTNER_ADMIN,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-#mosip.role.admin.masterdata.getvaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,RESIDENT,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,PARTNER,PARTNER_ADMIN,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
-
-#mosip.role.admin.masterdata.getweekdaysregistrationcenteridlangcode=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-#mosip.role.admin.masterdata.getworkingdaysregistrationcenteridlangcode=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-#mosip.role.admin.masterdata.getworkingdayslangcode=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-
 mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-#mosip.role.admin.masterdata.getzonesleafslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
 mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
 mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
 mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
-
 mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-
-#Adding the property files of commons-kernel-key manager service.
-
 mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL

From b784b813db00e3f05dc6f6d783b36bdd699af9d6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 11 Oct 2021 12:55:04 +0530
Subject: [PATCH 0267/1358] Updated roles in kernel - copied all roles from
 qa-double-rc2 env.

---
 kernel-default.properties | 442 +++++++++++++++++++-------------------
 1 file changed, 222 insertions(+), 220 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index a51d96f99be..9d31234f1fb 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -441,292 +441,294 @@ openapi.masterdata.servers[0].description=Admin Masterdata url
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
+auth.server.admin.offline.token.validate=false
 
 ## Roles
-mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getapplicationtypeslangcode=RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+
+mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.getapplicationtypeslangcode=PRE_REGISTRATION_ADMIN,RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER
+mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,CENTRAL_ADMIN
+mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
+mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
+mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT
+mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.gettitleall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuispecall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getusercentermapping=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserdetails=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getusers=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusersid=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getuserssearch=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplatefileformats=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postbiometricattributes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategorieslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdocumentcategoriescode=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriesall=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesall=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,CENTRAL_ADMIN
-mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
+mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
-mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.admin.masterdata.getmachineslangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getmachines=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postpacketrejectionreasonsreasoncategory=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postpacketresume=GLOBAL_ADMIN,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postpacketsearch=GLOBAL_ADMIN,REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postregistereddevices=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT
 mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getidschemaall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getidschemalatest=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.gettemplatesall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatefileformatslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchtemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatetypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttitle=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettitleall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postuispecpublish=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getuispecall=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getusersid=ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getusers=ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getuserdetails=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getuserssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
-mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
-mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postcsverifysign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
+mosip.role.kernel.getgetzktempcertificate=KEY_MIGRATION_ADMIN
+mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
 mosip.role.kernel.postcssign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postcsverifysign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postdecryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postencryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postdecryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postencryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postgeneratesymmetrickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postuploadotherdomaincertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postuploadcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postencryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postencryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postgeneratecsr=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postgeneratemasterkeyobjecttype=KEY_MAKER,TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postgeneratesymmetrickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postmigratebasekey=KEY_MIGRATION_ADMIN
-mosip.role.kernel.getgetzktempcertificate=KEY_MIGRATION_ADMIN
 mosip.role.kernel.postmigratezkkeys=KEY_MIGRATION_ADMIN
-mosip.role.kernel.postverifycertificatetrust=MS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
-mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
-mosip.role.kernel.postuploadpartnercertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
-mosip.role.kernel.postuploadcacertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
+mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadcacertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
+mosip.role.kernel.postuploadcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadotherdomaincertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadpartnercertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
 mosip.role.kernel.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
-mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postverifycertificatetrust=MS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
 mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postzkreencryptrandomkey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL

From a321ab1607c0781a51635f08b20c6ebabdab00c1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 11 Oct 2021 22:23:44 +0530
Subject: [PATCH 0268/1358] Idrepo updated.

---
 id-repository-default.properties | 46 +++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 244b7e4728e..b06198babab 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -115,6 +115,9 @@ mosip.idrepo.vid.policy-schema-url=${mosip.idrepo.mosip-config-url}mosip-vid-pol
 # VID policy based on which VID is created
 mosip.idrepo.vid.policy-file-url=${mosip.idrepo.mosip-config-url}mosip-vid-policy.json
 
+# Default type of VID to be created automatically while publishing UIN
+mosip.idrepo.draft-vid.default-type-to-create=PERPETUAL
+
 ## Rest servies 
 mosip.idrepo.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
@@ -189,6 +192,16 @@ mosip.idrepo.uin-generator.rest.httpMethod=GET
 mosip.idrepo.uin-generator.rest.headers.mediaType=application/json
 mosip.idrepo.uin-generator.rest.timeout=100
 
+mosip.idrepo.draft-vid.rest.uri=http://vid.idrepo/idrepository/v1/draft/vid
+mosip.idrepo.draft-vid.rest.httpMethod=POST
+mosip.idrepo.draft-vid.rest.headers.mediaType=application/json
+mosip.idrepo.draft-vid.rest.timeout=100
+
+mosip.idrepo.update-vid.rest.uri=http://vid.idrepo/idrepository/v1/vid/{vid}
+mosip.idrepo.update-vid.rest.httpMethod=PATCH
+mosip.idrepo.update-vid.rest.headers.mediaType=application/json
+mosip.idrepo.update-vid.rest.timeout=100
+
 ## Credential request generator
 mosip.credential.service.database.hostname=postgres-postgresql.postgres
 mosip.credential.service.database.port=5432
@@ -271,7 +284,7 @@ mosip.credential.service.application.id=PARTNER
 mosip.credential.service.includeCertificateHash=true
 mosip.credential.service.includeCertificate=true
 mosip.credential.service.includePayload=false
-mosip.credential.service.share.prependThumbprint=true
+mosip.credential.service.share.prependThumbprint=false
 mosip.credential.service.retry.maxAttempts=3
 mosip.credential.service.retry.maxDelay=100
 
@@ -334,3 +347,34 @@ auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
 
 # Enabling below property will start logging performance logs in identity and vid service
 mosip.idrepo.aspect-logging.enabled=false
+
+# Roles
+mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST
+mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST
+mosip.role.idrepo.credentialrequest.getgetrequestid=CREDENTIAL_REQUEST
+mosip.role.idrepo.credentialrequest.getgetrequestids=CREDENTIAL_REQUEST
+mosip.role.idrepo.credentialrequest.putretriggerrequestid=CREDENTIAL_REQUEST
+
+mosip.role.idrepo.credentialservice.postissue=CREDENTIAL_REQUEST
+
+mosip.role.idrepo.identity.postidrepo=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.getidvidid=REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION
+mosip.role.idrepo.identity.patchidrepo=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.getauthtypesstatusindividualidtypeindividualid=RESIDENT
+mosip.role.idrepo.identity.postauthtypesstatus=RESIDENT
+mosip.role.idrepo.identity.postdraftcreateregistrationId=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.patchdraftupdateregistrationId=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.getdraftpublishregistrationId=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.draftregistrationId=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR
+
+mosip.role.idrepo.vid.postvid=RESIDENT,REGISTRATION_PROCESSOR
+mosip.role.idrepo.vid.getvid=REGISTRATION_PROCESSOR,ID_AUTHENTICATION,RESIDENT
+mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR
+mosip.role.idrepo.vid.patchvid=ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.idrepo.vid.postvidregenerate=RESIDENT
+mosip.role.idrepo.vid.postviddeactivate=RESIDENT
+mosip.role.idrepo.vid.postvidreactivate=RESIDENT
+mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR

From d5eedb8fd00a1556d599ba70f2113a79ba4d8681 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 12 Oct 2021 12:55:37 +0530
Subject: [PATCH 0269/1358] Template language corrected.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 014710a5db1..b23515a26a0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -376,7 +376,7 @@ mosip.min-languages.count=2
 mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara
+mosip.default.template-languages=eng,fra
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang

From 19ce6568915714f33320f16c91678d4e6e2e191b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 12 Oct 2021 14:09:33 +0530
Subject: [PATCH 0270/1358] Regclient properties updated.

---
 registration-default.properties | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/registration-default.properties b/registration-default.properties
index 2ba31980ae8..ce6fa9416a4 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -4,6 +4,9 @@ mosip.registration.num_of_fingerprint_retries=3
 #Iris retry attempts. Possible values 1 to 10
 mosip.registration.num_of_iris_retries=3
 
+#Face retry attempts. Possible values 1 to 10
+mosip.registration.num_of_face_retries=3
+
 #Maximum no. of days without running the Master Sync Job beyond which client is frozen for registration
 mosip.registration.masterSyncJob.frequency=190
 
@@ -198,6 +201,8 @@ mosip.registration.thumbs_fingerprint_threshold=40
 #Thereshold Quality Value for IRIS capture
 mosip.registration.iris_threshold=60
 
+#Threshold Quality Value for Face capture
+mosip.registration.face_threshold=90
 
 #Maximum number of days where Registration or UIN Update or Lost UIN will be allowed without updating the Registration Client Software
 mosip.registration.softwareUpdateCheck_configured_frequency = 300
@@ -406,6 +411,9 @@ mosip.registration.mds.face.dedup.enable.flag=N
 #Storage Location of the Identity Schema. LOCAL specifies the schema is stored within the application. Should not be modified
 mosip.kernel.idobjectvalidator.file-storage-uri=LOCAL
 
+#File name of the Identity Schema. Should not be modified
+mosip.kernel.idobjectvalidator.schema-name=mosip-identity-json-schema.json
+
 #Property Source of the Identity Schema. Should not be modified
 mosip.kernel.idobjectvalidator.property-source=LOCAL
 
@@ -415,7 +423,10 @@ mosip.kernel.idobjectvalidator.property-source=LOCAL
 mosip.kernel.transliteration.arabic-language-code=ara
 
 #Language Code for French Language. Should not be modified
-mosip.kernel.transliteration.franch-language-code = fra
+mosip.kernel.transliteration.franch-language-code=fra
+
+#Language Code for French Language. Should not be modified
+mosip.kernel.transliteration.english-language-code=eng
 
 #----For CBEFF Component----
 
@@ -477,3 +488,14 @@ mosip.registration.mdm.trust.domain.deviceinfo=DEVICE
 # Below age ranges map should contain proper age group name and age range, any overlap of the age 
 # range will result in a random behaviour of tagging. In range, upper and lower values are inclusive.
 mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':'6-17','ADULT':'18-200'}
+
+# Roles
+mosip.role.registration.postauth=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.registration.getgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
+mosip.role.registration.postexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.postpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.postsearch=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN

From 7d61bdfb728d734ecd896f93404e61d31e319a41 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 12 Oct 2021 15:45:17 +0530
Subject: [PATCH 0271/1358] Syncdata roles updated.

---
 syncdata-default.properties | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index f7991350c4c..3456db70c97 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -414,22 +414,17 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=http://masterdata.kernel/v1/
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-
 ## Roles
-mosip.role.admin.syncdata.getconfigs=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getglobalconfigs=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN
-mosip.role.admin.syncdata.getregistrationcenterconfigregistrationcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getconfigurationregistrationcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getclientsettingsregcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getroles=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getuserdetailsregcenterid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getusersaltregid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.gettpmpublickeyverify=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getlatestidschema=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default,REGISTRATION_PROCESSOR,INDIVIDUAL,RESIDENT,ID_AUTHENTICATION
+mosip.role.admin.syncdata.getlatestidschema=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,RESIDENT,ID_AUTHENTICATION
 mosip.role.admin.syncdata.getgetcertificate=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.gettpmpublickeymachineid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
-mosip.role.admin.syncdata.getconfigsmachinename=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.gettpmpublickeymachineid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default,REGISTRATION_PROCESSOR
+mosip.role.admin.syncdata.getconfigskeyIndex=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getuserdetails=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getgetcacertificates=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getv2clientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
+mosip.role.admin.syncdata.getclientsettingsentityIdentifier=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,default
+mosip.role.admin.syncdata.getscriptsscriptName=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,default
+

From d0d5b5bf193ab64f2d6691470f0a2419697f5b0a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 12 Oct 2021 16:20:53 +0530
Subject: [PATCH 0272/1358] Syncdata updated.

---
 syncdata-default.properties | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3456db70c97..6784ed0ab37 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -1,7 +1,6 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# mosip.api.public.host
 # db.dbuser.password 
 # keycloak.host
 # keycloak.admin.password
@@ -10,6 +9,7 @@
 # mosip.mosip.admin.client.secret
 # mosip.mosip.reg.client.secret
 # preregistration.mosip.prereg.client.secret
+# mosip.api.internal.host
 # softhsm.kernel.pin
 
 
@@ -414,6 +414,15 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=http://masterdata.kernel/v1/
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
+mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.internal.host}/v1/syncdata/scripts/applicanttype.mvel
+mosip.sync.entity.auth-required.APPLICANTTYPE.MVEL=true
+mosip.sync.entity.auth-token.APPLICANTTYPE.MVEL=Authorization:OAUTH
+mosip.sync.entity.encrypted.APPLICANTTYPE.MVEL=false
+mosip.sync.entity.headers.APPLICANTTYPE.MVEL=Content-Type:text/plain;charset=UTF-8
+mosip.sync.entity.only-on-fullsync.APPLICANTTYPE.MVEL=false
+
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
 ## Roles
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From 21a07a3141c38fba6cfdc135917ea8aed9fb52c6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 12 Oct 2021 16:40:03 +0530
Subject: [PATCH 0273/1358] Corection in syncdata property.

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 6784ed0ab37..731b083e35f 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -414,7 +414,7 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=http://masterdata.kernel/v1/
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.internal.host}/v1/syncdata/scripts/applicanttype.mvel
+mosip.sync.entity.url.APPLICANTTYPE.MVEL=https://${mosip.api.internal.host}/v1/syncdata/scripts/applicanttype.mvel
 mosip.sync.entity.auth-required.APPLICANTTYPE.MVEL=true
 mosip.sync.entity.auth-token.APPLICANTTYPE.MVEL=Authorization:OAUTH
 mosip.sync.entity.encrypted.APPLICANTTYPE.MVEL=false

From 99a8fb57e9c47c919d7246a0a49a3a694426c9fc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 12 Oct 2021 21:15:46 +0530
Subject: [PATCH 0274/1358] vid policy json updated.

---
 mosip-vid-policy.json | 53 +++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index 262cd99f55d..9261a14506f 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -1,24 +1,33 @@
 {
-  "vidPolicies": [
-    {
-      "vidType": "Perpetual",
-      "vidPolicy": {
-        "validForInMinutes": null,
-        "transactionsAllowed": null,
-        "instancesAllowed": 1,
-  "autoRestoreAllowed": true,
-  "restoreOnAction": "REVOKED"
-      }
-    },
-    {
-      "vidType": "Temporary",
-      "vidPolicy": {
-        "validForInMinutes": 30,
-        "transactionsAllowed": 1,
-        "instancesAllowed": 5,
-        "autoRestoreAllowed": false,
-  "restoreOnAction": "REGENERATE"
-      }
-    }
-  ]
+    "vidPolicies": [{
+            "vidType": "Perpetual",
+            "vidPolicy": {
+                "validForInMinutes": null,
+                "transactionsAllowed": null,
+                "instancesAllowed": 1,
+                "autoRestoreAllowed": true,
+                "restoreOnAction": "REVOKED"
+            }
+        },
+        {
+            "vidType": "Temporary",
+            "vidPolicy": {
+                "validForInMinutes": 30,
+                "transactionsAllowed": 1,
+                "instancesAllowed": 5,
+                "autoRestoreAllowed": false,
+                "restoreOnAction": "REGENERATE"
+            }
+        },
+        {
+            "vidType": "OneTimeUse",
+            "vidPolicy": {
+                "validForInMinutes": null,
+                "transactionsAllowed": 1,
+                "instancesAllowed": 1,
+                "autoRestoreAllowed": true,
+                "restoreOnAction": "REVOKED"
+            }
+        }
+    ]
 }

From d3ed1151250a17a42dfdd03a2c90ce7393e44297 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 13 Oct 2021 11:01:57 +0530
Subject: [PATCH 0275/1358] [MOSIP-17836] Updated for 1.2.0.

---
 registration-processor-default.properties | 57 ++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e972795b2e2..8972b3def82 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -234,9 +234,9 @@ mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_work
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=http://regproc-notifier.regproc/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
 
 # Email template code for PauseForAdditionalInfo
-mosip.regproc.notification_service.biometric_correction.email=RPR_PAUSED_FOR_ADDITIONAL_INFO_EMAIL
+mosip.regproc.notification_service.biometric_correction.email=RPR_PAUSED_FOR_ADD_INFO_EMAIL
 # SMS template code for PauseForAdditionalInfo
-mosip.regproc.notification_service.biometric_correction.sms=RPR_PAUSED_FOR_ADDITIONAL_INFO_SMS
+mosip.regproc.notification_service.biometric_correction.sms=RPR_PAUSED_FOR_ADD_INFO_SMS
 # SUBJECT template code for PauseForAdditionalInfo
 mosip.regproc.notification_service.biometric_correction.subject=Requesting the additional details for progressing on the application of UIN
 
@@ -813,3 +813,56 @@ mosip.kernel.salt-generator.tableName=crypto_salt
 
 # List of old reg client versions with others attribute not present but currently supported for registration, this is required to take care of the backward compatibility checks
 mosip.regproc.common.before-cbeff-others-attibute.reg-client-versions=1.1.3,1.1.4,1.1.5
+
+regproc.notification.template.code.lost.uin.email=RPR_LOST_UIN_EMAIL
+regproc.notification.template.code.lost.uin.sms=RPR_LOST_UIN_SMS
+regproc.notification.template.code.lost.uin.sub=RPR_UIN_GEN_EMAIL_SUB
+regproc.notification.template.code.uin.created.email=RPR_UIN_GEN_EMAIL
+regproc.notification.template.code.uin.created.sms=RPR_UIN_GEN_SMS
+regproc.notification.template.code.uin.created.sub=RPR_UIN_GEN_EMAIL_SUB
+regproc.notification.template.code.uin.new.email=RPR_UIN_UPD_EMAIL
+regproc.notification.template.code.uin.new.sms=RPR_UIN_UPD_SMS
+regproc.notification.template.code.uin.new.sub=RPR_UIN_UPD_EMAIL_SUB
+regproc.notification.template.code.uin.activate.email=RPR_UIN_REAC_EMAIL
+regproc.notification.template.code.uin.activate.sms=RPR_UIN_REAC_SMS
+regproc.notification.template.code.uin.activate.sub=RPR_UIN_REAC_EMAIL_SUB
+regproc.notification.template.code.uin.deactivate.email=RPR_UIN_DEAC_EMAIL
+regproc.notification.template.code.uin.deactivate.sms=RPR_UIN_DEAC_SMS
+regproc.notification.template.code.uin.deactivate.sub=RPR_UIN_DEAC_EMAIL_SUB
+regproc.notification.template.code.uin.update.email=RPR_UIN_UPD_EMAIL
+regproc.notification.template.code.uin.update.sms=RPR_UIN_UPD_SMS
+regproc.notification.template.code.uin.update.sub=RPR_UIN_UPD_EMAIL_SUB
+regproc.notification.template.code.duplicate.uin.email=RPR_DUP_UIN_EMAIL
+regproc.notification.template.code.duplicate.uin.sms=RPR_DUP_UIN_SMS
+regproc.notification.template.code.duplicate.uin.sub=RPR_DUP_UIN_EMAIL_SUB
+regproc.notification.template.code.technical.issue.email=RPR_TEC_ISSUE_EMAIL
+regproc.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
+regproc.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
+regproc.notification.template.code.paused.for.additional.info.email=RPR_PAUSED_FOR_ADD_INFO_EMAIL
+regproc.notification.template.code.paused.for.additional.info.sms=RPR_PAUSED_FOR_ADD_INFO_SMS
+regproc.notification.template.code.paused.for.additional.info.sub=RPR_PAUSED_FOR_ADD_INFO_EMAIL_SUB
+
+regproc.packet.validator.notification.template.code.new.reg.email=RPR_RPV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.new.reg.sms=RPR_RPV_SUC_SMS
+regproc.packet.validator.notification.template.code.new.reg.sub=RPR_RPV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.lost.uin.email=RPR_LPV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.lost.uin.sms=RPR_LPV_SUC_SMS
+regproc.packet.validator.notification.template.code.lost.uin.sub=RPR_LPV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.reprint.uin.email=RPR_PPV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.reprint.uin.sms=RPR_PPV_SUC_SMS
+regproc.packet.validator.notification.template.code.reprint.uin.sub=RPR_PPV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.activate.email=RPR_APV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.activate.sms=RPR_APV_SUC_SMS
+regproc.packet.validator.notification.template.code.activate.sub=RPR_APV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.deactivate.email=RPR_DPV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.deactivate.sms=RPR_DPV_SUC_SMS
+regproc.packet.validator.notification.template.code.deactivate.sub=RPR_DPV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.uin.update.email=RPR_UPV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.uin.update.sms=RPR_UPV_SUC_SMS
+regproc.packet.validator.notification.template.code.uin.update.sub=RPR_UPV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.resident.update.email=RPR_RUPV_SUC_EMAIL
+regproc.packet.validator.notification.template.code.resident.update.sms=RPR_RUPV_SUC_SMS
+regproc.packet.validator.notification.template.code.resident.update.sub=RPR_RUPV_SUC_EMAIL_SUB
+regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TEC_ISSUE_EMAIL
+regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
+regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB

From 733deffd543111c175b64fe59f21970350c7585f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 13 Oct 2021 11:15:57 +0530
Subject: [PATCH 0276/1358] [MOSIP-17836] Updated for 1.2.0.

---
 registration-processor-default.properties | 54 +++++++++--------------
 1 file changed, 22 insertions(+), 32 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8972b3def82..e26046e6f84 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -55,9 +55,8 @@ packet.default.source=id
 schema.default.fieldCategory=pvt,none
 # The IDSchemaVersion used to create packets in reg-proc
 IDSchema.Version=0.1
-## TODO: correct this
-NGINXDMZURL=http://regproc-pktserver.regproc/
 packet.info.storage.service=*
+mosip.preferred-language.enabled=false
 
 ## Camel bridge
 # Url to cluster manager to enable this stage for joining the cluster in secure zone
@@ -114,15 +113,22 @@ DEVICEVALIDATEHISTORY=http://pms-partner.pms/v1/partnermanager/deviceproviderman
 IDSCHEMA=${MASTER}/idschema/latest
 
 ## ID Repository Services
-IDREPOSITORY=http://identity.idrepo/idrepository/v1/identity/
-IDREPOGETIDBYUIN=http://identity.idrepo/idrepository/v1/identity/idvid
+IDENTITY=http://identity.idrepo
+IDREPOSITORY=${IDENTITY}/idrepository/v1/identity/
+IDREPOGETIDBYUIN=${IDENTITY}/idrepository/v1/identity/idvid
 UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
-RETRIEVEIDENTITYFROMRID=http://identity.idrepo/idrepository/v1/identity/idvid
-RETRIEVEIDENTITY=http://identity.idrepo/idrepository/v1/identity/idvid
+RETRIEVEIDENTITYFROMRID=${IDENTITY}/idrepository/v1/identity/idvid
+RETRIEVEIDENTITY=${IDENTITY}/idrepository/v1/identity/idvid
 CREATEVID=http://vid.idrepo/idrepository/v1/vid
 GETUINBYVID=http://vid.idrepo/idrepository/v1/idvid
 CREDENTIALREQUEST=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
 GETVIDSBYUIN=http://vid.idrepo/idrepository/v1/vid/uin
+IDREPOHASDRAFT=${IDENTITY}/idrepository/v1/identity/draft
+IDREPOGETDRAFT=${IDENTITY}/idrepository/v1/identity/draft
+IDREPOCREATEDRAFT=${IDENTITY}/idrepository/v1/identity/draft/create
+IDREPOUPDATEDRAFT=${IDENTITY}/idrepository/v1/identity/draft/update
+IDREPOPUBLISHDRAFT=${IDENTITY}/idrepository/v1/identity/draft/publish
+IDREPOEXTRACTBIOMETRICS=${IDENTITY}/idrepository/v1/identity/draft/extractbiometrics/
 
 ## Encrypt Services
 KEYMANAGER=http://keymanager.keymanager/
@@ -147,6 +153,7 @@ EMAILNOTIFIER=${NOTIFIER}/v1/notifier/email/send
 
 ## PMS
 PMS=http://pms-policy.pms/v1/policymanager/policies
+PARTNERGETBIOEXTRACTOR=http://pms-partner.pms/v1/partnermanager/partners
 
 ## Registration status properties
 registration.processor.max.retry=10
@@ -224,7 +231,6 @@ registration.processor.identityjson=registration-processor-identity.json
 registration.processor.abis.json=registration-processor-abis.json
 registration.processor.demographic.identity=identity
 registration.processor.notification.emails=
-registration.processor.print.textfile=registration-processor-print-text-file.json
 
 ## Notification service
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
@@ -254,10 +260,6 @@ registration.processor.queue.username=artemis
 registration.processor.queue.password=${activemq.password}
 registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
-registration.processor.queue.address = print-service
-registration.processor.queue.printpostaladdress = postal-service
-
-registration.processor.document.category=idobject-document-category-mapping.json
 
 ## Packet validator
 registration.processor.applicant.type=applicanttype-document-mapping.json
@@ -282,11 +284,6 @@ registration.processor.reprocess.days_of_month=*
 registration.processor.reprocess.months=*
 registration.processor.reprocess.days_of_week=*
 
-## WorkflowAction api id
-mosip.regproc.workflow.action.api-id=mosip.registration.processor.workflow.action
-mosip.regproc.workflow.action.version=1.0
-mosip.regproc.workflow.action.hotlisted-tag=HOTLISTED
-mosip.regproc.workflow.action.resumefrombeginning.stage=PacketUploaderStage
 #WorkflowAction service  websub topic name
 mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
 mosip.regproc.workflow.action.job.server.port=8026
@@ -336,6 +333,12 @@ mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
 mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
 mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
 
+mosip.regproc.workflow.manager.eventbus.kafka.commit.type=single
+mosip.regproc.workflow.manager.eventbus.kafka.max.poll.records=100
+mosip.regproc.workflow.manager.eventbus.kafka.poll.frequency=100
+mosip.regproc.workflow.manager.eventbus.kafka.group.id=workflow-manager
+mosip.regproc.workflow.manager.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+
 
 #Service Ids
 #Audit request id
@@ -429,18 +432,6 @@ mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka:9092
 # Default base packages for stage beans to be scanned in a stage group
 mosip.regproc.mosip-stage-executor.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor,io.mosip.registartion.processor
 
-# packet receiver stage
-#Supported commmit config: auto, batch, single
-mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
-mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
-mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
-mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
-mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
-mosip.regproc.packet.receiver.server.port=8081
-mosip.regproc.packet.receiver.eventbus.port=5711
-# Flag to disable the copying of tags from the packet manger to the message event
-mosip.regproc.packet.receiver.message.tag.loading.disable=true
-
 #Event bus address for anonymous profile
 mosip.anonymous.profile.eventbus.address=anonymous-profile-bus-in
 
@@ -523,10 +514,6 @@ mosip.regproc.cmd-validator.device.allowed-digital-id-timestamp-variation=30
 # Timestamp format followed in digital id and biometrics payload
 mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:mm:ss'Z'
 
-mosip.registration.processor.validate-machine=true
-mosip.registration.processor.validate-device=true
-mosip.registration.processor.validate-center=true
-
 ## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
 mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
@@ -866,3 +853,6 @@ regproc.packet.validator.notification.template.code.resident.update.sub=RPR_RUPV
 regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TEC_ISSUE_EMAIL
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
+
+openapi.registrationProcessor.servers[0].url=http://${mosip.api.internal.host}/registrationprocessor/v1/registrationtransaction
+openapi.registrationProcessor.servers[0].description=Registration Processor URL

From 10cd06e2194a4a19750d16ba08b532360b513df2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 13 Oct 2021 11:25:47 +0530
Subject: [PATCH 0277/1358] Missing props added.

---
 registration-processor-default.properties | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e26046e6f84..b57c985d7a8 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -856,3 +856,14 @@ regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_
 
 openapi.registrationProcessor.servers[0].url=http://${mosip.api.internal.host}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
+
+# TODO: Check these properties - they are missing for qa-double-rc2, but services fail if we don't add these.
+# packet receiver stage
+#Supported commmit config: auto, batch, single
+mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
+mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
+mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
+mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
+mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
+mosip.regproc.packet.receiver.server.port=8081
+mosip.regproc.packet.receiver.eventbus.port=5711

From b381cfe617d11b9bff523f3820ca23b166fc2492 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 13 Oct 2021 16:06:33 +0530
Subject: [PATCH 0278/1358] Syncdata updated.

---
 syncdata-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 731b083e35f..f59b4c3c498 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -423,6 +423,9 @@ mosip.sync.entity.only-on-fullsync.APPLICANTTYPE.MVEL=false
 
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
+syncdata.cache.evict.delta-sync.cron=0 0/15 * * * *
+syncdata.cache.snapshot.cron=0 0 23 * * * 
+
 ## Roles
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From 30979ea89356e03f1ae275c4619095a274d78d5b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 14 Oct 2021 17:35:31 +0530
Subject: [PATCH 0279/1358] IDA internal property file added.

---
 id-authentication-default.properties          |  2 --
 id-authentication-internal-default.properties | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 id-authentication-internal-default.properties

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index a9295a6097c..e3922dd78bc 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -229,8 +229,6 @@ ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servle
 ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
new file mode 100644
index 00000000000..2a9c587a184
--- /dev/null
+++ b/id-authentication-internal-default.properties
@@ -0,0 +1,16 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# mosip.api.internal.url
+
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+
+# ********* ADMIN Configurations ************
+# Configure N time period threshold for accepting auth/OTP/KYC request for a country
+authrequest.received-time-allowed.seconds=120
+# Configuration for +/- time period adjustment in minutes for the request time validation, so that 
+# The requests originating from a system that is not in time-sync will be accepted for the time period
+authrequest.received-time-adjustment.seconds=30
+#Configuration for time period difference between each biometric segment and digital Id capture
+authrequest.biometrics.allowed-segment-time-difference-in-seconds=60

From 2534887e97158cf019c97f545d05b76e21ec4114 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 26 Oct 2021 10:10:27 +0530
Subject: [PATCH 0280/1358] IDA properties updated from develop2 branch.

---
 id-authentication-default.properties | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index e3922dd78bc..af6f0385b95 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -553,6 +553,20 @@ mosip.ida.credential.biometric.attribute.name=individualBiometrics
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
+#The list of attributes in identity that are to be decrypted by default 
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
+
+#------ Un-encrypted Credential Attributes list -----------
+#The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).
+#These attributes will not be decrypted when fetching the records from IDA DB for Authentication/EKYC/OTP requests.
+#By default all attributes are assumed to be Zero Knowledge encrypted.
+#Specify the attributes here only if they are not encrypted as per the datashare policy.
+ida-zero-knowledge-unencrypted-credential-attributes=
+
+#openapi properties to sort tags and operations in Id Authentication
+springdoc.swagger-ui.tagsSorter=alpha
+springdoc.swagger-ui.operationsSorter=alpha
+
 ## Roles
 mosip.role.idauth.postotp=RESIDENT
 mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT

From 974a7833dc335b1eef94fb6bc114d64cfbb02c9b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 26 Oct 2021 17:39:38 +0530
Subject: [PATCH 0281/1358] IDA prop updated.

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index af6f0385b95..6018163b427 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -93,7 +93,7 @@ mosip.ida.request.timeout.secs=10
 mosip.ida.request.mediaType=application/json
 
 ## IDA mapping
-ida.mapping.json.filename=id-authentication-mapping.json
+ida.mapping.json.filename=identity-mapping.json
 mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${ida.mapping.json.filename} 
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 

From a80f1ea405af8ef2f65bedbf3269f6ccfac9bac3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 27 Oct 2021 10:15:07 +0530
Subject: [PATCH 0282/1358] IDA prop added.

---
 id-authentication-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 6018163b427..e5305790348 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -229,6 +229,8 @@ ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servle
 ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
+## Masterdata templates
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000

From 32b93334d6ce8fc3a64f1ccec7b895fbac8b3e22 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 27 Oct 2021 10:18:50 +0530
Subject: [PATCH 0283/1358] IDA prop added.

---
 id-authentication-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index e5305790348..ce4a62046bf 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -231,6 +231,7 @@ ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.contex
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
 ## Masterdata templates
 ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000

From 2bcc55b1913044b25ef4ef165a067e2c0bd85578 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 28 Oct 2021 09:55:38 +0530
Subject: [PATCH 0284/1358] All flows in regproc enabled.

---
 registration-processor-default.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b57c985d7a8..f7026660c6f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -64,9 +64,7 @@ cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
-## TODO: Revert to all flows
-#camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
-camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml
+camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
 
 # main processor used in stages
 registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE

From f5410d5c298befe3a7c7b2264bda528f82afd17f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 29 Oct 2021 10:16:55 +0530
Subject: [PATCH 0285/1358] Admin prop reverted.

---
 admin-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index afff909e674..58fc26613c8 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -181,9 +181,9 @@ mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
 mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
-tempuri=https://admin.v3box1.mosip.net
-#mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
-mosip.admin-services.redirecturi=${tempuri}/v1/admin/login-redirect/
+#tempuri=https://admin.v3box1.mosip.net
+#mosip.admin-services.redirecturi=${tempuri}/v1/admin/login-redirect/
+mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth

From afcd0e4f67b528f5bcd1b04024b3d6976b236b81 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 29 Oct 2021 10:43:30 +0530
Subject: [PATCH 0286/1358] Admin prop corrected.

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 58fc26613c8..21e3169bb95 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -202,8 +202,8 @@ mosip.security.secure-cookie=false
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
 mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
-#mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
-mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
+#mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code

From cd047e48610a0c0f2b28cfd63810a877e4831ac1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 29 Oct 2021 11:58:40 +0530
Subject: [PATCH 0287/1358] Kernel roles updated.

---
 kernel-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 9d31234f1fb..e795656e9dd 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -732,3 +732,4 @@ mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_A
 mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postzkreencryptrandomkey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN

From 88cf559d6cf1dc0a2a26b0219d923a3a2c1df90a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 29 Oct 2021 12:17:50 +0530
Subject: [PATCH 0288/1358] Admin roles updated.

---
 admin-default.properties | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 21e3169bb95..477ba0e12f6 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -217,3 +217,10 @@ regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
 KEYBASEDTOKENAPI=${authmanager.base.url}/authenticate/clientidsecretkey
+
+# Roles
+mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.postbulkupload=GLOBAL_ADMIN
+mosip.role.admin.getbulkuploadtranscationtranscationid=GLOBAL_ADMIN
+mosip.role.admin.getbulkuploadgetalltransactions=GLOBAL_ADMIN
+mosip.role.admin.postauditmanagerlog=GLOBAL_ADMIN,ZONAL_ADMIN

From 11337e1eea6529a03b08c9ac3d2ec14ac96758e0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 3 Nov 2021 10:33:21 +0530
Subject: [PATCH 0289/1358] Token param updated.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index e795656e9dd..1afb8224de0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -441,7 +441,7 @@ openapi.masterdata.servers[0].description=Admin Masterdata url
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
-auth.server.admin.offline.token.validate=false
+auth.server.admin.offline.token.validate=true
 
 ## Roles
 

From aa2d40296e3001bcdc8a306a8ac04ea8ced61e47 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 3 Nov 2021 15:11:01 +0530
Subject: [PATCH 0290/1358] IAM adapter properties updated.

---
 admin-default.properties         | 5 +++++
 id-repository-default.properties | 4 ++++
 kernel-default.properties        | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 477ba0e12f6..2033be88f80 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -218,6 +218,11 @@ regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
 KEYBASEDTOKENAPI=${authmanager.base.url}/authenticate/clientidsecretkey
 
+# IAM adapter
+mosip.iam.adapter.appid=admin
+mosip.iam.adapter.clientid=mosip-admin-client
+mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
+
 # Roles
 mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.postbulkupload=GLOBAL_ADMIN
diff --git a/id-repository-default.properties b/id-repository-default.properties
index b06198babab..d9b8742d23e 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -348,6 +348,10 @@ auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
 # Enabling below property will start logging performance logs in identity and vid service
 mosip.idrepo.aspect-logging.enabled=false
 
+mosip.iam.adapter.appid.id-repository=regproc
+mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
+mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.regproc.client.secret}
+
 # Roles
 mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST
diff --git a/kernel-default.properties b/kernel-default.properties
index 1afb8224de0..e7e09710fda 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -441,7 +441,11 @@ openapi.masterdata.servers[0].description=Admin Masterdata url
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
-auth.server.admin.offline.token.validate=true
+auth.server.admin.offline.token.validate=false
+
+mosip.iam.adapter.appid=admin
+mosip.iam.adapter.clientid=mosip-admin-client
+mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
 ## Roles
 

From cf399c7665d050d449da46da51c56ea2705a4366 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 3 Nov 2021 15:18:24 +0530
Subject: [PATCH 0291/1358] Realm id prop updated.

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index b23515a26a0..4241efe6806 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -171,6 +171,7 @@ mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
 mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
 
 ## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
@@ -383,3 +384,4 @@ mosip.default.user-preferred-language-attribute=preferredLang
 
 # Path to identity mapping json file
 mosip.identity.mapping-file=${mosip.kernel.xsdstorage-uri}/identity-mapping.json
+

From 0dd32c0aeed9a3932db0e51ebfb74a7f0cf10285 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 3 Nov 2021 15:25:00 +0530
Subject: [PATCH 0292/1358] auth.server prop updated.

---
 admin-default.properties              | 1 +
 application-default.properties        | 2 ++
 data-share-default.properties         | 2 ++
 hotlist-default.properties            | 2 ++
 id-repository-default.properties      | 3 +++
 kernel-default.properties             | 2 ++
 partner-management-default.properties | 1 +
 pre-registration-default.properties   | 1 +
 syncdata-default.properties           | 1 +
 9 files changed, 15 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 2033be88f80..14ca78b0dda 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -29,6 +29,7 @@ mosip.admin.app-id=admin
 mosip.kernel.signature.cryptomanager-encrypt-url=http://keymanager.keymanager/v1/keymanager/private/encrypt
 auth.server.validate.url=${authmanager.base.url}/authorize/admin/validateToken
 auth.server.refreshToken.url=${authmanager.base.url}/authorize/admin/refreshToken
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client
 auth.role.prefix=ROLE_
 auth.header.name=Authorization
 
diff --git a/application-default.properties b/application-default.properties
index 4241efe6806..8b0b8946753 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -164,6 +164,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.issuer.uri=${keycloak.host}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.host}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 
@@ -385,3 +386,4 @@ mosip.default.user-preferred-language-attribute=preferredLang
 # Path to identity mapping json file
 mosip.identity.mapping-file=${mosip.kernel.xsdstorage-uri}/identity-mapping.json
 
+
diff --git a/data-share-default.properties b/data-share-default.properties
index 0f4f613197a..b82c3b9fceb 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -31,3 +31,5 @@ mosip.data.share.includeCertificate=false
 mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=true
+
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client
diff --git a/hotlist-default.properties b/hotlist-default.properties
index c440e8e486a..935ba93f93c 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -69,3 +69,5 @@ kernel.retry.traverse.root.cause.enabled=false
 kernel.retry.retryable.exceptions=io.mosip.hotlist.exception.HotlistRetryException
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
+
+auth.server.admin.allowed.audience=mosip-regproc-client
diff --git a/id-repository-default.properties b/id-repository-default.properties
index d9b8742d23e..412acb237c8 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -352,6 +352,8 @@ mosip.iam.adapter.appid.id-repository=regproc
 mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
 mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.regproc.client.secret}
 
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client
+
 # Roles
 mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST
@@ -382,3 +384,4 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR
+
diff --git a/kernel-default.properties b/kernel-default.properties
index e7e09710fda..0d90668d1a3 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -292,6 +292,7 @@ kernel.uin.transfer-scheduler-days_of_week=*
 ## UIN Auth adapter config
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 
+
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
@@ -442,6 +443,7 @@ openapi.masterdata.servers[0].description=Admin Masterdata url
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
 auth.server.admin.offline.token.validate=false
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
diff --git a/partner-management-default.properties b/partner-management-default.properties
index b149114dd31..47601fe8b88 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -146,6 +146,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index f10870f3f78..b3aae390e62 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -246,6 +246,7 @@ appId=prereg
 kernel.auth.env=http://authmanager.kernel
 kernel.auth.contextpath=authmanager
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client
 
 ## PRID service 
 kernel.prid.env=http://pridgenerator.kernel
diff --git a/syncdata-default.properties b/syncdata-default.properties
index f59b4c3c498..7b87974e3ca 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -300,6 +300,7 @@ kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111

From 018fd385b466acaba5bebb84065f16b7e339b301 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 8 Nov 2021 12:55:09 +0530
Subject: [PATCH 0293/1358] Reprocess prop corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f7026660c6f..086cc6b525e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -270,7 +270,7 @@ mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.
 registration.processor.reprocess.fetchsize=100
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=30
+registration.processor.reprocess.elapse.time=7200
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From f33d226d4e92b0417d46c613ccc24f7955a56202 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 8 Nov 2021 16:37:57 +0530
Subject: [PATCH 0294/1358] Reprocess prop updated.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 086cc6b525e..b0968b8c2e6 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -270,7 +270,7 @@ mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.
 registration.processor.reprocess.fetchsize=100
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=7200
+registration.processor.reprocess.elapse.time=120
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From 12afe11389741d09f2d524a55b900124ebe2427b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 9 Nov 2021 08:08:24 +0530
Subject: [PATCH 0295/1358] Biometric correction camel xml added.

---
 ...el-routes-biometric-correction-default.xml | 225 ++++++++++++++++++
 1 file changed, 225 insertions(+)
 create mode 100644 registration-processor-camel-routes-biometric-correction-default.xml

diff --git a/registration-processor-camel-routes-biometric-correction-default.xml b/registration-processor-camel-routes-biometric-correction-default.xml
new file mode 100644
index 00000000000..46f127d744e
--- /dev/null
+++ b/registration-processor-camel-routes-biometric-correction-default.xml
@@ -0,0 +1,225 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <route id="packet-reciever-->securezone-notification biometric_correction route">
+      <from uri="eventbus://packet-receiver-biometric_correction-bus-out" />
+      <log message="packet-reciever-->securezone-notification biometric_correction ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="securezone-notification-->packet-uploader biometric_correction route">
+      <from uri="eventbus://securezone-notification-biometric_correction-bus-out" />
+      <log message="securezone-notification-->packet-uploader biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected-without-parent-flow" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-uploader-->packet-validator biometric_correction route">
+      <from uri="eventbus://packet-uploader-biometric_correction-bus-out" />
+      <log message="packet-uploader-->packet-validator biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-validator-->packet-classifier biometric_correction route">
+      <from uri="eventbus://packet-validator-biometric_correction-bus-out" />
+      <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-classifier-->cmd-validator biometric_correction route">
+      <from uri="eventbus://packet-classifier-biometric_correction-bus-out" />
+      <log message="packet-classifier-->cmd-validator biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://c-m-d-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="cmd-validator-->operator-validator biometric_correction route">
+      <from uri="eventbus://c-m-d-validator-biometric_correction-bus-out" />
+      <log message="cmd-validator-->operator-validator/supervisor-validator biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://operator-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="operator-validator-->supervisor-validator biometric_correction route">
+      <from uri="eventbus://operator-validator-biometric_correction-bus-out" />
+      <log message="operator-validator-->supervisor-validator/introducer-validator/demo-dedupe biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+          <otherwise>
+                 <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="supervisor-validator-->introducer-validator biometric_correction route">
+      <from uri="eventbus://supervisor-validator-biometric_correction-bus-out" />
+      <log message="supervisor-validator-->introducer-validator/demo-dedupe biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+          <otherwise>
+                 <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="introducer-validator-->resume parent biometric_correction route">
+      <from uri="eventbus://introducer-validator-biometric_correction-bus-out" />
+      <log message="introducer-validator-->resume parent biometric_correction route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+        <otherwise>
+                 <to uri="workflow-cmd://complete-as-processed" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>

From b879509d6f4eebaf65cf6b00d17d3b12991130de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 9 Nov 2021 11:13:02 +0530
Subject: [PATCH 0296/1358] Packet server property added.

---
 registration-processor-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b0968b8c2e6..aafc27600d9 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -855,6 +855,8 @@ regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_
 openapi.registrationProcessor.servers[0].url=http://${mosip.api.internal.host}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
+NGINXDMZURL=http://regproc-pktserver.regproc/
+
 # TODO: Check these properties - they are missing for qa-double-rc2, but services fail if we don't add these.
 # packet receiver stage
 #Supported commmit config: auto, batch, single

From e61c687a499a2e29ceb648b2797d78388d1b0bd0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 9 Nov 2021 12:25:19 +0530
Subject: [PATCH 0297/1358] Signature verification disabled for testing.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 8b0b8946753..7fc83a6f50b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -309,7 +309,7 @@ mosip.registration.gps_device_enable_flag=n
 packetmanager.default.read.strategy=defaultPriority
 packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
-packetmanager.packet.signature.disable-verification=false
+packetmanager.packet.signature.disable-verification=true
 mosip.commons.packetnames=id,evidence,optional
 provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
 provider.packetreader.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketReaderImpl

From 2585ffeef1fba1725e50349bc15cdc73742f8609 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 10 Nov 2021 10:10:19 +0530
Subject: [PATCH 0298/1358] PMS url corrected.

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index ce4a62046bf..9fc334d7d0f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -181,7 +181,7 @@ auth-token-generator.rest.secretKey=${mosip.ida.auth.secretKey}
 auth-token-generator.rest.appId=${mosip.ida.auth.appId}
 
 ## Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
-id-pmp-service.rest.uri=http://partner-manager.pms/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
+id-pmp-service.rest.uri=http://pms-partner.pms/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
 id-pmp-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-pmp-service.rest.timeout=${mosip.ida.request.timeout.secs}

From 8b48648f66d7bafefe3afc49509da4d8344ec827 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Wed, 10 Nov 2021 17:15:30 +0530
Subject: [PATCH 0299/1358] [ MOSIP-17992 ] updated kernel-default.properties

updated partner cert grace duration to 30 days
mosip.kernel.partner.issuer.certificate.allowed.grace.duration=30
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0d90668d1a3..60cf7f3654a 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -434,7 +434,7 @@ mosip.ui.spec.default.domain=registration-client
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=200
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=30
 
 # masterdata swagger openApi
 openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata

From 4423be99f3e0a49512a2d6db1b2534098305c7db Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Wed, 10 Nov 2021 19:15:05 +0530
Subject: [PATCH 0300/1358] [MOSIP-17992] increased the partner cert issuer
 grace duration to 500

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 60cf7f3654a..0cd57e45ee9 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -434,7 +434,7 @@ mosip.ui.spec.default.domain=registration-client
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=30
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=500
 
 # masterdata swagger openApi
 openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata

From d29232cd05854706e21ff8394c4561284e1f8d58 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 11 Nov 2021 10:58:31 +0530
Subject: [PATCH 0301/1358] MOSIP cbeff xsd updated.

---
 mosip-cbeff.xsd | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/mosip-cbeff.xsd b/mosip-cbeff.xsd
index 4f53d61be96..c39a985c276 100644
--- a/mosip-cbeff.xsd
+++ b/mosip-cbeff.xsd
@@ -5,7 +5,6 @@ obtaining a copy of the Schema, to use, copy, modify, merge and distribute free
 of charge, copies of the Schema for the purposes of developing, implementing, 
 installing and using software based on the Schema, and to permit persons to 
 whom the Schema is furnished to do so, subject to the following conditions:
-
 THE SCHEMA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -21,13 +20,14 @@ xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://
 		<xs:sequence>
 			<xs:element name="Version" type="VersionType" minOccurs="0"/>
 			<xs:element name="CBEFFVersion" type="VersionType" minOccurs="0"/>
-			<xs:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
+			<!--<xs:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded"/>-->
 			<xs:element name="BIRInfo" type="BIRInfoType"/>
 			<xs:element name="BDBInfo" type="BDBInfoType" minOccurs="0"/>
 			<xs:element name="SBInfo" type="SBInfoType" minOccurs="0"/>
 			<xs:element name="BIR" type="BIRType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="BDB" type="xs:base64Binary" minOccurs="0"/>
-			<xs:element name="SB" type="xs:base64Binary" minOccurs="0"/>
+			<xs:element name="BDB" type="xs:base64Binary" minOccurs="0" />
+			<xs:element name="SB" type="xs:base64Binary" minOccurs="0" />
+			<xs:element name="Others" type="Entry" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="VersionType">
@@ -171,4 +171,12 @@ xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://
 			<xs:pattern value="[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}"/>
 		</xs:restriction>
 	</xs:simpleType>
-</xs:schema>
+
+	<xs:complexType name="Entry">
+		<xs:sequence>
+			<xs:element name="Key" type="xs:string"/>
+			<xs:element name="Value" type="xs:string"/>
+		</xs:sequence>
+	</xs:complexType>
+
+</xs:schema>
\ No newline at end of file

From 710924c140184044735f0e66ee7f718146c11962 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 11 Nov 2021 11:25:08 +0530
Subject: [PATCH 0302/1358] Reg proc prop corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index aafc27600d9..e395f31aeb2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -138,7 +138,7 @@ DIGITALSIGNATURE=${KEYMANAGER}/v1/keymanager/sign
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
 # Validate hostlisted devices
 DEVICEHOTLIST=http://admin-hotlist-service/v1/hotlist
-JWTVERIFY=http://${KEYMANAGER}/v1/keymanager/jwtVerify
+JWTVERIFY=${KEYMANAGER}/v1/keymanager/jwtVerify
 
 ## Crypto
 CRYPTOMANAGERDECRYPT=${KEYMANAGER}/v1/keymanager/decrypt

From 87311e15cac551b9ba7028c15adc5f31219075f5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 11 Nov 2021 12:47:50 +0530
Subject: [PATCH 0303/1358] Camel xml updated.

---
 ...ion-processor-camel-routes-new-default.xml | 171 +++++++++++-------
 1 file changed, 107 insertions(+), 64 deletions(-)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index c24fba42682..865eb2c9ef6 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -33,6 +33,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader new route">
       <from uri="eventbus://securezone-notification-new-bus-out" />
       <log message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
@@ -54,10 +55,10 @@
          </otherwise>
       </choice>
    </route>
-    <!-- packet-uploader to packet-validator Route -->
-    <route id="packet-uploader-->packet-validator new route">
-    <from uri="eventbus:packet-uploader-new-bus-out" />
-    <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
+   <!-- packet-uploader to packet-validator Route -->
+   <route id="packet-uploader-->packet-validator new route">
+      <from uri="eventbus://packet-uploader-new-bus-out" />
+      <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -75,12 +76,11 @@
             <to uri="eventbus://packet-validator-bus-in" />
          </otherwise>
       </choice>
-    </route>
-
-    <!-- Packet Validator to Packet classifier Route -->
-    <route id="packet-validator-->packet-classifier new route">
-        <from uri="eventbus:packet-validator-new-bus-out" />
-        <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
+   </route>
+   <!-- Packet Validator to Packet classifier Route -->
+   <route id="packet-validator-->packet-classifier new route">
+      <from uri="eventbus://packet-validator-new-bus-out" />
+      <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -98,12 +98,11 @@
             <to uri="eventbus://packet-classifier-bus-in" />
          </otherwise>
       </choice>
-    </route>
-
-    <!-- Packet Classifier to Quality Checker Route -->
-    <route id="packet-classifier-->quality-checker new route">
-        <from uri="eventbus:packet-classifier-new-bus-out" />
-        <log message="packet-classifier-->quality-checker new route ${bodyAs(String)}" />
+   </route>
+   <!-- Packet Classifier to Quality Classifier Route -->
+   <route id="packet-classifier-->cmd-validator new route">
+      <from uri="eventbus://packet-classifier-new-bus-out" />
+      <log message="packet-classifier-->quality-classifier new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -118,46 +117,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <to uri="eventbus://quality-classifier-bus-in" />
-         </otherwise>
-      </choice>
-    </route>
-
-   <route id="quality-classifier-->cmd-validator new route">
-      <from uri="eventbus://quality-classifier-new-bus-out" />
-      <log message="quality-classifier-->cmd-validator new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-	  <when>
-             <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
-           <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
-           <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
-           <to uri="workflow-cmd://pause-and-request-additional-info" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://c-m-d-validator-bus-in" />
-         </when>
-		  <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
-           <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
-		    <!-- PAUSE_FOR is in seconds -->
-           <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
-           <to uri="workflow-cmd://pause-and-request-additional-info" />
-         </when>
-         <otherwise>
-            <to uri="workflow-cmd://complete-as-failed" />
          </otherwise>
       </choice>
    </route>
@@ -215,7 +175,7 @@
             <to uri="eventbus://introducer-validator-bus-in" />
          </when>
          <otherwise>
-            <to uri="eventbus://demo-dedupe-bus-in" />
+            <to uri="eventbus://quality-classifier-bus-in" />
          </otherwise>
       </choice>
    </route>
@@ -240,13 +200,13 @@
             <to uri="eventbus://introducer-validator-bus-in" />
          </when>
          <otherwise>
-            <to uri="eventbus://demo-dedupe-bus-in" />
+            <to uri="eventbus://quality-classifier-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="introducer-validator-->demo-dedupe new route">
+   <route id="introducer-validator-->quality-classifier new route">
       <from uri="eventbus://introducer-validator-new-bus-out" />
-      <log message="introducer-validator-->demo-dedupe new route ${bodyAs(String)}" />
+      <log message="packet-classifier-->quality-classifier new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -258,10 +218,48 @@
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
+            <to uri="eventbus://quality-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="quality-classifier-->demo-dedupe new route">
+      <from uri="eventbus://quality-classifier-new-bus-out" />
+      <log message="quality-classifier-->demo-dedupe new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
+            <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+            <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+            <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://demo-dedupe-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+            <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+            <!-- PAUSE_FOR is in seconds -->
+            <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+            <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
          </otherwise>
       </choice>
    </route>
@@ -398,10 +396,55 @@
          </otherwise>
       </choice>
    </route>
-   <!-- UIN Generator to Printing Route -->
-   <route id="uin-generation route-->printing-stage new route">
+   <!-- UIN Generator to biometric-extraction Route -->
+   <route id="uin-generation route-->biometric-extraction-stage new route">
       <from uri="eventbus://uin-generator-new-bus-out" />
-      <log message="uin-generation-->printing-stage route ${bodyAs(String)}" />
+      <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-extraction-bus-in" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
+ <!-- biometric-extraction to finalization Route -->
+   <route id="biometric-extraction route-->finalization-stage new route">
+      <from uri="eventbus://biometric-extraction-new-bus-out" />
+      <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+	 <!-- finalization to Printing Route -->
+   <route id="finalization route-->printing-stage new route">
+      <from uri="eventbus://finalization-new-bus-out" />
+      <log message="finalization-->printing-stage route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -417,6 +460,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
+			<to uri="workflow-cmd://anonymous-profile" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
@@ -443,4 +487,3 @@
       </choice>
    </route>
 </routes>
-

From 14d380f1a89f444233585cf5d7719f6b5d76a7e1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 11 Nov 2021 15:13:03 +0530
Subject: [PATCH 0304/1358] Regproc prop corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e395f31aeb2..24f7a94fbb1 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -137,7 +137,7 @@ ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
 DIGITALSIGNATURE=${KEYMANAGER}/v1/keymanager/sign
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
 # Validate hostlisted devices
-DEVICEHOTLIST=http://admin-hotlist-service/v1/hotlist
+DEVICEHOTLIST=http://admin-hotlist.admin/v1/hotlist
 JWTVERIFY=${KEYMANAGER}/v1/keymanager/jwtVerify
 
 ## Crypto

From 54c2e363c3092b5eeab64615908d5ab0e179f9c9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 11 Nov 2021 22:07:37 +0530
Subject: [PATCH 0305/1358] Missing prop added.

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 7fc83a6f50b..2dfe14bfcfd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -386,4 +386,5 @@ mosip.default.user-preferred-language-attribute=preferredLang
 # Path to identity mapping json file
 mosip.identity.mapping-file=${mosip.kernel.xsdstorage-uri}/identity-mapping.json
 
+mosip.notification.timezone=GMT+05:30
 

From 4875b50e51a86a601eab402526461561733fa1de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 12 Nov 2021 12:32:30 +0530
Subject: [PATCH 0306/1358] IDA internal prop updated.

---
 id-authentication-internal-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 2a9c587a184..20d767763cc 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -14,3 +14,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client

From ea80ca653fd0b32ca33cb6d7e6c4667522236a86 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 12 Nov 2021 13:00:54 +0530
Subject: [PATCH 0307/1358] [MOSIP-17992] commend
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0cd57e45ee9..7b501a91add 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -434,7 +434,7 @@ mosip.ui.spec.default.domain=registration-client
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=500
+##mosip.kernel.partner.issuer.certificate.allowed.grace.duration=500
 
 # masterdata swagger openApi
 openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata

From ec519fc43c4c8d94c451c45877e0504b8d0647fb Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 12 Nov 2021 17:17:21 +0530
Subject: [PATCH 0308/1358] updated
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 7b501a91add..0b139a15b34 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -434,7 +434,7 @@ mosip.ui.spec.default.domain=registration-client
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-##mosip.kernel.partner.issuer.certificate.allowed.grace.duration=500
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=60
 
 # masterdata swagger openApi
 openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata

From 43b8950632721604e8efe3d7d9ed28e49ff496f6 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Mon, 15 Nov 2021 11:55:23 +0530
Subject: [PATCH 0309/1358] Update kernel-default.properties

updated mosip.kernel.partner.issuer.certificate.allowed.grace.duration property
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0b139a15b34..9325145a758 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -434,7 +434,7 @@ mosip.ui.spec.default.domain=registration-client
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=60
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 
 # masterdata swagger openApi
 openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata

From 52534ad89146ac32b348234fc07e90f596b1244b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 16 Nov 2021 12:13:29 +0530
Subject: [PATCH 0310/1358] Prereg demographic file added (was missing).

---
 pre-registration-demographic.json | 359 ++++++++++++++++++++++++++++++
 1 file changed, 359 insertions(+)
 create mode 100644 pre-registration-demographic.json

diff --git a/pre-registration-demographic.json b/pre-registration-demographic.json
new file mode 100644
index 00000000000..c4b839d770a
--- /dev/null
+++ b/pre-registration-demographic.json
@@ -0,0 +1,359 @@
+{
+    "identity": [
+        {
+            "id": "IDSchemaVersion",
+            "description": "ID Schema Version",
+            "type": "number",
+            "controlType": null,
+            "fieldType": "default",
+            "inputRequired": false,
+            "validators": [],
+            "required": true
+        },
+        {
+            "id": "fullName",
+            "description": "Enter Full Name",
+            "labelName": {
+                "eng": "Full Name",
+                "fra": "Nom complet"
+            },
+            "controlType": "textbox",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": true,
+            "transliteration": true
+        },
+        {
+            "id": "dateOfBirth",
+            "description": "Enter DOB",
+            "labelName": {
+                "eng": "Date Of Birth",
+                "fra": "Date de naissance"
+            },
+            "controlType": "date",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "string",
+            "validators": [],
+            "required": true
+        },
+        {
+            "id": "gender",
+            "description": "Enter Gender",
+            "labelName": {
+                "eng": "Gender",
+                "fra": "Le genre"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "dynamic",
+            "type": "simpleType",
+            "validators": [],
+            "required": true
+        },
+        {
+            "id": "residenceStatus",
+            "description": "Residence status",
+            "labelName": {
+                "eng": "Residence Status",
+                "fra": "Statut de résidence"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "dynamic",
+            "type": "simpleType",
+            "validators": [],
+            "required": true
+        },
+        {
+            "id": "addressLine1",
+            "description": "addressLine1",
+            "labelName": {
+                "eng": "Address Line1",
+                "fra": "Adresse 1"
+            },
+            "controlType": "textbox",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": true,
+            "transliteration": true
+        },
+        {
+            "id": "addressLine2",
+            "description": "addressLine2",
+            "labelName": {
+                "eng": "Address Line2",
+                "fra": "Adresse 2"
+            },
+            "controlType": "textbox",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": false,
+            "transliteration": true
+        },
+        {
+            "id": "addressLine3",
+            "description": "addressLine3",
+            "labelName": {
+                "eng": "Address Line3",
+                "fra": "Adresse 3"
+            },
+            "controlType": "textbox",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": false,
+            "transliteration": true
+        },
+        {
+            "id": "region",
+            "description": "region",
+            "labelName": {
+                "eng": "Region",
+                "fra": "Région"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": true
+        },
+        {
+            "id": "province",
+            "description": "province",
+            "labelName": {
+                "eng": "Province",
+                "fra": "Province"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": true
+        },
+        {
+            "id": "city",
+            "description": "city",
+            "labelName": {
+                "eng": "City",
+                "fra": "Ville"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^(?=.{0,50}$).*",
+                    "arguments": []
+                }
+            ],
+            "required": true
+        },
+        {
+            "id": "zone",
+            "description": "zone",
+            "labelName": {
+                "eng": "Zone",
+                "fra": "Zone"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "simpleType",
+            "validators": [],
+            "required": true
+        },
+        {
+            "id": "postalCode",
+            "description": "postalCode",
+            "labelName": {
+                "eng": "Postal Code",
+                "fra": "code postal"
+            },
+            "controlType": "dropdown",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "string",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+                    "arguments": []
+                }
+            ],
+            "required": true
+        },
+        {
+            "id": "phone",
+            "description": "phone",
+            "labelName": {
+                "eng": "Phone",
+                "fra": "Téléphone"
+            },
+            "controlType": "textbox",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "string",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^([6-9]{1})([0-9]{9})$",
+                    "arguments": []
+                }
+            ],
+            "required": true
+        },
+        {
+            "id": "email",
+            "description": "email",
+            "labelName": {
+                "eng": "Email",
+                "fra": "Email"
+            },
+            "controlType": "textbox",
+            "inputRequired": true,
+            "fieldType": "default",
+            "type": "string",
+            "validators": [
+                {
+                    "type": "regex",
+                    "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+                    "arguments": []
+                }
+            ],
+            "required": true
+        },
+        {
+            "id": "proofOfAddress",
+            "description": "proofOfAddress",
+            "labelName": {
+                "fra": "Address Proof",
+                "eng": "Address Proof"
+            },
+            "controlType": "fileupload",
+            "inputRequired": true,
+            "validators": [],
+            "subType": "POA",
+            "required": false
+        },
+        {
+            "id": "proofOfIdentity",
+            "description": "proofOfIdentity",
+            "labelName": {
+                "fra": "Identity Proof",
+                "eng": "Identity Proof"
+            },
+            "controlType": "fileupload",
+            "inputRequired": true,
+            "validators": [],
+            "subType": "POI",
+            "required": true
+        },
+        {
+            "id": "proofOfRelationship",
+            "description": "proofOfRelationship",
+            "labelName": {
+                "fra": "Relationship Proof",
+                "eng": "Relationship Proof"
+            },
+            "controlType": "fileupload",
+            "inputRequired": true,
+            "validators": [],
+            "subType": "POR",
+            "required": false
+        },
+        {
+            "id": "proofOfDateOfBirth",
+            "description": "proofOfDateOfBirth",
+            "labelName": {
+                "fra": "DOB Proof",
+                "eng": "DOB Proof"
+            },
+            "controlType": "fileupload",
+            "inputRequired": true,
+            "validators": [],
+            "subType": "POB",
+            "required": true
+        },
+        {
+            "id": "proofOfException",
+            "description": "proofOfException",
+            "labelName": {
+                "fra": "Exception Proof",
+                "eng": "Exception Proof"
+            },
+            "controlType": "fileupload",
+            "inputRequired": true,
+            "validators": [],
+            "subType": "POE",
+            "required": true
+        },
+        {
+            "id": "proofOfException-1",
+            "description": "proofOfException",
+            "labelName": {
+                "fra": "Exception Proof",
+                "eng": "Exception Proof"
+            },
+            "controlType": "fileupload",
+            "inputRequired": true,
+            "validators": [],
+            "subType": "POE",
+            "required": true
+        }
+    ],
+    "locationHierarchy": [
+        "region",
+        "province",
+        "city",
+        "zone",
+        "postalCode"
+    ]
+}

From 4cd6df14f902ed71be59750a2722cf0e99e637db Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 16 Nov 2021 17:09:43 +0530
Subject: [PATCH 0311/1358] Resident prop added.

---
 resident-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resident-default.properties b/resident-default.properties
index a0733c94b45..667c279f345 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -103,3 +103,5 @@ token.request.appid=resident
 token.request.clientId=mosip-resident-client
 token.request.secretKey=${mosip.mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
+
+auth.server.admin.allowed.audience=mosip-resident-client

From d43c2f7886b90a8c38b8bc7bc2e20662f65c4b69 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 17 Nov 2021 16:42:00 +0530
Subject: [PATCH 0312/1358] openapi properties commented out.

---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 9325145a758..f5973b2c2df 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -437,8 +437,8 @@ scheduling.job.cron=0 0 2 * * ?
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 
 # masterdata swagger openApi
-openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
-openapi.masterdata.servers[0].description=Admin Masterdata url
+#openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
+#openapi.masterdata.servers[0].description=Admin Masterdata url
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 

From 1f80becd08ab0a0b542fc5a76496387367434384 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 17 Nov 2021 16:54:54 +0530
Subject: [PATCH 0313/1358] Experimental change in openapi prop.

---
 kernel-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index f5973b2c2df..ed5f31a6567 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -439,6 +439,9 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
+openapi.service.servers[0].url=https://${mosip.api.internal.host}
+openapi.service.servers[0].description=For Swagger
+
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 

From 05c28f81cd710b48a1d4399f0b3628eaa7ae2830 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 18 Nov 2021 21:24:02 +0530
Subject: [PATCH 0314/1358] Applicanttype.mvel updated to the latest.

---
 applicanttype.mvel | 74 +++++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 37839f68830..535f9fc5e8f 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -6,24 +6,23 @@ import java.util.List;
 import java.time.ZoneId;
 import java.time.temporal.ValueRange;
 
-String CHILD = "INFANT";
-String MINOR = "MINOR";
-String ADULT = "ADULT";
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+String CHILD = "CHL";
+String ADULT = "ADL";
 String MALE = 'MLE';
 String FEMALE = 'FLE';
 String NonResident = "FR";
 String Resident = "NFR";
 String Others = "OTH";
 String DATE_PATTERN = "yyyy/MM/dd";
+String regex = "^\\d{4}(\\/)(((0)[1-9])|((1)[0-2]))(\\/)([0-2][0-9]|(3)[0-1])$";
+Pattern pattern = Pattern.compile(regex);
 
 def isUpdateFlow(identity) {
-  Object val = identity.get('_flow');
-  if(val != null) {
-    return ((String)val).equals('Update') ? true : false;
-  }
-
-  val = identity.getOrDefault('isUpdate', false);
-  return val == null ? false : (Boolean) val;  
+  Object val = identity.getOrDefault('_flow', null);
+  return (val == 'Update') ? true : false;
 }
 
 def getResidenceStatus(identity) {
@@ -59,14 +58,16 @@ def getAgeCode(identity) {
         return null;
 
     String dob = identity.get('dateOfBirth');
+    if(!pattern.matcher(dob).matches())
+        return null;
+        
     LocalDate date = LocalDate.parse(dob, DateTimeFormatter.ofPattern(DATE_PATTERN));
     LocalDate currentDate = LocalDate.now(ZoneId.of("UTC"));
-     int  ageInYears = -1;
-     if (!date.isAfter(currentDate)) {
-         ageInYears = Period.between(date, currentDate).getYears();
-    } else {
-            return "KER-MSD-151";
-     }
+    
+    if(date.isAfter(currentDate)) { return 'KER-MSD-151'; }
+    
+    int ageInYears = Period.between(date, currentDate).getYears();
+    
     String ageGroup = null;
     for(String groupName : ageGroups.keySet()) {
         String[] range = ((String)ageGroups.get(groupName)).split('-');
@@ -75,12 +76,14 @@ def getAgeCode(identity) {
         }
     }
 
-   return ageGroup;
+   return ageGroup == null ? null : (ageGroup == 'INFANT' ? CHILD : ADULT);
 }
 
 
 def getBioExceptionFlag(identity) {
-    return identity.containsKey('isBioException') ? (Boolean) identity.get('isBioException') : false;
+    if(!identity.containsKey('isBioException')) { return false; }
+    Object val = identity.getOrDefault('isBioException', null);
+    return (val == 'true') ? true : (( val == 'false' ) ? false : null);
 }
 
 def getApplicantType() {
@@ -88,55 +91,60 @@ def getApplicantType() {
   String genderType = getGenderType(identity);
   String ageCode = getAgeCode(identity);
   boolean isBioExPresent = getBioExceptionFlag(identity);
+  
+  if( ageCode == 'KER-MSD-151' ) { return "KER-MSD-151"; }
+  
+  if(itc == null || genderType == null || ageCode == null || isBioExPresent == null ) { 
+      return isUpdateFlow(identity) ? "A000" : "KER-MSD-147";
+  }
+  
+  System.out.println(itc + " - " + genderType + " - " + ageCode + " - " + isBioExPresent);
 
-  if(itc == null || genderType == null || ageCode == null)
-    return isUpdateFlow(identity) ? "A000" : "KER-MSD-147";
-
-  if (itc == NonResident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+  if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
     return "A001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
     return "A002";
-  } else if (itc == Resident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+  } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
     return "A003";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
     return "A004";
-  } else if (itc == NonResident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
     return "A005";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
     return "A006";
-  } else if (itc == Resident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+  } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
     return "A007";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
     return "A008";
-  } else if (itc == NonResident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+  } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
     return "A005";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
     return "A006";
-  } else if (itc == Resident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && !isBioExPresent) {
+  } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
     return "A007";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
     return "A008";
-  } else if (itc == NonResident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+  } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
     return "A009";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
     return "A010";
-  } else if (itc == Resident && genderType == MALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+  } else if (itc == Resident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
     return "A011";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
     return "A012";
-  } else if (itc == NonResident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
     return "A013";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
     return "A014";
-  } else if (itc == Resident && genderType == FEMALE && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+  } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
     return "A015";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
     return "A016";
-  } else if (itc == NonResident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+  } else if (itc == NonResident && genderType == Others && ageCode == CHILD && isBioExPresent) {
     return "A013";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
     return "A014";
-  } else if (itc == Resident && genderType == Others && (ageCode == CHILD || ageCode == MINOR) && isBioExPresent) {
+  } else if (itc == Resident && genderType == Others && ageCode == CHILD && isBioExPresent) {
     return "A015";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
     return "A016";

From b1a1f874c211ced63478b885c7eeb51af1a22271 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 18 Nov 2021 21:26:42 +0530
Subject: [PATCH 0315/1358] Admin props synced to latest.

---
 admin-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 14ca78b0dda..d08d671edc8 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -224,6 +224,11 @@ mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
+# LostRid 
+mosip.registration.processor.lostrid.id=mosip.registration.lostrid
+mosip.registration.processor.lostrid.version=1.0
+LOST_RID_API=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/lostridsearch
+
 # Roles
 mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.postbulkupload=GLOBAL_ADMIN

From 05663d5656ca1fdc8376df04f773f5326acd7743 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 18 Nov 2021 21:36:40 +0530
Subject: [PATCH 0316/1358] Kernel props synced with latest.

---
 kernel-default.properties | 48 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ed5f31a6567..14b065f98e8 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -149,7 +149,7 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
 logging.level.org.hibernate.SQL=ERROR
-ogging.level.org.hibernate.type=ERROR
+logging.level.org.hibernate.type=ERROR
 
 admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
 admin_database_username=kerneluser
@@ -355,7 +355,7 @@ datastores=db_1_DS,db_2_DS
 mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 
 # Keymanager service keystore cache properties
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
 mosip.kernel.syncdata-service-machine-url=http://masterdata.kernel/v1/masterdata/machines/%s/eng
@@ -452,6 +452,50 @@ mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
+#AdminMaster endpoints to access without authentication
+mosip.service-context=/v1/masterdata
+mosip.service.end-points[0]=/**/getApplicationType
+mosip.service.end-points[1]=/**/applicationtype/{applicationId}/languages
+mosip.service.end-points[2]=/**/blocklistedwords/{langcode}
+mosip.service.end-points[3]=/**/documentcategories
+mosip.service.end-points[4]=/**/documentcategories/{langcode}
+mosip.service.end-points[5]=/**/documenttypes/{documentcategorycode}/{langcode}
+mosip.service.end-points[6]=/**/documenttypes/{langcode}
+mosip.service.end-points[7]=/**/dynamicfields
+mosip.service.end-points[8]=/**/dynamicfields/distinct
+mosip.service.end-points[9]=/**/exceptionalholidays/{registrationCenterId}/{languageCode}
+mosip.service.end-points[10]=/**/gendertypes
+mosip.service.end-points[11]=/**/gendertypes/{langcode}
+mosip.service.end-points[12]=/**/gendertypes/validate/{gendername}
+mosip.service.end-points[13]=/**/idtypes/{langcode}
+mosip.service.end-points[14]=/**/individualtypes
+mosip.service.end-points[15]=/**/languages
+mosip.service.end-points[16]=/**/locations/{langcode}
+mosip.service.end-points[17]=/**/locations/{locationcode}/{langcode}
+mosip.service.end-points[18]=/**/locations/info/{locationcode}/{langcode}
+mosip.service.end-points[19]=/**/locations/locationhierarchy/{hierarchyname}
+mosip.service.end-points[20]=/**/locations/immediatechildren/{locationcode}/{langcode}
+mosip.service.end-points[21]=/**/locations/validate/{locationname}
+mosip.service.end-points[22]=/**/locationHierarchyLevels/{level}/{langcode}
+mosip.service.end-points[23]=/**/locationHierarchyLevels/{langcode}
+mosip.service.end-points[24]=/**/templates
+mosip.service.end-points[25]=/**/templates/{langcode}
+mosip.service.end-points[26]=/**/templates/{langcode}/{templatetypecode}
+mosip.service.end-points[27]=/**/templates/templatetypecodes/{code}
+mosip.service.end-points[28]=/**/templatetypes/{code}/{langcode}
+mosip.service.end-points[29]=/**/templatetypes/{langcode}
+mosip.service.end-points[30]=/**/title
+mosip.service.end-points[31]=/**/title/{lancode}
+mosip.service.end-points[32]=/**/uispec/{domain}/latest
+mosip.service.end-points[33]=/**/validdocuments/{languagecode}
+mosip.service.end-points[34]=/**/validdocuments/{docCategoryCode}/{languagecode}
+mosip.service.end-points[35]=/**/weekdays/{registrationCenterId}/{langCode}
+mosip.service.end-points[36]=/**/workingdays/{registrationCenterID}/{langCode}
+mosip.service.end-points[37]=/**/workingdays/{langCode}
+mosip.service.end-points[38]=/**/zones/leafs/{langCode}
+
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
 ## Roles
 
 mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN

From 1338fabac75253ec4218328591f8246e286e8d1e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 18 Nov 2021 21:44:05 +0530
Subject: [PATCH 0317/1358] Prereg synced to latest.

---
 pre-registration-default.properties | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index b3aae390e62..44de4204c30 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -417,7 +417,7 @@ mosip.preregistration.uispec.all=mosip.preregistration.uispec.all
 
 preregistration.cookie.contextpath=/
 
-## Roles
+# Roles
 mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.putapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getapplications=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN
@@ -438,7 +438,7 @@ mosip.role.prereg.deletedocumentspreregistrationid=INDIVIDUAL
 mosip.role.prereg.putdocumentsdocumentid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postqrcodegenerate=INDIVIDUAL
 mosip.role.prereg.getrefreshconfig=PRE_REGISTRATION_ADMIN
-mosip.role.prereg.postnotificationnotify=INDIVIDUAL,PRE_REGISTRATION_ADMIN
+mosip.role.prereg.postnotificationnotify=REGISTRATION_OFFICER,INDIVIDUAL,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.postnotification=INDIVIDUAL,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.posttransliterationtransliterate=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
 mosip.role.prereg.getuispeclatest=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,INDIVIDUAL
@@ -447,3 +447,17 @@ mosip.role.prereg.postpreregsync=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RE
 mosip.role.prereg.getsyncpreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getsyncpreregistrationidmachineid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postsyncconsumedpreregids=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+
+mosip.role.prereg.cancelappointmentpreregid=REGISTRATION_OFFICER,INDIVIDUAL,PRE_REGISTRATION_ADMIN
+mosip.role.prereg.deleteappointmentpreregid=REGISTRATION_OFFICER,INDIVIDUAL,PRE_REGISTRATION_ADMIN
+
+mosip.role.prereg.getappointmentavailability=INDIVIDUAL
+mosip.role.prereg.postappointmentpreregistrationid=INDIVIDUAL
+mosip.role.prereg.postappointment=INDIVIDUAL
+mosip.role.prereg.getappointmentpreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN,INDIVIDUAL
+mosip.role.prereg.putappointmentpreregistrationid=INDIVIDUAL
+mosip.role.prereg.putbatchappointmentpreregistrationid=PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR
+mosip.role.prereg.deleteappointment=INDIVIDUAL
+mosip.role.prereg.getappointmentpreregistrationidregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getappointmentregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+

From c98847fd769dfe95e658b22954154bfbb93db45c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 18 Nov 2021 21:47:47 +0530
Subject: [PATCH 0318/1358] PMS props synced to latest.

---
 partner-management-default.properties | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 47601fe8b88..f34beed2d07 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -150,6 +150,13 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
+#To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
+mosip.pms.ui.required.roles=Auth_Partner,Device_Provider,Credential_Partner,FTM_Provider,MISP_Partner
+# To configure misp partner type
+mosip.pms.misp.partner.type=MISP_Partner
+# Role for partner admin =
+mosip.pms.partneradmin.role=PARTNER_ADMIN
+
 ## Security
 mosip.security.csrf-enable:false
 mosip.security.secure-cookie:false
@@ -223,6 +230,7 @@ mosip.role.pms.postpoliciessearch=PARTNER_ADMIN,POLICYMANAGER
 mosip.role.pms.getpoliciesconfigkey=PARTNER_ADMIN,POLICYMANAGER
 mosip.role.pms.postpoliciesgroupfiltervalues=PARTNER_ADMIN,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
 mosip.role.pms.postpoliciesfiltervalues=PARTNER_ADMIN,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
+mosip.role.pms.getactivegroupgroupname=AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,ABIS_PARTNER,MANUAL_ADJUDICATION,POLICYMANAGER
 mosip.role.pms.postdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
 mosip.role.pms.putdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
 mosip.role.pms.patchdevicedetail=PARTNER_ADMIN

From d229c338b14b41b652f33185eab30153b47513de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 19 Nov 2021 16:03:20 +0530
Subject: [PATCH 0319/1358] Regprod props synced with develop2 branch.

---
 ...on-processor-camel-routes-lost-default.xml | 207 +++++++++++++++---
 ...ion-processor-camel-routes-new-default.xml |  28 ++-
 ...-processor-camel-routes-update-default.xml | 193 +++++++++++++---
 registration-processor-default.properties     | 136 +++++++-----
 4 files changed, 449 insertions(+), 115 deletions(-)

diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index f7de0a5fb73..c7ae8c2c665 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -1,4 +1,39 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification lost Route -->
+   <route id="packet-reciever-->securezone-notification lost route">
+      <from uri="eventbus://packet-receiver-lost-bus-out" />
+      <log message="packet-reciever-->securezone-notification ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
    <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader lost route">
       <from uri="eventbus://securezone-notification-lost-bus-out" />
@@ -66,9 +101,9 @@
       </choice>
    </route>
    <!-- Packet classifier to Quality Classifier Route -->
-   <route id="packet-classifier-->quality-classifier lost route">
+   <route id="packet-classifier-->cmd-validator lost route">
       <from uri="eventbus://packet-classifier-lost-bus-out" />
-      <log message="packet-classifier-->quality-classifier lost route ${bodyAs(String)}" />
+      <log message="packet-classifier-->cmd-validator lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -83,13 +118,13 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <to uri="eventbus://quality-classifier-bus-in" />
+            <to uri="eventbus://c-m-d-validator-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="quality-classifier-->cmd-validator lost route">
-      <from uri="eventbus://quality-classifier-lost-bus-out" />
-      <log message="quality-classifier-->cmd-validator lost route ${bodyAs(String)}" />
+   <route id="cmd-validator-->operator-validator lost route">
+      <from uri="eventbus://c-m-d-validator-lost-bus-out" />
+      <log message="cmd-validator-->operator-validator/supervisor-validator lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -104,17 +139,21 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
-            <to uri="eventbus://c-m-d-validator-bus-in" />
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://operator-validator-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
+            <to uri="eventbus://supervisor-validator-bus-in" />
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
          </otherwise>
       </choice>
    </route>
-   <route id="cmd-validator-->operator-validator lost route">
-      <from uri="eventbus://c-m-d-validator-lost-bus-out" />
-      <log message="cmd-validator-->operator-validator/supervisor-validator lost route ${bodyAs(String)}" />
+   <route id="operator-validator-->supervisor-validator lost route">
+      <from uri="eventbus://operator-validator-lost-bus-out" />
+      <log message="operator-validator-->supervisor-validator/bio-dedupe lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -128,22 +167,18 @@
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
-            <to uri="eventbus://operator-validator-bus-in" />
-         </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
             <to uri="eventbus://supervisor-validator-bus-in" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="eventbus://quality-classifier-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="operator-validator-->supervisor-validator lost route">
-      <from uri="eventbus://operator-validator-lost-bus-out" />
-      <log message="operator-validator-->supervisor-validator/bio-dedupe lost route ${bodyAs(String)}" />
+   <route id="supervisor-validator-->introducer-validator lost route">
+      <from uri="eventbus://supervisor-validator-lost-bus-out" />
+      <log message="supervisor-validator-->introducer-validator/quality-classifier lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -158,17 +193,17 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
-            <to uri="eventbus://supervisor-validator-bus-in" />
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
          </when>
          <otherwise>
-            <to uri="eventbus://bio-dedupe-bus-in" />
+            <to uri="eventbus://quality-classifier-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="supervisor-validator-->bio-dedupe lost route">
-      <from uri="eventbus://supervisor-validator-lost-bus-out" />
-      <log message="supervisor-validator-->bio-dedupe lost route ${bodyAs(String)}" />
+   <route id="introducer-validator-->quality-classifier lost route">
+      <from uri="eventbus://introducer-validator-lost-bus-out" />
+      <log message="packet-classifier-->quality-classifier lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -183,7 +218,45 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
+            <to uri="eventbus://quality-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="quality-classifier-->bio-dedupe lost route">
+      <from uri="eventbus://quality-classifier-lost-bus-out" />
+      <log message="quality-classifier-->bio-dedupe lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
+            <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+            <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+            <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://bio-dedupe-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+            <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+            <!-- PAUSE_FOR is in seconds -->
+            <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+            <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
          </otherwise>
       </choice>
    </route>
@@ -191,7 +264,7 @@
       <from uri="eventbus://bio-dedupe-lost-bus-out" />
       <log message="bio-dedupe-->uin-generation lost route ${bodyAs(String)}" />
       <choice>
-         <when>
+        <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
@@ -199,9 +272,14 @@
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://mark-as-reprocess" />
          </when>
-         <when>
+        <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'verification-bus-in')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
@@ -216,6 +294,27 @@
          </otherwise>
       </choice>
    </route>
+   <route id="verification route-->uin-generator lost route">
+      <from uri="eventbus://verification-lost-bus-out" />
+      <log message="verification route-->uin-generator lost route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
    <route id="abis-handler-->abis-middleware lost route">
       <from uri="eventbus://abis-handler-lost-bus-out" />
       <log message="abis-handler-->abis-middleware lost route ${bodyAs(String)}" />
@@ -279,15 +378,61 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="uin-generation-lost-->printing-stage lost route">
+	<!-- UIN Generator to biometric-extraction Route -->
+   <route id="uin-generation route-->biometric-extraction-stage lost route">
       <from uri="eventbus://uin-generator-lost-bus-out" />
-      <log message="uin-generation-lost-->printing-stage lost route ${bodyAs(String)}" />
+      <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-extraction-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+ <!-- biometric-extraction to finalization Route -->
+   <route id="biometric-extraction route-->finalization-stage lost route">
+      <from uri="eventbus://biometric-extraction-lost-bus-out" />
+      <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+	 <!-- finalization to Printing Route -->
+   <route id="finalization-lost-->printing-stage lost route">
+      <from uri="eventbus://finalization-lost-bus-out" />
+      <log message="finalization-lost-->printing-stage lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -303,6 +448,7 @@
          </when>
          <otherwise>
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
@@ -324,7 +470,8 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
-</routes>
\ No newline at end of file
+</routes>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 865eb2c9ef6..87cdcb5ac47 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -332,7 +332,7 @@
         <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
-         </when> 
+         </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://mark-as-reprocess" />
@@ -340,6 +340,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'verification-bus-in')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
@@ -354,6 +359,27 @@
          </otherwise>
       </choice>
    </route>
+   <route id="verification route-->uin-generator new route">
+      <from uri="eventbus://verification-new-bus-out" />
+      <log message="verification route-->uin-generator new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
    <route id="abis-middleware route-->abis-handler new route">
       <from uri="eventbus://abis-middle-ware-new-bus-out" />
       <log message="abis-middleware route-->abis-handler new route ${bodyAs(String)}" />
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 49e7e1d9264..4be966b2cde 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -1,4 +1,39 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification update route">
+      <from uri="eventbus://packet-receiver-update-bus-out" />
+      <log message="packet-reciever-->securezone-notification update ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
    <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader update route">
       <from uri="eventbus://securezone-notification-update-bus-out" />
@@ -65,8 +100,7 @@
          </otherwise>
       </choice>
    </route>
-   <!-- Packet Classifier to Quality Classifier Route -->
-   <route id="packet-classifier-->quality-classifier update route">
+   <route id="packet-classifier-->cmd-validator update route">
       <from uri="eventbus://packet-classifier-update-bus-out" />
       <log message="packet-classifier-->quality-classifier update route ${bodyAs(String)}" />
       <choice>
@@ -83,32 +117,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <to uri="eventbus://quality-classifier-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="quality-classifier-->cmd-validator update route">
-      <from uri="eventbus://quality-classifier-update-bus-out" />
-      <log message="quality-classifier-->cmd-validator update route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://c-m-d-validator-bus-in" />
-         </when>
-         <otherwise>
-            <to uri="workflow-cmd://complete-as-failed" />
          </otherwise>
       </choice>
    </route>
@@ -166,7 +175,7 @@
             <to uri="eventbus://introducer-validator-bus-in" />
          </when>
          <otherwise>
-            <to uri="eventbus://biometric-authentication-bus-in" />
+            <to uri="eventbus://quality-classifier-bus-in" />
          </otherwise>
       </choice>
    </route>
@@ -191,13 +200,13 @@
             <to uri="eventbus://introducer-validator-bus-in" />
          </when>
          <otherwise>
-            <to uri="eventbus://biometric-authentication-bus-in" />
+            <to uri="eventbus://quality-classifier-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="introducer-validator-->biometric-authentication-stage update route">
+   <route id="introducer-validator-->quality-classifier update route">
       <from uri="eventbus://introducer-validator-update-bus-out" />
-      <log message="introducer-validator-->biometric-authentication-stage update route ${bodyAs(String)}" />
+      <log message="introducer-validator-->quality-classifier update route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -210,9 +219,48 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
+            <to uri="eventbus://quality-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="quality-classifier-->biometric-authentication update route">
+      <from uri="eventbus://quality-classifier-update-bus-out" />
+      <log message="quality-classifier-->biometric-authentication update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
+            <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+            <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+            <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://biometric-authentication-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+            <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
+            <!-- PAUSE_FOR is in seconds -->
+            <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
+            <to uri="workflow-cmd://pause-and-request-additional-info" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
          </otherwise>
       </choice>
    </route>
@@ -231,6 +279,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://demo-dedupe-bus-in" />
@@ -252,6 +301,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
@@ -314,6 +364,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'verification-bus-in')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
@@ -324,6 +379,27 @@
          </otherwise>
       </choice>
    </route>
+   <route id="verification route-->uin-generator update route">
+      <from uri="eventbus://verification-update-bus-out" />
+      <log message="verification route-->uin-generator update route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
    <route id="abis-middleware route-->abis-handler update route">
       <from uri="eventbus://abis-middle-ware-update-bus-out" />
       <log message="abis-middleware route-->abis-handler update route ${bodyAs(String)}" />
@@ -360,16 +436,61 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <!-- UIN Generator to Printing Route -->
-   <route id="uin-generation route-->printing-stage update route">
+	<!-- UIN Generator to biometric-extraction Route -->
+   <route id="uin-generation route-->biometric-extraction-stage update route">
       <from uri="eventbus://uin-generator-update-bus-out" />
-      <log message="uin-generation-->printing-stage update route ${bodyAs(String)}" />
+      <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-extraction-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+ <!-- biometric-extraction to finalization Route -->
+   <route id="biometric-extraction route-->finalization-stage update route">
+      <from uri="eventbus://biometric-extraction-update-bus-out" />
+      <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+	 <!-- finalization to Printing Route -->
+   <route id="finalization route-->printing-stage update route">
+      <from uri="eventbus://finalization-update-bus-out" />
+      <log message="finalization-->printing-stage update route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -385,6 +506,7 @@
          </when>
          <otherwise>
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
@@ -406,7 +528,8 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
-</routes>
\ No newline at end of file
+</routes>
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 24f7a94fbb1..9046d5a12de 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -136,6 +136,11 @@ ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
 ## Digital Signature Service
 DIGITALSIGNATURE=${KEYMANAGER}/v1/keymanager/sign
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
+
+#Status for matched records in demo dedupe stage.
+# 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
+registration.processor.demodedupe.manual.adjudication.status=REJECTED
+
 # Validate hostlisted devices
 DEVICEHOTLIST=http://admin-hotlist.admin/v1/hotlist
 JWTVERIFY=${KEYMANAGER}/v1/keymanager/jwtVerify
@@ -165,29 +170,13 @@ mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.lostrid.version=1.0
 
+
 # this property is used in lostrid api to get postal code
 mosip.registration.processor.postalcode.req.url=${MASTER}/registrationcenters
 
 # Status for matched records in demo dedupe stage
-registration.processor.demodedupe.manualverification.status=REJECTED
 mosip.registration.processor.demographic.deduplication.enable=true
 
-## Manual verification
-mosip.registration.processor.manual.verification.assignment.id=mosip.manual.verification.assignment
-mosip.registration.processor.manual.verification.decision.id=mosip.manual.verification.decision
-mosip.registration.processor.manual.verification.biometric.id=mosip.manual.verification.biometric
-mosip.registration.processor.manual.verification.demographic.id=mosip.manual.verification.demographic
-mosip.registration.processor.manual.verification.packetinfo.id=mosip.manual.verification.packetinfo
-# Manual verification queue message expiry in seconds, if given 0 then message will never expire
-registration.processor.queue.manualverification.request.messageTTL=5400
-# queue name where mosip will send request to external mv system
-registration.processor.queue.manualverification.request=mosip-to-mv
-# queue name where mosip will receive response from external mv system
-registration.processor.queue.manualverification.response=mv-to-mosip
-# Buffer time above the expiry queue to allow reprocessing (in seconds)
-registration.processor.manual.verification.reprocess.buffer.time=900
-registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
-registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
 
@@ -203,6 +192,8 @@ auth.PrependThumbprint.enable=false
 registration.processor.max.file.size=5
 mosip.registration.processor.application.version=1.0
 mosip.registration.processor.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+# Date pattern for registrationDate that should be followed in lostrid request
+mosip.registration.processor.lostrid.registrationdate.pattern=yyyy-MM-dd
 mosip.registration.processor.timezone=GMT
 mosip.registration.processor.packet.id=mosip.registration.packet
 mosip.registration.processor.grace.period=10800
@@ -259,6 +250,10 @@ registration.processor.queue.password=${activemq.password}
 registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
 
+registration.processor.queue.manualverification.request=mosip-to-mv
+# queue name where mosip will receive response from external mv system
+registration.processor.queue.manualverification.response=mv-to-mosip
+
 ## Packet validator
 registration.processor.applicant.type=applicanttype-document-mapping.json
 mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT
@@ -268,6 +263,8 @@ mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.
 ## Reprocessor stage
 # Number of the reprocess records to be fetched at a time
 registration.processor.reprocess.fetchsize=100
+registration.processor.reprocess.limit=500
+registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
 registration.processor.reprocess.elapse.time=120
@@ -282,6 +279,56 @@ registration.processor.reprocess.days_of_month=*
 registration.processor.reprocess.months=*
 registration.processor.reprocess.days_of_week=*
 
+# Verification
+mosip.regproc.verification.eventbus.kafka.commit.type=single
+mosip.regproc.verification.eventbus.kafka.max.poll.records=100
+mosip.regproc.verification.eventbus.kafka.poll.frequency=100
+mosip.regproc.verification.eventbus.kafka.group.id=verification-stage
+mosip.regproc.verification.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+
+registration.processor.verification.queue.username=${registration.processor.queue.username}
+registration.processor.verification.queue.password=${registration.processor.queue.password}
+registration.processor.verification.queue.url=${registration.processor.queue.url}
+registration.processor.verification.queue.typeOfQueue=${registration.processor.queue.typeOfQueue}
+registration.processor.verification.queue.response=verification-to-mosip
+registration.processor.verification.policy.id=mpolicy-default-adjudication
+registration.processor.verification.subscriber.id=mpartner-default-adjudication
+registration.processor.queue.verification.request.messageTTL=5400
+mosip.regproc.verification.eventbus.port=5730
+mosip.regproc.verification.server.port=8101
+mosip.regproc.verification.server.servlet.path=/registrationprocessor/v1/verification
+
+# Manual adjudication
+mosip.regproc.manual.adjudication.eventbus.kafka.commit.type=single
+mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
+mosip.regproc.manual.adjudication.eventbus.kafka.poll.frequency=100
+mosip.regproc.manual.adjudication.eventbus.kafka.group.id=manual-adjudication-stage
+mosip.regproc.manual.adjudication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.manual.adjudication.server.servlet.path=/registrationprocessor/v1/manualverification
+mosip.regproc.manual.adjudication.server.port=8084
+mosip.regproc.manual.adjudication.eventbus.port=5720
+mosip.regproc.manual.adjudication.use.lts.format=true
+mosip.registration.processor.manual.adjudication.assignment.id=mosip.manual.adjudication.assignment
+mosip.registration.processor.manual.adjudication.decision.id=mosip.manual.adjudication.decision
+mosip.registration.processor.manual.adjudication.biometric.id=mosip.manual.adjudication.biometric
+mosip.registration.processor.manual.adjudication.demographic.id=mosip.manual.adjudication.demographic
+mosip.registration.processor.manual.adjudication.packetinfo.id=mosip.manual.adjudication.packetinfo
+
+#Manual verification queue message expiry in seconds, if given 0 then message will never expire
+registration.processor.queue.manual.adjudication.request.messageTTL=5400
+# Buffer time above the expiry queue to allow reprocessing (in seconds)
+registration.processor.manual.adjudication.reprocess.buffer.time=900
+registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
+registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
+# Manual verification queue message expiry in seconds, if given 0 then message will never expire
+# Buffer time above the expiry queue to allow reprocessing (in seconds)
+registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
+registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
+registration.processor.manual.adjudication.queue.username=${registration.processor.queue.username}
+registration.processor.manual.adjudication.queue.password=${registration.processor.queue.password}
+registration.processor.manual.adjudication.queue.url=${registration.processor.queue.url}
+registration.processor.manual.adjudication.queue.typeOfQueue=${registration.processor.queue.typeOfQueue}
+
 #WorkflowAction service  websub topic name
 mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
 mosip.regproc.workflow.action.job.server.port=8026
@@ -372,9 +419,8 @@ PACKETMANAGER_INFO=${packetmanager.base.url}/v1/packetmanager/info
 PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdateTag
 PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
 PACKETMANAGER_GET_TAGS=${packetmanager.base.url}/v1/packetmanager/getTags
-DATASHARE=http://datashare.datashare
 DATASHARECREATEURL=/v1/datashare/create
-DATASHAREGETEURL=${DATASHARE}/v1/datashare/get
+DATASHAREGETEURL=http://datashare.datashare/v1/datashare/get
 # Default abis is mock-abis provided by MOSIP
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
@@ -388,24 +434,30 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 # BioSDK 
 mosip.biosdk.default.host= http://biosdk-service.biosdk
 mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
-mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-mosip.biometric.sdk.provider.finger.version=0.9
-mosip.biometric.sdk.provider.finger.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+# The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
+# This class will be loaded in runtime, the containing jar should be available in classpath
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+# The version of the BIO SDK API implemeted for Finger modality
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 # The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
 # If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
 # If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
-mosip.biometric.sdk.provider.finger.format.url.default=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
+
 # The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 # The version of the BIO SDK API implemeted for Iris modality
-mosip.biometric.sdk.provider.iris.version=0.9
-mosip.biometric.sdk.provider.iris.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+
 # The fully qualified Class Name of the BIO SDK API implemented for Face modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
-mosip.biometric.sdk.provider.face.version=0.9
-mosip.biometric.sdk.provider.face.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+# The version of the BIO SDK API implemeted for Face modality
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
 ## Printing
 mosip.registration.processor.credentialtype=euin
@@ -587,16 +639,6 @@ mosip.regproc.bio.dedupe.server.port=9096
 mosip.regproc.bio.dedupe.eventbus.port=5718
 mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
-## Manual verification
-mosip.regproc.manual.verification.eventbus.kafka.commit.type=single
-mosip.regproc.manual.verification.eventbus.kafka.max.poll.records=100
-mosip.regproc.manual.verification.eventbus.kafka.poll.frequency=100
-mosip.regproc.manual.verification.eventbus.kafka.group.id=manual-verification-stage
-mosip.regproc.manual.verification.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-mosip.regproc.manual.verification.server.servlet.path=/registrationprocessor/v1/manualverification
-mosip.regproc.manual.verification.server.port=8084
-mosip.regproc.manual.verification.eventbus.port=5720
-
 #uin-generator-stage
 mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
 mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
@@ -857,13 +899,9 @@ openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
 NGINXDMZURL=http://regproc-pktserver.regproc/
 
-# TODO: Check these properties - they are missing for qa-double-rc2, but services fail if we don't add these.
-# packet receiver stage
-#Supported commmit config: auto, batch, single
-mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
-mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
-mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
-mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
-mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
-mosip.regproc.packet.receiver.server.port=8081
-mosip.regproc.packet.receiver.eventbus.port=5711
+# modifiable delay in websub subscription
+mosip.regproc.websub.resubscription.delay.secs=1800000
+mosip.regproc.websub.subscriptions-delay-on-startup.secs=300000
+
+# Roles
+mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN

From 49225bced3bac22d3eae104039957fb65eb420a1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 19 Nov 2021 18:06:34 +0530
Subject: [PATCH 0320/1358] Missing prop added in Applications

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 2dfe14bfcfd..fbe441cebe2 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -388,3 +388,5 @@ mosip.identity.mapping-file=${mosip.kernel.xsdstorage-uri}/identity-mapping.json
 
 mosip.notification.timezone=GMT+05:30
 
+# registration center type validation regex, used to restrict the special charecter
+mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}[a-zA-Z0-9]$

From 562f5fabde1630220d4163a2b4b468adef946a4f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 20 Nov 2021 09:30:55 +0530
Subject: [PATCH 0321/1358] Regproc camel routes updated.

---
 ...cessor-camel-routes-deactivate-default.xml | 86 +++++++++++++++++-
 ...essor-camel-routes-res-reprint-default.xml | 37 ++++++++
 ...cessor-camel-routes-res-update-default.xml | 91 ++++++++++++++++++-
 3 files changed, 207 insertions(+), 7 deletions(-)

diff --git a/registration-processor-camel-routes-deactivate-default.xml b/registration-processor-camel-routes-deactivate-default.xml
index c46836dbe9d..57a71c08715 100644
--- a/registration-processor-camel-routes-deactivate-default.xml
+++ b/registration-processor-camel-routes-deactivate-default.xml
@@ -1,4 +1,39 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification deactivated route">
+      <from uri="eventbus://packet-receiver-deactivated-bus-out" />
+      <log message="packet-reciever-->securezone-notification deactivated-route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
    <route id="securezone-notification-->packet-uploader deactivated route">
       <from uri="eventbus://securezone-notification-deactivated-bus-out" />
       <log message="securezone-notification-->packet-uploader deactivated route ${bodyAs(String)}" />
@@ -42,9 +77,54 @@
          </otherwise>
       </choice>
    </route>
-   <route id="uin-generation route--> deactivated route">
+   <!-- UIN Generator to biometric-extraction Route -->
+   <route id="uin-generation route-->biometric-extraction-stage deactivated route">
       <from uri="eventbus://uin-generator-deactivated-bus-out" />
-      <log message="uin-generation--> deactivated route ${bodyAs(String)}" />
+      <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-extraction-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+ <!-- biometric-extraction to finalization Route -->
+   <route id="biometric-extraction route-->finalization-stage deactivated route">
+      <from uri="eventbus://biometric-extraction-deactivated-bus-out" />
+      <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+	 <!-- finalization to deactivated Route -->
+   <route id="finalization route--> deactivated route">
+      <from uri="eventbus://finalization-deactivated-bus-out" />
+      <log message="finalization--> deactivated route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -60,7 +140,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
+			<to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index e8112afcc0e..fc79de8bcc6 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -1,4 +1,39 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification res_reprint route">
+      <from uri="eventbus://packet-receiver-res_reprint-bus-out" />
+      <log message="packet-reciever-->securezone-notification res_reprint ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
    <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader res_reprint route">
       <from uri="eventbus://securezone-notification-res_reprint-bus-out" />
@@ -40,6 +75,7 @@
          </when>
          <otherwise>
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
@@ -61,6 +97,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index 78673948a4b..26b4ac736e6 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -1,4 +1,39 @@
 <routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification res_update route">
+      <from uri="eventbus://packet-receiver-res_update-bus-out" />
+      <log message="packet-reciever-->securezone-notification res_update ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
    <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader res_update route">
       <from uri="eventbus://securezone-notification-res_update-bus-out" />
@@ -79,6 +114,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
@@ -137,16 +173,61 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <!-- UIN Generator to Printing Route -->
-   <route id="uin-generation route-->printing-stage res_update route">
+	<!-- UIN Generator to biometric-extraction Route -->
+   <route id="uin-generation route-->biometric-extraction-stage res_update route">
       <from uri="eventbus://uin-generator-res_update-bus-out" />
-      <log message="uin-generation-->printing-stage res_update route ${bodyAs(String)}" />
+      <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-extraction-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+ <!-- biometric-extraction to finalization Route -->
+   <route id="biometric-extraction route-->finalization-stage res_update route">
+      <from uri="eventbus://biometric-extraction-res_update-bus-out" />
+      <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+	 <!-- finalization to Printing Route -->
+   <route id="finalization route-->printing-stage res_update route">
+      <from uri="eventbus://finalization-res_update-bus-out" />
+      <log message="finalization-->printing-stage res_update route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -162,6 +243,7 @@
          </when>
          <otherwise>
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
@@ -183,7 +265,8 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
-</routes>
\ No newline at end of file
+</routes>

From 396cf1a17804999700157d20154b54830208b50f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 20 Nov 2021 09:34:31 +0530
Subject: [PATCH 0322/1358] App prop synced to develop2

---
 application-default.properties | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index fbe441cebe2..d99a19f0e38 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -31,8 +31,6 @@ mosip.kernel.idobjectvalidator.date-format=uuuu/MM/dd
 ## Properties that need to be updated when Identity Schema has been updated
 mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone
 mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.update-uin=IDSchemaVersion,UIN
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.child-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.new-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registration=IDSchemaVersion,UIN,fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.other=IDSchemaVersion,UIN
@@ -51,8 +49,6 @@ mosip.country.code=MOR
 
 ## Language supported by platform
 mosip.supported-languages=eng,fra
-mosip.primary-language=eng
-mosip.secondary-language=fra
 mosip.right_to_left_orientation=
 mosip.left_to_right_orientation=eng,fra
 
@@ -298,6 +294,7 @@ mosip.kernel.syncdata-service-idschema-url=${mosip.masterdata.base.url}/v1/maste
 mosip.kernel.syncdata-service-dynamicfield-url=${mosip.masterdata.base.url}/v1/masterdata/dynamicfields
 mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.syncdata.base.url}/v1/syncdata/tpm/publickey/
 mosip.kernel.keymanager-service-validate-url=${mosip.keymanager.base.url}/v1/keymanager/validate
+mosip.kernel.keymanager-service-csverifysign-url=${mosip.keymanager.base.url}/v1/keymanager/csverifysign
 
 ## GPS
 mosip.registration.gps_device_enable_flag=n
@@ -316,6 +313,8 @@ provider.packetreader.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES
 provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
+# the idschema is double by default. If country wish to change it to string then make this property false
+mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
 objectstore.crypto.name=OnlinePacketCryptoServiceImpl
 default.provider.version=v1.0

From cac5f199177badbb510944b3599671d2b11f5867 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 20 Nov 2021 09:39:05 +0530
Subject: [PATCH 0323/1358] Packet manager props added.

---
 packet-manager-default.properties | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packet-manager-default.properties

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
new file mode 100644
index 00000000000..0a4be330459
--- /dev/null
+++ b/packet-manager-default.properties
@@ -0,0 +1,18 @@
+# Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
+mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
+
+# Roles
+mosip.role.commons-packet.postcreatepacket=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postaddtag=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postaddorupdatetag=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postdeletetag=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postinfo=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postgettags=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postvalidatepacket=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postaudits=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.postmetainfo=METADATA_READ
+mosip.role.commons-packet.postbiometrics=BIOMETRIC_READ
+mosip.role.commons-packet.postdocument=DOCUMENT_READ
+mosip.role.commons-packet.postsearchfields=DATA_READ
+mosip.role.commons-packet.postsearchfield=DATA_READ
+auth.server.admin.allowed.audience=mosip-regproc-client

From 35ecfbe698891c7766dabc34a6c141fe989fe6c8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 21 Nov 2021 14:08:27 +0530
Subject: [PATCH 0324/1358] Regproc missing props added.

---
 registration-processor-default.properties | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 9046d5a12de..e0259f1ed08 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -197,6 +197,22 @@ mosip.registration.processor.lostrid.registrationdate.pattern=yyyy-MM-dd
 mosip.registration.processor.timezone=GMT
 mosip.registration.processor.packet.id=mosip.registration.packet
 mosip.registration.processor.grace.period=10800
+# Supported commmit config: auto, batch, single
+mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
+# Maximum records that can be received in one poll from kafka
+mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
+# Interval between each poll calls to kafka in milli sec
+mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
+# Kafka consumer group id, used by kafka to identify multiple instances of the same consumer
+mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
+# Base sevlet path for the stage
+mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
+# Port number in which the application will run
+mosip.regproc.packet.receiver.server.port=8081
+# Port number to be used by eventbus for communicating with other vertx apps in the cluster
+mosip.regproc.packet.receiver.eventbus.port=5711
+# Flag to disable the copying of tags from the packet manger to the message event
+mosip.regproc.packet.receiver.message.tag.loading.disable=true
 
 ## UIN generation
 registration.processor.id.repo.create=mosip.id.create

From 51134a59bb143ce45ffb1999eeb7b5323f0a6e57 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 23 Nov 2021 11:14:36 +0530
Subject: [PATCH 0325/1358] XML corrected.

---
 registration-processor-camel-routes-deactivate-default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-camel-routes-deactivate-default.xml b/registration-processor-camel-routes-deactivate-default.xml
index 57a71c08715..146348baff8 100644
--- a/registration-processor-camel-routes-deactivate-default.xml
+++ b/registration-processor-camel-routes-deactivate-default.xml
@@ -144,3 +144,4 @@
          </otherwise>
       </choice>
    </route>
+</routes>

From 397945c551fdd558a3bc3655f742087046625bc9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 23 Nov 2021 11:44:50 +0530
Subject: [PATCH 0326/1358] Reprocessor frequency increased for testing.

---
 registration-processor-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e0259f1ed08..b0b769c8941 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -289,7 +289,9 @@ registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron
 registration.processor.reprocess.seconds=0
 # TODO: time reduced for testing.  Revert for production.
-registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
+#registration.processor.reprocess.minutes=0,5,10,15,20,25,30,35,40,45,50,55
+# Every 3 min
+registration.processor.reprocess.minutes=0,3,6,9,12,15,18,21,24,27,30,33,36,39,42,45,48,51,54,57
 registration.processor.reprocess.hours=*
 registration.processor.reprocess.days_of_month=*
 registration.processor.reprocess.months=*

From c1ee08ca78a5fc53300fc3af8190df6ee677594a Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Tue, 23 Nov 2021 16:22:21 +0530
Subject: [PATCH 0327/1358] Update kernel-default.properties

commented property as not required. "mosip.security.provider.name=SunPKCS11-pkcs11-proxy"
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 14b065f98e8..c4d40514bc2 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -295,7 +295,7 @@ auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authoriz
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
-mosip.security.provider.name=SunPKCS11-pkcs11-proxy
+#mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client

From 29edefe6b9a78b6bf29a02a24c8ffb688ba0dfca Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 24 Nov 2021 11:57:47 +0530
Subject: [PATCH 0328/1358] Updated regproc prop.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b0b769c8941..dca232d5ae1 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -142,7 +142,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 registration.processor.demodedupe.manual.adjudication.status=REJECTED
 
 # Validate hostlisted devices
-DEVICEHOTLIST=http://admin-hotlist.admin/v1/hotlist
+DEVICEHOTLIST=http://admin-hotlist.admin/v1/hotlist/status
 JWTVERIFY=${KEYMANAGER}/v1/keymanager/jwtVerify
 
 ## Crypto

From e5db06b9e14912d5ca131bab32d200b015bc363e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 24 Nov 2021 12:54:28 +0530
Subject: [PATCH 0329/1358] Regproc camel route corrected.

---
 ...tion-processor-camel-routes-biometric-correction-default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-camel-routes-biometric-correction-default.xml b/registration-processor-camel-routes-biometric-correction-default.xml
index 46f127d744e..62786cd8b7a 100644
--- a/registration-processor-camel-routes-biometric-correction-default.xml
+++ b/registration-processor-camel-routes-biometric-correction-default.xml
@@ -29,7 +29,7 @@
             <setBody>
                <simple>${bodyAs(String)}</simple>
             </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
          </otherwise>
       </choice>
    </route>

From 70601bb3646295dea7e92336cf42121ae95a3abf Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 24 Nov 2021 13:41:54 +0530
Subject: [PATCH 0330/1358] Registration client props synced with develop2.

---
 registration-default.properties | 133 ++++----------------------------
 1 file changed, 16 insertions(+), 117 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index ce6fa9416a4..409745cc6eb 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -207,33 +207,9 @@ mosip.registration.face_threshold=90
 #Maximum number of days where Registration or UIN Update or Lost UIN will be allowed without updating the Registration Client Software
 mosip.registration.softwareUpdateCheck_configured_frequency = 300
 
-#----Consent Message to be displayed in Registration Preview Screen based on Application's Primary Language----
-
-#For English as primary language
-mosip.registration.consent_eng=I understand that the data collected about me during registration by the said authority includes my -<br>&#x2022 Name <br> &#x2022 Date of birth <br> &#x2022 Gender <br> &#x2022 Address <br> &#x2022 Contact details <br> &#x2022 Documents <br> I also understand that this information will be stored and processed for the purpose of verifying my identity in order to access various services, or to comply with a legal obligation. I give my consent for the collection of this data for this purpose. 
-
-
-#For French as primary language
-mosip.registration.consent_fra=Je comprends que les données recueillies à mon sujet lors de la enregistrement par ladite autorité comprennent mon -  <br> &#x2022 nom <br>&#x2022 Date de naissance <br>&#x2022 genre <br>&#x2022 adresse <br>&#x2022 coordonnées <br>&#x2022 Documents <br>Je comprends également que ces informations seront stockées et traitées dans le but de vérifier mon identité afin d'accéder à divers services, ou de se conformer à une obligation légale. Je donne mon consentement pour la collecte de ces données à cette fin.
-
-
-#Name of the Webcam to be used for capturing photo
-#if camera with this name is not found, simply chooses first camera discovered
-mosip.registration.webcam_name=logitech
-
 #Enable or Disable the Scanner Device for Document Scanning.
 mosip.registration.document_scanner_enabled=No
 
-
-#----Guidelines Text to be displayed in Registration Acknowledgement Receipt based on Application Primary Language----
-
-#For English language
-mosip.registration.important_guidelines_eng=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
-
-#For French language
-mosip.registration.important_guidelines_fra=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
-
-
 #Application ID of the Registration Client required for Authentication Web-Service. Should not be modified.
 mosip.registration.app.id=registrationclient
 
@@ -281,6 +257,19 @@ mosip.registration.mdm.host=127.0.0.1
 mosip.registration.mdm.portRangeFrom=4501
 mosip.registration.mdm.portRangeTo=4600
 
+mosip.biometric.sdk.providers.finger.mockvendor.classname=io.mosip.mock.sdk.impl.SampleSDK
+mosip.biometric.sdk.providers.finger.mockvendor.version=0.9
+mosip.biometric.sdk.providers.finger.mockvendor.args=
+mosip.biometric.sdk.providers.finger.mockvendor.threshold=60
+mosip.biometric.sdk.providers.iris.mockvendor.classname=io.mosip.mock.sdk.impl.SampleSDK
+mosip.biometric.sdk.providers.iris.mockvendor.version=0.9
+mosip.biometric.sdk.providers.iris.mockvendor.args=
+mosip.biometric.sdk.providers.iris.mockvendor.threshold=60
+mosip.biometric.sdk.providers.face.mockvendor.classname=io.mosip.mock.sdk.impl.SampleSDK
+mosip.biometric.sdk.providers.face.mockvendor.version=0.9
+mosip.biometric.sdk.providers.face.mockvendor.args=
+mosip.biometric.sdk.providers.face.mockvendor.threshold=60
+
 ## SDK configurations
 #SDK implementation class for finger modality
 mosip.biometric.sdk.provider.finger.classname=io.mosip.mock.sdk.impl.SampleSDK
@@ -315,96 +304,6 @@ mosip.biometric.sdk.provider.face.args=
 #Quality threshold used by SDK to match modality
 mosip.biometric.sdk.provider.face.threshold=60
 
-##------------------------------------- unused properties
-#Maximum no. of days without login credentials sync beyond which client is frozen for registration
-mosip.registration.Login_Credentials_Sync.frequency=190
-
-#Maximum no. of days without checking for software set-up beyond which client is frozen for registration
-mosip.registration.Registration_Client_Setup_Sync.frequency=190
-
-#Maximum no. of days without checking for software update beyond which client is frozen for registration
-mosip.registration.Registration_Client_Config_Sync.frequency=190
-
-#Maximum no. of days for User Role Set-up Sync beyond which client is frozen for registration
-mosip.registration.User_Role_Setup_Sync.frequency=190
-
-#Minimum number of biometrics required to on-board the officer
-mosip.registration.user_on_board_threshold_limit=1
-
-#Admin Setting to turn Fingerprint Capture On or Off. If y, finger print is turned on. If n, Finger print is truned off.
-mosip.registration.fingerprint_enable_flag=Y
-
-#Admin Setting to turn Iris Capture On or Off. If y, iris is turned on. If n, iris turned off.
-mosip.registration.iris_enable_flag=Y
-
-#Admin Setting to turn Face Capture On or Off. If y, face is turned on. If n, face is truned off.
-mosip.registration.face_enable_flag=Y
-
-#Validate the quality of captured fingerprint. Used by fingerprint capture device.
-mosip.registration.quality_score=60
-
-#Minimum time (in seconds) to elapse between face photo recaptures
-mosip.registration.re_capture_time=10
-
-#Days before key expiry that registration should be inhibited
-mosip.registration.key_policy_sync_threshold_value=1
-
-#Whether to show UI for sync Data report (Currently not available)
-mosip.registration.ui_sync_data=y
-
-#Minimum time (in seconds) to elapse between face photo recaptures
-mosip.registration.face_recapture_time=5
-
-#Webcam Library Name. Should not be modified
-mosip.registration.webcam_library_name=sarxos
-
-#Send notifications to additional recipients after Registration is completed. If set to y, this feature will be enabled.
-#If set to n, this feature will not be enabled
-mosip.registration.send_notification_disable_flag=y
-
-#Current MDS version
-current_mdm_spec=0.9.2
-
-#Threshold quality for Iris biometric authentication, but this is not used currently
-mosip.iris_authentication.quality_score=30
-
-mosip.registration.mdm.contextPath=
-mosip.registration.mdm.hostProtocol=http
-
-## ---------------------------------- Properties need to be removed from code and properties
-#Fields that can be updated through the UIN Update feature
-mosip.registration.uin.update.configured.fields=name,age,gender,address,phone,email,parentOrGuardianDetails,foreigner,biometrics,cnieNumber
-
-#Max registration packet size (in MB) allowed to be uploaded
-mosip.registration.max_reg_packet_size=5
-
-#Create CBEFF file with both Duplicate and Unique Tags or with only Unique Tags. If Y, only Unique Tags will be available in CBEFF.
-#If N, both Duplicate and Unique Tags will be available
-mosip.registration.cbeff_only_unique_tags=Y
-
-#Registration Packet Local Storage Date's pattern for Folder
-mosip.registration.packet_store_date_format=dd-MMM-yyyy
-
-#Enable or Disable the MDM service. If set to Y, the MDM services will be invoked for capturing the biometrics.
-#If set N, the MDM services will not be invoked.
-mosip.mdm.enabled=N
-
-#Regex Pattern for validating the CNIE Number, need to remove from rollback scripts
-mosip.id.validation.identity.CNIENumber=^([0-9]{10,30})$
-
-#Regex Pattern for validating the CNIE Number
-mosip.id.validation.identity.referenceIdentityNumber=^([0-9]{10,30})$
-
-#Admin Setting to turn local deduplication check for finger print On or Off. If y, dedupe check is turned on. If n, dedupe check is truned off.
-mosip.registration.mds.fingerprint.dedup.enable.flag=N
-
-#Admin Setting to turn local deduplication check Iris On or Off. If y, dedupe check is turned on. If n, dedupe check is truned off.
-mosip.registration.mds.iris.dedup.enable.flag=N
-
-#Admin Setting to turn local deduplication check Face On or Off. If y, dedupe check is turned on. If n, dedupe check is truned off.
-mosip.registration.mds.face.dedup.enable.flag=N
-
-## ----------------------- kernel properties --- Required to be here ?
 
 #----Kernel's ID Object Validator Component. Identity object have to be validated in local----
 
@@ -425,9 +324,6 @@ mosip.kernel.transliteration.arabic-language-code=ara
 #Language Code for French Language. Should not be modified
 mosip.kernel.transliteration.franch-language-code=fra
 
-#Language Code for French Language. Should not be modified
-mosip.kernel.transliteration.english-language-code=eng
-
 #----For CBEFF Component----
 
 #CBEFF XSD Storage URI. Should not be modified
@@ -479,6 +375,9 @@ mosip.registration.packet_upload_batch_size=5
 #used to fill env in the MDM rcapture request
 mosip.registration.server_profile=Staging
 
+#Batch size for Packet Status Search Job
+mosip.registration.status_sync_batch_size=5
+
 # domain used for MDM trust validation
 # For L1 devices this should be FTM
 mosip.registration.mdm.trust.domain.rcapture=DEVICE

From a013c9e874309956c7060ff635b6ac08d638b5b2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 24 Nov 2021 15:09:07 +0530
Subject: [PATCH 0331/1358] Face removed from abis modalities

---
 registration-processor-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index dca232d5ae1..881cbd35bae 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -644,7 +644,8 @@ mosip.regproc.abis.handler.eventbus.port=5726
 mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
 mosip.regproc.abis.handler.biometric-modalities-segments-mapping.INFANT={'Face':{'Face'}}
 mosip.regproc.abis.handler.biometric-modalities-segments-mapping.MINOR={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
-mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
+#mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'}}
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye','Face' : 'face'}
 
 #bio-dedupe-stage

From 2efc620103cabd07ef4a6a44d5a29dcddfae1eba Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 24 Nov 2021 17:29:49 +0530
Subject: [PATCH 0332/1358] ID Repo props updated.

---
 id-repository-default.properties | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 412acb237c8..4d72bbac389 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -73,8 +73,6 @@ mosip.idrepo.identity.json.path=identity.UIN
 mosip.idrepo.identity.uin-status.registered=ACTIVATED
 # List of allowed UIN status in ID-Repo 
 mosip.idrepo.identity.uin-status=ACTIVATED,BLOCKED,DEACTIVATED 
-# Types allowed in retreiveIdentity requests
-mosip.idrepo.identity.allowedTypes=bio,demo,all
 
 # idobjectvalidator
 # Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
@@ -303,31 +301,30 @@ credential.service.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 # BioSDK service
 mosip.biosdk.default.host=http://biosdk-service.biosdk
 mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
-
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.finger.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 # The version of the BIO SDK API implemeted for Finger modality
-mosip.biometric.sdk.provider.finger.version=0.9
-mosip.biometric.sdk.provider.finger.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 # The default URL will be taken if no format specified in the extraction or the incoming extraction format is not configured. 
 # If the below default configuration is not configured, the one of the configured url will be used as the default URL. 
 # If no URL is configured, the default URL will be taken from the environment variable 'mosip_biosdk_service'.
-mosip.biometric.sdk.provider.finger.format.url.default=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
 
 # The fully qualified Class Name of the BIO SDK API implemented for Iris modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.iris.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 # The version of the BIO SDK API implemeted for Iris modality
-mosip.biometric.sdk.provider.iris.version=0.9
-mosip.biometric.sdk.provider.iris.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.iris.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
 # The fully qualified Class Name of the BIO SDK API implemented for Face modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
-mosip.biometric.sdk.provider.face.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 # The version of the BIO SDK API implemeted for Face modality
-mosip.biometric.sdk.provider.face.version=0.9
-mosip.biometric.sdk.provider.face.format.url.mock-1.1=${mosip.biosdk.default.service.url}
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.version=0.9
+mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
 # Credential issuance Event properties
 id-repo-ida-event-type-namespace=mosip
@@ -348,12 +345,12 @@ auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
 # Enabling below property will start logging performance logs in identity and vid service
 mosip.idrepo.aspect-logging.enabled=false
 
-mosip.iam.adapter.appid.id-repository=regproc
-mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
-mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.regproc.client.secret}
-
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client
 
+#openapi properties to sort tag and operations of id-repository services
+springdoc.swagger-ui.tagsSorter=alpha
+springdoc.swagger-ui.operationsSorter=alpha
+
 # Roles
 mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST

From e9c58749a5fb424125d75e4af6607a6f1e729974 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 24 Nov 2021 18:21:31 +0530
Subject: [PATCH 0333/1358] Update print-default.properties

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index 190a8f798ff..ac08c7e3205 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -7,7 +7,7 @@
 
 ## Websub
 websub.base.url=http://websub.websub
-mosip.event.hubURL=${websub.base.url}/websub
+mosip.event.hubURL=${websub.base.url}/hub
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident

From eb2f257c8889c5a6d53cdc7b53dd956fdd38ddc3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 08:02:57 +0530
Subject: [PATCH 0334/1358] Regproc abis props updated.

---
 registration-processor-default.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 881cbd35bae..dc99aec6e17 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -643,10 +643,9 @@ mosip.regproc.abis.handler.server.port=9071
 mosip.regproc.abis.handler.eventbus.port=5726
 mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
 mosip.regproc.abis.handler.biometric-modalities-segments-mapping.INFANT={'Face':{'Face'}}
-mosip.regproc.abis.handler.biometric-modalities-segments-mapping.MINOR={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
-#mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'},'Face':{'Face'}}
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping.MINOR={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'}}
 mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'}}
-mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye','Face' : 'face'}
+mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye'}
 
 #bio-dedupe-stage
 mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single

From a19a50b40d52a210e6b05687ee46d0e2c0cdbf72 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 11:10:31 +0530
Subject: [PATCH 0335/1358] IDA props updated.

---
 id-authentication-default.properties          | 3 ---
 id-authentication-external-default.properties | 7 +++++++
 id-authentication-otp-default.properties      | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 id-authentication-external-default.properties
 create mode 100644 id-authentication-otp-default.properties

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 9fc334d7d0f..2ceeaab5ec7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -229,9 +229,6 @@ ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servle
 ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
-## Masterdata templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
new file mode 100644
index 00000000000..ae918afd20d
--- /dev/null
+++ b/id-authentication-external-default.properties
@@ -0,0 +1,7 @@
+## Masterdata templates
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+
+mosip.service-context=${server.servlet.context-path}
+mosip.service.end-points=/**/*
+mosip.service.exclude.auth.allowed.method=GET,POST
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
new file mode 100644
index 00000000000..0a4a47fcf4c
--- /dev/null
+++ b/id-authentication-otp-default.properties
@@ -0,0 +1,8 @@
+## Masterdata templates
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+
+#Endpoints to access without authentication
+mosip.service-context=${server.servlet.context-path}
+mosip.service.end-points=/**/*
+mosip.service.exclude.auth.allowed.method=GET,POST

From e79abfaaeddd0612c141de5275d35ad1b57e52b2 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Thu, 25 Nov 2021 12:12:28 +0530
Subject: [PATCH 0336/1358] Update resident-default.properties

Added mosip-reg-client in the allowed audience to run DSD.
---
 resident-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 667c279f345..75861dbf805 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -104,4 +104,5 @@ token.request.clientId=mosip-resident-client
 token.request.secretKey=${mosip.mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
 
-auth.server.admin.allowed.audience=mosip-resident-client
+#todo remove reg-client service accunt in production env
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client

From ea86ef2e6e613972f8076fbb4693d64396c837f5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 12:20:13 +0530
Subject: [PATCH 0337/1358] Minor.

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 75861dbf805..adaca5770ac 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -104,5 +104,5 @@ token.request.clientId=mosip-resident-client
 token.request.secretKey=${mosip.mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
 
-#todo remove reg-client service accunt in production env
+#TODO remove reg-client service accunt in production env
 auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client

From 6f406c97782a85a93c018066c82a17cb33bcefa0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 12:28:56 +0530
Subject: [PATCH 0338/1358] mosip-reg-client added as allowed audience for
 testing.  Remove later.

---
 kernel-default.properties             | 2 +-
 partner-management-default.properties | 2 +-
 pre-registration-default.properties   | 2 +-
 syncdata-default.properties           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index c4d40514bc2..345fdf59ae1 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -446,7 +446,7 @@ openapi.service.servers[0].description=For Swagger
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 
 auth.server.admin.offline.token.validate=false
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
diff --git a/partner-management-default.properties b/partner-management-default.properties
index f34beed2d07..26d6f809d3e 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -146,7 +146,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-reg-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 44de4204c30..c576ee551c9 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -246,7 +246,7 @@ appId=prereg
 kernel.auth.env=http://authmanager.kernel
 kernel.auth.contextpath=authmanager
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## PRID service 
 kernel.prid.env=http://pridgenerator.kernel
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 7b87974e3ca..880bde08473 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -300,7 +300,7 @@ kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111

From ee2c802251626bd9dbfe6bf492b0aa089984c6aa Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 12:36:26 +0530
Subject: [PATCH 0339/1358] Unused props removed.

---
 kernel-default.properties   | 4 ++--
 syncdata-default.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 345fdf59ae1..53ea95f514d 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -303,7 +303,7 @@ mosip.ui.spec.default.domain=registration-client
 #### Required for admin UI ##############
 ## this pattern like --> display column : configKey. 
 ## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
 mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
@@ -418,7 +418,7 @@ syncdata.websub.resubscription.delay.millis=48000000
 ## Admin UI
 ## this pattern like --> display column : configKey. 
 ## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 880bde08473..131a1ce4d99 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -312,7 +312,7 @@ mosip.ui.spec.default.domain=registration-client
 #### Required for admin UI ##############
 ## this pattern like --> display column : configKey. 
 ## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=primaryLangCode:${mosip.primary-language};secondaryLangCode:${mosip.secondary-language};version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
 mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager

From fc0775ce243503202c31cf2cb2b9bd22471da4a4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 14:21:38 +0530
Subject: [PATCH 0340/1358] IDA prop corrected.

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 2ceeaab5ec7..644b0231ccb 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -162,13 +162,13 @@ sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=http://idrepo-identity.idrepo/idrepository/v1/identity/idvid/{rid}?type={type}
+rid-uin.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=http://idrepo-identity.idrepo/idrepository/v1/identity/idvid/{rid}
+rid-uin-auth.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}

From bb2d18c402d9592751a9d9cfd5183ec70e0a1364 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Thu, 25 Nov 2021 17:29:56 +0530
Subject: [PATCH 0341/1358] Update registration-processor-default.properties

Added missing registration.external.status.id property.
---
 registration-processor-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index dc99aec6e17..b907363c486 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -923,3 +923,6 @@ mosip.regproc.websub.subscriptions-delay-on-startup.secs=300000
 
 # Roles
 mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
+
+# Registration External Status Id
+mosip.registration.processor.registration.external.status.id=mosip.registration.external.status

From 3f006c69b8434bca1c7d074c76bafa14fb6c2ba0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 25 Nov 2021 23:31:39 +0530
Subject: [PATCH 0342/1358] Missing dmz properties added in regproc.

---
 registration-processor-default.properties | 29 +++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index dc99aec6e17..317185147ec 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -170,6 +170,17 @@ mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.lostrid.version=1.0
 
+mosip.registration.processor.registration.external.status.id=mosip.registration.external.status
+mosip.registration.processor.packet.external.status.id=mosip.registration.packet.external.status
+
+# LatestTransactionTypeCodes Before uploading to Object Store
+mosip.registration.processor.packet.status.transactiontypecodes-before-uploading-to-objectstore=PACKET_RECEIVER,SECUREZONE_NOTIFICATION
+# LatestTransactionTypeCode  uploading to Object Store
+mosip.registration.processor.packet.status.transactiontypecodes-uploading-to-objectstore=UPLOAD_PACKET
+# LatestTransactionTypeCodes  time based resend required
+mosip.registration.processor.packet.status.transactiontypecodes-time-based-resend-required=PACKET_RECEIVER
+
+mosip.registration.processor.registration.status.external-statuses-to-consider-processed=UIN_GENERATED,REREGISTER,REJECTED,REPROCESS_FAILED
 
 # this property is used in lostrid api to get postal code
 mosip.registration.processor.postalcode.req.url=${MASTER}/registrationcenters
@@ -921,5 +932,23 @@ NGINXDMZURL=http://regproc-pktserver.regproc/
 mosip.regproc.websub.resubscription.delay.secs=1800000
 mosip.regproc.websub.subscriptions-delay-on-startup.secs=300000
 
+# The list of comma separated stages that should be successfully completed before packet 
+# reaches the stage that uploads packets to the packet store 
+mosip.registration.processor.registration.status.stages-before-reaching-packet-store=PacketReceiverStage,SecurezoneNotificationStage
+
+# Registration External Status Version
+mosip.registration.processor.registration.external.status.version=1.0
+# Packet Status Version
+mosip.registration.processor.packet.external.status.version=1.0
+
 # Roles
 mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
+mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
+mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
+mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+

From 480bc115d5f9d83476dcd26d6c85fe86e2f477e4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 27 Nov 2021 09:27:14 +0530
Subject: [PATCH 0343/1358] Props synced with develop2.

---
 registration-default.properties           | 14 ++++----------
 registration-processor-default.properties |  4 ++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 409745cc6eb..c271ba15d23 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -388,13 +388,7 @@ mosip.registration.mdm.trust.domain.deviceinfo=DEVICE
 # range will result in a random behaviour of tagging. In range, upper and lower values are inclusive.
 mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':'6-17','ADULT':'18-200'}
 
-# Roles
-mosip.role.registration.postauth=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.registration.getgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
-mosip.role.registration.postexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.postpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.postsearch=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
+# On every Pre-reg application fetch in registration page, clears all the captured data prior to pre-reg application fetch
+# set the field id's which should not be cleared after Pre-reg application fetch
+# it is comma separated list of field ids
+mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferredLang
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 317185147ec..8993538be4c 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -929,8 +929,8 @@ openapi.registrationProcessor.servers[0].description=Registration Processor URL
 NGINXDMZURL=http://regproc-pktserver.regproc/
 
 # modifiable delay in websub subscription
-mosip.regproc.websub.resubscription.delay.secs=1800000
-mosip.regproc.websub.subscriptions-delay-on-startup.secs=300000
+mosip.regproc.websub.resubscription.delay.millisecs=43200000
+mosip.regproc.websub.subscriptions-delay-on-startup.millisecs=300000
 
 # The list of comma separated stages that should be successfully completed before packet 
 # reaches the stage that uploads packets to the packet store 

From 0e3a55fdc3de4baba5fd4eda33f8f3e40b517041 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 27 Nov 2021 15:57:10 +0530
Subject: [PATCH 0344/1358] Auth adapter props added.

---
 id-authentication-default.properties | 6 ++++++
 id-repository-default.properties     | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 644b0231ccb..28754e50cd4 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -476,6 +476,12 @@ mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 ## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
+# IAM Adapter 
+mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
+mosip.iam.adapter.clientsecret=${mosip.ida.auth.secretKey}
+mosip.iam.adapter.appid=${mosip.ida.auth.appId}
+mosip.authmanager.client-token-endpoint=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+
 ## IDA key generator 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip.ida.database.port}/mosip_ida
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 4d72bbac389..28df888f0b3 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -185,6 +185,12 @@ mosip.idrepo.websub.vid-credential-update.topic=VID_CRED_STATUS_UPDATE
 mosip.idrepo.websub.vid-credential-update.secret= ${idrepo.websub.vid.credential.update.secret}
 mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 
+## Auth adapter
+mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
+mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.appid.id-repository=regproc
+mosip.authmanager.client-token-endpoint=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+
 mosip.idrepo.uin-generator.rest.uri=http://idgenerator.kernel/v1/idgenerator/uin
 mosip.idrepo.uin-generator.rest.httpMethod=GET
 mosip.idrepo.uin-generator.rest.headers.mediaType=application/json

From 841c8d944396f8cc0243b424ddda1f85116e4ac9 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Mon, 29 Nov 2021 12:39:38 +0530
Subject: [PATCH 0345/1358] Update partner-management-default.properties

Added property for self registration disable.
---
 partner-management-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 26d6f809d3e..a7d66c48a2d 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -286,3 +286,5 @@ mosip.role.pms.postmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.putmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmispsmispidlicensekey=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
+
+partner.register.as.user.in.iam.enable=false

From ad9772e536ce0c3801d757afac3fc218bbbb9edd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 30 Nov 2021 08:58:44 +0530
Subject: [PATCH 0346/1358] Admin prop added.

---
 admin-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-default.properties b/admin-default.properties
index d08d671edc8..f50e11fb15a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -228,6 +228,7 @@ mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.lostrid.version=1.0
 LOST_RID_API=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/lostridsearch
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
 
 # Roles
 mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN

From 38005db774d734dc405d52df33030cac6c53700f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 30 Nov 2021 16:01:56 +0530
Subject: [PATCH 0347/1358] Role added to Kernel.

---
 kernel-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 53ea95f514d..17d315e3ec0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -745,6 +745,7 @@ mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdynamicfieldsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
 mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER

From e7b381f8a8d2fbab951c80e5a69348e65e7ca8e7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Tue, 30 Nov 2021 16:43:08 +0530
Subject: [PATCH 0348/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 17d315e3ec0..0a6060a1d5c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -439,7 +439,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
-openapi.service.servers[0].url=https://${mosip.api.internal.host}
+openapi.service.servers[0].url=https://${mosip.api.internal.host}/v1/masterdata
 openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 

From 2e2171f4114565ddad0281888cabcd0493689b0b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 30 Nov 2021 18:09:31 +0530
Subject: [PATCH 0349/1358] unused prop removed.

---
 id-authentication-default.properties | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 28754e50cd4..fa8c71f4f91 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -393,11 +393,6 @@ request.idtypes.allowed=VID,UIN
 ## The ID types to be supported for Internal Authentication/OTP Requests
 request.idtypes.allowed.internalauth=UIN,VID
 
-## Encrypted Credential Attributes list
-## The list of attributes in identity that are Zero Knowledge encrpted in IDA while storing the credential in DB.
-## This list is used to identify the attributes to decrypt when fetching the records from DB
-ida-zero-knowledge-encrypted-credential-attributes=individualBiometrics,fullName,dateOfBirth,phone,email,postalCode,city,region,province,zone
-
 ## Cryptograpic/Signature verificate related configurations
 mosip.ida.internal.thumbprint-validation-required=false
 mosip.ida.internal.trust-validation-required=false

From 2b95ea94e1fd37819a40fc1c2a0c95d7b5303d61 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 30 Nov 2021 18:19:46 +0530
Subject: [PATCH 0350/1358] IDA prop updated.

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index fa8c71f4f91..4b5d0d31f84 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -555,7 +555,7 @@ mosip.ida.credential.biometric.attribute.name=individualBiometrics
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
 #The list of attributes in identity that are to be decrypted by default 
-ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email
 
 #------ Un-encrypted Credential Attributes list -----------
 #The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).

From 329160dc812a188c12c1865831cbbeeb123a988c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Wed, 1 Dec 2021 09:16:51 +0530
Subject: [PATCH 0351/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0a6060a1d5c..610a421bdc5 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -439,7 +439,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
-openapi.service.servers[0].url=https://${mosip.api.internal.host}/v1/masterdata
+openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path}
 openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 

From dc0ca097b9e2c18fc203fd3b6c3032d0c9ff1401 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Dec 2021 13:09:23 +0530
Subject: [PATCH 0352/1358] Reverted previous prop change.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 610a421bdc5..0a6060a1d5c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -439,7 +439,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
-openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path}
+openapi.service.servers[0].url=https://${mosip.api.internal.host}/v1/masterdata
 openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 

From e2ee8ed5deb66597bc61c5985d4afb42681f26ae Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Dec 2021 13:16:07 +0530
Subject: [PATCH 0353/1358] Identity json synced with develop2

---
 identity-mapping.json | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/identity-mapping.json b/identity-mapping.json
index dd54babc19b..443c34632f7 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -30,9 +30,15 @@
         "phone": {
             "value": "phone"
         },
+        "phoneNumber": {
+            "value": "phone"
+        },
         "email": {
             "value": "email"
         },
+        "emailId": {
+            "value": "email"
+        },
         "uin": {
             "value": "UIN"
         },
@@ -59,6 +65,33 @@
         },
         "locationHierarchyForProfiling": {
             "value": "zone,postalCode"
+        },
+        "addressLine1": {
+            "value": "addressLine1"
+        },
+        "addressLine2": {
+            "value": "addressLine2"
+        },
+        "addressLine3": {
+            "value": "addressLine3"
+        },
+        "location1": {
+            "value": "city"
+        },
+        "location2": {
+            "value": "region"
+        },
+        "location3": {
+            "value": "province"
+        },
+        "postalCode": {
+            "value": "postalCode"
+        },
+        "location4": {
+            "value": "zone"
+        },
+        "fullAddress": {
+            "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
         }
     },
     "metaInfo": {

From a7994d32015b056eff93fabea9b725158ec8581b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 1 Dec 2021 15:43:41 +0530
Subject: [PATCH 0354/1358] Reg proc prop addded.

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8993538be4c..64317351813 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -109,6 +109,7 @@ TEMPLATES=${MASTER}/templates
 DEVICEVALIDATEHISTORY=http://pms-partner.pms/v1/partnermanager/deviceprovidermanagement/validate
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
+LANGUAGE=${MASTER}/languages
 
 ## ID Repository Services
 IDENTITY=http://identity.idrepo

From 082f9e6ce34d4870531f64c09fcef028e0791cd9 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 2 Dec 2021 10:41:02 +0530
Subject: [PATCH 0355/1358] Added new properties.

---
 kernel-default.properties             | 43 ++-------------------------
 partner-management-default.properties |  4 +--
 pre-registration-default.properties   |  2 +-
 registration-default.properties       |  6 ++++
 4 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0a6060a1d5c..14360134d52 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -453,46 +453,9 @@ mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
 #AdminMaster endpoints to access without authentication
-mosip.service-context=/v1/masterdata
-mosip.service.end-points[0]=/**/getApplicationType
-mosip.service.end-points[1]=/**/applicationtype/{applicationId}/languages
-mosip.service.end-points[2]=/**/blocklistedwords/{langcode}
-mosip.service.end-points[3]=/**/documentcategories
-mosip.service.end-points[4]=/**/documentcategories/{langcode}
-mosip.service.end-points[5]=/**/documenttypes/{documentcategorycode}/{langcode}
-mosip.service.end-points[6]=/**/documenttypes/{langcode}
-mosip.service.end-points[7]=/**/dynamicfields
-mosip.service.end-points[8]=/**/dynamicfields/distinct
-mosip.service.end-points[9]=/**/exceptionalholidays/{registrationCenterId}/{languageCode}
-mosip.service.end-points[10]=/**/gendertypes
-mosip.service.end-points[11]=/**/gendertypes/{langcode}
-mosip.service.end-points[12]=/**/gendertypes/validate/{gendername}
-mosip.service.end-points[13]=/**/idtypes/{langcode}
-mosip.service.end-points[14]=/**/individualtypes
-mosip.service.end-points[15]=/**/languages
-mosip.service.end-points[16]=/**/locations/{langcode}
-mosip.service.end-points[17]=/**/locations/{locationcode}/{langcode}
-mosip.service.end-points[18]=/**/locations/info/{locationcode}/{langcode}
-mosip.service.end-points[19]=/**/locations/locationhierarchy/{hierarchyname}
-mosip.service.end-points[20]=/**/locations/immediatechildren/{locationcode}/{langcode}
-mosip.service.end-points[21]=/**/locations/validate/{locationname}
-mosip.service.end-points[22]=/**/locationHierarchyLevels/{level}/{langcode}
-mosip.service.end-points[23]=/**/locationHierarchyLevels/{langcode}
-mosip.service.end-points[24]=/**/templates
-mosip.service.end-points[25]=/**/templates/{langcode}
-mosip.service.end-points[26]=/**/templates/{langcode}/{templatetypecode}
-mosip.service.end-points[27]=/**/templates/templatetypecodes/{code}
-mosip.service.end-points[28]=/**/templatetypes/{code}/{langcode}
-mosip.service.end-points[29]=/**/templatetypes/{langcode}
-mosip.service.end-points[30]=/**/title
-mosip.service.end-points[31]=/**/title/{lancode}
-mosip.service.end-points[32]=/**/uispec/{domain}/latest
-mosip.service.end-points[33]=/**/validdocuments/{languagecode}
-mosip.service.end-points[34]=/**/validdocuments/{docCategoryCode}/{languagecode}
-mosip.service.end-points[35]=/**/weekdays/{registrationCenterId}/{langCode}
-mosip.service.end-points[36]=/**/workingdays/{registrationCenterID}/{langCode}
-mosip.service.end-points[37]=/**/workingdays/{langCode}
-mosip.service.end-points[38]=/**/zones/leafs/{langCode}
+mosip.service.end-points={cipher}dd5737cb38b0d354e925a031d1662cae45feb891135577d72d75017f71a3c72d38d157158eb9e12d8e51ffb3e66e1397eb0e20040939ad145363a00c458f247c53a712c564467770d08b0cab22b967ba71d09e75a4c53492f23bb29e4c529a87787e7652c720b8eb7ce61ffc4ea6efe89be9d85034fcb135582af662290eacc0392ea96c15fef0a20694cd24c553ec3325e1450e4fb6ea773b200fcdc5d097014e7ff1794d93330c40f50fce4c20d15fc9b0ddced67877cf51ecf38d7b3fb352e176fe12956e0e2e1d43ac77dd200085dac1d3e3fe49475d5077b6bff6162c53a2d00fdbc5cd12a0aa983165916cb9cd72b2eff9c8bf7bc92bea2619fc0900b5936655a16a96fe8b188fa06a625760f78b1273a66137228095305ca32093b1fda5faac87b1ae172caa990776fa6dc52f6f1863848b21e42eb1af5ee530f12af7ef94aa8bccb254fe65c69870338e7bae1a95f344c9fcb806ac7801466168c81de7262e1a0bf49c62ee0c3676babbc718ba790e7b9428482443f6e612c9ef497702a79c9a49d47ab98d97a868e7f2ce1b7febc3d09afadbf5555e21234290aaaef94681c78326d7c178316b7d211f2a72dfb5a39e6badda11d4ee42b79c003fdf1d83d72aee288f6c8ad6e5f66c2dae350d50f5aec39360b8cce5e3682ef6f8adb7a6377a9580d420944f98c98390d3a2f7a0682d26991a60e3ab79401c63233c5a18b1902f715ebf595107563d9a60d3280c1baed1777e894660ea1e05b6433e2653af499b286fdb6380b29d32953bd23de2ec8f2c441b0e22c3877f85aa23046e2830fb9f94dced2ee55f107c8160f05bfa5436620898b36d18ae26bd4c7400e3d51f85bad2a81665aa7baf7d10cb792067b600fb0277fb0119aa9186c3d1a2079c56ca999ce1d4930b9ea77f80d88bb2afbb93002b77c3d5f5a895822dacc6038112160bf280d392599c268d504aff4e933fa4308ab50d25793c93fd2a51b1c7d2938219ff84202ae286cb1b9650ec5dfd79dabad2acf2b44fbc08170c097c93a9d663b4c130392bd536d86a87cd11ab074d3db666dcf2f40349d1056ce2708cfcfbcdd868a8073acd9a2241159e64cae84eceabd8acb83afbeeafa822defd7616bfd5801f1976392872f61e637bc21c3db4fe30d6c1de644d2291ce9d48ff1afff9f1ab596620553fd669cfa38dc5ccea6286abbcd93ca8b434b2b6d42129d72e7daa91001d43005d781369c054b36a6158d4f2cc6c6136565733b13cd7d306c715809f2d9a5024abcffbc0ef3b58585b881f6509bd1876b923494445a2a430ddf5e517b49b65647f54a2e10a002224269c78a38b6ddbddc02176d93e1e280cfdefc317efe361babe0eb3688c9d3406c4ef7a1851ddc7d511703b1d4e2c449792abd523c6eadfbfea13cf862478d75196f8133deadc31222fa6be3cd1cac015f2af1865d834bda4e7f3352cc72116d732ed384a0b94237810bf5909ea453f9052aeb0ae6d492e7ed4d2c33145e38a79742ca23294f3dc89e3cafcfbc8349aae712172bd661137ad6179df3bcc1f03b80af7c82b8a1aa91140086e663ff257d8084680c00c9a31f9c96e0b3d350192851c0c279b8159070e5f1f06153d132447fddbbf1dbb7378b84c38dc1c5f2f8cbbfcd8a478f78b1ed6ed44a0d81a88be605b66a5caad776ab1ae7c8a88362efef9b43d261dd292324e173606fabd3b8ade5fce14671d274d33e93f975d12071473fa7b0289a99a151ce67b3070f44001b5d74b3087ad1fbd071605fd62fa5f86454b881fd1ad86bd565b33248d47100d862dcc57dc0e9f673e25b0845b27d06b38c30ca975efb8031444459d776f6221a90fa51b971a4054332411de943afd8b
+
+
 
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
diff --git a/partner-management-default.properties b/partner-management-default.properties
index a7d66c48a2d..96f5768fc02 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -151,7 +151,7 @@ auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
 #To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
-mosip.pms.ui.required.roles=Auth_Partner,Device_Provider,Credential_Partner,FTM_Provider,MISP_Partner
+mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
 # To configure misp partner type
 mosip.pms.misp.partner.type=MISP_Partner
 # Role for partner admin =
@@ -183,7 +183,7 @@ mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.kernel.filtervalue.max_columns =100
+mosip.pms.filtervalue.max_columns =100
 mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c576ee551c9..da75da8ca28 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -395,7 +395,7 @@ mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recapt
 mosip.security.csrf-enable:false
 mosip.security.cors-enable:false
 # Comma Separated Allowed Origins
-mosip.security.origins:localhost:8080,localhost:4200
+mosip.security.origins:localhost:8080,localhost:4200,${mosipbox.public.url}
 mosip.security.secure-cookie:false
 
 ## for prereg booking notification name validation
diff --git a/registration-default.properties b/registration-default.properties
index c271ba15d23..bf14ed74bc4 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -392,3 +392,9 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':
 # set the field id's which should not be cleared after Pre-reg application fetch
 # it is comma separated list of field ids
 mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferredLang
+
+
+mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
+mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
\ No newline at end of file

From 3eec2b2d4c1179638db37b0557d8786fa8f6faa3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 3 Dec 2021 16:48:50 +0530
Subject: [PATCH 0356/1358] Unused file removed.

---
 print-default.properties                  |  2 +-
 registration-processor-default.properties |  2 +-
 registration-processor-identity.json      | 82 -----------------------
 resident-default.properties               |  2 +-
 4 files changed, 3 insertions(+), 85 deletions(-)
 delete mode 100644 registration-processor-identity.json

diff --git a/print-default.properties b/print-default.properties
index ac08c7e3205..88727b781ad 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -105,7 +105,7 @@ registration.processor.unMaskedUin.length=5
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 IDSchema.Version=1.0
-registration.processor.identityjson=registration-processor-identity.json
+registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
 CREATEDATASHARE=http://datashare.datashare/v1/datashare/create
 DECRYPTPINBASSED=http://keymanager.keymanager/v1/keymanager/decryptWithPin
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 64317351813..d311b3e1aff 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -244,7 +244,7 @@ mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.Vir
 
 ## Message sender
 # Mapping identity json to map with the applicant id json
-registration.processor.identityjson=registration-processor-identity.json
+registration.processor.identityjson=identity-mapping.json
 registration.processor.abis.json=registration-processor-abis.json
 registration.processor.demographic.identity=identity
 registration.processor.notification.emails=
diff --git a/registration-processor-identity.json b/registration-processor-identity.json
deleted file mode 100644
index 5401557e24c..00000000000
--- a/registration-processor-identity.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-   "identity":{
-      "IDSchemaVersion":{
-         "value":"IDSchemaVersion"
-      },
-      "name":{
-         "value":"fullName"
-      },
-      "gender":{
-         "value":"gender"
-      },
-      "dob":{
-         "value":"dateOfBirth"
-      },
-      "age":{
-         "value":"age"
-      },
-      "introducerRID":{
-         "value":"introducerRID"
-      },
-      "introducerUIN":{
-         "value":"introducerUIN"
-      },
-      "introducerVID":{
-         "value":"introducerVID"
-      },
-      "introducerName":{
-         "value":"introducerName"
-      },
-      "phone":{
-         "value":"phone"
-      },
-      "email":{
-         "value":"email"
-      },
-      "uin":{
-         "value":"UIN"
-      },
-      "individualBiometrics":{
-         "value":"individualBiometrics"
-      },
-      "introducerBiometrics":{
-         "value":"introducerBiometrics"
-      },
-      "individualAuthBiometrics":{
-         "value":"individualAuthBiometrics"
-      },
-      "officerBiometricFileName":{
-         "value":"officerBiometricFileName"
-      },
-      "supervisorBiometricFileName":{
-         "value":"supervisorBiometricFileName"
-      },
-      "residenceStatus":{
-         "value":"residenceStatus"
-      }
-
-   },
-   "metaInfo":{
-      "value":"metaInfo"
-   },
-   "audits":{
-      "value":"audits"
-   },
-   "documents":{
-      "poa":{
-         "value":"proofOfAddress"
-      },
-      "poi":{
-         "value":"proofOfIdentity"
-      },
-      "por":{
-         "value":"proofOfRelationship"
-      },
-      "pob":{
-         "value":"proofOfDateOfBirth"
-      },
-      "poe":{
-         "value":"proofOfException"
-      }
-   }
-}
diff --git a/resident-default.properties b/resident-default.properties
index adaca5770ac..25ed8a42c2e 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -87,7 +87,7 @@ mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/aud
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 auth.types.allowed=demo,bio-Finger,bio-Iris,bio-FACE
 
-resident.identityjson=registration-processor-identity.json
+resident.identityjson=identity-mapping.json
 mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
 

From 421a37a8853191aadd288b78156ef9da3f7258ac Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 6 Dec 2021 12:39:37 +0530
Subject: [PATCH 0357/1358] Prereg synced with develop2.

---
 pre-registration-default.properties | 40 +++++++++++++++++++----------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index da75da8ca28..8bfd87868ab 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -114,7 +114,7 @@ mosip.preregistration.sync.sign.refid=SIGN
 
 ## Booking 
 ## Sync every n days 
-preregistration.availability.sync=37
+preregistration.availability.sync=30
 ## Number of days for which booking slots will be available
 preregistration.availability.noOfDays=140
 ## Gap between the date of booking and the first appointment date to be shown
@@ -148,6 +148,12 @@ mosip.batch.token.request.id=
 preregistration.job.schedule.cron.consumedStatusJob=0 0 0 * * ?
 preregistration.job.schedule.cron.slotavailability=0 0 0 * * ?
 preregistration.job.schedule.cron.expiredStatusJob=0 0 0 * * ?
+preregistration.job.schedule.cron.updateApplicationsBookingJob=0 0 * ? * *
+preregistration.job.schedule.cron.purgeExpiredRegCenterSlots=0 0 0 * * ?
+
+# Map to decide code for days of the week. Used by BatchJob
+mosip.kernel.masterdata.day.codes.map={SUNDAY:'101', MONDAY:'102', TUESDAY:'103', WEDNESDAY:'104', THURSDAY:'105', FRIDAY:'106', SATURDAY:'107'}
+
 ## Schema name for batch job table
 spring.batch.tablePrefix=PREREG.BATCH_
 ## Booking service URL for creating time slots
@@ -185,8 +191,8 @@ masterdata.service.contextpath=masterdata
 masterdata.resource.url=${masterdata.service.env}/${masterdata.service.version}/${masterdata.service.contextpath}
 regCenter.url=${masterdata.resource.url}/registrationcenters
 holiday.url=${masterdata.resource.url}/getregistrationcenterholidays/
-holiday.exceptional.url=${masterdata.resource.url}/exceptionalholidays
-working.day.url=${masterdata.resource.url}/weekdays
+holiday.exceptional.url=${masterdata.resource.url}/exceptionalholidays/
+working.day.url=${masterdata.resource.url}/weekdays/
 mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/all?pageSize
 ##Kernel Service URL for fetching templates
 resource.template.url=${masterdata.resource.url}/templates
@@ -314,18 +320,18 @@ mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalida
 global.config.file=application-${spring.profiles.active}.properties
 pre.reg.config.file=pre-registration-${spring.profiles.active}.properties
 ## Mapping file for Pre-registration & ID Object
-preregistartion.config.identityjson=identity-mapping.json 
+preregistration.config.identityjson=identity-mapping.json 
 
 # UI scheme json
 preregistration.demographic.idschema-json-filename=pre-registration-demographic.json
 
 # Verify where it is used
-preregistartion.response = response
-preregistartion.identity.name=fullName
-preregistartion.demographicDetails=demographicDetails
-preregistartion.identity.email=email
-preregistartion.identity.phone=phone
-preregistartion.identity=identity 
+preregistration.response = response
+preregistration.identity.name=fullName
+preregistration.demographicDetails=demographicDetails
+preregistration.identity.email=email
+preregistration.identity.phone=phone
+preregistration.identity=identity 
 
 ## QR code service
 mosip.pre-registration.qrcode.generate.id=mosip.pre-registration.qrcode.generate
@@ -354,7 +360,8 @@ mosip.id.pre-registration.transliteration.transliterate=mosip.pre-registration.t
 mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j
 
 ## List of keys which UI will consume
-ui.config.params=preregistartion.contact.email,preregistartion.contact.phone,preregistration.availability.sync,preregistration.availability.noOfDays,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,mosip.preregistration.captcha.sitekey,mosip.adult.age,mosip.idschema.version,mosip.preregistration.captcha.enable,preregistartion.identity.name,preregistration.ui.version
+ui.config.params=preregistration.availability.sync,preregistration.availability.noOfDays,mosip.id.validation.identity.email,mosip.id.validation.identity.postalCode,mosip.id.validation.identity.phone,mosip.id.validation.identity.dateOfBirth,mosip.id.validation.identity.referenceIdentityNumber,mosip.default.dob.month,mosip.default.dob.day,mosip.kernel.otp.expiry-time,mosip.kernel.otp.validation-attempt-threshold,mosip.kernel.otp.default-length,mosip.kernel.sms.number.length,mosip.kernel.pin.length,preregistration.max.file.size,preregistration.recommended.centers.locCode,preregistration.nearby.centers,mosip.login.mode,preregistration.workflow.demographic,preregistration.workflow.documentupload,preregistration.workflow.booking,preregistration.auto.logout,preregistration.timespan.cancel,preregistration.timespan.rebook,preregistration.booking.offset,mosip.right_to_left_orientation,mosip.left_to_right_orientation,mosip.id.validation.identity.age,mosip.id.validation.identity.fullName.[*].value,mosip.id.validation.identity.addressLine1.[*].value,preregistration.documentupload.allowed.file.type,preregistration.documentupload.allowed.file.nameLength,preregistration.documentupload.allowed.file.size,mosip.preregistration.auto.logout.idle,mosip.preregistration.auto.logout.timeout,mosip.preregistration.auto.logout.ping,mosip.country.code,mosip.notificationtype,mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable,mosip.preregistration.captcha.sitekey,mosip.adult.age,mosip.idschema.version,mosip.preregistration.captcha.enable,preregistration.identity.name,preregistration.ui.version,preregistration.contact.email,preregistration.contact.phone
+
 ## This config is used for loading recommended centers based on the value of the config. 
 ## The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 preregistration.recommended.centers.locCode=5
@@ -372,8 +379,8 @@ mosip.preregistration.auto.logout.idle=180
 mosip.preregistration.auto.logout.timeout=60
 preregistration.ui.version=1.2.0
 
-preregistartion.contact.email=contact@dev.mosip.net
-preregistartion.contact.phone=9999999999
+preregistration.contact.email=contact@dev.mosip.net
+preregistration.contact.phone=9999999999
 
 # Determines to maintain iternal cycle & make sure value is not null (any value greater than zero)
 mosip.preregistration.auto.logout.ping=30
@@ -417,6 +424,13 @@ mosip.preregistration.uispec.all=mosip.preregistration.uispec.all
 
 preregistration.cookie.contextpath=/
 
+# To generate token from keycloak. Use by kernel auth adapter.
+mosip.iam.adapter.clientid=mosip-prereg-client
+mosip.iam.adapter.clientsecret=${preregistration.mosip.prereg.client.secret}
+
+# preregistration.mosip.prereg.client.secret
+mosip.iam.adapter.appid=prereg
+
 # Roles
 mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.putapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN

From 468cce236554f634a0597145949df797f23ff27c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 6 Dec 2021 16:02:14 +0530
Subject: [PATCH 0358/1358] IDrepo prop added.

---
 id-repository-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 28df888f0b3..80a038f72a9 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -169,6 +169,11 @@ mosip.idrepo.credential.cancel-request.rest.timeout=100
 # Fixed delay time after which job will be triggered again to process the created/updated credential details.
 mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 
+# Dummy partner id used to create a credential request record in credential_request_status.
+# Credential won't be issued for the below provided. id-repository-credential-feeder will utilize
+# the credential request with below partner id to issue credential to new IDA partners.
+idrepo-dummy-online-verification-partner-id=MOVP
+
 mosip.idrepo.retrieve-by-uin.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json

From 47065aa771a6448454c043a0c8c014d354828abb Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 7 Dec 2021 22:47:46 +0530
Subject: [PATCH 0359/1358] Unused props removed.

---
 application-default.properties      |   4 +-
 pre-registration-default.properties |   3 -
 pre-registration-demographic.json   | 359 ----------------------------
 3 files changed, 2 insertions(+), 364 deletions(-)
 delete mode 100644 pre-registration-demographic.json

diff --git a/application-default.properties b/application-default.properties
index d99a19f0e38..09093383b95 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -186,9 +186,9 @@ mosip.kernel.crypto.hash-symmetric-key-length=256
 mosip.kernel.crypto.hash-iteration=100000
 mosip.kernel.crypto.sign-algorithm-name=RS256
 mosip.keymanager.base.url=http://keymanager.keymanager
-mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
+#mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
 mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
-mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
+#mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
 mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
 mosip.kernel.keymanager.cert.url=${mosip.keymanager.base.url}/v1/keymanager/getCertificate
 mosip.kernel.keymanager-service-CsSign-url=${mosip.keymanager.base.url}/v1/keymanager/cssign
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 8bfd87868ab..7aafcfac254 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -322,9 +322,6 @@ pre.reg.config.file=pre-registration-${spring.profiles.active}.properties
 ## Mapping file for Pre-registration & ID Object
 preregistration.config.identityjson=identity-mapping.json 
 
-# UI scheme json
-preregistration.demographic.idschema-json-filename=pre-registration-demographic.json
-
 # Verify where it is used
 preregistration.response = response
 preregistration.identity.name=fullName
diff --git a/pre-registration-demographic.json b/pre-registration-demographic.json
deleted file mode 100644
index c4b839d770a..00000000000
--- a/pre-registration-demographic.json
+++ /dev/null
@@ -1,359 +0,0 @@
-{
-    "identity": [
-        {
-            "id": "IDSchemaVersion",
-            "description": "ID Schema Version",
-            "type": "number",
-            "controlType": null,
-            "fieldType": "default",
-            "inputRequired": false,
-            "validators": [],
-            "required": true
-        },
-        {
-            "id": "fullName",
-            "description": "Enter Full Name",
-            "labelName": {
-                "eng": "Full Name",
-                "fra": "Nom complet"
-            },
-            "controlType": "textbox",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": true,
-            "transliteration": true
-        },
-        {
-            "id": "dateOfBirth",
-            "description": "Enter DOB",
-            "labelName": {
-                "eng": "Date Of Birth",
-                "fra": "Date de naissance"
-            },
-            "controlType": "date",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "string",
-            "validators": [],
-            "required": true
-        },
-        {
-            "id": "gender",
-            "description": "Enter Gender",
-            "labelName": {
-                "eng": "Gender",
-                "fra": "Le genre"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "dynamic",
-            "type": "simpleType",
-            "validators": [],
-            "required": true
-        },
-        {
-            "id": "residenceStatus",
-            "description": "Residence status",
-            "labelName": {
-                "eng": "Residence Status",
-                "fra": "Statut de résidence"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "dynamic",
-            "type": "simpleType",
-            "validators": [],
-            "required": true
-        },
-        {
-            "id": "addressLine1",
-            "description": "addressLine1",
-            "labelName": {
-                "eng": "Address Line1",
-                "fra": "Adresse 1"
-            },
-            "controlType": "textbox",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": true,
-            "transliteration": true
-        },
-        {
-            "id": "addressLine2",
-            "description": "addressLine2",
-            "labelName": {
-                "eng": "Address Line2",
-                "fra": "Adresse 2"
-            },
-            "controlType": "textbox",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": false,
-            "transliteration": true
-        },
-        {
-            "id": "addressLine3",
-            "description": "addressLine3",
-            "labelName": {
-                "eng": "Address Line3",
-                "fra": "Adresse 3"
-            },
-            "controlType": "textbox",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": false,
-            "transliteration": true
-        },
-        {
-            "id": "region",
-            "description": "region",
-            "labelName": {
-                "eng": "Region",
-                "fra": "Région"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": true
-        },
-        {
-            "id": "province",
-            "description": "province",
-            "labelName": {
-                "eng": "Province",
-                "fra": "Province"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": true
-        },
-        {
-            "id": "city",
-            "description": "city",
-            "labelName": {
-                "eng": "City",
-                "fra": "Ville"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^(?=.{0,50}$).*",
-                    "arguments": []
-                }
-            ],
-            "required": true
-        },
-        {
-            "id": "zone",
-            "description": "zone",
-            "labelName": {
-                "eng": "Zone",
-                "fra": "Zone"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "simpleType",
-            "validators": [],
-            "required": true
-        },
-        {
-            "id": "postalCode",
-            "description": "postalCode",
-            "labelName": {
-                "eng": "Postal Code",
-                "fra": "code postal"
-            },
-            "controlType": "dropdown",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "string",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-                    "arguments": []
-                }
-            ],
-            "required": true
-        },
-        {
-            "id": "phone",
-            "description": "phone",
-            "labelName": {
-                "eng": "Phone",
-                "fra": "Téléphone"
-            },
-            "controlType": "textbox",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "string",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^([6-9]{1})([0-9]{9})$",
-                    "arguments": []
-                }
-            ],
-            "required": true
-        },
-        {
-            "id": "email",
-            "description": "email",
-            "labelName": {
-                "eng": "Email",
-                "fra": "Email"
-            },
-            "controlType": "textbox",
-            "inputRequired": true,
-            "fieldType": "default",
-            "type": "string",
-            "validators": [
-                {
-                    "type": "regex",
-                    "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-                    "arguments": []
-                }
-            ],
-            "required": true
-        },
-        {
-            "id": "proofOfAddress",
-            "description": "proofOfAddress",
-            "labelName": {
-                "fra": "Address Proof",
-                "eng": "Address Proof"
-            },
-            "controlType": "fileupload",
-            "inputRequired": true,
-            "validators": [],
-            "subType": "POA",
-            "required": false
-        },
-        {
-            "id": "proofOfIdentity",
-            "description": "proofOfIdentity",
-            "labelName": {
-                "fra": "Identity Proof",
-                "eng": "Identity Proof"
-            },
-            "controlType": "fileupload",
-            "inputRequired": true,
-            "validators": [],
-            "subType": "POI",
-            "required": true
-        },
-        {
-            "id": "proofOfRelationship",
-            "description": "proofOfRelationship",
-            "labelName": {
-                "fra": "Relationship Proof",
-                "eng": "Relationship Proof"
-            },
-            "controlType": "fileupload",
-            "inputRequired": true,
-            "validators": [],
-            "subType": "POR",
-            "required": false
-        },
-        {
-            "id": "proofOfDateOfBirth",
-            "description": "proofOfDateOfBirth",
-            "labelName": {
-                "fra": "DOB Proof",
-                "eng": "DOB Proof"
-            },
-            "controlType": "fileupload",
-            "inputRequired": true,
-            "validators": [],
-            "subType": "POB",
-            "required": true
-        },
-        {
-            "id": "proofOfException",
-            "description": "proofOfException",
-            "labelName": {
-                "fra": "Exception Proof",
-                "eng": "Exception Proof"
-            },
-            "controlType": "fileupload",
-            "inputRequired": true,
-            "validators": [],
-            "subType": "POE",
-            "required": true
-        },
-        {
-            "id": "proofOfException-1",
-            "description": "proofOfException",
-            "labelName": {
-                "fra": "Exception Proof",
-                "eng": "Exception Proof"
-            },
-            "controlType": "fileupload",
-            "inputRequired": true,
-            "validators": [],
-            "subType": "POE",
-            "required": true
-        }
-    ],
-    "locationHierarchy": [
-        "region",
-        "province",
-        "city",
-        "zone",
-        "postalCode"
-    ]
-}

From ac87c862e17eb469f1faa8319d10c717bbcc3989 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 8 Dec 2021 10:06:54 +0530
Subject: [PATCH 0360/1358] Synced with develop2

---
 partner-management-default.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 96f5768fc02..2c7942d9cbe 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -120,6 +120,12 @@ pmp.ca.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uplo
 pmp.partner.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadPartnerCertificate
 pmp.partner.certificaticate.get.rest.uri=${keymanager.base.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
 pmp-keymanager.upload.other.domain.cert.rest.uri=${keymanager.base.url}/v1/keymanager/uploadOtherDomainCertificate
+
+#Auth token generation
+mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
+mosip.iam.adapter.clientsecret=${mosip.pmp.auth.secretKey}
+mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
+
 # Used to get data share url to publish to websub
 pmp.certificaticate.datashare.rest.uri=http://datashare.datashare/v1/datashare/create
 # Used for generating the datashare url

From 633f3831bebf9903fdeb3190624edce5820a2338 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 8 Dec 2021 11:39:24 +0530
Subject: [PATCH 0361/1358] Synced with develop2

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 14360134d52..39f90605e02 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -491,7 +491,6 @@ mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGIST
 mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
@@ -539,9 +538,10 @@ mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_A
 mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMI
 mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
 mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN

From fce71186643471d7e8f6e4f9df4268e7687295e1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 8 Dec 2021 16:18:26 +0530
Subject: [PATCH 0362/1358] Synced with develop2

---
 kernel-default.properties       | 437 ++++++++++++++++----------------
 registration-default.properties |   9 +-
 2 files changed, 227 insertions(+), 219 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 39f90605e02..da9f3c47165 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -461,292 +461,293 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
 ## Roles
 
-mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.getapplicationtypeslangcode=PRE_REGISTRATION_ADMIN,RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.postapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postbiometricattributes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER
-mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,CENTRAL_ADMIN
-mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
-mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
-mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.putlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMI
-mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT
-mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatefileformatslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.gettitleall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getuispecall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getusercentermapping=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getuserdetails=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getusers=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getusersid=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getuserssearch=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
-mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
-mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchtemplatefileformats=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postbiometricattributes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getdocumentcategories=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+#mosip.role.admin.masterdata.getdocumenttypesdocumentcategorycode=INDIVIDUAL,ID_AUTHENTICATION,ZONAL_ADMIN,PARTNER,PARTNER_ADMIN,PRE_REGISTRATION,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,CENTRAL_ADMIN
 mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
 mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
+mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postpacketrejectionreasonsreasoncategory=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postpacketresume=GLOBAL_ADMIN,REGISTRATION_ADMIN
-mosip.role.admin.masterdata.postpacketsearch=GLOBAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postpacketresume=REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postpacketsearch=REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postregistereddevices=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT
 mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplatefileformats=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatetypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttitle=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettitleall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postuispecpublish=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getuispecall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getusersid=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusers=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusercentermapping=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserdetails=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserssearch=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdynamicfieldsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
-mosip.role.kernel.getgetzktempcertificate=KEY_MIGRATION_ADMIN
-mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
-mosip.role.kernel.postcssign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.posttpmencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postcsverifysign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postcssign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postdecryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postdecryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postencryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postdecryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postencryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postgeneratesymmetrickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadotherdomaincertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postuploadcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postgeneratecsr=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postgeneratemasterkeyobjecttype=KEY_MAKER,TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postgeneratesymmetrickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postmigratebasekey=KEY_MIGRATION_ADMIN
+mosip.role.kernel.getgetzktempcertificate=KEY_MIGRATION_ADMIN
 mosip.role.kernel.postmigratezkkeys=KEY_MIGRATION_ADMIN
-mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postuploadcacertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
-mosip.role.kernel.postuploadcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postuploadotherdomaincertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postverifycertificatetrust=MS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
+mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
 mosip.role.kernel.postuploadpartnercertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
+mosip.role.kernel.postuploadcacertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
+mosip.role.kernel.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postverifycertificatetrust=MS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
-mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
 mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postzkreencryptrandomkey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
 mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN
diff --git a/registration-default.properties b/registration-default.properties
index bf14ed74bc4..49999b8c94f 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -364,6 +364,13 @@ mosip.registration.replace_sdk_quality_score=N
 mosip.registration.reset_password_url=https://dev.mosip.net/keycloak/auth/realms/mosip/account/
 #Flag to check / bypass device cert validation
 
+mosip.registration.onboard_yourself_url=https://docs.mosip.io/platform/modules/registration-client/first-user-registration-and-onboarding
+mosip.registration.registering_individual_url=https://docs.mosip.io/platform/modules/registration-client/registration-packet
+mosip.registration.sync_data_url=https://docs.mosip.io/platform/modules/registration-client/registration-functionality
+mosip.registration.mapping_devices_url=https://docs.mosip.io/platform/modules/registration-client/device-integration-specifications
+mosip.registration.uploading_data_url=https://docs.mosip.io/platform/modules/registration-client/ui-specification-for-registration-client
+mosip.registration.updating_biometrics_url=https://docs.mosip.io/platform/modules/registration-client/guide-to-configure-mosip-for-biometrics
+
 mosip.registration.mdm.validate.trust=true
 
 #Batch size for RID Sync Job
@@ -397,4 +404,4 @@ mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferre
 mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
 mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
\ No newline at end of file
+mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN

From 7af81dac46231ccd6ea91e496026f324de633d0a Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Wed, 8 Dec 2021 19:48:36 +0530
Subject: [PATCH 0363/1358] Uncommenting the properties syncdata

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 09093383b95..d99a19f0e38 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -186,9 +186,9 @@ mosip.kernel.crypto.hash-symmetric-key-length=256
 mosip.kernel.crypto.hash-iteration=100000
 mosip.kernel.crypto.sign-algorithm-name=RS256
 mosip.keymanager.base.url=http://keymanager.keymanager
-#mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
+mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
 mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
-#mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
+mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
 mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
 mosip.kernel.keymanager.cert.url=${mosip.keymanager.base.url}/v1/keymanager/getCertificate
 mosip.kernel.keymanager-service-CsSign-url=${mosip.keymanager.base.url}/v1/keymanager/cssign

From 0b534fc82b09edbd0fb67623b916cb7d20b09074 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 8 Dec 2021 21:18:52 +0530
Subject: [PATCH 0364/1358] Synced with develop2

---
 resident-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resident-default.properties b/resident-default.properties
index 25ed8a42c2e..6d635b2878e 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -106,3 +106,6 @@ objectstore.adapter.name=PosixAdapter
 
 #TODO remove reg-client service accunt in production env
 auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client
+
+#Mapping Identity json to map with the applicant id json
+registration.processor.identityjson=identity-mapping.json

From 69a6590923cc993f0c98368c4e0c8be3001cb288 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 9 Dec 2021 15:17:50 +0530
Subject: [PATCH 0365/1358] Synced with develop2.

---
 data-share-default.properties    |   2 +-
 id-repository-default.properties |   2 +-
 res.diff                         | 144 +++++++++++++++++++++++++++++++
 3 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 res.diff

diff --git a/data-share-default.properties b/data-share-default.properties
index b82c3b9fceb..2c119ac03b7 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -32,4 +32,4 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=true
 
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client,mosip-resident-client
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 80a038f72a9..edae0eb3f51 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -235,7 +235,7 @@ mosip.credential.request.service.version=1.0
 
 ## Batch job
 # batch job time intervel in miliseconds
-mosip.credential.request.job.timedelay=1
+mosip.credential.request.job.timedelay=15000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
 # This property can be set to auth,print or keep it empty so batch will pick up all records#
diff --git a/res.diff b/res.diff
new file mode 100644
index 00000000000..4945cc9ba83
--- /dev/null
+++ b/res.diff
@@ -0,0 +1,144 @@
+DIFFERENT VALUES:
+
+SYNCSERVICE:
+< ${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/sync
+> http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/sync
+
+IDREPOSITORY:
+< http://idrepo-identity-service/idrepository/v1/identity/
+> http://identity.idrepo/idrepository/v1/identity/
+
+INTERNALAUTHTRANSACTIONS:
+< http://ida-internal-service/idauthentication/v1/internal/authTransactions
+> http://ida-internal.ida/idauthentication/v1/internal/authTransactions
+
+token.request.secretKey:
+< {cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+> ${mosip.mosip.resident.client.secret}
+
+IDREPOGETIDBYUIN:
+< http://idrepo-identity-service/idrepository/v1/identity/idvid
+> http://identity.idrepo/idrepository/v1/identity/idvid
+
+resident.secretKey:
+< {cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+> ${mosip.mosip.resident.client.secret}
+
+SMSNOTIFIER:
+< http://kernel-notification-service/v1/notifier/sms/send
+> http://notifier.kernel/v1/notifier/sms/send
+
+POLICY_REQ_URL:
+< http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+> http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+
+IDAUTHCREATEVID:
+< http://idrepo-vid-service/idrepository/v1/vid
+> http://vid.idrepo/idrepository/v1/vid
+
+RIDGENERATION:
+< http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
+> http://ridgenerator.kernel/v1/ridgenerator/generate/rid
+
+AUTHTYPESTATUSUPDATE:
+< http://idrepo-identity-service/idrepository/v1/identity/authtypes/status
+> http://identity.idrepo/idrepository/v1/identity/authtypes/status
+
+CREATEVID:
+< http://idrepo-vid-service/idrepository/v1/vid
+> http://vid.idrepo/idrepository/v1/vid
+
+CREDENTIAL_REQ_URL:
+< http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
+> http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
+
+IDAUTHREVOKEVID:
+< http://idrepo-vid-service/idrepository/v1/vid
+> http://vid.idrepo/idrepository/v1/vid/deactivate
+
+MASTER:
+< http://kernel-masterdata-service/v1/masterdata
+> http://masterdata.kernel/v1/masterdata
+
+mosip.kernel.masterdata.audit-url:
+< http://kernel-auditmanager-service/v1/auditmanager/audits
+> http://auditmanager.kernel/v1/auditmanager/audits
+
+GETUINBYVID:
+< http://idrepo-vid-service/idrepository/v1/vid
+> http://vid.idrepo/idrepository/v1/vid
+
+REGISTRATIONSTATUSSEARCH:
+< ${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
+> http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
+
+IDREPOGETIDBYRID:
+< http://idrepo-identity-service/idrepository/v1/identity/idvid
+> http://identity.idrepo/idrepository/v1/identity/idvid
+
+KERNELENCRYPTIONSERVICE:
+< http://ida-internal-service/idauthentication/v1/internal/getCertificate
+> http://ida-internal.ida/idauthentication/v1/internal/getCertificate
+
+auth.server.admin.allowed.audience:
+< mosip-resident-client
+> mosip-resident-client,mosip-reg-client
+
+EMAILNOTIFIER:
+< http://kernel-notification-service/v1/notifier/email/send
+> http://notifier.kernel/v1/notifier/email/send
+
+ENCRYPTURL:
+< http://kernel-keymanager-service/v1/keymanager/encrypt
+> http://keymanager.kernel/v1/keymanager/encrypt
+
+DECRYPT_API_URL:
+< http://kernel-keymanager-service/v1/keymanager/decrypt
+> http://keymanager.kernel/v1/keymanager/decrypt
+
+PARTNER_API_URL:
+< http://pms-partner-manager-service/v1/partnermanager/partners
+> http://pms-partner.pms/v1/partnermanager/partners
+
+CREDENTIAL_STATUS_URL:
+< http://idrepo-credential-request-generator/v1/credentialrequest/get/
+> http://credentialrequest.idrepo/v1/credentialrequest/get/
+
+KERNELAUTHMANAGER:
+< http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
+> http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+
+MIDSCHEMAURL:
+< http://kernel-syncdata-service/v1/syncdata/latestidschema
+> http://syncdata.kernel/v1/syncdata/latestidschema
+
+CREDENTIAL_CANCELREQ_URL:
+< http://idrepo-credential-request-generator/v1/credentialrequest/cancel/
+> http://credentialrequest.idrepo/v1/credentialrequest/cancel/
+
+OTP_GEN_URL:
+< http://ida-internal-service/idauthentication/v1/internal/otp
+> http://ida-internal.ida/idauthentication/v1/internal/otp
+
+CREDENTIAL_TYPES_URL:
+< http://idrepo-credential-service/v1/credentialservice/types
+> http://credential.idrepo/v1/credentialservice/types
+
+PACKETRECEIVER:
+< ${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+> http://regproc-group1/registrationprocessor/v1/packetreceiver/registrationpackets
+
+INTERNALAUTH:
+< http://ida-internal-service/idauthentication/v1/internal/auth
+> http://ida-internal.ida/idauthentication/v1/internal/auth
+
+=======================================================
+
+NEW PROPERTIES in /Users/puneet/Documents/mosip/develop2/mosip-config/sandbox/resident-mz.properties
+set(['dmz.ingress.base.url'])
+
+=======================================================
+
+NEW PROPERITES in resident-default.properties
+set([])
+

From 5c59bde67f982e716390c7b6c2deb38c672e386c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 9 Dec 2021 15:37:25 +0530
Subject: [PATCH 0366/1358] Swagger context path added.

---
 kernel-default.properties | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index da9f3c47165..24955fe2b1e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -439,9 +439,13 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
-openapi.service.servers[0].url=https://${mosip.api.internal.host}/v1/masterdata
+openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.path:}}
 openapi.service.servers[0].description=For Swagger
 
+#${server.servlet.context-path:${server.servlet.path:}}
+
+
+
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 

From ade7ded323ec7b7a20a557d41ad97567801d8af7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 9 Dec 2021 15:50:24 +0530
Subject: [PATCH 0367/1358] openAPI props disabled.

---
 kernel-default.properties | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 24955fe2b1e..c718562ec90 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -439,12 +439,8 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
-openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.path:}}
-openapi.service.servers[0].description=For Swagger
-
-#${server.servlet.context-path:${server.servlet.path:}}
-
-
+#openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.path:}}
+#openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails

From 474109ddba5b2beb87f34ff72027a4c6dc5a10ae Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 10 Dec 2021 17:10:32 +0530
Subject: [PATCH 0368/1358] Synced with develop2

---
 kernel-default.properties | 81 ++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index c718562ec90..e119e61739d 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -295,7 +295,7 @@ auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authoriz
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111
-#mosip.security.provider.name=SunPKCS11-pkcs11-proxy
+mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
@@ -453,6 +453,7 @@ mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
 #AdminMaster endpoints to access without authentication
+mosip.service-context=/v1/masterdata
 mosip.service.end-points={cipher}dd5737cb38b0d354e925a031d1662cae45feb891135577d72d75017f71a3c72d38d157158eb9e12d8e51ffb3e66e1397eb0e20040939ad145363a00c458f247c53a712c564467770d08b0cab22b967ba71d09e75a4c53492f23bb29e4c529a87787e7652c720b8eb7ce61ffc4ea6efe89be9d85034fcb135582af662290eacc0392ea96c15fef0a20694cd24c553ec3325e1450e4fb6ea773b200fcdc5d097014e7ff1794d93330c40f50fce4c20d15fc9b0ddced67877cf51ecf38d7b3fb352e176fe12956e0e2e1d43ac77dd200085dac1d3e3fe49475d5077b6bff6162c53a2d00fdbc5cd12a0aa983165916cb9cd72b2eff9c8bf7bc92bea2619fc0900b5936655a16a96fe8b188fa06a625760f78b1273a66137228095305ca32093b1fda5faac87b1ae172caa990776fa6dc52f6f1863848b21e42eb1af5ee530f12af7ef94aa8bccb254fe65c69870338e7bae1a95f344c9fcb806ac7801466168c81de7262e1a0bf49c62ee0c3676babbc718ba790e7b9428482443f6e612c9ef497702a79c9a49d47ab98d97a868e7f2ce1b7febc3d09afadbf5555e21234290aaaef94681c78326d7c178316b7d211f2a72dfb5a39e6badda11d4ee42b79c003fdf1d83d72aee288f6c8ad6e5f66c2dae350d50f5aec39360b8cce5e3682ef6f8adb7a6377a9580d420944f98c98390d3a2f7a0682d26991a60e3ab79401c63233c5a18b1902f715ebf595107563d9a60d3280c1baed1777e894660ea1e05b6433e2653af499b286fdb6380b29d32953bd23de2ec8f2c441b0e22c3877f85aa23046e2830fb9f94dced2ee55f107c8160f05bfa5436620898b36d18ae26bd4c7400e3d51f85bad2a81665aa7baf7d10cb792067b600fb0277fb0119aa9186c3d1a2079c56ca999ce1d4930b9ea77f80d88bb2afbb93002b77c3d5f5a895822dacc6038112160bf280d392599c268d504aff4e933fa4308ab50d25793c93fd2a51b1c7d2938219ff84202ae286cb1b9650ec5dfd79dabad2acf2b44fbc08170c097c93a9d663b4c130392bd536d86a87cd11ab074d3db666dcf2f40349d1056ce2708cfcfbcdd868a8073acd9a2241159e64cae84eceabd8acb83afbeeafa822defd7616bfd5801f1976392872f61e637bc21c3db4fe30d6c1de644d2291ce9d48ff1afff9f1ab596620553fd669cfa38dc5ccea6286abbcd93ca8b434b2b6d42129d72e7daa91001d43005d781369c054b36a6158d4f2cc6c6136565733b13cd7d306c715809f2d9a5024abcffbc0ef3b58585b881f6509bd1876b923494445a2a430ddf5e517b49b65647f54a2e10a002224269c78a38b6ddbddc02176d93e1e280cfdefc317efe361babe0eb3688c9d3406c4ef7a1851ddc7d511703b1d4e2c449792abd523c6eadfbfea13cf862478d75196f8133deadc31222fa6be3cd1cac015f2af1865d834bda4e7f3352cc72116d732ed384a0b94237810bf5909ea453f9052aeb0ae6d492e7ed4d2c33145e38a79742ca23294f3dc89e3cafcfbc8349aae712172bd661137ad6179df3bcc1f03b80af7c82b8a1aa91140086e663ff257d8084680c00c9a31f9c96e0b3d350192851c0c279b8159070e5f1f06153d132447fddbbf1dbb7378b84c38dc1c5f2f8cbbfcd8a478f78b1ed6ed44a0d81a88be605b66a5caad776ab1ae7c8a88362efef9b43d261dd292324e173606fabd3b8ade5fce14671d274d33e93f975d12071473fa7b0289a99a151ce67b3070f44001b5d74b3087ad1fbd071605fd62fa5f86454b881fd1ad86bd565b33248d47100d862dcc57dc0e9f673e25b0845b27d06b38c30ca975efb8031444459d776f6221a90fa51b971a4054332411de943afd8b
 
 
@@ -564,9 +565,6 @@ mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_A
 mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getputlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getpatchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdeletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -710,44 +708,49 @@ mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.kernel.posttpmencryptionpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmsigningpublickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.posttpmencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postcsverifysign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postcssign=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postdecryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postencryptdt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postdecryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postencryptwithpin=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.putrevokekey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postgeneratesymmetrickey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postuploadotherdomaincertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postuploadcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postgeneratecsr=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.getgetcertificate=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postgeneratemasterkeyobjecttype=KEY_MAKER,TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postmigratebasekey=KEY_MIGRATION_ADMIN
-mosip.role.kernel.getgetzktempcertificate=KEY_MIGRATION_ADMIN
-mosip.role.kernel.postmigratezkkeys=KEY_MIGRATION_ADMIN
-mosip.role.kernel.postverifycertificatetrust=MS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
-mosip.role.kernel.getgetpartnercertificatepartnercertid=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,PMS_USER
-mosip.role.kernel.postuploadpartnercertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
-mosip.role.kernel.postuploadcacertificate=PMS_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL
-mosip.role.kernel.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
-mosip.role.kernel.postzkencrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postzkdecrypt=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postzkreencryptrandomkey=TEST,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,RESIDENT,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.admin.masterdata.deletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdynamicfieldsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
 mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.keymanager.postcssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postcsverifysign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmsigningpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmencryptionpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadotherdomaincertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postmigratebasekey=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.getzktempcertificate=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.postlicensegenerate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postmigratezkkeys=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
+mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT

From 7fbd7686b62404d58d27222b178a7e1fa46b0888 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Mon, 13 Dec 2021 14:32:57 +0530
Subject: [PATCH 0369/1358] Update data-share-default.properties

---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 2c119ac03b7..54ce7c0cec9 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -32,4 +32,4 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=true
 
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client,mosip-resident-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client,mosip-regproc-client,mosip-resident-client

From ab479f551dde6feb3587ebb40bf516a648d38a14 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 15 Dec 2021 10:27:27 +0530
Subject: [PATCH 0370/1358] Synced with develop2.

---
 id-authentication-default.properties          | 4 +---
 id-authentication-external-default.properties | 7 +++++++
 id-authentication-internal-default.properties | 7 +++++++
 id-authentication-otp-default.properties      | 7 +++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4b5d0d31f84..f4ecb37296f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -225,8 +225,7 @@ ida-websub-auth-type-callback-url=http://ida-internal.ida/idauthentication/v1/in
 ida-websub-credential-issue-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
-## Callback url for partner CA certification upload event
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
 
@@ -255,7 +254,6 @@ ida-topic-activate-id=${ida-auth-partner-id}/ACTIVATE_ID
 ida-topic-pmp-partner-updated=PARTNER_UPDATED
 ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
 ida-topic-pmp-policy-updated=POLICY_UPDATED
-ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
 ida-topic-hotlist=MOSIP_HOTLIST
 ida-topic-credential-status-update=CREDENTIAL_STATUS_UPDATE
 ida-topic-auth-type-status-update-acknowledge=AUTH_TYPE_STATUS_UPDATE_ACK
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index ae918afd20d..b93d695b4f1 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,6 +1,13 @@
 ## Masterdata templates
 ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
 ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+# Callback url for partner CA certification upload event
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+# Secret for partner CA certification upload callback
+ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
+# Topic for Partner CA Certificate Upload event
+ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
+
 
 mosip.service-context=${server.servlet.context-path}
 mosip.service.end-points=/**/*
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 20d767763cc..b05933c21ca 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -6,6 +6,13 @@
 ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
 ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
 
+# Callback url for partner CA certification upload event
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+# Secret for partner CA certification upload callback
+ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
+# Topic for Partner CA Certificate Upload event
+ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
+
 # ********* ADMIN Configurations ************
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
 authrequest.received-time-allowed.seconds=120
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index 0a4a47fcf4c..2d0eb32cace 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -2,6 +2,13 @@
 ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
 ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
 
+# Callback url for partner CA certification upload event
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+# Secret for partner CA certification upload callback
+ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
+# Topic for Partner CA Certificate Upload event
+ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
+
 #Endpoints to access without authentication
 mosip.service-context=${server.servlet.context-path}
 mosip.service.end-points=/**/*

From dcfe3fddc7b9cef57ded245d13817f2c01533f95 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Wed, 15 Dec 2021 15:43:00 +0530
Subject: [PATCH 0371/1358] added client to allowed audience

added mosip-pms-client & mosip-resident-client
---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 2c7942d9cbe..8f195b4f607 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -152,7 +152,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 

From 71dc8a77d58e20ca9e2b1092c7cbdaabfb27affe Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 16 Dec 2021 15:14:42 +0530
Subject: [PATCH 0372/1358] IDA roles updated.

---
 id-authentication-default.properties | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f4ecb37296f..d243887e7dc 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -567,7 +567,25 @@ springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
 ## Roles
-mosip.role.idauth.postotp=RESIDENT
-mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.idauth.postverifyidentity=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.idauth.getauthtransactionsindividualid=RESIDENT
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadotherdomaincertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT

From 98bc435d4182fec5217b8ccfba7862a4b3b5f0fc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 16 Dec 2021 15:23:36 +0530
Subject: [PATCH 0373/1358] Swagger path added

---
 application-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index d99a19f0e38..5a8dd4119a6 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -5,6 +5,7 @@
 #   s3.accesskey 
 #   s3.region
 #   s3.secretkey
+#   mosip.api.internal.host
 
 aplication.configuration.level.version=LTS
 
@@ -389,3 +390,7 @@ mosip.notification.timezone=GMT+05:30
 
 # registration center type validation regex, used to restrict the special charecter
 mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}[a-zA-Z0-9]$
+
+# Swagger
+openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
+openapi.service.servers[0].description=For Swagger

From 801d4d2ad4d5013b6e0bb0d78cd5c13a25098e4f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 16 Dec 2021 17:52:17 +0530
Subject: [PATCH 0374/1358] Synced with develop2.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d311b3e1aff..4595a558dd9 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -522,7 +522,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends 
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'CHILD' && @['ID_OBJECT-residenceStatus'] == 'nonResident')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_ADULT_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'ADULT' && @['ID_OBJECT-residenceStatus'] == 'Non-Foreigner')]","pauseFor": 6000,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
 
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)

From 968d264fb2f6ed6c1d2d84b6b8a7ed04f96f49d8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 17 Dec 2021 09:05:34 +0530
Subject: [PATCH 0375/1358] Synced with develop2.

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 131a1ce4d99..ed878a7c3f8 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -300,7 +300,7 @@ kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
 auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111

From 41c52dbc07c0511be4761eb5d4f0bee71463259c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 17 Dec 2021 09:06:31 +0530
Subject: [PATCH 0376/1358] Synced with develop2 branch.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 4595a558dd9..be8d99461cf 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -295,7 +295,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=120
+registration.processor.reprocess.elapse.time=4800
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From 3ff448ebb6bac39ffd298352db4cd6dcf1c5b747 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 17 Dec 2021 16:04:39 +0530
Subject: [PATCH 0377/1358] Synced with develop2

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index be8d99461cf..1f63f37214e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -522,8 +522,8 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends 
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_ADULT_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'ADULT' && @['ID_OBJECT-residenceStatus'] == 'Non-Foreigner')]","pauseFor": 6000,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'INFANT')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single

From faef07e76a45de17752ac47e890237f712ec64e7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 17 Dec 2021 18:12:24 +0530
Subject: [PATCH 0378/1358] Synced with develop2 branch.

---
 registration-processor-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1f63f37214e..980506abecf 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -523,7 +523,8 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'INFANT')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'INFANT' && @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+
 
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single

From aea1ee91ae4d6f93dd2fb6a67d7b9f8ce250f099 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 18 Dec 2021 12:01:57 +0530
Subject: [PATCH 0379/1358] Pointing to internal keycloak url.

---
 kernel-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index e119e61739d..b64ad06cc9b 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -208,7 +208,8 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.host}
+#mosip.iam.base-url=${keycloak.host}
+mosip.iam.base-url=http://keycloak.keycloak
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
 mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/

From 94e55d2c733ca9527a155bc941d3d9465b10413e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 18 Dec 2021 14:18:49 +0530
Subject: [PATCH 0380/1358] Reverted back previous change.

---
 kernel-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index b64ad06cc9b..e119e61739d 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -208,8 +208,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-#mosip.iam.base-url=${keycloak.host}
-mosip.iam.base-url=http://keycloak.keycloak
+mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
 mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/

From 126c25f78556dd7c2a9497a7849ee6dc17e930ad Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 18 Dec 2021 16:03:16 +0530
Subject: [PATCH 0381/1358] Synced with develop2 branch.

---
 id-authentication-default.properties | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d243887e7dc..985f16adae7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -173,13 +173,6 @@ rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
 
-## Auth token generation and validation URLs
-auth-token-generator.rest.uri=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
-auth-token-validator.rest.uri=http://authmanager.kernel/v1/authmanager/authorize/validateToken
-auth-token-generator.rest.clientId=${mosip.ida.auth.clientId}
-auth-token-generator.rest.secretKey=${mosip.ida.auth.secretKey}
-auth-token-generator.rest.appId=${mosip.ida.auth.appId}
-
 ## Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
 id-pmp-service.rest.uri=http://pms-partner.pms/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
@@ -215,7 +208,6 @@ id-masterdata-template-service-multilang.rest.timeout=${mosip.ida.request.timeou
 ida-websub-authtype-callback-secret=${ida.websub.authtype.callback.secret}
 ida-websub-credential-issue-callback-secret=${ida.websub.credential.issue.callback.secret}
 ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback.secret}
-ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
@@ -266,7 +258,6 @@ ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
 ida-topic-pmp-partner-updated=PARTNER_UPDATED
 ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
 ida-topic-pmp-policy-updated=POLICY_UPDATED
-ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
 
@@ -486,7 +477,7 @@ zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
 ## TODO: For testing. Revert in production
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+#mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 ## Admin
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
@@ -514,10 +505,8 @@ cred-request-service-retrigger-cred-issuance.rest.headers.mediaType=${mosip.ida.
 cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.timeout.secs}
 
 # Child Auth Filter configurations
-ida.child-auth-filter.date-of-birth.attribute.name=dateOfBirth
-ida.child-auth-filter.date-of-birth.pattern=yyyy/MM/dd
-ida.child-auth-filter.child.max.age=5
 ida.child-auth-filter.factors.denied=otp,bio
+ida.child-auth-filter.child.max.age=5
 
 # The chunk size of failed message items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.
 ida.fetch.failed.websub.messages.chunk.size=10
@@ -529,8 +518,6 @@ ida.fetch.failed.websub.messages.chunk.size=10
 
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
-#Auth Filters for internal auth
-ida.mosip.kyc.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
 ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 
@@ -547,8 +534,6 @@ mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
 mosip.ida.allowed.domain.uris=https://${mosip.api.public.host},https://${mosip.api.internal.host}
-# Biometrics attribute name present in data-share policy
-mosip.ida.credential.biometric.attribute.name=individualBiometrics
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
@@ -567,6 +552,10 @@ springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
 ## Roles
+mosip.role.idauth.postotp=RESIDENT
+mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.idauth.postverifyidentity=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.idauth.getauthtransactionsindividualid=RESIDENT
 mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
 mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
 mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT

From 7da026c604b7cb2280b15eb6f1437ad5d043080a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 20 Dec 2021 11:00:20 +0530
Subject: [PATCH 0382/1358] Synced with develop2 branch.

---
 syncdata-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index ed878a7c3f8..3e11e604eea 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -219,7 +219,7 @@ mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 #Self token resttemplate related to configuration
-mosip.iam.adapter.clientid=mosip-reg-client
+mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
 mosip.iam.adapter.appid=registrationclient
 mosip.iam.adapter.issuerURL=${mosip.iam.base-url}/auth/realms/mosip
@@ -427,6 +427,8 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 syncdata.cache.evict.delta-sync.cron=0 0/15 * * * *
 syncdata.cache.snapshot.cron=0 0 23 * * * 
 
+mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
+
 ## Roles
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From 01afae4036158301fe849d2e9a88f76ca63b78f1 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Mon, 20 Dec 2021 14:10:41 +0530
Subject: [PATCH 0383/1358] Update data-share-default.properties

updated data-share protocol to HTTPS
---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 54ce7c0cec9..aadfb3b718f 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -25,7 +25,7 @@ data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
 data.share.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
-mosip.data.share.protocol=http
+mosip.data.share.protocol=https
 mosip.data.share.includeCertificateHash=false
 mosip.data.share.includeCertificate=false
 mosip.data.share.includePayload=false

From 594e1f0c42078debb30dad5d656c67eaeacfedea Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 20 Dec 2021 16:11:35 +0530
Subject: [PATCH 0384/1358] Updated v3 config

---
 data-share-default.properties                 | 2 +-
 id-authentication-internal-default.properties | 2 +-
 registration-processor-default.properties     | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index aadfb3b718f..1c172537851 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -32,4 +32,4 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=true
 
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client,mosip-regproc-client,mosip-resident-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client,mosip-regproc-client,mosip-resident-client,mosip-reg-client
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index b05933c21ca..eee330f07df 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -21,4 +21,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 980506abecf..983c0c37e4c 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -523,8 +523,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"NON_RESIDENT_CHILD_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'INFANT' && @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 600,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
-
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"ADULT_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'ADULT')]","pauseFor": 6000,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single

From 81523b5753264a111e4fcb6fe89ec8ab079f9913 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Mon, 20 Dec 2021 17:55:56 +0530
Subject: [PATCH 0385/1358] Update data-share-default.properties

---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 1c172537851..8fdd04455bb 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -25,7 +25,7 @@ data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
 data.share.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
-mosip.data.share.protocol=https
+mosip.data.share.protocol=http
 mosip.data.share.includeCertificateHash=false
 mosip.data.share.includeCertificate=false
 mosip.data.share.includePayload=false

From 60c7004d18fb200219e7746fd72abd0d80998b01 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Mon, 20 Dec 2021 18:06:47 +0530
Subject: [PATCH 0386/1358] Update partner-management-default.properties

---
 partner-management-default.properties | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 8f195b4f607..ec896aae767 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -156,6 +156,16 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
+
+#To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
+mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
+
+# To configure misp partner type
+mosip.pms.misp.partner.type=MISP_Partner
+
+# Role for partner admin =
+mosip.pms.partneradmin.role=PARTNER_ADMIN
+
 #To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
 mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
 # To configure misp partner type

From 65c26f4102608c188821a712df4bc858c6dda598 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Tue, 21 Dec 2021 15:27:21 +0530
Subject: [PATCH 0387/1358] updated the config

---
 admin-default.properties              | 117 ++++++++++++++++++---
 application-default.properties        |  74 +++++++++++++
 data-share-default.properties         |  22 +++-
 id-authentication-default.properties  |  84 ++++++++++++++-
 id-repository-default.properties      |  52 +++++++---
 kernel-default.properties             | 144 +++++++++++++++++++++-----
 partner-management-default.properties | 116 +++++++++++++++++++--
 pre-registration-default.properties   | 122 +++++++++++++++++++---
 print-default.properties              |  82 ++++++++++++++-
 resident-default.properties           |  24 ++++-
 syncdata-default.properties           | 143 ++++++++++++++++++++-----
 11 files changed, 865 insertions(+), 115 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index f50e11fb15a..0377476d2f7 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -7,6 +7,25 @@
 # mosip.mosip.regproc.client.secret
 # mosip.api.internal.host
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 mosip.api.internal.url=https://${mosip.api.internal.host}
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
@@ -16,8 +35,82 @@ mosip.admin.request-id=ADMIN.REQUEST
 mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 ## Account management
-authmanager.base.url=http://authmanager.kernel/v1/authmanager
+authmanager.base.url=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.admin.accountmgmt.auth-manager-base-uri=${authmanager.base.url}
 mosip.admin.accountmgmt.user-name-url=/username/
 mosip.admin.accountmgmt.user-detail-url=/userdetail/
@@ -26,7 +119,7 @@ mosip.admin.accountmgmt.change-passoword-url=/changepassword/
 mosip.admin.accountmgmt.reset-password-url=/resetpassword/
 mosip.admin.app-id=admin
 
-mosip.kernel.signature.cryptomanager-encrypt-url=http://keymanager.keymanager/v1/keymanager/private/encrypt
+mosip.kernel.signature.cryptomanager-encrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/private/encrypt
 auth.server.validate.url=${authmanager.base.url}/authorize/admin/validateToken
 auth.server.refreshToken.url=${authmanager.base.url}/authorize/admin/refreshToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client
@@ -51,7 +144,7 @@ hibernate.generate_statistics=false
 
 ## Use registration
 auth.server.user-register-url=${authmanager.base.url}/user
-mosip.kernel.emailnotifier-url=http://notifier.kernel/v1/notifier/email/send
+mosip.kernel.emailnotifier-url=${mosip.kernel-notification-service.url}/v1/notifier/email/send
 auth.server.sendotp-url=${authmanager.base.url}/authenticate/sendotp
 auth.server.user-add-password-url=${authmanager.base.url}/user/addpassword
 mosip.admin-appid=admin
@@ -165,18 +258,18 @@ mosip.admin.masterdata.card.valid-document-fra=Documents valides
 mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u0635\u0627\u0644\u062D\u0629
 
 ## UIN activate/deactivate
-mosip.admin.uinmgmt.uin-detail-search=http://identity.idrepo/v1/identity/uin/{uin}
-mosip.kernel.packet-status-update-url=http://registration-transaction.regproc/registrationprocessor/v1/registrationtransaction/search
+mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
+mosip.kernel.packet-status-update-url=${mosip.regproc-registration-transaction-service.url}/v1/registrationtransaction/search
 mosip.kernel.packet-reciever-api-url=http://packet-receiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
-mosip.kernel.zone-validation-url=http://masterdata.kernel/v1/masterdata/zones/authorize
+mosip.kernel.zone-validation-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
-mosip.kernel.audit.manager.api=http://auditmanager.kernel/v1/auditmanager/audits
-mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.kernel.audit.manager.api=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
 mosip.open-id.base-url=${keycloak.host}
-mosip.admin-services.audit.manager.api=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.admin-services.audit.manager.api=${mosip.admin-service.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
@@ -202,7 +295,7 @@ mosip.security.secure-cookie=false
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
-mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.module.clientsecret=${mosip.secret.mosip-admin-client}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
@@ -214,7 +307,7 @@ mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-conn
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
-regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
+regproc.token.request.secretKey=${mosip.secret.mosip-regproc-client}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
 KEYBASEDTOKENAPI=${authmanager.base.url}/authenticate/clientidsecretkey
@@ -222,7 +315,7 @@ KEYBASEDTOKENAPI=${authmanager.base.url}/authenticate/clientidsecretkey
 # IAM adapter
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.secret.mosip-admin-client}
 
 # LostRid 
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
diff --git a/application-default.properties b/application-default.properties
index 5a8dd4119a6..7a3382ab3e4 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,6 +14,80 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 mosip.masterdata.base.url = http://masterdata.kernel
 mosip.syncdata.base.url=http://syncdata.kernel
 
diff --git a/data-share-default.properties b/data-share-default.properties
index 8fdd04455bb..ccada1321e6 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -12,13 +12,33 @@ KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
 PARTNER_POLICY=http://pms-policy.pms/v1/policymanager/policies/{policyId}/partner/{partnerId}
 KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 data.share.application.id=PARTNER
 mosip.data.share.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 !-- if value is true then  please set servlet path to /   --!
 mosip.data.share.urlshortner=false
 data.share.token.request.appid=datsha
 data.share.token.request.clientId=mosip-datsha-client
-data.share.token.request.secretKey=${mosip.mosip.datsha.client.secret}
+data.share.token.request.secretKey=${mosip.secret.mosip-datsha-client}
 data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 985f16adae7..51d58675b68 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -19,9 +19,83 @@
 mosip.api.internal.url=https://${mosip.api.internal.host}
 ## Client
 mosip.ida.auth.clientId=mosip-ida-client
-mosip.ida.auth.secretKey=${mosip.mosip.ida.client.secret}
+mosip.ida.auth.secretKey=${mosip.secret.mosip-ida-client}
 mosip.ida.auth.appId=ida
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 ## Database
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
@@ -187,13 +261,13 @@ data-share-get.rest.timeout=10
 data-share-get-decrypt-ref-id=${ida-auth-partner-id}
 
 ## Title Service rest api-GET
-id-masterdata-title-service.rest.uri=http://masterdata.kernel/v1/masterdata/title
+id-masterdata-title-service.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/title
 id-masterdata-title-service.rest.httpMethod=GET
 id-masterdata-title-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-title-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Master Data - Template Single Language
-id-masterdata-template-service.rest.uri=http://masterdata.kernel/v1/masterdata/templates/{langcode}/{templatetypecode}
+id-masterdata-template-service.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 id-masterdata-template-service.rest.httpMethod=GET
 id-masterdata-template-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -493,13 +567,13 @@ cred-request-service-get-request-ids.pageSize=10
 cred-request-service-get-request-ids.statusCode=ISSUED
 ida-max-credential-pull-window-days=2
 ida-max-websub-messages-pull-window-days=2
-cred-request-service-get-request-ids.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/getRequestIds?direction=ASC&orderBy=updateDateTime&pageNumber={pageNumber}&pageSize=${cred-request-service-get-request-ids.pageSize}&statusCode=${cred-request-service-get-request-ids.statusCode}&effectivedtimes={effectivedtimes}
+cred-request-service-get-request-ids.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/getRequestIds?direction=ASC&orderBy=updateDateTime&pageNumber={pageNumber}&pageSize=${cred-request-service-get-request-ids.pageSize}&statusCode=${cred-request-service-get-request-ids.statusCode}&effectivedtimes={effectivedtimes}
 cred-request-service-get-request-ids.rest.httpMethod=GET
 cred-request-service-get-request-ids.rest.headers.mediaType=${mosip.ida.request.mediaType}
 cred-request-service-get-request-ids.rest.timeout=${mosip.ida.request.timeout.secs}
 
 # Credential Request API to get Request IDs for the given status, pageStart and page
-cred-request-service-retrigger-cred-issuance.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/retrigger/{requestId}
+cred-request-service-retrigger-cred-issuance.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/retrigger/{requestId}
 cred-request-service-retrigger-cred-issuance.rest.httpMethod=PUT
 cred-request-service-retrigger-cred-issuance.rest.headers.mediaType=${mosip.ida.request.mediaType}
 cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index edae0eb3f51..61a456c93c7 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -117,16 +117,16 @@ mosip.idrepo.vid.policy-file-url=${mosip.idrepo.mosip-config-url}mosip-vid-polic
 mosip.idrepo.draft-vid.default-type-to-create=PERPETUAL
 
 ## Rest servies 
-mosip.idrepo.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.idrepo.audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
 mosip.idrepo.audit.rest.headers.mediaType=application/json
 
-mosip.idrepo.encryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/encrypt
+mosip.idrepo.encryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
 mosip.idrepo.encryptor.rest.httpMethod=POST
 mosip.idrepo.encryptor.rest.headers.mediaType=application/json
 mosip.idrepo.encryptor.rest.timeout=100
 
-mosip.idrepo.decryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/decrypt
+mosip.idrepo.decryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
 mosip.idrepo.decryptor.rest.httpMethod=POST
 mosip.idrepo.decryptor.rest.headers.mediaType=application/json
 mosip.idrepo.decryptor.rest.timeout=100
@@ -192,7 +192,7 @@ mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 
 ## Auth adapter
 mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
-mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.clientsecret.id-repository=${mosip.secret.mosip-reg-client}
 mosip.iam.adapter.appid.id-repository=regproc
 mosip.authmanager.client-token-endpoint=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 
@@ -225,7 +225,7 @@ hibernate.show_sql=false
 # Token generator properties 
 credential.request.token.request.appid=crereq
 credential.request.token.request.clientId=mosip-crereq-client
-credential.request.token.request.secretKey=${mosip.mosip.crereq.client.secret}
+credential.request.token.request.secretKey=${mosip.secret.mosip-reg-client}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
 credential.request.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
@@ -251,9 +251,9 @@ credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
 
 ## Rest services
-CRDENTIALSERVICE=http://credential.idrepo/v1/credentialservice/issue
-KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
-CALLBACKURL=http://credential.idrepo/v1/credentialrequest/callback/notifyStatus
+CRDENTIALSERVICE=${mosip.idrepo-credential-service.url}/v1/credentialservice/issue
+KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+CALLBACKURL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/callback/notifyStatus
 
 # Websub
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
@@ -301,12 +301,12 @@ IDREPOGETIDBYID=http://identity.idrepo/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
 mosip.data.share.internal.domain.name=datashare.datashare
 CREATEDATASHARE=/v1/datashare/create
-KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
-KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
-KEYMANAGER_ENCRYPT_PIN=http://keymanager.keymanager/v1/keymanager/encryptWithPin
-KEYMANAGER_ENCRYPT_ZK=http://keymanager.keymanager/v1/keymanager/zkEncrypt
-PARTNER_POLICY=http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-PARTNER_EXTRACTION_POLICY=http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
+KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
+KEYMANAGER_ENCRYPT_PIN=${mosip.kernel-keymanager-service.url}/v1/keymanager/encryptWithPin
+KEYMANAGER_ENCRYPT_ZK=${mosip.kernel-keymanager-service.url}/v1/keymanager/zkEncrypt
+PARTNER_POLICY=${mosip.pms-partner-manager-service.url=http}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+PARTNER_EXTRACTION_POLICY=${mosip.pms-partner-manager-service.url=http}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
 credential.service.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
 # BioSDK service
@@ -347,11 +347,31 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 ## Auth token generator 
-auth-token-generator.rest.uri=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 auth-token-generator.rest.appId=regproc
 auth-token-generator.rest.clientId=mosip-regproc-client
-auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
+auth-token-generator.rest.secretKey=${mosip.secret.mosip-regproc-client}
 
 # Enabling below property will start logging performance logs in identity and vid service
 mosip.idrepo.aspect-logging.enabled=false
diff --git a/kernel-default.properties b/kernel-default.properties
index e119e61739d..e851f1082e4 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -14,8 +14,82 @@
 # email.smtp.username
 # email.smtp.secret
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
+mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel-syncdata-service.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -25,7 +99,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=http://masterdata.kernel/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -77,13 +151,13 @@ auth.refreshtoken.header=RefreshToken
 auth.jwt.refresh.expiry=86400000
 auth.primary.language=eng
 
-otp.manager.api.generate=http://otpmanager.kernel/v1/otpmanager/otp/generate
-otp.manager.api.verify=http://otpmanager.kernel/v1/otpmanager/otp/validate
-otp.sender.api.email.send=http://notifier.kernel/v1/notifier/email/send
-otp.sender.api.sms.send=http://notifier.kernel/v1/notifier/sms/send
-masterdata.api.template=http://masterdata.kernel/v1/masterdata/templates/
+otp.manager.api.generate=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
+otp.manager.api.verify=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
+otp.sender.api.email.send=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+otp.sender.api.sms.send=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
+masterdata.api.template=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=http://identity.idrepo/idrepository/v1/identity/uin/{uin}
+idrepo.api.getuindetails=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
@@ -256,7 +330,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=http://authmanager.kernel/v1/authmanager
+mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -267,12 +341,12 @@ mosip.admin_realm_id=mosip
 
 master.search.maximum.rows=50
 mosip.level=2
-mosip.kernel.masterdata.audit-url= http://auditmanager.kernel/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url= ${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
 # Keymanager runs in separate namespace "keymanager"
-mosip.kernel.sign-url=http://keymanager.keymanager/v1/keymanager/sign
+mosip.kernel.sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
@@ -290,7 +364,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 
 
 ## Proxy otp
@@ -306,7 +380,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -358,7 +432,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=http://masterdata.kernel/v1/masterdata/machines/%s/eng
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/machines/%s/eng
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments
@@ -370,10 +444,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=http://authmanager.kernel/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=http://authmanager.kernel/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
@@ -388,7 +462,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/callback/partner/ca_certificate
-syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=${mosip.kernel-syncdata-service.url}/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
@@ -400,9 +474,9 @@ subscriptions-delay-on-startup=120000
 mosip.kernel.keymanager.113nothumbprint.support=false
 
 # Pause & resume api proeprties
-PACKET_RESUME_API=http://regproc-workflowmanager/registrationprocessor/v1/workflowmanager/workflowaction
-PACKET_PAUSE_API=http://regproc-workflowmanager/registrationprocessor/v1/workflowmanager/workflow/search
-KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+PACKET_RESUME_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflowaction
+PACKET_PAUSE_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflow/search
+KEYBASEDTOKENAPI=${mosip.kernel-syncdata-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## resubscription and subscription initial delay for masterdata service
 masterdata.websub.resubscription.delay.millis=48000000
@@ -426,7 +500,7 @@ mosip.admin.ui.configs=version:${aplication.configuration.level.version};locatio
 mosip.kernel.keymanager.113nothumbprint.support=false
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 
 ## identity schema backward compatability ########
@@ -437,7 +511,7 @@ scheduling.job.cron=0 0 2 * * ?
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 
 # masterdata swagger openApi
-#openapi.masterdata.servers[0].url=http://masterdata.kernel/v1/masterdata
+#openapi.masterdata.servers[0].url=${mosip.kernel-masterdata-service.url}/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
 #openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.path:}}
 #openapi.service.servers[0].description=For Swagger
@@ -448,9 +522,29 @@ zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 auth.server.admin.offline.token.validate=false
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.secret.mosip-admin-client}
 
 #AdminMaster endpoints to access without authentication
 mosip.service-context=/v1/masterdata
diff --git a/partner-management-default.properties b/partner-management-default.properties
index ec896aae767..dd24b25226a 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -16,6 +16,80 @@ mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 ## Auth device
 mosip.authdevice.database.hostname=postgres-postgresql.postgres
 mosip.authdevice.database.port=5432
@@ -107,15 +181,35 @@ mosip.kernel.sign-url=${keymanager.base.url}/v1/keymanager/jwtSign
 ## Kernel services
 mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
 mosip.pmp.auth.clientId=mosip-partner-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
+mosip.pmp.auth.secretKey= ${mosip.secret.mosip-partnermanager-client}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
-pms.cert.service.token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+pms.cert.service.token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 pmp.ca.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadCACertificate
 pmp.partner.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadPartnerCertificate
 pmp.partner.certificaticate.get.rest.uri=${keymanager.base.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
@@ -123,11 +217,11 @@ pmp-keymanager.upload.other.domain.cert.rest.uri=${keymanager.base.url}/v1/keyma
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
-mosip.iam.adapter.clientsecret=${mosip.pmp.auth.secretKey}
+mosip.iam.adapter.clientsecret=${mosip.secret.mosip-partnermanager-client}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
-pmp.certificaticate.datashare.rest.uri=http://datashare.datashare/v1/datashare/create
+pmp.certificaticate.datashare.rest.uri=${mosip.datashare-service.url}/v1/datashare/create
 # Used for generating the datashare url
 pms.certs.datashare.policyId=mpolicy-default-cert
 pms.certs.datashare.subscriberId=mpartner-default-cert
@@ -150,8 +244,8 @@ mosip.keycloak.admin.user.id=admin
 mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
 ## Auth adapter
-auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
@@ -193,7 +287,7 @@ policy.auth.allowed.token.types=random,partner,policy
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret=${mosip.mosip.pms.client.secret}
+mosip.iam.module.clientsecret=${mosip.secret.mosip-partnermanager-client}
 mosip.iam.module.redirecturi=https://${mosip.api.public.host}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
@@ -210,14 +304,14 @@ token.request.password=mosip
 token.request.username=110005
 token.request.version=string
 token.request.id=v1
-token.request.issuerUrl=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 token.request.clientId=admin
-PASSWORDBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/useridPwd
+PASSWORDBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/useridPwd
 application.env.local=false
 
 # Notifications
-emailResourse.url=http://notification.kernel/v1/notifier/email/send
-resource.template.url=http://masterdata.kernel/v1/masterdata/templates/{langcode}/{templatetypecode}
+emailResourse.url=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+resource.template.url=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 notifications.sent.before.days = 3
 partner.registration.sub-template = partner-reg-sub-template
 partner.reg.content-template=partner-reg-content-template
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 7aafcfac254..5a7707e31a5 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -17,6 +17,26 @@ javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.databa
 javax.persistence.jdbc.user=prereguser
 javax.persistence.jdbc.password=${db.dbuser.password}
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 ## Hibernate
 hibernate.hbm2ddl.auto=none
 hibernate.show_sql=false
@@ -37,6 +57,80 @@ mosip.adult.age=${mosip.kernel.applicant.type.age.limit}
 ## This version is set in the ID object created in pre-registration
 mosip.idschema.version=0.1
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 ## Demographic Service 
 demographic.service.version=v1
 demographic.service.env=http://prereg-application.prereg
@@ -140,7 +234,7 @@ mosip.preregistration.batchjob.service.expired.id=mosip.pre-registration.batchjo
 # Batch Job Service used to fetch token from key cloak
 mosip.batch.token.authmanager.appId=prereg
 mosip.batch.token.authmanager.userName=mosip-prereg-client
-mosip.batch.token.authmanager.password=${preregistration.mosip.prereg.client.secret}
+mosip.batch.token.authmanager.password=${mosip.secret.mosip-prereg-client}
 mosip.batch.token.authmanager.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}/authenticate/clientidsecretkey
 mosip.batch.token.request.id=
 
@@ -171,15 +265,15 @@ secret_url.version=string
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=3
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
-sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
-otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
+mail-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+sms-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
+otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=otp-sms-template
 pre.reg.login.otp.mail.subject.template=otp-email-subject-template
 pre.reg.login.otp.mail.content.template=otp-email-content-template
 
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/{langcode}/{templatetypecode}
+id-masterdata-template-service-multilang.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 
 ## Masterdata service
 ## Base url is only used for masterdata. We give the in-cluster url here
@@ -242,7 +336,7 @@ preregistration.crypto.PrependThumbprint=false
 ##  KeyCloak 
 ## Both below fields must match with what is there on Keycloak properties 
 clientId=mosip-prereg-client
-secretKey=${preregistration.mosip.prereg.client.secret}
+secretKey=${mosip.secret.mosip-prereg-client}
 
 ## Used for Key Creating KeyCloak session
 userIdType=USERID
@@ -251,7 +345,7 @@ appId=prereg
 ## Auth service 
 kernel.auth.env=http://authmanager.kernel
 kernel.auth.contextpath=authmanager
-auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## PRID service 
@@ -261,7 +355,7 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 
 ## Syncdata service
 latestidschema.service.contextpath=latestidschemafetch the latest ID Schema for the ID object validator
-mosip.preregistration.id-schema=http://syncdata.kernel/v1/syncdata/latestidschema
+mosip.preregistration.id-schema=${mosip.kernel-syncdata-service.url}/v1/syncdata/latestidschema
 syncdata.resource.url=http://syncdata.kernel/v1/syncdata
 
 ## OTP 
@@ -274,9 +368,9 @@ secret_url.version=string
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=3
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
-sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
-otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
+mail-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+sms-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
+otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
@@ -411,9 +505,9 @@ object.store.s3.use.account.as.bucketname=true
 ## Spring cache
 spring.cache.type=none
 
-mosip.preregistration.appointment.getavailablity.url=http://prereg-booking.prereg/preregistration/v1/appointment/availability/{registrationCenterId}
-mosip.preregistration.appointment.book.url=http://prereg-booking.prereg/preregistration/v1/appointment/{preRegistrationId}
-mosip.preregistration.appointment.multi.book.url=http://prereg-booking.prereg/preregistration/v1/appointment
+mosip.preregistration.appointment.getavailablity.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment/availability/{registrationCenterId}
+mosip.preregistration.appointment.book.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment/{preRegistrationId}
+mosip.preregistration.appointment.multi.book.url={mosip.prereg-booking-service.url}/preregistration/v1/appointment
 mosip.preregistration.applications.status.get = mosip.preregistration.applications.status
 mosip.preregistration.applications.details.get = mosip.preregistration.applications.detail.info
 mosip.preregistration.uispec.latest=mosip.preregistration.uispec.latest
diff --git a/print-default.properties b/print-default.properties
index 88727b781ad..969f15762ff 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -5,13 +5,87 @@
 # keycloak.host
 # print.websub.hub.secret
 
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
+
 ## Websub
 websub.base.url=http://websub.websub
 mosip.event.hubURL=${websub.base.url}/hub
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
-mosip.event.callBackUrl=http://print-service.print/v1/print/print/callback/notifyPrint
+mosip.event.callBackUrl=${mosip.print-service.url}/v1/print/print/callback/notifyPrint
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
 mosip.event.secret=${print.websub.hub.secret}
 csrf.disabled=true
@@ -30,7 +104,7 @@ token.request.secretKey= ${mosip.mosip.regproc.client.secret}
 token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
 # Audit service
-AUDIT=http://auditmanager.kernel/v1/auditmanager/audits
+AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.kernel.pdf_owner_password=123456
 
 ## Auth service
@@ -107,6 +181,6 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.n
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=http://datashare.datashare/v1/datashare/create
-DECRYPTPINBASSED=http://keymanager.keymanager/v1/keymanager/decryptWithPin
+CREATEDATASHARE=${mosip.datashare-service.url}/v1/datashare/create
+DECRYPTPINBASSED=${mosip.kernel-keymanager-service.url}/v1/keymanager/decryptWithPin
 mosip.print.prependThumbprint=true
diff --git a/resident-default.properties b/resident-default.properties
index 6d635b2878e..2a79298f166 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -29,12 +29,32 @@ PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
 DECRYPT_API_URL=http://keymanager.kernel/v1/keymanager/decrypt
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 ## Token generation
 token.request.id=io.mosip.resident
 resident.appid=resident
 token.request.version=1.0
 resident.clientId=mosip-resident-client
-resident.secretKey=${mosip.mosip.resident.client.secret}
+resident.secretKey=${mosip.secret.mosip-resident-client}
 # Below is defined in application properties
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
@@ -101,7 +121,7 @@ mosip.registration.processor.registration.sync.id=mosip.registration.sync
 id.repo.vidType=Perpetual
 token.request.appid=resident
 token.request.clientId=mosip-resident-client
-token.request.secretKey=${mosip.mosip.resident.client.secret}
+token.request.secretKey=${mosip.secret.mosip-resident-client}
 objectstore.adapter.name=PosixAdapter
 
 #TODO remove reg-client service accunt in production env
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3e11e604eea..35d28be5502 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -12,9 +12,102 @@
 # mosip.api.internal.host
 # softhsm.kernel.pin
 
+mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
+mosip.NAME.url=http://NAME.default:80
+mosip.activemq.url=http://activemq.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
+mosip.admin-service.url=http://admin-service.default:80
+mosip.admin-ui.url=http://admin-ui.default:80
+mosip.artifactory-service.url=http://artifactory-service.default:80
+mosip.clamav.url=http://clamav.default:80
+mosip.config-server.url=http://config-server.default:80
+mosip.datashare-service.url=http://datashare-service.default:80
+mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.default:80
+mosip.ida-internal-service.url=http://ida-internal-service.default:80
+mosip.ida-otp-service.url=http://ida-otp-service.default:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.kafka.url=http://kafka.default:80
+mosip.kafka-headless.url=http://kafka-headless.default:80
+mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
+mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.keycloak.url=http://keycloak.default:80
+mosip.kubernetes.url=http://kubernetes.default:80
+mosip.minio.url=http://minio.default:80
+mosip.mock-abis.url=http://mock-abis.default:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-mv.url=http://mock-mv.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
+mosip.pms-ui.url=http://pms-ui.default:80
+mosip.postgres.url=http://postgres.default:80
+mosip.prereg-application-service.url=http://prereg-application-service.default:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
+mosip.prereg-ui.url=http://prereg-ui.default:80
+mosip.print-service.url=http://print-service.default:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.resident-service.url=http://resident-service.default:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
+mosip.softhsm-ida.url=http://softhsm-ida.default:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.ingress-nginx.url=http://ingress-nginx.default:80
+mosip.kube-dns.url=http://kube-dns.default:80
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
+mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.kibana-kibana.url=http://kibana-kibana.default:80
+mosip.metrics-server.url=http://metrics-server.default:80
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.default:80
+
 
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
+mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -25,7 +118,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
 mosip.kernel.syncdata-service-idschema-url=http://masterdata.kernel/v1/masterdata/idschema/latest
-mosip.kernel.masterdata.locationhierarchylevels.uri = http://masterdata.kernel/v1/masterdata/locationHierarchyLevels
+mosip.kernel.masterdata.locationhierarchylevels.uri =${mosip.kernel-masterdata-service.url}/v1/masterdata/locationHierarchyLevels
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -77,21 +170,21 @@ auth.refreshtoken.header=RefreshToken
 auth.jwt.refresh.expiry=86400000
 auth.primary.language=eng
 
-otp.manager.api.generate=http://otpmanager.kernel/v1/otpmanager/otp/generate
-otp.manager.api.verify=http://otpmanager.kernel/v1/otpmanager/otp/validate
-otp.sender.api.email.send=http://notification.kernel/v1/notifier/email/send
-otp.sender.api.sms.send=http://notification.kernel/v1/notifier/sms/send
-masterdata.api.template=http://masterdata.kernel/v1/masterdata/templates/
+otp.manager.api.generate=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
+otp.manager.api.verify=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
+otp.sender.api.email.send=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+otp.sender.api.sms.send={mosip.kernel-notification-service.url}/v1/notifier/sms/send
+masterdata.api.template=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=http://identity.idrepo/idrepository/v1/identity/uin/{uin}
+idrepo.api.getuindetails=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key=${mosip.mosip.auth.client.secret}
+mosip.kernel.auth.secret.key=${mosip.secret.mosip-auth-client}
 
 mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
+mosip.kernel.ida.secret.key=${mosip.secret.mosip-ida-client}
 
 ## Token id salts
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
@@ -220,7 +313,7 @@ mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 #Self token resttemplate related to configuration
 mosip.iam.adapter.clientid=mosip-syncdata-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.secret.mosip-reg-client}
 mosip.iam.adapter.appid=registrationclient
 mosip.iam.adapter.issuerURL=${mosip.iam.base-url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
@@ -271,23 +364,23 @@ mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
 mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.admin.clientsecret=${mosip.secret.mosip-admin-client}
 mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
 mosip.admin_realm_id=mosip
 
 master.search.maximum.rows=50
 mosip.level=2
-mosip.kernel.masterdata.audit-url= http://auditmanager.kernel/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url= ${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
-mosip.kernel.keymanager-service-sign-url=http://keymanager.keymanager/v1/keymanager/jwtSign
+mosip.kernel.keymanager-service-sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
 mosip.kernel.prereg.realm-id=preregistration
 mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
+mosip.kernel.prereg.secret.key=${mosip.secret.mosip-prereg-client}
 
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
@@ -299,7 +392,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client
 
 ## Proxy otp
@@ -315,7 +408,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=http://authmanager.kernel/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -367,7 +460,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=http://masterdata.kernel/v1/masterdata/machines/%s/eng
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/masterdata/machines/%s/eng
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments
@@ -376,13 +469,13 @@ mosip.syncdata.tpm.required=false
 mosip.kernel.registrationclient.app.id=registrationclient
 mosip.kernel.registrationclient.client.id=mosip-reg-client
 # env variable
-mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
+mosip.kernel.registrationclient.secret.key=${mosip.secret.mosip-reg-client}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=http://authmanager.kernel/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=http://authmanager.kernel/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=http://authmanager.kernel/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
@@ -397,7 +490,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=http://syncdata.kernel/v1/syncdata/websub/callback/cacert
+syncdata.websub.callback.url.ca-cert=${mosip.kernel-syncdata-service.url}/v1/syncdata/websub/callback/cacert
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a
@@ -409,7 +502,7 @@ syncdata.websub.resubscription.delay.millis=43200000
 subscriptions-delay-on-startup=120000
 
 #Property to fetch location hierarchies during client settings sync
-mosip.kernel.masterdata.locationhierarchylevels.uri=http://masterdata.kernel/v1/masterdata/locationHierarchyLevels
+mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/locationHierarchyLevels
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
 # Make it to true if support is required.

From 4a5f20ebe016fe09412474408c17957e4225e11c Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Tue, 21 Dec 2021 15:56:28 +0530
Subject: [PATCH 0388/1358] updated the config

---
 admin-default.properties            | 36 +++++++++++++-------------
 data-share-default.properties       | 37 +++++++++++++--------------
 id-repository-default.properties    | 38 +++++++++++++---------------
 kernel-default.properties           | 39 ++++++++++++++---------------
 pre-registration-default.properties | 37 +++++++++++++--------------
 resident-default.properties         | 38 ++++++++++++++--------------
 syncdata-default.properties         | 38 ++++++++++++++--------------
 7 files changed, 129 insertions(+), 134 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 0377476d2f7..737196d08d2 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -7,24 +7,24 @@
 # mosip.mosip.regproc.client.secret
 # mosip.api.internal.host
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 mosip.api.internal.url=https://${mosip.api.internal.host}
 mosip.admin.version-id=v1.0
diff --git a/data-share-default.properties b/data-share-default.properties
index ccada1321e6..a3f940e0cdb 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -12,25 +12,24 @@ KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
 PARTNER_POLICY=http://pms-policy.pms/v1/policymanager/policies/{policyId}/partner/{partnerId}
 KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 data.share.application.id=PARTNER
 mosip.data.share.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 61a456c93c7..9961df7e51b 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -347,26 +347,24 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 ## Auth token generator 
 auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 auth-token-generator.rest.appId=regproc
diff --git a/kernel-default.properties b/kernel-default.properties
index e851f1082e4..dacc49afdff 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -14,6 +14,25 @@
 # email.smtp.username
 # email.smtp.secret
 
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+
 mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
@@ -522,26 +541,6 @@ zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
 auth.server.admin.offline.token.validate=false
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.secret.mosip-admin-client}
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 5a7707e31a5..23ea7a0e1df 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -17,25 +17,24 @@ javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.databa
 javax.persistence.jdbc.user=prereguser
 javax.persistence.jdbc.password=${db.dbuser.password}
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 ## Hibernate
 hibernate.hbm2ddl.auto=none
diff --git a/resident-default.properties b/resident-default.properties
index 2a79298f166..f4abbb1108f 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -29,25 +29,25 @@ PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
 DECRYPT_API_URL=http://keymanager.kernel/v1/keymanager/decrypt
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 ## Token generation
 token.request.id=io.mosip.resident
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 35d28be5502..bc3e62bd016 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -12,25 +12,25 @@
 # mosip.api.internal.host
 # softhsm.kernel.pin
 
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80

From 066cf83b78e99f2f41b31e7878f4690f2e5de142 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Tue, 21 Dec 2021 18:43:30 +0530
Subject: [PATCH 0389/1358] Added the application-default-dmz.properties file

---
 application-default-dmz.properties | 374 +++++++++++++++++++++++++++++
 1 file changed, 374 insertions(+)
 create mode 100644 application-default-dmz.properties

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
new file mode 100644
index 00000000000..5c7d211bbc3
--- /dev/null
+++ b/application-default-dmz.properties
@@ -0,0 +1,374 @@
+#---------------------------------------Common properties-----------------------
+aplication.configuration.level.version=LTS
+mz.ingress.base.url: http://mz.ingress:30080
+
+#Kernel-idobjectalidator
+# Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key
+mosip.kernel.idobjectvalidator.property-source=APPLICATION_CONTEXT
+mosip.kernel.idobjectvalidator.schema-name=mosip-identity-json-schema.json
+mosip.kernel.idobjectvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable=NA
+
+
+
+mosip.masterdata.base.url = ${mz.ingress.base.url}
+mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
+mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
+mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
+mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
+mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
+mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
+mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
+
+mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
+mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus
+mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
+mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
+mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus
+mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
+mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
+
+mosip.country.code=WOR
+
+# Language Supported By Platform - ISO
+mosip.supported-languages=eng,ara
+
+# Application IDs
+mosip.prereg.app-id=PRE_REGISTRATION
+mosip.reg.app-id=REGISTRATION
+mosip.regproc.app-id=REGISTRATION_PROCESSOR
+mosip.ida.app-id=IDA
+mosip.ida.ref-id=INTERNAL
+mosip.idrepo.app-id=ID_REPO
+
+# UTC ISO Date Time Pattern
+mosip.utc-datetime-pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+mosip.sign.header=response-signature
+mosip.signed.response.header=response-signature
+
+#----------------------- CBEFF Util--------------------------------------------------
+# Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
+mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+# Cbeff XSD file name in config server
+mosip.kernel.xsdfile=mosip-cbeff.xsd
+
+#----------------------------- Applicant Type --------------------------------------------------
+mosip.kernel.applicant.type.age.limit = 5
+
+#----------------------------- Static PIN --------------------------------------------------
+mosip.kernel.pin.length=6
+
+#-----------------------------TspId -----------------------------------------------
+#length of the Tsp id
+mosip.kernel.tspid.length=4
+
+#-----------------------------partnerId -----------------------------------------------
+#length of the partner id
+mosip.kernel.partnerid.length=4
+
+#-----------------------------TOKEN-ID Properties---------------------------------
+#length of the token id
+mosip.kernel.tokenid.length=36
+
+#-----------------------------Registration Center Id -----------------------------------------------
+#length of the registration center id
+mosip.kernel.registrationcenterid.length=5
+
+#-----------------------------Machine Id -----------------------------------------------
+#length of the machine id
+mosip.kernel.machineid.length=5
+
+#-----------------------------RID Properties---------------------------------------
+# length of the rid
+mosip.kernel.rid.length=29
+# length of the timestamp
+mosip.kernel.rid.timestamp-length=14
+# rid sequence max digits
+mosip.kernel.rid.sequence-length=5
+
+# Upper bound of number of digits in sequence allowed in id. For example if
+# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
+# ascending and descending order)
+mosip.kernel.tokenid.sequence-limit=3
+
+#-----------------------------PRID Properties------------------------------------
+#prid-length
+mosip.kernel.prid.length=14
+
+# Upper bound of number of digits in sequence allowed in id. For example if
+# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
+# ascending and descending order)
+#to disable validation assign zero or negative value
+mosip.kernel.prid.sequence-limit=3
+
+# Number of digits in repeating block allowed in id. For example if limit is 2,
+# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
+#to disable validation assign zero or negative value
+mosip.kernel.prid.repeating-block-limit=3
+
+
+# Lower bound of number of digits allowed in between two repeating digits in
+# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit) to disable validation assign zero or negative value
+mosip.kernel.prid.repeating-limit=2
+
+# list of number that id should not be start with to disable null
+mosip.kernel.prid.not-start-with=0,1
+
+#restricted numbers for prid
+mosip.kernel.prid.restricted-numbers=786,666
+
+
+#-----------------------------VID Properties--------------------------------------
+# length of the vid
+mosip.kernel.vid.length=16
+
+# Upper bound of number of digits in sequence allowed in id. For example if
+# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
+# ascending and descending order)
+# to disable sequence limit validation assign 0 or negative value
+mosip.kernel.vid.length.sequence-limit=3
+
+# Number of digits in repeating block allowed in id. For example if limit is 2,
+# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
+# to disable repeating block validation assign 0 or negative value
+mosip.kernel.vid.length.repeating-block-limit=2
+
+
+# Lower bound of number of digits allowed in between two repeating digits in
+# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
+# to disable repeating limit validation, assign 0  or negative value
+mosip.kernel.vid.length.repeating-limit=2
+
+# list of number that id should not be start with
+# to disable null
+mosip.kernel.vid.not-start-with=0,1
+
+#restricted numbers for vid
+mosip.kernel.vid.restricted-numbers=786,666
+
+#-----------------------------UIN Properties--------------------------------------
+#length of the uin
+mosip.kernel.uin.length=10
+#minimum threshold of unused uin
+mosip.kernel.uin.min-unused-threshold=200000
+#number of uins to generate
+mosip.kernel.uin.uins-to-generate=500000
+#restricted numbers for uin
+mosip.kernel.uin.restricted-numbers=786,666
+
+# Upper bound of number of digits in sequence allowed in id. For example if
+# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
+# ascending and descending order)
+# to disable sequence limit validation assign 0 or negative value
+mosip.kernel.uin.length.sequence-limit=3
+
+# Number of digits in repeating block allowed in id. For example if limit is 2,
+# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
+#to disable validation assign zero or negative value
+mosip.kernel.uin.length.repeating-block-limit=2
+
+# Lower bound of number of digits allowed in between two repeating digits in
+# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
+# to disable repeating limit validation, assign 0  or negative value
+mosip.kernel.uin.length.repeating-limit=2
+
+#reverse group digit limit for uin filter
+mosip.kernel.uin.length.reverse-digits-limit=5
+
+#group digit limit for uin filter
+mosip.kernel.uin.length.digits-limit=5
+
+#should not start with
+mosip.kernel.uin.not-start-with=0,1
+
+#adjacent even digit limit for uin filter
+mosip.kernel.uin.length.conjugative-even-digits-limit=3
+
+
+
+#------------------------Auth-Adapter-----------------------------------------------
+auth.server.validate.url=${mz.ingress.base.url}/v1/authmanager/authorize/admin/validateToken
+#----------------------- Crypto --------------------------------------------------
+#Crypto asymmetric algorithm name
+mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
+#Crypto symmetric algorithm name
+mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
+#Keygenerator asymmetric algorithm name
+mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
+#Keygenerator symmetric algorithm name
+mosip.kernel.keygenerator.symmetric-algorithm-name=AES
+#Asymmetric algorithm key length
+mosip.kernel.keygenerator.asymmetric-key-length=2048
+#Symmetric algorithm key length
+mosip.kernel.keygenerator.symmetric-key-length=256
+#Keygenerator symmetric algorithm name
+mosip.kernel.keygenerator.symmetric-algorithm-name=AES
+# keygenerator asymmetric algorithm name
+mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
+#Encrypted data and encrypted symmetric key separator
+mosip.kernel.data-key-splitter=#KEY_SPLITTER#
+#GCM tag length
+mosip.kernel.crypto.gcm-tag-length=128
+#Hash algo name
+mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
+#Symmtric key length used in hash
+mosip.kernel.crypto.hash-symmetric-key-length=256
+#No of iterations in hash
+mosip.kernel.crypto.hash-iteration=100000
+#Sign algo name
+mosip.kernel.crypto.sign-algorithm-name=RS256
+
+mosip.keymanager.base.url=http://kernel-keymanager-service
+mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
+mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
+mosip.sign.applicationid=KERNEL
+mosip.sign.refid=SIGN
+mosip.kernel.cryptomanager.request_id=CRYPTOMANAGER.REQUEST
+mosip.kernel.cryptomanager.request_version=v1.0
+mosip.kernel.signature.signature-request-id=SIGNATURE.REQUEST
+mosip.kernel.signature.signature-version-id=v1.0
+
+
+
+#----------------------------------ID Repo------------------------------------------
+mosip.idrepo.identity.uin-status.registered=ACTIVATED
+mosip.idrepo.identity.uin-status=ACTIVATED,BLOCKED,DEACTIVATED
+
+#---------------------------------------otp manager service-------------------------------
+#the default length for otp(in number)
+mosip.kernel.otp.default-length=6
+#the default crypto function
+#It can be: HmacSHA512, HmacSHA256, HmacSHA1.
+mosip.kernel.otp.mac-algorithm=HmacSHA512
+#the OTP expires after the given time(in seconds).
+mosip.kernel.otp.expiry-time=180
+#the key is freezed for the given time(in seconds).
+mosip.kernel.otp.key-freeze-time=1800
+#the number of validation attempts allowed(in number).
+#mosip.kernel.otp.validation-attempt-threshold =3 means , the validation and generation will be blocked from 4th time.
+mosip.kernel.otp.validation-attempt-threshold=10
+#minimum length of key(in number).
+mosip.kernel.otp.min-key-length=3
+#maximum length of key(in number).
+mosip.kernel.otp.max-key-length=64
+
+
+#--------------------------------------Licensekeymanager  Service--------------------------------------
+#the license key length.
+mosip.kernel.licensekey.length=16
+#List of permissions
+# NOTE: ',' in the below list is used as splitter in the implementation.
+# Use of ',' in the values for below key should be avoided.
+# Use of spaces before and after ',' also should be avoided.
+mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authentication - Identity Data Match,Demo Authentication - Address Data Match,Demo Authentication - Full Address Data Match,Demo Authentication - Secondary Language Match,Biometric Authentication - FMR Data Match,Biometric Authentication - IIR Data Match,Biometric Authentication - FID Data Match,Static Pin Authentication,eKYC - limited,eKYC - Full,eKYC - No
+
+
+
+#-----------------------------Virus Scanner--------------------------------------
+mosip.kernel.virus-scanner.host=clamav 
+mosip.kernel.virus-scanner.port=80
+
+#------------------------Transliteration-----------------------------------------------
+mosip.kernel.transliteration.arabic-language-code=ara
+mosip.kernel.transliteration.english-language-code=eng
+
+
+
+#-------Registration processor Notification types------------
+mosip.registration.processor.notification.types=SMS|EMAIL
+
+
+mosip.default.dob.month=01
+mosip.default.dob.day=01
+mosip.login.mode= email,mobile
+
+
+#---Language orientation-----
+mosip.right_to_left_orientation=ara
+mosip.left_to_right_orientation=eng
+
+
+
+#**************** Notification Type *************
+#mosip.notificationtype=SMS|EMAIL
+mosip.notificationtype=EMAIL
+mosip.kernel.sms.proxy-sms=false
+#******** Notification lanugage types - either PRIMARY or BOTH ********
+mosip.notification.language-type=BOTH
+
+
+#-------------------System---------------
+logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
+
+#-------------------Admin---------------
+mosip.min-digit-longitude-latitude=4
+mosip.kernel.filtervalue.max_columns=20
+
+auth.server.admin.validate.url=${mz.ingress.base.url}/v1/authmanager/authorize/admin/validateToken
+
+#------------------PDF Genration-----------------------------------------
+mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+#------------------Quality Check-----------------------------------------
+#Quality threshold for applicant iris
+mosip.iris_threshold=0
+#Quality threshold for applicant leftslap fingerprint
+mosip.leftslap_fingerprint_threshold=0
+#Quality threshold for applicant rightslap fingerprint
+mosip.rightslap_fingerprint_threshold=0
+#Quality threshold for applicant thumbs fingerprint
+mosip.thumbs_fingerprint_threshold=0
+#Quality threshold for applicant face
+mosip.facequalitythreshold=0
+#Bio SDK Integration
+mosip.fingerprint.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
+mosip.face.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
+mosip.iris.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
+
+#-------UIN Alias-------------------
+mosip.uin.alias=
+
+#---------------------------------kernel Salt Generator---------------------------------------------------#
+mosip.kernel.salt-generator.chunk-size=10
+mosip.kernel.salt-generator.start-sequence=0
+mosip.kernel.salt-generator.end-sequence=999
+#----------------------------------------------------------------------------------------------------------#
+server.max-http-header-size=10000000
+
+mosip.kernel.auth.adapter.ssl-bypass=true
+
+# device registration/deregistration config
+mosip.stage.environment=Developer
+
+# log level
+logging.level.root=WARN
+logging.level.io.mosip=INFO
+logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
+
+#iam adapter
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+
+# tomcat access logs
+server.tomcat.accesslog.enabled=true
+server.tomcat.accesslog.directory=/dev
+server.tomcat.accesslog.prefix=stdout
+server.tomcat.accesslog.buffered=false
+server.tomcat.accesslog.suffix=
+server.tomcat.accesslog.file-date-format=
+server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}","req.userAgent":"%{User-Agent}i","req.xForwardedFor":"%{X-Forwarded-For}i","req.referer":"%{Referer}i","req.method":"%m","req.remoteHost":"%a"}
+server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
+
+
+mosip.mandatory-languages=eng
+mosip.optional-languages=ara,eng
+mosip.min-languages.count=1
+mosip.max-languages.count=2
+mosip.recommended.centers.locCode=6
+
+#Config key to pick the preferred language for communicating to the Resident
+mosip.default.user-preferred-language-attribute=preferredLang
+
+# URL to get new Auth Token from OIDC provider & to do online validation of auth token with OIDC provider.
+auth.server.admin.issuer.uri=${mosipbox.public.url}/keycloak/auth/realms/
+
+# Map to find the realm for the inputted appid to get the token from OIDC provider.
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
\ No newline at end of file

From 173f382784f96569f759ec440c918819228d75f3 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Tue, 21 Dec 2021 18:54:42 +0530
Subject: [PATCH 0390/1358] Added the application-default-dmz.properties file
 and registration-processor-default-dmz.properties

---
 application-default-dmz.properties            |   3 +-
 registration-processor-default-dmz.properties | 250 ++++++++++++++++++
 2 files changed, 252 insertions(+), 1 deletion(-)
 create mode 100644 registration-processor-default-dmz.properties

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 5c7d211bbc3..64db11ba56f 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -1,6 +1,7 @@
 #---------------------------------------Common properties-----------------------
 aplication.configuration.level.version=LTS
 mz.ingress.base.url: http://mz.ingress:30080
+mosip.keymanager.base.url=http://kernel-keymanager-service
 
 #Kernel-idobjectalidator
 # Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key
@@ -218,7 +219,7 @@ mosip.kernel.crypto.hash-iteration=100000
 #Sign algo name
 mosip.kernel.crypto.sign-algorithm-name=RS256
 
-mosip.keymanager.base.url=http://kernel-keymanager-service
+
 mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
 mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
 mosip.sign.applicationid=KERNEL
diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
new file mode 100644
index 00000000000..5c9c7e9f051
--- /dev/null
+++ b/registration-processor-default-dmz.properties
@@ -0,0 +1,250 @@
+####################################################################################################
+#---------------------------------------- COMMON PROPERTIES ----------------------------------------
+####################################################################################################
+
+#------------------------------------------Spring properties---------------------------------------#
+
+# DB details to which regproc dmz services and stage will connect
+mosip.registration.processor.database.hostname=mz.ingress
+mosip.registration.processor.database.port=30090
+
+# URL prefix to connect to mz services cluster
+mz.ingress.url=http://mz.ingress:30080
+
+# Persistence properties
+javax.persistence.jdbc.driver=org.postgresql.Driver
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
+javax.persistence.jdbc.user=regprcuser
+javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
+
+# Hibernate properties
+hibernate.hbm2ddl.auto=none
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.jdbc.lob.non_contextual_creation=true
+hibernate.show_sql=false
+
+# Health checker config followed by all spring apps
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=info,health,refresh
+
+#----------------------------------Registration processor rest client API's------------------------#
+
+# Audit Service URLs
+AUDIT=${mz.ingress.url}/v1/auditmanager/audits
+
+# Auth Services URLs
+KEYBASEDTOKENAPI=${mz.ingress.url}/v1/authmanager/authenticate/clientidsecretkey
+GETINDIVIDUALIDFROMUSERID=${mz.ingress.url}/v1/authmanager/individualId
+TOKENVALIDATE=${mz.ingress.url}/v1/authmanager/authorize/admin/validateToken
+DIGITALSIGNATURE=${mz.ingress.url}/v1/keymanager/sign
+
+# IDA Services URLs
+ida-internal-auth-uri=${mz.ingress.url}/idauthentication/v1/internal/auth
+ida-internal-get-certificate-uri=${mz.ingress.url}/idauthentication/v1/internal/getCertificate
+
+# Keymanager service URLs
+CRYPTOMANAGERDECRYPT=${mz.ingress.url}/v1/keymanager/decrypt
+ENCRYPTURL=${mz.ingress.url}/v1/keymanager/encrypt
+
+#------------------------------------Other common libraries properties-----------------------------#
+
+# Landing zone folder where uploaded files are temporarily kept
+registration.processor.LANDING_ZONE = /mnt/regproc/landing
+
+# Base base package to be used for scanning components of the IAM adapter to autowire
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+
+# Token generation request details
+token.request.id=io.mosip.registration.processor
+token.request.appid=regproc
+token.request.version=1.0
+token.request.clientId=mosip-regproc-client
+token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
+token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+
+# Request id to be used for various internal services
+mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
+mosip.registration.processor.audit.id=mosip.applicanttype.getApplicantType
+mosip.registration.processor.crypto.decrypt.id=mosip.cryptomanager.decrypt
+
+# Kernel Crypto signature
+registration.processor.signature.isEnabled=true
+
+# The elapse time beyond which the rids will be considered for reprocessing
+registration.processor.reprocess.elapse.time=300
+
+# Virus Scanner Connection details
+mosip.kernel.virus-scanner.host=clamav
+mosip.kernel.virus-scanner.port=80
+# virus scanner provider to be passed during runtime. This property will load provider during startup
+mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl
+
+# Extension used for the packets
+registration.processor.packet.ext=.zip
+# Id used for referencing keys in keymanager belonging to regproc module
+registration.processor.application.id=REGISTRATION
+# Version string that will be used in the reponses
+mosip.registration.processor.application.version=1.0
+# Date time pattern that should be followed in timestamp for both request and response
+mosip.registration.processor.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+# Date pattern for registrationDate that should be followed in lostrid request
+mosip.registration.processor.lostrid.registrationdate.pattern=yyyy-MM-dd
+# Timezone that is expected to be followed in the request and response
+mosip.registration.processor.timezone=GMT
+# Allowed time difference between the request time and the curren time
+mosip.registration.processor.grace.period=10800
+
+# The list of comma separated stages that should be successfully completed before packet
+# reaches the stage that uploads packets to the packet store
+mosip.registration.processor.registration.status.stages-before-reaching-packet-store=PacketReceiverStage,SecurezoneNotificationStage
+
+# Stage Group Configuratoins
+# Default base packages for stage beans to be scanned in a stage group
+mosip.regproc.mosip-stage-executor.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor,io.mosip.registartion.processor
+# Add any new base package of Stage bean specific to stage group as below
+# mosip.regproc.stage-groups.stage-beans-base-packages.<stage_group_name>=${mosip.regproc.stage-groups.stage-beans-base-packages.default}
+# Example: mosip.regproc.stage-groups.stage-beans-base-packages.stage-group-1=${mosip.regproc.stage-groups.stage-beans-base-packages.default},my.stage.bean.base.package
+
+# Mostly used for forming the config server URI in stages
+packet.info.storage.service=*
+registration.processor.identityjson=identity-mapping.json
+config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
+
+# main processor used in stages
+registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE
+# sub processor used in stages
+registration.processor.sub-processes=BIOMETRIC_CORRECTION
+
+#--------------------------------Registration core library properties------------------------------#
+
+# Regproc supported eventbus types: vertx, kafka. Defaults to vertx if the config is not present
+mosip.regproc.eventbus.type=kafka
+
+# Kafka event bus config, will be used only when the type is kafka
+# Kafka cluster servers comma separated, common for all stages and camel bridge
+mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default.svc.cluster.local:9092,kafka-1.kafka-headless.default.svc.cluster.local:9092,kafka-2.kafka-headless.default.svc.cluster.local:9092
+
+# workel pool size to process multiple requests parallely by stages
+worker.pool.size=10
+
+####################################################################################################
+#------------------------------------ WORKFLOW ENGINE PROPERTIES -----------------------------------
+####################################################################################################
+
+#------------------------------------------camel-bridge--------------------------------------------#
+
+mosip.regproc.camel.bridge.eventbus.kafka.commit.type=single
+mosip.regproc.camel.bridge.eventbus.kafka.max.poll.records=100
+mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
+# Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends
+# MosipVerticleAPIManager
+# Kafka consumer group id, used by kafka to identify multiple instances of the same consumer
+mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-brdige-dmz
+
+# Camel Route xml files corresponding to the dmz flow
+camel.dmz.active.flows.file.names=registration-processor-camel-routes-new-dmz.xml,registration-processor-camel-routes-update-dmz.xml,registration-processor-camel-routes-activate-dmz.xml,registration-processor-camel-routes-res-update-dmz.xml,registration-processor-camel-routes-deactivate-dmz.xml,registration-processor-camel-routes-lost-dmz.xml,registration-processor-camel-routes-res-reprint-dmz.xml,registration-processor-camel-routes-biometric-correction-dmz.xml
+# Current zone on which services and stages are runnning, can be dmz or mz
+registration.processor.zone=dmz
+# Pause settings used by camel to match expression and pause packet processing
+# Eg: [{"matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","resumeRemoveTags" : "HOTLISTED"}]
+mosip.regproc.camelbridge.pause-settings=[]
+# Prefix used by all the address in the camel flow
+mosip.regproc.camelbridge.endpoint-prefix=eventbus://
+
+
+####################################################################################################
+#------------------------------------ REGPROC SERVICES PROPERTIES ----------------------------------
+####################################################################################################
+
+#-------------------------------------Registration Status service----------------------------------#
+
+# Exposed API ids and versions used for request validation
+mosip.registration.processor.registration.status.id=mosip.registration.status
+mosip.registration.processor.registration.sync.id=mosip.registration.sync
+mosip.registration.processor.lostrid.id=mosip.registration.lostrid
+# Registration External Status Id
+mosip.registration.processor.registration.external.status.id=mosip.registration.external.status
+# Packet external Status Id
+mosip.registration.processor.packet.external.status.id=mosip.registration.packet.external.status
+mosip.registration.processor.sync.version=1.0
+mosip.registration.processor.registration.status.version=1.0
+mosip.registration.processor.lostrid.version=1.0
+# Registration External Status Version
+mosip.registration.processor.registration.external.status.version=1.0
+# Packet Status Version
+mosip.registration.processor.packet.external.status.version=1.0
+
+# LatestTransactionTypeCodes Before uploading to Object Store
+mosip.registration.processor.packet.status.transactiontypecodes-before-uploading-to-objectstore=PACKET_RECEIVER,SECUREZONE_NOTIFICATION
+# LatestTransactionTypeCode  uploading to Object Store
+mosip.registration.processor.packet.status.transactiontypecodes-uploading-to-objectstore=UPLOAD_PACKET
+# LatestTransactionTypeCodes  time based resend required
+mosip.registration.processor.packet.status.transactiontypecodes-time-based-resend-required=PACKET_RECEIVER
+
+# Maximum no of time client is allowed to upload a packet on failure
+registration.processor.max.retry=3
+
+# The comma separate list of external statuses that should be considered as processed
+# for search API response consumed by regclient
+mosip.registration.processor.registration.status.external-statuses-to-consider-processed=UIN_GENERATED,REREGISTER,REJECTED,REPROCESS_FAILED
+
+# this property is used in lostrid api to get postal code
+mosip.registration.processor.postalcode.req.url=${mz.ingress.url}/v1/masterdata/registrationcenters
+#registration status api controller assigned roles
+mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
+mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
+mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+
+####################################################################################################
+#------------------------------------- STAGE SPECIFIC PROPERTIES -----------------------------------
+####################################################################################################
+
+#-----------------------------------------Packet Receiver Stage------------------------------------#
+
+# Supported commmit config: auto, batch, single
+mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
+# Maximum records that can be received in one poll from kafka
+mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
+# Interval between each poll calls to kafka in milli sec
+mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
+# Kafka consumer group id, used by kafka to identify multiple instances of the same consumer
+mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
+
+# Base sevlet path for the stage
+mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
+# Port number in which the application will run
+mosip.regproc.packet.receiver.server.port=8081
+# Port number to be used by eventbus for communicating with other vertx apps in the cluster
+mosip.regproc.packet.receiver.eventbus.port=5711
+
+# Flag to disable the copying of tags from the packet manger to the message event
+mosip.regproc.packet.receiver.message.tag.loading.disable=true
+#Maximum file size to be upload from packet receiver
+registration.processor.max.file.size=5
+# Module id that should be added in the responses
+mosip.registration.processor.packet.id=mosip.registration.packet
+
+####################################################################################################
+#----------------------------- NOT USED PROPERTIES (To be removed later) ---------------------------
+####################################################################################################
+
+#-----packet-utility----------
+# The known packet sources. Should be set as all fieldCategory present in idschema
+# (NOTE : if fieldCategory is set as pvt then the source should be id)
+registration.processor.sourcepackets=id,evidence,optional
+# The mandatory default source packet.(In default configuration this is thd id packet)
+packet.default.source=id
+# the default schema field cagegory (ex - private)
+schema.default.fieldCategory=pvt
+
+registration.processor.notification_service_subscriber_hub_url=${mosipbox.public.url}/hub/
+registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
+registration.processor.notification_service_subscriber_topic=registration_processor_workflow_completed_event
+registration.processor.notification_service_subscriber_callback_url=${mosipbox.public.url}/registrationprocessor/v1/notification/callback/notify
+
+mosip.regproc.message.tag.loading.disable=true
\ No newline at end of file

From 09add061cd3074e2a38f509ae2b9aea842cf0278 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Tue, 21 Dec 2021 19:06:30 +0530
Subject: [PATCH 0391/1358] removed the NAME.url property

---
 admin-default.properties              | 1 -
 application-default.properties        | 1 -
 id-authentication-default.properties  | 1 -
 kernel-default.properties             | 1 -
 partner-management-default.properties | 1 -
 pre-registration-default.properties   | 1 -
 syncdata-default.properties           | 1 -
 7 files changed, 7 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 737196d08d2..cb04412372b 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -35,7 +35,6 @@ mosip.admin.request-id=ADMIN.REQUEST
 mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
diff --git a/application-default.properties b/application-default.properties
index 7a3382ab3e4..f980eb00360 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,7 +14,6 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 51d58675b68..d9ce54e8337 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -22,7 +22,6 @@ mosip.ida.auth.clientId=mosip-ida-client
 mosip.ida.auth.secretKey=${mosip.secret.mosip-ida-client}
 mosip.ida.auth.appId=ida
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
diff --git a/kernel-default.properties b/kernel-default.properties
index dacc49afdff..9e5862761b7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -33,7 +33,6 @@ mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774o
 mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
diff --git a/partner-management-default.properties b/partner-management-default.properties
index dd24b25226a..241fd4ca587 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -16,7 +16,6 @@ mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 23ea7a0e1df..5a5487ac33b 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -56,7 +56,6 @@ mosip.adult.age=${mosip.kernel.applicant.type.age.limit}
 ## This version is set in the ID object created in pre-registration
 mosip.idschema.version=0.1
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
diff --git a/syncdata-default.properties b/syncdata-default.properties
index bc3e62bd016..29923a54c00 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -32,7 +32,6 @@ mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774o
 mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
-mosip.NAME.url=http://NAME.default:80
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80

From b0be71afdcf8fcdff27193a416acfe74c4308431 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 21 Dec 2021 19:52:12 +0530
Subject: [PATCH 0392/1358] added hazelcast files for default-dmz

---
 hazelcast-default-dmz.xml                     | 47 +++++++++++++++++++
 ...t_cache.xml => hazelcast_cache-default.xml |  0
 ...ssor-camel-routes-activate-default-dmz.xml | 37 +++++++++++++++
 ...outes-biometric-correction-default-dmz.xml | 37 +++++++++++++++
 ...or-camel-routes-deactivate-default-dmz.xml | 37 +++++++++++++++
 ...rocessor-camel-routes-lost-default-dmz.xml | 37 +++++++++++++++
 ...processor-camel-routes-new-default-dmz.xml | 37 +++++++++++++++
 ...r-camel-routes-res-reprint-default-dmz.xml | 38 +++++++++++++++
 ...or-camel-routes-res-update-default-dmz.xml | 37 +++++++++++++++
 ...cessor-camel-routes-update-default-dmz.xml | 37 +++++++++++++++
 10 files changed, 344 insertions(+)
 create mode 100644 hazelcast-default-dmz.xml
 rename hazelcast_cache.xml => hazelcast_cache-default.xml (100%)
 create mode 100644 registration-processor-camel-routes-activate-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-biometric-correction-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-deactivate-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-lost-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-new-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-res-reprint-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-res-update-default-dmz.xml
 create mode 100644 registration-processor-camel-routes-update-default-dmz.xml

diff --git a/hazelcast-default-dmz.xml b/hazelcast-default-dmz.xml
new file mode 100644
index 00000000000..3ab6b64f7d0
--- /dev/null
+++ b/hazelcast-default-dmz.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ~ Copyright 2017 Red Hat, Inc. ~ ~ Red Hat licenses this file to you 
+     	under the Apache License, version 2.0 ~ (the "License"); you may not use 
+	this file except in compliance with the ~ License. You may obtain a copy 
+	of the License at: ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless 
+	required by applicable law or agreed to in writing, software ~ distributed 
+	under the License is distributed on an "AS IS" BASIS, WITHOUT ~ WARRANTIES 
+	OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
+	the specific language governing permissions and limitations ~ under the License. -->
+
+<hazelcast
+	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
+	xmlns="http://www.hazelcast.com/schema/config"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <properties>
+   <property name="hazelcast.discovery.enabled">true</property>
+	 <property name="hazelcast.logging.type">slf4j</property>
+ </properties>
+<group>
+		<name>k8s</name>
+		<password/>
+	</group>
+ <network>
+ <join>
+        <multicast enabled="false"/>
+        <tcp-ip enabled="true">
+            <interface>127.0.0.1</interface>
+        </tcp-ip>
+    </join>
+    <interfaces enabled="true">
+        <interface>127.0.0.1</interface>
+    </interfaces>
+<!-- For vertx uncomment the below join section and comment the above join and interfaces section. -->
+<!--   <join>
+     <multicast enabled="false"/>
+     <tcp-ip enabled="false" />
+     <discovery-strategies>
+       <discovery-strategy enabled="true"
+           class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
+         <properties>
+           <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
+         </properties>
+       </discovery-strategy>
+     </discovery-strategies>
+   </join> -->
+ </network>
+</hazelcast>
diff --git a/hazelcast_cache.xml b/hazelcast_cache-default.xml
similarity index 100%
rename from hazelcast_cache.xml
rename to hazelcast_cache-default.xml
diff --git a/registration-processor-camel-routes-activate-default-dmz.xml b/registration-processor-camel-routes-activate-default-dmz.xml
new file mode 100644
index 00000000000..71c3b1b90dc
--- /dev/null
+++ b/registration-processor-camel-routes-activate-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification activated route">
+      <from uri="eventbus://packet-receiver-activated-bus-out" />
+      <log message="packet-reciever-->securezone-notification activated-route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-biometric-correction-default-dmz.xml b/registration-processor-camel-routes-biometric-correction-default-dmz.xml
new file mode 100644
index 00000000000..d23999be45e
--- /dev/null
+++ b/registration-processor-camel-routes-biometric-correction-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification biometric_correction route">
+      <from uri="eventbus://packet-receiver-biometric_correction-bus-out" />
+      <log message="packet-reciever-->securezone-notification biometric_correction ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-deactivate-default-dmz.xml b/registration-processor-camel-routes-deactivate-default-dmz.xml
new file mode 100644
index 00000000000..9157eb14f19
--- /dev/null
+++ b/registration-processor-camel-routes-deactivate-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification deactivated route">
+      <from uri="eventbus://packet-receiver-deactivated-bus-out" />
+      <log message="packet-reciever-->securezone-notification deactivated-route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-lost-default-dmz.xml b/registration-processor-camel-routes-lost-default-dmz.xml
new file mode 100644
index 00000000000..55cbf750ce1
--- /dev/null
+++ b/registration-processor-camel-routes-lost-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification lost Route -->
+   <route id="packet-reciever-->securezone-notification lost route">
+      <from uri="eventbus://packet-receiver-lost-bus-out" />
+      <log message="packet-reciever-->securezone-notification ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-new-default-dmz.xml b/registration-processor-camel-routes-new-default-dmz.xml
new file mode 100644
index 00000000000..a633ab73b07
--- /dev/null
+++ b/registration-processor-camel-routes-new-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification new route">
+      <from uri="eventbus://packet-receiver-new-bus-out" />
+      <log message="packet-reciever-->securezone-notification new ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-res-reprint-default-dmz.xml b/registration-processor-camel-routes-res-reprint-default-dmz.xml
new file mode 100644
index 00000000000..d1aab074d9d
--- /dev/null
+++ b/registration-processor-camel-routes-res-reprint-default-dmz.xml
@@ -0,0 +1,38 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification res_reprint route">
+      <from uri="eventbus://packet-receiver-res_reprint-bus-out" />
+      <log message="packet-reciever-->securezone-notification res_reprint ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+            `
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-res-update-default-dmz.xml b/registration-processor-camel-routes-res-update-default-dmz.xml
new file mode 100644
index 00000000000..e6ddcb64b7e
--- /dev/null
+++ b/registration-processor-camel-routes-res-update-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification res_update route">
+      <from uri="eventbus://packet-receiver-res_update-bus-out" />
+      <log message="packet-reciever-->securezone-notification res_update ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-update-default-dmz.xml b/registration-processor-camel-routes-update-default-dmz.xml
new file mode 100644
index 00000000000..5dab02e7839
--- /dev/null
+++ b/registration-processor-camel-routes-update-default-dmz.xml
@@ -0,0 +1,37 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <!-- Packet-Reciever to securezone-notification Route -->
+   <route id="packet-reciever-->securezone-notification update route">
+      <from uri="eventbus://packet-receiver-update-bus-out" />
+      <log message="packet-reciever-->securezone-notification update ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>
\ No newline at end of file

From 26b02241cd4a5a4abe5b61782dbafc5eb3d7d88e Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 22 Dec 2021 11:59:04 +0530
Subject: [PATCH 0393/1358] updated config

---
 application-default.properties | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index f980eb00360..75643cc64eb 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,6 +14,10 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
+mosip.api.internal.url=${mosipbox.public.url}
+
+db.dbuser.password={cipher}81mosip.db3bb0946f56f47cc36a605cf54459b3e6e871677f777ff6189c23a74cd734
+
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
@@ -85,6 +89,28 @@ mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.def
 mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
 mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.default:80
+mosip.packet-receiver-service.url=http://dmz.ingress:30080
+mosip.regproc-status-service.url=http://dmz.ingress:30080
+
+
+mosip.mosip.admin.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.mosip.regproc.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.mosip.auth.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.mosip.ida.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.mosip.reg.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+preregistration.mosip.prereg.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
+mosip.mosip.misp.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.partner.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.policymanager.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.partnermanager.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.resident.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.admin.services.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.crereq.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.creser.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.datsha.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.abis.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.creser.idpass.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.pms.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 
 mosip.masterdata.base.url = http://masterdata.kernel

From b74b1823baa56279d87c9aca942c1b768f69d064 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Wed, 22 Dec 2021 12:30:09 +0530
Subject: [PATCH 0394/1358] removed the properties

---
 id-repository-default.properties    | 18 ------
 kernel-default.properties           | 92 ----------------------------
 pre-registration-default.properties | 92 ----------------------------
 print-default.properties            | 74 -----------------------
 resident-default.properties         | 20 -------
 syncdata-default.properties         | 93 -----------------------------
 6 files changed, 389 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 9961df7e51b..d035e5dab83 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -347,24 +347,6 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 ## Auth token generator 
 auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 auth-token-generator.rest.appId=regproc
diff --git a/kernel-default.properties b/kernel-default.properties
index 9e5862761b7..4c29bc8b584 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -14,98 +14,6 @@
 # email.smtp.username
 # email.smtp.secret
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
-
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel-syncdata-service.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 5a5487ac33b..5c434143078 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -17,25 +17,6 @@ javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.databa
 javax.persistence.jdbc.user=prereguser
 javax.persistence.jdbc.password=${db.dbuser.password}
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
 ## Hibernate
 hibernate.hbm2ddl.auto=none
 hibernate.show_sql=false
@@ -56,79 +37,6 @@ mosip.adult.age=${mosip.kernel.applicant.type.age.limit}
 ## This version is set in the ID object created in pre-registration
 mosip.idschema.version=0.1
 
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
-
 ## Demographic Service 
 demographic.service.version=v1
 demographic.service.env=http://prereg-application.prereg
diff --git a/print-default.properties b/print-default.properties
index 969f15762ff..d456bc3fb5c 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -5,80 +5,6 @@
 # keycloak.host
 # print.websub.hub.secret
 
-mosip.NAME.url=http://NAME.default:80
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
-
 ## Websub
 websub.base.url=http://websub.websub
 mosip.event.hubURL=${websub.base.url}/hub
diff --git a/resident-default.properties b/resident-default.properties
index f4abbb1108f..ddf1fcb509b 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -29,26 +29,6 @@ PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
 DECRYPT_API_URL=http://keymanager.kernel/v1/keymanager/decrypt
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
 ## Token generation
 token.request.id=io.mosip.resident
 resident.appid=resident
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 29923a54c00..80fb6e8820f 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -12,99 +12,6 @@
 # mosip.api.internal.host
 # softhsm.kernel.pin
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
-
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles

From 706a8f8288509488a66d41634d89b4524be0495c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 22 Dec 2021 12:33:25 +0530
Subject: [PATCH 0395/1358] removed properties

---
 data-share-default.properties        | 18 -------
 id-authentication-default.properties | 73 ----------------------------
 2 files changed, 91 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index a3f940e0cdb..111b59de266 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -12,24 +12,6 @@ KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
 PARTNER_POLICY=http://pms-policy.pms/v1/policymanager/policies/{policyId}/partner/{partnerId}
 KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 data.share.application.id=PARTNER
 mosip.data.share.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d9ce54e8337..6bbfca413b7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -22,79 +22,6 @@ mosip.ida.auth.clientId=mosip-ida-client
 mosip.ida.auth.secretKey=${mosip.secret.mosip-ida-client}
 mosip.ida.auth.appId=ida
 
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
-
 ## Database
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 

From 0088459917ff6f25ec8c6c277f0881181fdacd80 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 22 Dec 2021 12:38:06 +0530
Subject: [PATCH 0396/1358] updated application.properties

---
 application-default.properties | 62 ++++++++++++++++------------------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 75643cc64eb..bc76252d402 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,7 +14,8 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.api.internal.url=${mosipbox.public.url}
+mosip.api.internal.url=${mosip.api.internal.host}
+mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}81mosip.db3bb0946f56f47cc36a605cf54459b3e6e871677f777ff6189c23a74cd734
 
@@ -91,7 +92,7 @@ mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.default:80
 mosip.packet-receiver-service.url=http://dmz.ingress:30080
 mosip.regproc-status-service.url=http://dmz.ingress:30080
-
+mosip.websub.url=${mosip.api.external.url}
 
 mosip.mosip.admin.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
 mosip.mosip.regproc.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
@@ -113,11 +114,11 @@ mosip.mosip.creser.idpass.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8
 mosip.mosip.pms.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 
-mosip.masterdata.base.url = http://masterdata.kernel
-mosip.syncdata.base.url=http://syncdata.kernel
+#mosip.masterdata.base.url = http://masterdata.kernel
+#mosip.syncdata.base.url=http://syncdata.kernel
 
 # masterdata field data url
-mosip.idobjectvalidator.masterdata.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/possiblevalues/{subType}
+mosip.idobjectvalidator.masterdata.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/possiblevalues/{subType}
 # Path to IDSchemaVersion. Path is defined as per JsonPath.compile.
 mosip.kernel.idobjectvalidator.identity.id-schema-version-path=identity.IDSchemaVersion
 # Path to dateOfBirth field. Path is defined as per JsonPath.compile.
@@ -259,7 +260,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 
 ## Auth adapter
-auth.server.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.issuer.uri=${keycloak.host}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.host}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
@@ -277,22 +278,18 @@ mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
 mosip.kernel.keygenerator.symmetric-algorithm-name=AES
 mosip.kernel.keygenerator.asymmetric-key-length=2048
 mosip.kernel.keygenerator.symmetric-key-length=256
-mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
 mosip.kernel.data-key-splitter=#KEY_SPLITTER#
 mosip.kernel.crypto.gcm-tag-length=128
 mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
 mosip.kernel.crypto.hash-symmetric-key-length=256
 mosip.kernel.crypto.hash-iteration=100000
 mosip.kernel.crypto.sign-algorithm-name=RS256
-mosip.keymanager.base.url=http://keymanager.keymanager
-mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
-mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
-mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/auth/decrypt
-mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
-mosip.kernel.keymanager.cert.url=${mosip.keymanager.base.url}/v1/keymanager/getCertificate
-mosip.kernel.keymanager-service-CsSign-url=${mosip.keymanager.base.url}/v1/keymanager/cssign
-mosip.kernel.keymanager.cert.url=${mosip.keymanager.base.url}/v1/keymanager/getCertificate
+mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/publickey/{applicationId}
+mosip.kernel.keymanager-service-decrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/auth/decrypt
+mosip.kernel.keymanager-service-sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/sign
+mosip.kernel.keymanager.cert.url=${mosip.kernel-keymanager-service.url}/v1/keymanager/getCertificate
+mosip.kernel.keymanager-service-CsSign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/cssign
 mosip.sign.applicationid=KERNEL
 mosip.sign.refid=SIGN
 mosip.kernel.cryptomanager.request_id=CRYPTOMANAGER.REQUEST
@@ -355,7 +352,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 ## Admin
 mosip.min-digit-longitude-latitude=4
 mosip.kernel.filtervalue.max_columns=20
-auth.server.admin.validate.url=http://authmanager.kernel/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 
 ## PDF generation. TODO: this password must be passed as config server env variable
 mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
@@ -390,11 +387,11 @@ management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
 management.metrics.export.prometheus.enabled=true
 
-mosip.kernel.syncdata-service-idschema-url=${mosip.masterdata.base.url}/v1/masterdata/idschema/latest
-mosip.kernel.syncdata-service-dynamicfield-url=${mosip.masterdata.base.url}/v1/masterdata/dynamicfields
-mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.syncdata.base.url}/v1/syncdata/tpm/publickey/
-mosip.kernel.keymanager-service-validate-url=${mosip.keymanager.base.url}/v1/keymanager/validate
-mosip.kernel.keymanager-service-csverifysign-url=${mosip.keymanager.base.url}/v1/keymanager/csverifysign
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-dynamicfield-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/dynamicfields
+mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
+mosip.kernel.keymanager-service-validate-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/validate
+mosip.kernel.keymanager-service-csverifysign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/csverifysign
 
 ## GPS
 mosip.registration.gps_device_enable_flag=n
@@ -437,11 +434,11 @@ object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
 packet.manager.account.name=packet-manager
-CRYPTOMANAGER_DECRYPT=${mosip.keymanager.base.url}/v1/keymanager/decrypt
-CRYPTOMANAGER_ENCRYPT=${mosip.keymanager.base.url}/v1/keymanager/encrypt
-IDSCHEMAURL=${mosip.masterdata.base.url}/v1/masterdata/idschema/latest
-KEYMANAGER_SIGN=${mosip.keymanager.base.url}/v1/keymanager/sign
-AUDIT_URL=http://auditmanager.kernel/v1/auditmanager/audits
+CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+IDSCHEMAURL=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
+KEYMANAGER_SIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/sign
+AUDIT_URL=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 packet.default.source=id
 schema.default.fieldCategory=pvt,none
 
@@ -466,9 +463,8 @@ server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t"
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
 ## Websub (internal url)
-websub.base.url=http://websub.websub
-websub.hub.url=${websub.base.url}/hub/
-websub.publish.url=${websub.base.url}/hub/
+websub.hub.url=${mosip.websub.url}/hub/
+websub.publish.url=${mosip.websub.url}/hub/
 
 mosip.mandatory-languages=eng,fra
 ## Leave blank if no optional langauges
@@ -490,6 +486,6 @@ mosip.notification.timezone=GMT+05:30
 # registration center type validation regex, used to restrict the special charecter
 mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}[a-zA-Z0-9]$
 
-# Swagger
-openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
-openapi.service.servers[0].description=For Swagger
+## Swagger
+#openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
+#openapi.service.servers[0].description=For Swagger

From 80517277ebc76365aa79b44ddd3a1436bed29915 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 22 Dec 2021 13:04:12 +0530
Subject: [PATCH 0397/1358] updated admin properties

---
 admin-default.properties | 127 ++++++---------------------------------
 1 file changed, 17 insertions(+), 110 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index cb04412372b..0fff3054455 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -7,110 +7,17 @@
 # mosip.mosip.regproc.client.secret
 # mosip.api.internal.host
 
-mosip.secret.mosip-admin-client={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
-mosip.api.internal.url=https://${mosip.api.internal.host}
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres
-mosip.kernel.database.port=5432
-
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
+mosip.kernel.database.hostname=postgres
+mosip.kernel.database.port=80
 
 ## Account management
 authmanager.base.url=${mosip.kernel-auth-service.url}/v1/authmanager
-mosip.admin.accountmgmt.auth-manager-base-uri=${authmanager.base.url}
+mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
 mosip.admin.accountmgmt.user-name-url=/username/
 mosip.admin.accountmgmt.user-detail-url=/userdetail/
 mosip.admin.accountmgmt.unblock-url=/unblock/
@@ -119,8 +26,8 @@ mosip.admin.accountmgmt.reset-password-url=/resetpassword/
 mosip.admin.app-id=admin
 
 mosip.kernel.signature.cryptomanager-encrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/private/encrypt
-auth.server.validate.url=${authmanager.base.url}/authorize/admin/validateToken
-auth.server.refreshToken.url=${authmanager.base.url}/authorize/admin/refreshToken
+auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.refreshToken.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/refreshToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client
 auth.role.prefix=ROLE_
 auth.header.name=Authorization
@@ -142,10 +49,10 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
 ## Use registration
-auth.server.user-register-url=${authmanager.base.url}/user
+auth.server.user-register-url=${mosip.kernel-auth-service.url}/v1/authmanager/user
 mosip.kernel.emailnotifier-url=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-auth.server.sendotp-url=${authmanager.base.url}/authenticate/sendotp
-auth.server.user-add-password-url=${authmanager.base.url}/user/addpassword
+auth.server.sendotp-url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/sendotp
+auth.server.user-add-password-url=${mosip.kernel-auth-service.url}/v1/authmanager/user/addpassword
 mosip.admin-appid=admin
 mosip.admin-otp-context=auth-otp
 mosip.admin-userid-otp-type=USERID 
@@ -159,7 +66,7 @@ mosip.admin.security.policy.type1=password
 mosip.admin.security.policy.type2=password,otp
 mosip.admin.security.policy.type3=otp
 mosip.admin.security.policy.role-policy-mapping={ZONAL_ADMIN:'type2',ZONAL_APPROVER:'type1',CENTRAL_ADMIN:'type1',CENTRAL_APPROVER:'type1',REGISTRATION_OFFICER:'type1',REGISTRATION_SUPERVISOR:'type1',REGISTRATION_OPERATOR:'type1'}
-mosip.admin.security.policy.userrole-auth-url=${authmanager.base.url}/role/{appId}/{username}
+mosip.admin.security.policy.userrole-auth-url=${mosip.kernel-auth-service.url}/v1/authmanager/role/{appId}/{username}
 
 ## Masterdata cards
 
@@ -259,7 +166,7 @@ mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u
 ## UIN activate/deactivate
 mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
 mosip.kernel.packet-status-update-url=${mosip.regproc-registration-transaction-service.url}/v1/registrationtransaction/search
-mosip.kernel.packet-reciever-api-url=http://packet-receiver.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
+mosip.kernel.packet-reciever-api-url=${mosip.packet-receiver-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
 mosip.kernel.zone-validation-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
 mosip.kernel.audit.manager.api=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
@@ -268,7 +175,7 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/au
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
 mosip.open-id.base-url=${keycloak.host}
-mosip.admin-services.audit.manager.api=${mosip.admin-service.url}/v1/auditmanager/audits
+mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
@@ -276,7 +183,7 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
 #tempuri=https://admin.v3box1.mosip.net
 #mosip.admin-services.redirecturi=${tempuri}/v1/admin/login-redirect/
-mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
+mosip.admin-services.redirecturi=${mosip.api.external.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
@@ -294,7 +201,7 @@ mosip.security.secure-cookie=false
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
-mosip.iam.module.clientsecret=${mosip.secret.mosip-admin-client}
+mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
@@ -306,20 +213,20 @@ mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-conn
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
-regproc.token.request.secretKey=${mosip.secret.mosip-regproc-client}
+regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
-KEYBASEDTOKENAPI=${authmanager.base.url}/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 # IAM adapter
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.secret.mosip-admin-client}
+mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
 # LostRid 
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.lostrid.version=1.0
-LOST_RID_API=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/lostridsearch
+LOST_RID_API=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/lostridsearch
 logging.level.org.springframework.web.client.RestTemplate=DEBUG
 
 # Roles

From 10134b4cc941ea53bc73dd40e67b9ae7b7b2a339 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 22 Dec 2021 13:32:05 +0530
Subject: [PATCH 0398/1358] updated properties

---
 application-default.properties   |  1 +
 data-share-default.properties    |  2 +-
 hotlist-default.properties       | 12 +++++-----
 id-repository-default.properties | 41 ++++++++++++++++----------------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index bc76252d402..2e69b355ece 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -35,6 +35,7 @@ mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-g
 mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
 mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
 mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
+mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.default:80
 mosip.kafka.url=http://kafka.default:80
 mosip.kafka-headless.url=http://kafka-headless.default:80
 mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
diff --git a/data-share-default.properties b/data-share-default.properties
index 111b59de266..244a9978446 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -7,7 +7,7 @@
 mosip.data.share.service.id=mosip.data.share
 mosip.data.share.service.version=1.0
 
-CRYPTOMANAGER_ENCRYPT=http://keymanager.kernel/v1/keymanager/encrypt
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
 KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
 PARTNER_POLICY=http://pms-policy.pms/v1/policymanager/policies/{policyId}/partner/{partnerId}
 KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
diff --git a/hotlist-default.properties b/hotlist-default.properties
index 935ba93f93c..d64a5cf7cdc 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -5,8 +5,8 @@
 spring.application.name=HOTLIST
 
 ## DB
-mosip.hotlist.db.url=postgres-postgresql.postgres
-mosip.hotlist.db.port=5432
+mosip.hotlist.db.url=postgres
+mosip.hotlist.db.port=80
 mosip.hotlist.db.db-name=mosip_hotlist
 mosip.hotlist.db.username=hotlistuser
 mosip.hotlist.db.password=${db.dbuser.password}
@@ -37,21 +37,21 @@ mosip.hotlist.cleanup-schedule.init-delay=24
 mosip.hotlist.cleanup-schedule.fixed-rate=24
 
 ## REST services
-mosip.idrepo.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.idrepo.audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
 mosip.idrepo.audit.rest.headers.mediaType=application/json
 
-mosip.hotlist.encryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/encrypt
+mosip.hotlist.encryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
 mosip.hotlist.encryptor.rest.httpMethod=POST
 mosip.hotlist.encryptor.rest.headers.mediaType=application/json
 mosip.hotlist.encryptor.rest.timeout=100
 
-mosip.hotlist.decryptor.rest.uri=http://keymanager.keymanager/v1/keymanager/decrypt
+mosip.hotlist.decryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
 mosip.hotlist.decryptor.rest.httpMethod=POST
 mosip.hotlist.decryptor.rest.headers.mediaType=application/json
 mosip.hotlist.decryptor.rest.timeout=100
 
-mosip.hotlist.audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
+mosip.hotlist.audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.hotlist.audit.rest.httpMethod=POST
 mosip.hotlist.audit.rest.headers.mediaType=application/json
 
diff --git a/id-repository-default.properties b/id-repository-default.properties
index d035e5dab83..b9b7b22435b 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -14,8 +14,8 @@ management.endpoint.restart.enabled=true
 
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.idrepo.db.url=postgres-postgresql.postgres
-mosip.idrepo.db.port=5432
+mosip.idrepo.db.url=postgres
+mosip.idrepo.db.port=80
 mosip.idrepo.db.identity.db-name=mosip_idrepo
 mosip.idrepo.db.identity.username=idrepouser
 mosip.idrepo.db.identity.password=${db.dbuser.password}
@@ -131,36 +131,36 @@ mosip.idrepo.decryptor.rest.httpMethod=POST
 mosip.idrepo.decryptor.rest.headers.mediaType=application/json
 mosip.idrepo.decryptor.rest.timeout=100
 
-mosip.idrepo.vid-service.rest.uri=http://vid.idrepo/idrepository/v1/vid/uin/{uin}
+mosip.idrepo.vid-service.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/uin/{uin}
 mosip.idrepo.vid-service.rest.httpMethod=GET
 mosip.idrepo.vid-service.rest.headers.mediaType=application/json
 mosip.idrepo.vid-service.rest.timeout=100
 
-mosip.idrepo.retrieve-uin-by-vid.rest.uri=http://vid.idrepo/idrepository/v1/vid/{vid}
+mosip.idrepo.retrieve-uin-by-vid.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/{vid}
 mosip.idrepo.retrieve-uin-by-vid.rest.httpMethod=GET
 mosip.idrepo.retrieve-uin-by-vid.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-uin-by-vid.rest.timeout=100
 
-mosip.idrepo.bio-extractor-service.rest.uri=http://bioextractor.idrepo/v1/bioextractor/{extractionFormat}/extracttemplates
+mosip.idrepo.bio-extractor-service.rest.uri=${mosip.idrepo-bioextractor-service.url}/v1/bioextractor/{extractionFormat}/extracttemplates
 mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
 mosip.idrepo.bio-extractor-service.rest.timeout=100
 
-mosip.idrepo.syncdata-service.rest.uri=http://masterdata.kernel/v1/masterdata/idschema/latest
+mosip.idrepo.syncdata-service.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
 mosip.idrepo.syncdata-service.rest.httpMethod=GET
 mosip.idrepo.syncdata-service.rest.headers.mediaType=application/json
 mosip.idrepo.syncdata-service.rest.timeout=100
 
-mosip.idrepo.pmp.partner.rest.uri=http://pms-partner.pms/v1/partnermanager/partners?partnerType=Online_Verification_Partner
+mosip.idrepo.pmp.partner.rest.uri=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 mosip.idrepo.pmp.partner.rest.httpMethod=GET
 mosip.idrepo.pmp.partner.rest.headers.mediaType=application/json
 mosip.idrepo.pmp.partner.rest.timeout=100
 
-mosip.idrepo.credential.request.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
+mosip.idrepo.credential.request.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/requestgenerator
 mosip.idrepo.credential.request.rest.httpMethod=POST
 mosip.idrepo.credential.request.rest.headers.mediaType=application/json
 mosip.idrepo.credential.request.rest.timeout=100
-mosip.idrepo.credential.cancel-request.rest.uri=http://credentialrequest.idrepo/v1/credentialrequest/cancel/{requestId}
+mosip.idrepo.credential.cancel-request.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/cancel/{requestId}
 mosip.idrepo.credential.cancel-request.rest.httpMethod=GET
 mosip.idrepo.credential.cancel-request.rest.headers.mediaType=application/json
 mosip.idrepo.credential.cancel-request.rest.timeout=100
@@ -174,18 +174,18 @@ mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 # the credential request with below partner id to issue credential to new IDA partners.
 idrepo-dummy-online-verification-partner-id=MOVP
 
-mosip.idrepo.retrieve-by-uin.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{uin}
+mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-by-uin.rest.timeout=100
 
-mosip.idrepo.vid-generator.rest.uri=http://idgenerator.kernel/v1/idgenerator/vid
+mosip.idrepo.vid-generator.rest.uri=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/vid
 mosip.idrepo.vid-generator.rest.httpMethod=GET
 mosip.idrepo.vid-generator.rest.headers.mediaType=application/json
 mosip.idrepo.vid-generator.rest.timeout=100
 
 ## Websub
-mosip.idrepo.websub.vid-credential-update.callback-url=http://identity.idrepo/idrepository/v1/identity/callback/vid_credential_status_update
+mosip.idrepo.websub.vid-credential-update.callback-url=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/callback/vid_credential_status_update
 mosip.idrepo.websub.vid-credential-update.topic=VID_CRED_STATUS_UPDATE
 mosip.idrepo.websub.vid-credential-update.secret= ${idrepo.websub.vid.credential.update.secret}
 mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
@@ -194,19 +194,19 @@ mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
 mosip.iam.adapter.clientsecret.id-repository=${mosip.secret.mosip-reg-client}
 mosip.iam.adapter.appid.id-repository=regproc
-mosip.authmanager.client-token-endpoint=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
-mosip.idrepo.uin-generator.rest.uri=http://idgenerator.kernel/v1/idgenerator/uin
+mosip.idrepo.uin-generator.rest.uri=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/uin
 mosip.idrepo.uin-generator.rest.httpMethod=GET
 mosip.idrepo.uin-generator.rest.headers.mediaType=application/json
 mosip.idrepo.uin-generator.rest.timeout=100
 
-mosip.idrepo.draft-vid.rest.uri=http://vid.idrepo/idrepository/v1/draft/vid
+mosip.idrepo.draft-vid.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/draft/vid
 mosip.idrepo.draft-vid.rest.httpMethod=POST
 mosip.idrepo.draft-vid.rest.headers.mediaType=application/json
 mosip.idrepo.draft-vid.rest.timeout=100
 
-mosip.idrepo.update-vid.rest.uri=http://vid.idrepo/idrepository/v1/vid/{vid}
+mosip.idrepo.update-vid.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/{vid}
 mosip.idrepo.update-vid.rest.httpMethod=PATCH
 mosip.idrepo.update-vid.rest.headers.mediaType=application/json
 mosip.idrepo.update-vid.rest.timeout=100
@@ -297,7 +297,7 @@ mosip.credential.service.share.prependThumbprint=false
 mosip.credential.service.retry.maxAttempts=3
 mosip.credential.service.retry.maxDelay=100
 
-IDREPOGETIDBYID=http://identity.idrepo/idrepository/v1/identity/idvid
+IDREPOGETIDBYID=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
 mosip.data.share.internal.domain.name=datashare.datashare
 CREATEDATASHARE=/v1/datashare/create
@@ -305,13 +305,12 @@ KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/cl
 KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
 KEYMANAGER_ENCRYPT_PIN=${mosip.kernel-keymanager-service.url}/v1/keymanager/encryptWithPin
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel-keymanager-service.url}/v1/keymanager/zkEncrypt
-PARTNER_POLICY=${mosip.pms-partner-manager-service.url=http}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-PARTNER_EXTRACTION_POLICY=${mosip.pms-partner-manager-service.url=http}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
+PARTNER_POLICY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+PARTNER_EXTRACTION_POLICY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
 credential.service.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
 # BioSDK service
-mosip.biosdk.default.host=http://biosdk-service.biosdk
-mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock-biosdk-service.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0

From 65f948391513c64e1e9734d997fe8f2c17baf59e Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 22 Dec 2021 13:46:40 +0530
Subject: [PATCH 0399/1358] updated properties

---
 application-default.properties        |   2 +-
 mock-abis-default.properties          |   2 +-
 partner-management-default.properties | 128 ++++----------------------
 3 files changed, 19 insertions(+), 113 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 2e69b355ece..2caefdce807 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -113,7 +113,7 @@ mosip.mosip.datsha.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc577
 mosip.mosip.abis.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 mosip.mosip.creser.idpass.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 mosip.mosip.pms.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-
+keycloak.admin.password={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
 #mosip.masterdata.base.url = http://masterdata.kernel
 #mosip.syncdata.base.url=http://syncdata.kernel
diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index e2103da97c3..d087a4f593c 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -8,7 +8,7 @@ management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
 abis.return.duplicate=false
-secret_url=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+secret_url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string
 secret_url.secretKey=${mosip.mosip.regproc.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 241fd4ca587..d5184dcf679 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -11,93 +11,21 @@
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 ## If database is external to production, provide the DNS or ip of the host and port 
-mosip.pmp.database.hostname=postgres-postgresql.postgres
-mosip.pmp.database.port=5432
+mosip.pmp.database.hostname=postgres
+mosip.pmp.database.port=80
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
 
-mosip.activemq.url=http://activemq.default:80
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
-mosip.keycloak.url=http://keycloak.default:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
-
 
 ## Auth device
-mosip.authdevice.database.hostname=postgres-postgresql.postgres
-mosip.authdevice.database.port=5432
+mosip.authdevice.database.hostname=postgres
+mosip.authdevice.database.port=80
 mosip.authdevice.database.user=authdeviceuser
 mosip.authdevice.database.password=${db.dbuser.password}
 
 ## Reg device
-mosip.regdevice.database.hostname=postgres-postgresql.postgres
-mosip.regdevice.database.port=5432
+mosip.regdevice.database.hostname=postgres
+mosip.regdevice.database.port=80
 mosip.regdevice.database.user=regdeviceuser
 mosip.regdevice.database.password=${db.dbuser.password}
 
@@ -174,49 +102,27 @@ pmp.partner.mobileNumbe.max.length=16
 masterdata.registerdevice.timestamp.validate=+5
 
 ## Keymanager
-keymanager.base.url=http://keymanager.keymanager
-mosip.kernel.sign-url=${keymanager.base.url}/v1/keymanager/jwtSign
-
+mosip.kernel.sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
 ## Kernel services
-mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
-
-mosip.secret.mosip-admin-client=7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.secret.mosip-auth-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-prereg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-regproc-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-ida-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-reg-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-misp-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partner-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-policymanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-partnermanager-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-resident-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-admin-services-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-crereq-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-datsha-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-abis-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-creser-idpass-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.secret.mosip-pms-client=vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
 mosip.pmp.auth.clientId=mosip-partner-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.secret.mosip-partnermanager-client}
+mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
-pmp.ca.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadCACertificate
-pmp.partner.certificaticate.upload.rest.uri=${keymanager.base.url}/v1/keymanager/uploadPartnerCertificate
-pmp.partner.certificaticate.get.rest.uri=${keymanager.base.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
-pmp-keymanager.upload.other.domain.cert.rest.uri=${keymanager.base.url}/v1/keymanager/uploadOtherDomainCertificate
+pmp.ca.certificaticate.upload.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadCACertificate
+pmp.partner.certificaticate.upload.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadPartnerCertificate
+pmp.partner.certificaticate.get.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
+pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadOtherDomainCertificate
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
-mosip.iam.adapter.clientsecret=${mosip.secret.mosip-partnermanager-client}
+mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
@@ -286,8 +192,8 @@ policy.auth.allowed.token.types=random,partner,policy
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret=${mosip.secret.mosip-partnermanager-client}
-mosip.iam.module.redirecturi=https://${mosip.api.public.host}/v1/partnermanager/login-redirect/
+mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
+mosip.iam.module.redirecturi=${mosip.api.external.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
@@ -297,7 +203,7 @@ mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-conn
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
-mosip.kernel.device.search-url=http://masterdata.kernel/v1/masterdata/devices/search
+mosip.kernel.device.search-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/devices/search
 token.request.appid=admin
 token.request.password=mosip
 token.request.username=110005

From 5a7f541e5a59329e67090c6eb83b50f392746605 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 22 Dec 2021 14:03:02 +0530
Subject: [PATCH 0400/1358] updated config

---
 application-default.properties       |  1 +
 data-share-default.properties        | 10 ++++-----
 id-authentication-default.properties | 28 ++++++++++++------------
 kernel-default.properties            |  4 ++--
 pre-registration-default.properties  | 32 ++++++++++++++--------------
 print-default.properties             |  8 +++----
 syncdata-default.properties          | 14 ++++++------
 7 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index bc76252d402..013e026a269 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -49,6 +49,7 @@ mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
 mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
 mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
 mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.kernel.syncdata.syncjob.url=http://kernel-syncjob-service:8099
 mosip.keycloak.url=http://keycloak.default:80
 mosip.kubernetes.url=http://kubernetes.default:80
 mosip.minio.url=http://minio.default:80
diff --git a/data-share-default.properties b/data-share-default.properties
index 111b59de266..ab66f769ff4 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -7,10 +7,10 @@
 mosip.data.share.service.id=mosip.data.share
 mosip.data.share.service.version=1.0
 
-CRYPTOMANAGER_ENCRYPT=http://keymanager.kernel/v1/keymanager/encrypt
-KEYMANAGER_JWTSIGN=http://keymanager.keymanager/v1/keymanager/jwtSign
-PARTNER_POLICY=http://pms-policy.pms/v1/policymanager/policies/{policyId}/partner/{partnerId}
-KEYBASEDTOKENAPI=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
+PARTNER_POLICY=${mosip.pms-policy-manager-service.url}/v1/policymanager/policies/{policyId}/partner/{partnerId}
+KEYBASEDTOKENAPI=${mosip.kernel-auditmanager-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 
 data.share.application.id=PARTNER
@@ -19,7 +19,7 @@ mosip.data.share.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.data.share.urlshortner=false
 data.share.token.request.appid=datsha
 data.share.token.request.clientId=mosip-datsha-client
-data.share.token.request.secretKey=${mosip.secret.mosip-datsha-client}
+data.share.token.request.secretKey=${mosip.mosip.datsha.client.secret}
 data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 6bbfca413b7..641ab9844f2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -19,7 +19,7 @@
 mosip.api.internal.url=https://${mosip.api.internal.host}
 ## Client
 mosip.ida.auth.clientId=mosip-ida-client
-mosip.ida.auth.secretKey=${mosip.secret.mosip-ida-client}
+mosip.ida.auth.secretKey=${mosip.mosip.ida.client.secret}
 mosip.ida.auth.appId=ida
 
 ## Database
@@ -108,7 +108,7 @@ mosip.date-of-birth.pattern=yyyy/MM/dd
 
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
-mosip.biosdk.default.service.url=http://biosdk-service.biosdk/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock-biosdk-service.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -132,49 +132,49 @@ mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.version=0.9
 mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
 
 ## Kernel-Audit
-audit.rest.uri=http://auditmanager.kernel/v1/auditmanager/audits
+audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 audit.rest.httpMethod=POST
 audit.rest.headers.mediaType=${mosip.ida.request.mediaType}
 audit.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Kernel OTP Validator
-otp-validate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/validate
+otp-validate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
 otp-validate.rest.httpMethod=GET
 otp-validate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-validate.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Kernel OTP Generator
-otp-generate.rest.uri=http://otpmanager.kernel/v1/otpmanager/otp/generate
+otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
 otp-generate.rest.httpMethod=POST
 otp-generate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-generate.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Mail Notification
-mail-notification.rest.uri=http://notifier.kernel/v1/notifier/email/send
+mail-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/email/send
 mail-notification.rest.httpMethod=POST
 mail-notification.rest.headers.mediaType=multipart/form-data
 mail-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## SMS Notification
-sms-notification.rest.uri=http://notifier.kernel/v1/notifier/sms/send
+sms-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
 sms-notification.rest.httpMethod=POST
 sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{rid}?type={type}
+rid-uin.rest.uri=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=http://identity.idrepo/idrepository/v1/identity/idvid/{rid}
+rid-uin-auth.rest.uri=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
-id-pmp-service.rest.uri=http://pms-partner.pms/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
+id-pmp-service.rest.uri=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
 id-pmp-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-pmp-service.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -199,7 +199,7 @@ id-masterdata-template-service.rest.headers.mediaType=${mosip.ida.request.mediaT
 id-masterdata-template-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Master Data - Template Multi language
-id-masterdata-template-service-multilang.rest.uri=http://masterdata.kernel/v1/masterdata/templates/templatetypecodes/{code}
+id-masterdata-template-service-multilang.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/templatetypecodes/{code}
 id-masterdata-template-service-multilang.rest.httpMethod=GET
 id-masterdata-template-service-multilang.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service-multilang.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -212,9 +212,9 @@ ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 
-ida-websub-auth-type-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/authTypeCallback/{partnerId}
+ida-websub-auth-type-callback-url=${mosip.ida-internal-service.url}/idauthentication/v1/internal/callback/authTypeCallback/{partnerId}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-credential-issue-callback-url=http://ida-internal.ida/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
+ida-websub-credential-issue-callback-url=${mosip.ida-internal-service.url}/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
 
@@ -464,7 +464,7 @@ mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
 mosip.iam.adapter.clientsecret=${mosip.ida.auth.secretKey}
 mosip.iam.adapter.appid=${mosip.ida.auth.appId}
-mosip.authmanager.client-token-endpoint=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## IDA key generator 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
diff --git a/kernel-default.properties b/kernel-default.properties
index 4c29bc8b584..ea79aa74f02 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -24,7 +24,7 @@ mosip.kernel.syncdata.syncdata-version-id=v1.0
 mosip.kernel.syncdata.registration-center-config-file=registration-${spring.profiles.active}.properties
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
-mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
+mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
@@ -443,7 +443,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 #openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 
-zone.user.details.url=http://authmanager.kernel/v1/authmanager/userdetails
+zone.user.details.url=${mosip.kernel-auth-service.url}/v1/authmanager/userdetails
 
 auth.server.admin.offline.token.validate=false
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 5c434143078..f17905520fe 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -39,7 +39,7 @@ mosip.idschema.version=0.1
 
 ## Demographic Service 
 demographic.service.version=v1
-demographic.service.env=http://prereg-application.prereg
+demographic.service.env=${mosip.prereg-application-service.url}
 demographic.service.contextpath=preregistration/${demographic.service.version}
 demographic.resource.url=${demographic.service.env}/${demographic.service.contextpath}
 # ID values for application APIs
@@ -61,7 +61,7 @@ mosip.id.preregistration.demographic.retrieve.date=mosip.pre-registration.demogr
 
 ## Document Service
 document.service.version=v1
-document.service.env=http://prereg-application.prereg
+document.service.env=${mosip.prereg-application-service.url}
 document.service.contextpath=preregistration/${document.service.version}
 document.resource.url=${document.service.env}/${document.service.contextpath}
 
@@ -91,7 +91,7 @@ mosip.kernel.objectstore.account-name=prereg
 
 ## Booking Service
 booking.service.version=v1
-booking.service.env=http://prereg-booking.prereg
+booking.service.env=${mosip.prereg-booking-service.url}
 booking.service.contextpath=preregistration/${booking.service.version}
 booking.resource.url=${booking.service.env}/${booking.service.contextpath}
 appointmentResourse.url=${booking.resource.url}
@@ -130,7 +130,7 @@ preregistration.country.specific.zoneId=GMT+05:30
 
 ## Batch job service
 batch.service.version=v1
-batch.service.env=http://prereg-batchjob.prereg
+batch.service.env=${mosip.prereg-batchjob-service.url}
 batch.service.contextpath=preregistration/${batch.service.version}/batch
 batch.resource.url=${batch.service.env}/${batch.service.contextpath}
 ## Id values of batch job service
@@ -183,10 +183,10 @@ id-masterdata-template-service-multilang.rest.uri=${mosip.kernel-masterdata-serv
 
 ## Masterdata service
 ## Base url is only used for masterdata. We give the in-cluster url here
-mosip.base.url=http://masterdata.kernel
+mosip.base.url=${mosip.kernel-masterdata-service.url}
 
 masterdata.service.version=v1
-masterdata.service.env=http://masterdata.kernel
+masterdata.service.env=${mosip.kernel-masterdata-service.url}
 masterdata.service.contextpath=masterdata
 masterdata.resource.url=${masterdata.service.env}/${masterdata.service.version}/${masterdata.service.contextpath}
 regCenter.url=${masterdata.resource.url}/registrationcenters
@@ -206,7 +206,7 @@ cancel.appoinment.template=cancel-appointment
 
 ## Notification service
 notification.service.version=v1
-notification.service.env=http://prereg-application.prereg
+notification.service.env=${mosip.prereg-application-service.url}
 notification.service.contextpath=preregistration/${notification.service.version}
 notification.url=${notification.service.env}/${notification.service.version}/${notification.service.contextpath}/notification
 mosip.pre-registration.notification.id.send=mosip.pre-registration.notification.notify
@@ -214,24 +214,24 @@ mosip.pre-registration.notification.id.send=mosip.pre-registration.notification.
 timeZone=Asia/Calcutta
 
 ## Email service 
-email.service.env=http://notifier.kernel
+email.service.env=${mosip.kernel-notification-service.url}
 email.service.contextpath=notifier
 #Kernel Service URL for Sending Emails
 emailResourse.url=${email.service.env}/${masterdata.service.version}/${email.service.contextpath}/email/send
 
 ## SMS service
-sms.service.env=http://notifier.kernel
+sms.service.env=${mosip.kernel-notification-service.url}
 sms.service.contextpath=notifier
 #Kernel service URL for sending SMS
 smsResourse.url=${sms.service.env}/${masterdata.service.version}/${sms.service.contextpath}/sms/send
 
 ## Audit service 
-audit.service.env=http://auditmanager.kernel
+audit.service.env=${mosip.kernel-auditmanager-service.url}
 audit.service.contextpath=auditmanager
 audit.url=${audit.service.env}/${masterdata.service.version}/${audit.service.contextpath}/audits
 
 ## Crypto service 
-crypto.service.env=http://keymanager.keymanager
+crypto.service.env=${mosip.kernel-keymanager-service.url}
 crypto.service.contextpath=keymanager
 ## Kernel Service URL for Encryption and decryption 
 cryptoResource.url=${crypto.service.env}/${masterdata.service.version}/${crypto.service.contextpath}
@@ -242,27 +242,27 @@ preregistration.crypto.PrependThumbprint=false
 ##  KeyCloak 
 ## Both below fields must match with what is there on Keycloak properties 
 clientId=mosip-prereg-client
-secretKey=${mosip.secret.mosip-prereg-client}
+secretKey=${preregistration.mosip.prereg.client.secret}
 
 ## Used for Key Creating KeyCloak session
 userIdType=USERID
 appId=prereg
 
 ## Auth service 
-kernel.auth.env=http://authmanager.kernel
+kernel.auth.env=${mosip.kernel-auditmanager-service.url}
 kernel.auth.contextpath=authmanager
 auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## PRID service 
-kernel.prid.env=http://pridgenerator.kernel
+kernel.prid.env=${mosip.kernel-pridgenerator-service.url}
 kernel.prid.contextpath=pridgenerator
 mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid.contextpath}/prid
 
 ## Syncdata service
 latestidschema.service.contextpath=latestidschemafetch the latest ID Schema for the ID object validator
 mosip.preregistration.id-schema=${mosip.kernel-syncdata-service.url}/v1/syncdata/latestidschema
-syncdata.resource.url=http://syncdata.kernel/v1/syncdata
+syncdata.resource.url=${mosip.kernel-syncdata-service.url}/v1/syncdata
 
 ## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}
@@ -392,7 +392,7 @@ mosip.preregistration.captcha.enable=true
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}
-mosip.preregistration.captcha.resourse.url=http://prereg-captcha.prereg/preregistration/v1/captcha/validatecaptcha
+mosip.preregistration.captcha.resourse.url=${mosip.prereg-captcha-service.url}/preregistration/v1/captcha/validatecaptcha
 mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
 
 ## Security 
diff --git a/print-default.properties b/print-default.properties
index d456bc3fb5c..ed90d5d165d 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -6,7 +6,7 @@
 # print.websub.hub.secret
 
 ## Websub
-websub.base.url=http://websub.websub
+websub.base.url=${mosip.websub.url}
 mosip.event.hubURL=${websub.base.url}/hub
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
@@ -34,11 +34,11 @@ AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 mosip.kernel.pdf_owner_password=123456
 
 ## Auth service
-authmanager.base.url=http://authmanager.kernel
+authmanager.base.url=${mosip.kernel-auth-service.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## Master data services
-MASTER=http://masterdata.kernel/v1/masterdata
+MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 mosip.print.audit.id=mosip.applicanttype.getApplicantType
 
@@ -46,7 +46,7 @@ mosip.print.application.version=1.0
 mosip.print.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 
 ## Encrypt services
-PDFSIGN=http://keymanager.keymanager/v1/keymanager/pdf/sign
+PDFSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/pdf/sign
 
 
 mosip.print.service.id=mosip.print
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 80fb6e8820f..3d601247ef7 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -22,8 +22,8 @@ mosip.kernel.syncdata.syncdata-version-id=v1.0
 mosip.kernel.syncdata.registration-center-config-file=registration-${spring.profiles.active}.properties
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
-mosip.kernel.syncdata.syncjob-base-url=http://kernel-syncjob-service:8099/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=http://masterdata.kernel/v1/masterdata/idschema/latest
+mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
 mosip.kernel.masterdata.locationhierarchylevels.uri =${mosip.kernel-masterdata-service.url}/v1/masterdata/locationHierarchyLevels
 
 ## SMS notification
@@ -86,11 +86,11 @@ idrepo.api.getuindetails=${mosip.idrepo-identity-service.url}/v1/identity/uin/{u
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key=${mosip.secret.mosip-auth-client}
+mosip.kernel.auth.secret.key=${mosip.mosip.auth.client.secret}
 
 mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key=${mosip.secret.mosip-ida-client}
+mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
 ## Token id salts
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
@@ -265,7 +265,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=http://authmanager.kernel/v1/authmanager
+mosip.authmanager.base-url=${mosip.kernel-auditmanager-service.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -286,7 +286,7 @@ masterdata.registerdevice.timestamp.validate=+10
 ## Prereg
 mosip.kernel.prereg.realm-id=preregistration
 mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key=${mosip.secret.mosip-prereg-client}
+mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
 
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
@@ -375,7 +375,7 @@ mosip.syncdata.tpm.required=false
 mosip.kernel.registrationclient.app.id=registrationclient
 mosip.kernel.registrationclient.client.id=mosip-reg-client
 # env variable
-mosip.kernel.registrationclient.secret.key=${mosip.secret.mosip-reg-client}
+mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
 mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/useridPwd

From fdb9e2288a9998625fa93a2b81acd82a123e6792 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 22 Dec 2021 14:03:04 +0530
Subject: [PATCH 0401/1358] updated properties

---
 application-default.properties  |  3 ++
 registration-default.properties |  2 +-
 resident-default.properties     | 66 ++++++++++++++++-----------------
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 2caefdce807..a8bf4292d01 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -73,6 +73,8 @@ mosip.regproc-registration-transaction-service.url=http://regproc-registration-t
 mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
 mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
 mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
+mosip.regproc-print-service.url=http://regproc-print-service.default:80
+mosip.regproc-group1-service.url=http://regproc-group1.default.80
 mosip.resident-service.url=http://resident-service.default:80
 mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
 mosip.softhsm-ida.url=http://softhsm-ida.default:80
@@ -95,6 +97,7 @@ mosip.packet-receiver-service.url=http://dmz.ingress:30080
 mosip.regproc-status-service.url=http://dmz.ingress:30080
 mosip.websub.url=${mosip.api.external.url}
 
+
 mosip.mosip.admin.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
 mosip.mosip.regproc.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
 mosip.mosip.auth.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
diff --git a/registration-default.properties b/registration-default.properties
index 49999b8c94f..9a3a5146f06 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -361,7 +361,7 @@ mosip.registration.quality_check_with_sdk=N
 mosip.registration.replace_sdk_quality_score=N
 
 #URL for reset password
-mosip.registration.reset_password_url=https://dev.mosip.net/keycloak/auth/realms/mosip/account/
+mosip.registration.reset_password_url=${mosip.api.external.url}/keycloak/auth/realms/mosip/account/
 #Flag to check / bypass device cert validation
 
 mosip.registration.onboard_yourself_url=https://docs.mosip.io/platform/modules/registration-client/first-user-registration-and-onboarding
diff --git a/resident-default.properties b/resident-default.properties
index ddf1fcb509b..9bb4d25defb 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -27,61 +27,61 @@ vid.revoke.id=mosip.vid.update
 resident.revokevid.id=mosip.resident.vidstatus
 PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
-DECRYPT_API_URL=http://keymanager.kernel/v1/keymanager/decrypt
+DECRYPT_API_URL=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
 
 ## Token generation
 token.request.id=io.mosip.resident
 resident.appid=resident
 token.request.version=1.0
 resident.clientId=mosip-resident-client
-resident.secretKey=${mosip.secret.mosip-resident-client}
+resident.secretKey=${mosip.mosip.resident.client.secret}
 # Below is defined in application properties
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services
-KERNELAUTHMANAGER=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
-REGPROCPRINT=http://regproc-print-service/registrationprocessor/v1/print/uincard
-INTERNALAUTH=http://ida-internal.ida/idauthentication/v1/internal/auth
-INTERNALAUTHTRANSACTIONS=http://ida-internal.ida/idauthentication/v1/internal/authTransactions
-KERNELENCRYPTIONSERVICE=http://ida-internal.ida/idauthentication/v1/internal/getCertificate
-IDAUTHCREATEVID=http://vid.idrepo/idrepository/v1/vid
-IDAUTHREVOKEVID=http://vid.idrepo/idrepository/v1/vid/deactivate
+KERNELAUTHMANAGER=${mosip.kernel-auditmanager-service.url}/v1/authmanager/authenticate/clientidsecretkey
+REGPROCPRINT=${mosip.regproc-print-service.url}/registrationprocessor/v1/print/uincard
+INTERNALAUTH=${mosip.ida-internal-service.url}/idauthentication/v1/internal/auth
+INTERNALAUTHTRANSACTIONS=${mosip.ida-internal-service.url}/idauthentication/v1/internal/authTransactions
+KERNELENCRYPTIONSERVICE=${mosip.ida-internal-service.url}/idauthentication/v1/internal/getCertificate
+IDAUTHCREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
+IDAUTHREVOKEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/deactivate
 ## Notification service
-IDREPOGETIDBYUIN=http://identity.idrepo/idrepository/v1/identity/idvid
-IDREPOGETIDBYRID=http://identity.idrepo/idrepository/v1/identity/idvid
-GETUINBYVID=http://vid.idrepo/idrepository/v1/vid
+IDREPOGETIDBYUIN=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
+IDREPOGETIDBYRID=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
+GETUINBYVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
 resident.notification.emails=mosiptestuser@gmail.com
 resident.notification.message=Notification has been sent to the provided contact detail(s)
 ## templates
-MASTER=http://masterdata.kernel/v1/masterdata
+MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
-RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
-CREATEVID=http://vid.idrepo/idrepository/v1/vid
-IDREPOSITORY=http://identity.idrepo/idrepository/v1/identity/
-ENCRYPTURL=http://keymanager.kernel/v1/keymanager/encrypt
-MIDSCHEMAURL=http://syncdata.kernel/v1/syncdata/latestidschema
+RIDGENERATION=${mosip.kernel-ridgenerator-service.url}/v1/ridgenerator/generate/rid
+CREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
+IDREPOSITORY=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/
+ENCRYPTURL=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+MIDSCHEMAURL=${mosip.kernel-keymanager-service.url}/v1/syncdata/latestidschema
 # DMZ service call
-SYNCSERVICE=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=http://regproc-group1/registrationprocessor/v1/packetreceiver/registrationpackets
-SMSNOTIFIER=http://notifier.kernel/v1/notifier/sms/send
-EMAILNOTIFIER=http://notifier.kernel/v1/notifier/email/send
-AUTHTYPESTATUSUPDATE=http://identity.idrepo/idrepository/v1/identity/authtypes/status
+SYNCSERVICE=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=${mosip.regproc-group1-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+SMSNOTIFIER=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
+EMAILNOTIFIER=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+AUTHTYPESTATUSUPDATE=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/authtypes/status
 #Regitstration processor reprint service
 #Registration status service
-REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
+REGISTRATIONSTATUSSEARCH=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
 resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service
-POLICY_REQ_URL=http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-OTP_GEN_URL=http://ida-internal.ida/idauthentication/v1/internal/otp
-CREDENTIAL_STATUS_URL=http://credentialrequest.idrepo/v1/credentialrequest/get/
-CREDENTIAL_REQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
-CREDENTIAL_CANCELREQ_URL=http://credentialrequest.idrepo/v1/credentialrequest/cancel/
-CREDENTIAL_TYPES_URL=http://credential.idrepo/v1/credentialservice/types
-PARTNER_API_URL=http://pms-partner.pms/v1/partnermanager/partners
-mosip.kernel.masterdata.audit-url=http://auditmanager.kernel/v1/auditmanager/audits
+POLICY_REQ_URL=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+OTP_GEN_URL=${mosip.ida-internal-service.url}/idauthentication/v1/internal/otp
+CREDENTIAL_STATUS_URL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/get/
+CREDENTIAL_REQ_URL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/requestgenerator
+CREDENTIAL_CANCELREQ_URL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/cancel/
+CREDENTIAL_TYPES_URL=${mosip.idrepo-credential-service.url}/v1/credentialservice/types
+PARTNER_API_URL=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners
+mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 
 ## Config data
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
@@ -101,7 +101,7 @@ mosip.registration.processor.registration.sync.id=mosip.registration.sync
 id.repo.vidType=Perpetual
 token.request.appid=resident
 token.request.clientId=mosip-resident-client
-token.request.secretKey=${mosip.secret.mosip-resident-client}
+token.request.secretKey=${mosip.mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
 
 #TODO remove reg-client service accunt in production env

From 646c5a65c8761fc4ee2e39e60af18ac841fabe61 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 22 Dec 2021 15:16:51 +0530
Subject: [PATCH 0402/1358] updated config

---
 application-default-dmz.properties            |  4 +-
 application-default.properties                |  6 ++-
 registration-processor-default-dmz.properties |  2 +-
 registration-processor-default.properties     | 48 +++++++++----------
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 64db11ba56f..07055a7badd 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -1,7 +1,7 @@
 #---------------------------------------Common properties-----------------------
 aplication.configuration.level.version=LTS
-mz.ingress.base.url: http://mz.ingress:30080
-mosip.keymanager.base.url=http://kernel-keymanager-service
+mz.ingress.base.url=${mz.ingress.base.url}
+mosip.keymanager.base.url=${mosip.kernel-keymanager-service.url}
 
 #Kernel-idobjectalidator
 # Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key
diff --git a/application-default.properties b/application-default.properties
index aedc4ff1b85..e9e54c873a4 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -94,9 +94,11 @@ mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.def
 mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
 mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.default:80
-mosip.packet-receiver-service.url=http://dmz.ingress:30080
-mosip.regproc-status-service.url=http://dmz.ingress:30080
+mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage:80
+mosip.regproc-status-service.url=http://regproc-registration-status-service:80
 mosip.websub.url=${mosip.api.external.url}
+mz.ingress.base.url=http://mz.ingress:30080
+dmz.ingress.base.url=http://dmz.ingress:30080
 
 
 mosip.mosip.admin.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
index 5c9c7e9f051..ef0db576212 100644
--- a/registration-processor-default-dmz.properties
+++ b/registration-processor-default-dmz.properties
@@ -9,7 +9,7 @@ mosip.registration.processor.database.hostname=mz.ingress
 mosip.registration.processor.database.port=30090
 
 # URL prefix to connect to mz services cluster
-mz.ingress.url=http://mz.ingress:30080
+mz.ingress.url=${mz.ingress.base.url}
 
 # Persistence properties
 javax.persistence.jdbc.driver=org.postgresql.Driver
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 983c0c37e4c..2032b886b6f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -82,23 +82,23 @@ token.request.secretKey=${mosip.mosip.regproc.client.secret}
 token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
 
 ## Audit Service
-AUDIT=http://auditmanager.kernel/v1/auditmanager/audits
+AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
 
 ## Auth Service
-authmanager.base.url=http://authmanager.kernel
+authmanager.base.url=${mosip.kernel-auth-service.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateToken
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
-IDAINTERNAL=http://ida-internal.ida
+IDAINTERNAL=${mosip.ida-internal-service.url}
 INTERNALAUTH=${IDAINTERNAL}/idauthentication/v1/internal/auth
 GETINDIVIDUALIDFROMUSERID=${authmanager.base.url}/v1/authmanager/individualId
 
 ## Master Data Services
-MASTER=http://masterdata.kernel/v1/masterdata
+MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
 MACHINEHISTORY=${MASTER}/machineshistories
 CENTERHISTORY=${MASTER}/registrationcentershistory
 CENTERUSERMACHINEHISTORY=${MASTER}/getregistrationmachineusermappinghistory
-REVERSEDATASYNC=http://prereg-datasync-service/preregistration/v1/sync/consumedPreRegIds
+REVERSEDATASYNC=${mosip.prereg-datasync-service.url}/preregistration/v1/sync/consumedPreRegIds
 CENTERDETAILS=${MASTER}/registrationcenters
 MACHINEDETAILS=${MASTER}/machines
 DEVICESHISTORIES=${MASTER}/deviceshistories
@@ -106,22 +106,22 @@ REGISTRATIONCENTERDEVICEHISTORY=${MASTER}/registrationcenterdevicehistory
 REGISTRATIONCENTERTIMESTAMP=${MASTER}/registrationcenters/validate
 USERDETAILS=${MASTER}/users
 TEMPLATES=${MASTER}/templates
-DEVICEVALIDATEHISTORY=http://pms-partner.pms/v1/partnermanager/deviceprovidermanagement/validate
+DEVICEVALIDATEHISTORY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/deviceprovidermanagement/validate
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
 LANGUAGE=${MASTER}/languages
 
 ## ID Repository Services
-IDENTITY=http://identity.idrepo
+IDENTITY=${mosip.idrepo-identity-service.url}
 IDREPOSITORY=${IDENTITY}/idrepository/v1/identity/
 IDREPOGETIDBYUIN=${IDENTITY}/idrepository/v1/identity/idvid
-UINGENERATOR=http://idgenerator.kernel/v1/idgenerator/uin
+UINGENERATOR=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/uin
 RETRIEVEIDENTITYFROMRID=${IDENTITY}/idrepository/v1/identity/idvid
 RETRIEVEIDENTITY=${IDENTITY}/idrepository/v1/identity/idvid
-CREATEVID=http://vid.idrepo/idrepository/v1/vid
-GETUINBYVID=http://vid.idrepo/idrepository/v1/idvid
-CREDENTIALREQUEST=http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
-GETVIDSBYUIN=http://vid.idrepo/idrepository/v1/vid/uin
+CREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
+GETUINBYVID=${mosip.idrepo-vid-service.url}/idrepository/v1/idvid
+CREDENTIALREQUEST=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/requestgenerator
+GETVIDSBYUIN=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/uin
 IDREPOHASDRAFT=${IDENTITY}/idrepository/v1/identity/draft
 IDREPOGETDRAFT=${IDENTITY}/idrepository/v1/identity/draft
 IDREPOCREATEDRAFT=${IDENTITY}/idrepository/v1/identity/draft/create
@@ -130,7 +130,7 @@ IDREPOPUBLISHDRAFT=${IDENTITY}/idrepository/v1/identity/draft/publish
 IDREPOEXTRACTBIOMETRICS=${IDENTITY}/idrepository/v1/identity/draft/extractbiometrics/
 
 ## Encrypt Services
-KEYMANAGER=http://keymanager.keymanager/
+KEYMANAGER=${mosip.kernel-keymanager-service.url}
 ENCRYPTURL=${KEYMANAGER}/v1/keymanager/encrypt
 ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
 
@@ -143,7 +143,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 registration.processor.demodedupe.manual.adjudication.status=REJECTED
 
 # Validate hostlisted devices
-DEVICEHOTLIST=http://admin-hotlist.admin/v1/hotlist/status
+DEVICEHOTLIST=${mosip.admin-hotlist-service.url}/v1/hotlist/status
 JWTVERIFY=${KEYMANAGER}/v1/keymanager/jwtVerify
 
 ## Crypto
@@ -151,13 +151,13 @@ CRYPTOMANAGERDECRYPT=${KEYMANAGER}/v1/keymanager/decrypt
 crypto.PrependThumbprint.enable=true
 
 ## SMS and EMAIL notification services
-NOTIFIER=http://notifier.kernel
+NOTIFIER=${mosip.kernel-notification-service.url}
 SMSNOTIFIER=${NOTIFIER}/v1/notifier/sms/send
 EMAILNOTIFIER=${NOTIFIER}/v1/notifier/email/send
 
 ## PMS
-PMS=http://pms-policy.pms/v1/policymanager/policies
-PARTNERGETBIOEXTRACTOR=http://pms-partner.pms/v1/partnermanager/partners
+PMS=${mosip.pms-policy-manager-service.url}/v1/policymanager/policies
+PARTNERGETBIOEXTRACTOR=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners
 
 ## Registration status properties
 registration.processor.max.retry=10
@@ -251,10 +251,10 @@ registration.processor.notification.emails=
 
 ## Notification service
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
-registration.processor.notification_service_subscriber_callback_url=http://regproc-notifier.regproc/registrationprocessor/v1/notification/callback/notify
+registration.processor.notification_service_subscriber_callback_url=${mosip.regproc-notification-service.url}/registrationprocessor/v1/notification/callback/notify
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_workflow_paused_for_additional_info_event
-registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=http://regproc-notifier.regproc/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
+registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosip.regproc-notification-service.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
 
 # Email template code for PauseForAdditionalInfo
 mosip.regproc.notification_service.biometric_correction.email=RPR_PAUSED_FOR_ADD_INFO_EMAIL
@@ -437,7 +437,7 @@ ida-internal-auth-uri=${IDAINTERNAL}/idauthentication/v1/internal/auth
 ida-internal-get-certificate-uri=${IDAINTERNAL}/idauthentication/v1/internal/getCertificate
 
 registration.processor.objectstore.adapter.name=S3Adapter
-packetmanager.base.url=http://packetmanager.packetmanager/commons
+packetmanager.base.url=${mosip.packetmanager-service.url}/commons
 PACKETMANAGER_SEARCH_FIELD=${packetmanager.base.url}/v1/packetmanager/searchField
 PACKETMANAGER_SEARCH_FIELDS=${packetmanager.base.url}/v1/packetmanager/searchFields
 PACKETMANAGER_SEARCH_METAINFO=${packetmanager.base.url}/v1/packetmanager/metaInfo
@@ -450,7 +450,7 @@ PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdate
 PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
 PACKETMANAGER_GET_TAGS=${packetmanager.base.url}/v1/packetmanager/getTags
 DATASHARECREATEURL=/v1/datashare/create
-DATASHAREGETEURL=http://datashare.datashare/v1/datashare/get
+DATASHAREGETEURL=${mosip.datashare-service.url}/v1/datashare/get
 # Default abis is mock-abis provided by MOSIP
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
@@ -462,7 +462,7 @@ mosip.regproc.data.share.protocol=http
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
-mosip.biosdk.default.host= http://biosdk-service.biosdk
+mosip.biosdk.default.host=${mosip.mock-biosdk-service.url}
 mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
@@ -924,10 +924,10 @@ regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TE
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
 
-openapi.registrationProcessor.servers[0].url=http://${mosip.api.internal.host}/registrationprocessor/v1/registrationtransaction
+openapi.registrationProcessor.servers[0].url=${mosip.api.internal.host}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
-NGINXDMZURL=http://regproc-pktserver.regproc/
+NGINXDMZURL=${mosip.packet-receiver-service.url}
 
 # modifiable delay in websub subscription
 mosip.regproc.websub.resubscription.delay.millisecs=43200000

From f4eec4f56080ae2e7db607cc1ee78981ba500994 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 22 Dec 2021 17:13:51 +0530
Subject: [PATCH 0403/1358] updated config from develop2 changes #1273 PR

---
 pre-registration-default.properties | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index f17905520fe..9b6eeda3e29 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -438,7 +438,7 @@ mosip.role.prereg.getapplicationsstatus=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRA
 mosip.role.prereg.deleteapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postapplicationsupdatedtime=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.prereg.getapplicationsconfig=INDIVIDUAL
-mosip.role.prereg.getapplicationsinfo=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
+mosip.role.prereg.getapplicationsinfo=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.postlogaudit=REGISTRATION_OFFICER,INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postdocumentspreregistrationid=INDIVIDUAL
 mosip.role.prereg.putdocumentspreregistrationid=INDIVIDUAL
@@ -472,3 +472,11 @@ mosip.role.prereg.deleteappointment=INDIVIDUAL
 mosip.role.prereg.getappointmentpreregistrationidregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getappointmentregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 
+# To generate token from keycloak in PreReg Data Sync Service. Used by kernel auth adapter.
+mosip.iam.adapter.clientid.pre-registration-datasync-service=mosip-reg-client
+mosip.iam.adapter.clientsecret.pre-registration-datasync-service={cipher}f4ba53f63109c6559d882fda0b7e9f16620cbe15604ea83c940af995520905d7
+mosip.iam.adapter.appid.pre-registration-datasync-service=registrationclient
+
+#the custom auth provider component names list
+mosip.security.authentication.provider.beans.list.pre-registration-application-service=customJWTAuthProvider
+mosip.security.authentication.provider.beans.list.pre-registration-booking-service=customJWTAuthProvider
\ No newline at end of file

From 51b4e3c8f16392c5815f12b614a08970461c5acc Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Wed, 22 Dec 2021 17:53:48 +0530
Subject: [PATCH 0404/1358] updated the property files as per develop2 commits
 1276,1278,1283,1284,1287

---
 application-default.properties        |  2 +-
 credential-request-default.properties |  9 +++++++++
 credential-service-default.properties | 10 ++++++++++
 id-repository-default.properties      |  8 ++++++++
 kernel-default.properties             |  2 +-
 print-default.properties              | 20 ++++++++++++++++++++
 websub-service.toml                   |  6 +++---
 7 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 credential-request-default.properties
 create mode 100644 credential-service-default.properties

diff --git a/application-default.properties b/application-default.properties
index e9e54c873a4..11e9eb8b1b6 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -275,7 +275,7 @@ mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
-mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
+mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
 
 ## Crypto
diff --git a/credential-request-default.properties b/credential-request-default.properties
new file mode 100644
index 00000000000..9c893b7fe00
--- /dev/null
+++ b/credential-request-default.properties
@@ -0,0 +1,9 @@
+#IDRepo credential request generator authentication detalis
+mosip.idrepo.credential-req-generator.auth.client-id=mosip-crereq-client
+mosip.idrepo.credential-req-generator.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential-req-generator.auth.app-id=crereq
+
+#------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
+mosip.iam.adapter.clientid.credential-request=${mosip.idrepo.credential-req-generator.auth.client-id}
+mosip.iam.adapter.clientsecret.credential-request=${mosip.idrepo.credential-req-generator.auth.secret-key}
+mosip.iam.adapter.appid.credential-request=${mosip.idrepo.credential-req-generator.auth.app-id}
\ No newline at end of file
diff --git a/credential-service-default.properties b/credential-service-default.properties
new file mode 100644
index 00000000000..aa4dae0fcbb
--- /dev/null
+++ b/credential-service-default.properties
@@ -0,0 +1,10 @@
+#IDRepo credential service authentication detalis
+mosip.idrepo.credential.auth.client-id=mosip-creser-client
+mosip.idrepo.credential.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential.auth.app-id=creser
+
+
+#------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
+mosip.iam.adapter.clientid.credential-service=${mosip.idrepo.credential.auth.client-id}
+mosip.iam.adapter.clientsecret.credential-service=${mosip.idrepo.credential.auth.secret-key}
+mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id}
\ No newline at end of file
diff --git a/id-repository-default.properties b/id-repository-default.properties
index b9b7b22435b..51fc78fe30a 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -141,6 +141,14 @@ mosip.idrepo.retrieve-uin-by-vid.rest.httpMethod=GET
 mosip.idrepo.retrieve-uin-by-vid.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-uin-by-vid.rest.timeout=100
 
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=15
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=15
+#this should be false if you don?t use the self token restTemplate from auth adapter true if you do (needed for websubclient).
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+
 mosip.idrepo.bio-extractor-service.rest.uri=${mosip.idrepo-bioextractor-service.url}/v1/bioextractor/{extractionFormat}/extracttemplates
 mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
diff --git a/kernel-default.properties b/kernel-default.properties
index ea79aa74f02..93246512dc7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -446,7 +446,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 zone.user.details.url=${mosip.kernel-auth-service.url}/v1/authmanager/userdetails
 
 auth.server.admin.offline.token.validate=false
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
diff --git a/print-default.properties b/print-default.properties
index ed90d5d165d..c1c6fdfa709 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -110,3 +110,23 @@ registration.processor.demographic.identity=identity
 CREATEDATASHARE=${mosip.datashare-service.url}/v1/datashare/create
 DECRYPTPINBASSED=${mosip.kernel-keymanager-service.url}/v1/keymanager/decryptWithPin
 mosip.print.prependThumbprint=true
+
+# websub authentication
+mosip.iam.adapter.clientid=mpartner-default-print
+mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
+mosip.iam.adapter.appid=print
+mosip.iam.adapter.issuerURL=${mosipbox.public.url}/keycloak/auth/realms/mosip
+mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
+# in minutes
+
+mosip.iam.adapter.validate-expiry-check-rate=1440
+
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=1440
+
+#this should be false if you don?t use this restTemplate true if you do
+
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
\ No newline at end of file
diff --git a/websub-service.toml b/websub-service.toml
index b5b3398c836..a03f61015d1 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -1,6 +1,6 @@
 [kafkaHub.config]
 # Flag to check whether to enable/disable security
-SECURITY_ON = false
+SECURITY_ON = true
 
 # Server ID is is used to uniquely identify each server
 # Each server must have a unique ID
@@ -42,7 +42,7 @@ MESSAGE_DELIVERY_COUNT = 3
 MESSAGE_DELIVERY_TIMEOUT = 10.0
 
 # The base URL of IDP
-MOSIP_AUTH_BASE_URL = "https://host/"
+MOSIP_AUTH_BASE_URL = "https://dev2.mosip.net/v1/authmanager"
 
 # The token validation URL of IDP
-MOSIP_AUTH_VALIDATE_TOKEN_URL = "https://host/oauth2/token"
+MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"

From a36e59cd3c81e4237e3ee77599d6ab96d962fc22 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:15:40 +0530
Subject: [PATCH 0405/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 11e9eb8b1b6..ce41733b7d2 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -17,7 +17,7 @@ mosip.recommended.centers.locCode=5
 mosip.api.internal.url=${mosip.api.internal.host}
 mosip.api.external.url=${mosipbox.public.url}
 
-db.dbuser.password={cipher}81mosip.db3bb0946f56f47cc36a605cf54459b3e6e871677f777ff6189c23a74cd734
+db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
 
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80

From 211a11d89779a545167043a4fc61fe2f17703dd8 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 22 Dec 2021 18:19:32 +0530
Subject: [PATCH 0406/1358] updated config from develop2 changes #1275 PR

---
 application-default.properties                |  2 +-
 data-share-default.properties                 |  2 +-
 id-authentication-default.properties          | 50 +++++++++++++------
 id-authentication-external-default.properties | 12 +++--
 id-authentication-internal-default.properties | 14 +++---
 id-authentication-otp-default.properties      | 11 ++--
 id-repository-default.properties              | 32 +++++++++---
 kernel-default.properties                     |  2 +-
 partner-management-default.properties         |  2 +-
 9 files changed, 87 insertions(+), 40 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index e9e54c873a4..88f624cec8b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -276,7 +276,7 @@ mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
 mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
-mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 
 ## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
diff --git a/data-share-default.properties b/data-share-default.properties
index ab66f769ff4..45e262c3ce8 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -33,4 +33,4 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=true
 
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mosip-ida-client,mosip-regproc-client,mosip-resident-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 641ab9844f2..b4396e414ea 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -18,7 +18,17 @@
 
 mosip.api.internal.url=https://${mosip.api.internal.host}
 ## Client
-mosip.ida.auth.clientId=mosip-ida-client
+# The Online Verification partner ID associated to the IDA instance.
+# This is used to subscribe to the credential issuance event notification sent by credential service.
+# for the particular Online Verification partner.
+# This credential issueance notification is handled inside Internal Authentication module.
+# The credentials issued to the partner will be as per the data-share policy associated to the partner.
+# TO DO: Change the property key to online-verification-partner-id
+ida-auth-partner-id=mpartner-default-auth
+# Kernel auth client ID for IDA
+#Note: since the Online verification Partner ID is used as client ID, for a different IDA instance, this needs to be changed accordingly
+#and also to be added to the 'auth.server.admin.allowed.audience' property of all dependency modules.
+mosip.ida.auth.clientId=${ida-auth-partner-id}
 mosip.ida.auth.secretKey=${mosip.mosip.ida.client.secret}
 mosip.ida.auth.appId=ida
 
@@ -58,13 +68,6 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 log4j.logger.org.hibernate=warn
 hibernate.show_sql=false
 
-## The Online Verification partner ID associated to the IDA instance.
-## This is used to subscribe to the credential issuance event notification sent by credential service.
-## for the particular Online Verification partner. 
-## This credential issueance notification is handled inside Internal Authentication module.
-## The credentials issued to the partner will be as per the data-share policy associated to the partner.
-## TO DO: Change the property key to online-verification-partner-id
-ida-auth-partner-id=mpartner-default-auth
 application.id=IDA
 application.name=ID-Authentication
 
@@ -212,14 +215,25 @@ ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 
-ida-websub-auth-type-callback-url=${mosip.ida-internal-service.url}/idauthentication/v1/internal/callback/authTypeCallback/{partnerId}
+ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
+ida-websub-auth-type-callback-url=${mosipbox.public.url}${ida-websub-auth-type-callback-relative-url}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-credential-issue-callback-url=${mosip.ida-internal-service.url}/idauthentication/v1/internal/callback/idchange/{eventType}/{partnerId}
+ida-websub-idchage-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
+ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
+ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
+ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
-
+ida-websub-partner-service-apikey-approved-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/apikey_approved
+ida-websub-partner-service-partner-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_updated
+ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/policy_updated
+ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
+ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
+ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
 ## Callback url for hotlist event
-ida-websub-hotlist-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/hotlist
+ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
+ida-websub-hotlist-callback-url=${mosipbox.public.url}${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
@@ -250,8 +264,8 @@ ida-topic-hotlist=MOSIP_HOTLIST
 ida-topic-credential-status-update=CREDENTIAL_STATUS_UPDATE
 ida-topic-auth-type-status-update-acknowledge=AUTH_TYPE_STATUS_UPDATE_ACK
 ida-topic-auth-transaction-status=AUTHENTICATION_TRANSACTION_STATUS
-ida-topic-masterdata-templates=masterdata/idauthentication_templates
-ida-topic-masterdata-titles=masterdata/titles
+ida-topic-masterdata-templates=MASTERDATA_IDAUTHENTICATION_TEMPLATES
+ida-topic-masterdata-titles=MASTERDATA_TITLES
 ida-topic-pmp-misp-license-generated=MISP_LICENSE_GENERATED
 ida-topic-pmp-misp-license-updated=MISP_LICENSE_UPDATED
 ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
@@ -261,6 +275,14 @@ ida-topic-pmp-policy-updated=POLICY_UPDATED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
 
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=15
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=15
+#this should be false if you don?t use the self token restTemplate from auth adapter true if you do (needed for websubclient).
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+
 ## IDA cache
 ## IDA cache Time to live in days - To clear cache scheduled based on the days provided.
 ## value <= 0 means cache clearing based on schedule is disabled.
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index b93d695b4f1..ae02ba0b445 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,8 +1,12 @@
-## Masterdata templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-templates-callback-url=${mosipbox.public.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
+ida-websub-masterdata-titles-callback-url=${mosipbox.public.url}${ida-websub-masterdata-titles-callback-relative-url}
+
 # Callback url for partner CA certification upload event
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-url=${mosipbox.public.url}${ida-websub-ca-cert-callback-relative-url}
+
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
 # Topic for Partner CA Certificate Upload event
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index eee330f07df..481ab0482c5 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -1,13 +1,13 @@
-# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
-# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
-# helm chart:
-# mosip.api.internal.url
+ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-templates-callback-url=${mosipbox.public.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
+ida-websub-masterdata-titles-callback-url=${mosipbox.public.url}${ida-websub-masterdata-titles-callback-relative-url}
 
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
 
 # Callback url for partner CA certification upload event
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-url=${mosipbox.public.url}${ida-websub-ca-cert-callback-relative-url}
+
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
 # Topic for Partner CA Certificate Upload event
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index 2d0eb32cace..0c8bafa86ca 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -1,9 +1,12 @@
-## Masterdata templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/masterdata/titles
+ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
+ida-websub-masterdata-templates-callback-url=${mosipbox.public.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
+ida-websub-masterdata-titles-callback-url=${mosipbox.public.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
+ida-websub-ca-cert-callback-url=${mosipbox.public.url}${ida-websub-ca-cert-callback-relative-url}
+
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
 # Topic for Partner CA Certificate Upload event
diff --git a/id-repository-default.properties b/id-repository-default.properties
index b9b7b22435b..bae622ce5b7 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,6 +26,21 @@ mosip.idrepo.objectstore.account-name=idrepo
 mosip.idrepo.objectstore.bucket-name=idrepository
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
+#IDRepo identity/vid service authentication details
+mosip.idrepo.auth.client-id=mosip-idrepo-client
+mosip.idrepo.auth.secret-key={cipher}cf4e1c8c5f2013a63ff8eeead18b641d2b38c1618e8b90ed55b9af6301fe75b60dbfc04bc5339128b374b21de7cc5eed65c796024ea1862b6fb0e938f06e19f4
+mosip.idrepo.auth.app-id=idrepo
+
+#IDRepo credential service authentication detalis
+mosip.idrepo.credential.auth.client-id=mosip-creser-client
+mosip.idrepo.credential.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential.auth.app-id=creser
+
+#IDRepo credential request generator authentication detalis
+mosip.idrepo.credential-req-generator.auth.client-id=mosip-crereq-client
+mosip.idrepo.credential-req-generator.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential-req-generator.auth.app-id=crereq
+
 # For auditing
 mosip.idrepo.application.name=ID-Repository
 mosip.idrepo.application.version.pattern=^v\\d+(\\.\\d+)?$
@@ -191,9 +206,9 @@ mosip.idrepo.websub.vid-credential-update.secret= ${idrepo.websub.vid.credential
 mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 
 ## Auth adapter
-mosip.iam.adapter.clientid.id-repository=mosip-regproc-client
+mosip.iam.adapter.clientid.id-repository=${mosip.idrepo.auth.client-id}
 mosip.iam.adapter.clientsecret.id-repository=${mosip.secret.mosip-reg-client}
-mosip.iam.adapter.appid.id-repository=regproc
+mosip.iam.adapter.appid.id-repository=${mosip.idrepo.auth.app-id}
 mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 mosip.idrepo.uin-generator.rest.uri=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/uin
@@ -223,8 +238,8 @@ hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.show_sql=false
 # Token generator properties 
-credential.request.token.request.appid=crereq
-credential.request.token.request.clientId=mosip-crereq-client
+credential.request.token.request.appid=${mosip.idrepo.credential-req-generator.auth.app-id}
+credential.request.token.request.clientId=${mosip.idrepo.credential-req-generator.auth.client-id}
 credential.request.token.request.secretKey=${mosip.secret.mosip-reg-client}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
@@ -233,6 +248,9 @@ mosip.credential.request.service.id=mosip.credential.request.generator
 mosip.credential.request.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.request.service.version=1.0
 
+# Reference Id which is used for encryption/decryption of credential request using keymanager
+mosip.credential.request.crypto-ref-id=credential_request
+
 ## Batch job
 # batch job time intervel in miliseconds
 mosip.credential.request.job.timedelay=15000
@@ -267,8 +285,8 @@ resubscription-delay-secs=43200
 WEBSUBSECRET=test
 
 # Credential service
-credential.service.token.request.appid=creser
-credential.service.token.request.clientId=mosip-creser-client
+credential.service.token.request.appid=${mosip.idrepo.credential.auth.app-id}
+credential.service.token.request.clientId=${mosip.idrepo.credential.auth.client-id}
 credential.service.token.request.secretKey=${mosip.mosip.creser.client.secret}
 credential.service.token.request.id=io.mosip.credentialstore
 # Credential formatter properties 
@@ -355,7 +373,7 @@ auth-token-generator.rest.secretKey=${mosip.secret.mosip-regproc-client}
 # 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-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-idrepo-client
 
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha
diff --git a/kernel-default.properties b/kernel-default.properties
index ea79aa74f02..248963b4a19 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -446,7 +446,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 zone.user.details.url=${mosip.kernel-auth-service.url}/v1/authmanager/userdetails
 
 auth.server.admin.offline.token.validate=false
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-client,mosip-crereq-client,mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-resident-client,mosip-reg-client,mpartner-default-print,mosip-idrepo-clientmosip-syncdata-client,mosip-masterdata-client
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
diff --git a/partner-management-default.properties b/partner-management-default.properties
index d5184dcf679..1674489b550 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -151,7 +151,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 

From 7c3dea961c69e806ae53c05d5b0caf28f6c5c7d6 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:20:13 +0530
Subject: [PATCH 0407/1358] Update kernel-default.properties

---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 93246512dc7..e81c749892f 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -133,8 +133,8 @@ kernel.prid.revoke-scheduler-days_of_week=*
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres
-mosip.kernel.database.port=5432
+mosip.kernel.database.hostname=postgres
+mosip.kernel.database.port=80
 
 javax.persistence.jdbc.driver=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect

From 9c9cec795cfd173089368566dd43ab8a7eb5df1d Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:21:50 +0530
Subject: [PATCH 0408/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2032b886b6f..b9ad100b4df 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -30,8 +30,8 @@ registration.processor.bio.dedupe.reprocess.buffer.time=900
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.registration.processor.database.hostname=postgres-postgresql.postgres
-mosip.registration.processor.database.port=5432
+mosip.registration.processor.database.hostname=postgres
+mosip.registration.processor.database.port=80
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
 javax.persistence.jdbc.user=regprcuser

From 6e991d902d3bcb8756ff17b8491861f08316901d Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:24:32 +0530
Subject: [PATCH 0409/1358] Update id-repository-default.properties

---
 id-repository-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 2fc778a7e24..3be43811c97 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -235,8 +235,8 @@ mosip.idrepo.update-vid.rest.headers.mediaType=application/json
 mosip.idrepo.update-vid.rest.timeout=100
 
 ## Credential request generator
-mosip.credential.service.database.hostname=postgres-postgresql.postgres
-mosip.credential.service.database.port=5432
+mosip.credential.service.database.hostname=postgres
+mosip.credential.service.database.port=80
 mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.database.hostname}:${mosip.credential.service.database.port}/mosip_credential?currentSchema=credential
 mosip.credential.service.jdbc.user=credentialuser
 mosip.credential.service.jdbc.password=${db.dbuser.password}

From 89f7e5d2e59cb3fb7988772fe94d4353b190bf3c Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:25:13 +0530
Subject: [PATCH 0410/1358] Update pre-registration-default.properties

---
 pre-registration-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 9b6eeda3e29..c73cb1995c2 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -11,8 +11,8 @@
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
 javax.persistence.jdbc.driver=org.postgresql.Driver
-mosip.database.ip=postgres-postgresql.postgres
-mosip.database.port=5432
+mosip.database.ip=postgres
+mosip.database.port=80
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_prereg?useSSL=false
 javax.persistence.jdbc.user=prereguser
 javax.persistence.jdbc.password=${db.dbuser.password}
@@ -479,4 +479,4 @@ mosip.iam.adapter.appid.pre-registration-datasync-service=registrationclient
 
 #the custom auth provider component names list
 mosip.security.authentication.provider.beans.list.pre-registration-application-service=customJWTAuthProvider
-mosip.security.authentication.provider.beans.list.pre-registration-booking-service=customJWTAuthProvider
\ No newline at end of file
+mosip.security.authentication.provider.beans.list.pre-registration-booking-service=customJWTAuthProvider

From 6ab1c7ae8f7343dbb2e0266a5e42104fe43c7645 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:31:43 +0530
Subject: [PATCH 0411/1358] Update application-default.properties

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index ce41733b7d2..838a2af9673 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -18,6 +18,8 @@ mosip.api.internal.url=${mosip.api.internal.host}
 mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
+softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
+
 
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80

From e93e6522c622f762ada51b838a4c9e13518d912d Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 19:41:31 +0530
Subject: [PATCH 0412/1358] Update application-default.properties

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 838a2af9673..cab62211472 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -21,6 +21,7 @@ db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a
 softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
 
 
+
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
@@ -101,7 +102,7 @@ mosip.regproc-status-service.url=http://regproc-registration-status-service:80
 mosip.websub.url=${mosip.api.external.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
-
+keycloak.host=${mosip.keycloak.url}
 
 mosip.mosip.admin.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
 mosip.mosip.regproc.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=

From 380ab7ddf6a02cda52434b670bac31ed394c66b0 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 19:47:33 +0530
Subject: [PATCH 0413/1358] Update application-default.properties

---
 application-default.properties | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index cab62211472..121077a84dd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -124,6 +124,13 @@ mosip.mosip.creser.idpass.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8
 mosip.mosip.pms.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 keycloak.admin.password={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 
+mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
+email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
+email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
+email.smtp.password={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
+
+
+#--------------------------------------------------------------------------------------------------
 #mosip.masterdata.base.url = http://masterdata.kernel
 #mosip.syncdata.base.url=http://syncdata.kernel
 

From 9451cda36993ca8d806d746bbf10963c52920ab7 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 19:50:50 +0530
Subject: [PATCH 0414/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 121077a84dd..be163b6dd85 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -122,7 +122,7 @@ mosip.mosip.datsha.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc577
 mosip.mosip.abis.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 mosip.mosip.creser.idpass.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
 mosip.mosip.pms.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-keycloak.admin.password={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
 
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
 email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4

From ca29e0b0d5ada2e4c5bc46cdc7651cce36d2a102 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 19:59:23 +0530
Subject: [PATCH 0415/1358] Update application-default.properties

---
 application-default.properties | 39 ++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index be163b6dd85..b0e8f8e8bea 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -104,24 +104,24 @@ mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
 keycloak.host=${mosip.keycloak.url}
 
-mosip.mosip.admin.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.mosip.regproc.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.mosip.auth.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.mosip.ida.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.mosip.reg.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-preregistration.mosip.prereg.client.secret={cipher}7Bb4eF/TkGMdyVMPf/KzyB06qcZeBq/pCS0Y0vKUtr0=
-mosip.mosip.misp.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.partner.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.policymanager.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.partnermanager.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.resident.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.admin.services.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.crereq.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.creser.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.datsha.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.abis.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.creser.idpass.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
-mosip.mosip.pms.client.secret={cipher}vmF7pYf1W1zuuH7GZUXhnUO7Q/uqFmY8hfnc5774ou4=
+mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
+mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.ida.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.reg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+preregistration.mosip.prereg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.misp.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.partner.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.policymanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.partnermanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.resident.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.admin.services.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.crereq.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.creser.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.datsha.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
 
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
@@ -129,6 +129,9 @@ email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26
 email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
 email.smtp.password={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
 
+s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
+
 
 #--------------------------------------------------------------------------------------------------
 #mosip.masterdata.base.url = http://masterdata.kernel

From 64d7f6398a835d636a2daf85cfd136355cfe68b5 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:01:41 +0530
Subject: [PATCH 0416/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index e81c749892f..41b446ae260 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -450,7 +450,7 @@ auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosi
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.secret.mosip-admin-client}
+mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 
 #AdminMaster endpoints to access without authentication
 mosip.service-context=/v1/masterdata

From 40cfccf7f44c95a6be64a0e4a3137a722006b81d Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:02:28 +0530
Subject: [PATCH 0417/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3d601247ef7..3dd4eb6d1a4 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -270,7 +270,7 @@ mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
 mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip.secret.mosip-admin-client}
+mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
 mosip.admin_realm_id=mosip
 

From 5d65151ffcb18d238a417169a59ec4272ca95835 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:03:53 +0530
Subject: [PATCH 0418/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3dd4eb6d1a4..20e24aec37b 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -219,7 +219,7 @@ mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 #Self token resttemplate related to configuration
 mosip.iam.adapter.clientid=mosip-syncdata-client
-mosip.iam.adapter.clientsecret=${mosip.secret.mosip-reg-client}
+mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
 mosip.iam.adapter.appid=registrationclient
 mosip.iam.adapter.issuerURL=${mosip.iam.base-url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey

From ff4fc45dd2dfe6dd14f206438d55fd1a06cbb3c3 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:06:38 +0530
Subject: [PATCH 0419/1358] Update application-default.properties

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index b0e8f8e8bea..3172bbf5a66 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -127,10 +127,11 @@ keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
 email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
 email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
-email.smtp.password={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
+email.smtp.secret={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
 
 s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
 s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
+s3.region=
 
 
 #--------------------------------------------------------------------------------------------------

From ec2071c831536b31e4749a7bfe8111252211c21d Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:13:47 +0530
Subject: [PATCH 0420/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 20e24aec37b..493c87bbec1 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -132,8 +132,8 @@ kernel.prid.revoke-scheduler-days_of_week=*
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres
-mosip.kernel.database.port=5432
+mosip.kernel.database.hostname=postgres
+mosip.kernel.database.port=80
 
 javax.persistence.jdbc.driver=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect

From 9d0e02e1f06e12765a5b29141c85b69811c03202 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:15:26 +0530
Subject: [PATCH 0421/1358] Update id-authentication-default.properties

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index b4396e414ea..c3a652896e0 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -35,8 +35,8 @@ mosip.ida.auth.appId=ida
 ## Database
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.ida.database.hostname=postgres-postgresql.postgres
-mosip.ida.database.port=5432
+mosip.ida.database.hostname=postgres
+mosip.ida.database.port=80
 mosip.ida.database.user=idauser
 mosip.ida.database.password=${db.dbuser.password}
 

From a83caf985cc21cbab284824bde978bade80802db Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:19:37 +0530
Subject: [PATCH 0422/1358] Update application-default.properties

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 3172bbf5a66..ab40ac2755b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -19,7 +19,8 @@ mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
 softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
-
+prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
+prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 
 
 mosip.activemq.url=http://activemq.default:80

From a0a978d99ae0a3bdd51c3a9bcdea4d3e2c7bf674 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:25:13 +0530
Subject: [PATCH 0423/1358] Update pre-registration-default.properties

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c73cb1995c2..370b542139a 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -140,7 +140,7 @@ mosip.preregistration.batchjob.service.expired.id=mosip.pre-registration.batchjo
 # Batch Job Service used to fetch token from key cloak
 mosip.batch.token.authmanager.appId=prereg
 mosip.batch.token.authmanager.userName=mosip-prereg-client
-mosip.batch.token.authmanager.password=${mosip.secret.mosip-prereg-client}
+mosip.batch.token.authmanager.password=${preregistration.mosip.prereg.client.secret}
 mosip.batch.token.authmanager.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}/authenticate/clientidsecretkey
 mosip.batch.token.request.id=
 

From 174f9af394b751d95f11c3a1d4729120ae063a4c Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:28:14 +0530
Subject: [PATCH 0424/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 493c87bbec1..5b9f075adac 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -426,7 +426,7 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 syncdata.cache.evict.delta-sync.cron=0 0/15 * * * *
 syncdata.cache.snapshot.cron=0 0 23 * * * 
 
-mosip.kernel.keymanager-service-publickey-url=${mosip.keymanager.base.url}/v1/keymanager/publickey/{applicationId}
+mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/publickey/{applicationId}
 
 ## Roles
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From 0d9ff28106318f4b6858fa3bab41275dd3e6efc9 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:35:35 +0530
Subject: [PATCH 0425/1358] Update application-default.properties

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index ab40ac2755b..f4a44bfe964 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -19,6 +19,7 @@ mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
 softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
+softhsm.ida.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
 prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
 prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 

From b4b1ff136c96ee9b9800f0ed6dd42ba99b2315d7 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:43:30 +0530
Subject: [PATCH 0426/1358] Update application-default.properties

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index f4a44bfe964..a52fb907a77 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -130,6 +130,7 @@ mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6
 email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
 email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
 email.smtp.secret={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
+activemq.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
 
 s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
 s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1

From 5d1104dff4c09389529ac28276ddb7d83e23e688 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:53:26 +0530
Subject: [PATCH 0427/1358] Update id-repository-default.properties

---
 id-repository-default.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 3be43811c97..f993f4dce11 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -28,17 +28,17 @@ mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
 mosip.idrepo.auth.client-id=mosip-idrepo-client
-mosip.idrepo.auth.secret-key={cipher}cf4e1c8c5f2013a63ff8eeead18b641d2b38c1618e8b90ed55b9af6301fe75b60dbfc04bc5339128b374b21de7cc5eed65c796024ea1862b6fb0e938f06e19f4
+mosip.idrepo.auth.secret-key=${mosip.mosip.idrepo.client.secret}
 mosip.idrepo.auth.app-id=idrepo
 
 #IDRepo credential service authentication detalis
 mosip.idrepo.credential.auth.client-id=mosip-creser-client
-mosip.idrepo.credential.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential.auth.secret-key=${mosip.mosip.creser.client.secret}
 mosip.idrepo.credential.auth.app-id=creser
 
 #IDRepo credential request generator authentication detalis
 mosip.idrepo.credential-req-generator.auth.client-id=mosip-crereq-client
-mosip.idrepo.credential-req-generator.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential-req-generator.auth.secret-key=${mosip.mosip.crereq.client.secret}
 mosip.idrepo.credential-req-generator.auth.app-id=crereq
 
 # For auditing
@@ -215,7 +215,7 @@ mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 
 ## Auth adapter
 mosip.iam.adapter.clientid.id-repository=${mosip.idrepo.auth.client-id}
-mosip.iam.adapter.clientsecret.id-repository=${mosip.secret.mosip-reg-client}
+mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.reg.client.secret}
 mosip.iam.adapter.appid.id-repository=${mosip.idrepo.auth.app-id}
 mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
@@ -248,7 +248,7 @@ hibernate.show_sql=false
 # Token generator properties 
 credential.request.token.request.appid=${mosip.idrepo.credential-req-generator.auth.app-id}
 credential.request.token.request.clientId=${mosip.idrepo.credential-req-generator.auth.client-id}
-credential.request.token.request.secretKey=${mosip.secret.mosip-reg-client}
+credential.request.token.request.secretKey=${mosip.mosip.reg.client.secret}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
 credential.request.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
@@ -376,7 +376,7 @@ mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 auth-token-generator.rest.appId=regproc
 auth-token-generator.rest.clientId=mosip-regproc-client
-auth-token-generator.rest.secretKey=${mosip.secret.mosip-regproc-client}
+auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
 
 # Enabling below property will start logging performance logs in identity and vid service
 mosip.idrepo.aspect-logging.enabled=false

From 470ca5267801207e3ceae75bee62c837e9606913 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:54:03 +0530
Subject: [PATCH 0428/1358] Update application-default.properties

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index a52fb907a77..34cf6e852cc 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -125,6 +125,7 @@ mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e
 mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+mosip.mosip.idrepo.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
 email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4

From 9e299439e7704b6303b2853d082e4aac6a06dd8c Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 20:56:56 +0530
Subject: [PATCH 0429/1358] Update application-default.properties

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 34cf6e852cc..d867291559f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -22,7 +22,8 @@ softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5
 softhsm.ida.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
 prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
 prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
-
+mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
+mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
 
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80

From d2494dc999a5f7409d8ce66df81956c7adbbd3dd Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:01:37 +0530
Subject: [PATCH 0430/1358] Update application-default.properties

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index d867291559f..54f5eed662d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -138,6 +138,8 @@ s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a
 s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
 s3.region=
 
+activemq.host=tcp://activemq
+activemq.core.port=80
 
 #--------------------------------------------------------------------------------------------------
 #mosip.masterdata.base.url = http://masterdata.kernel

From d19f473f081a4ec409ed248f9be9047a9d9f8146 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:05:05 +0530
Subject: [PATCH 0431/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b9ad100b4df..1222531cbc7 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -924,7 +924,7 @@ regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TE
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
 
-openapi.registrationProcessor.servers[0].url=${mosip.api.internal.host}/registrationprocessor/v1/registrationtransaction
+openapi.registrationProcessor.servers[0].url=${mosip.api.external.host}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
 NGINXDMZURL=${mosip.packet-receiver-service.url}

From be2c926c3f97c242282f52bf3b6f56a9e99e7b04 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:05:42 +0530
Subject: [PATCH 0432/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 54f5eed662d..5d101306d7c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,7 +14,7 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.api.internal.url=${mosip.api.internal.host}
+mosip.api.internal.url=${mosipbox.public.url}
 mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523

From e9a3726cb3c52ee451f69ef5bb88f03b7fe9ce3d Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:37:27 +0530
Subject: [PATCH 0433/1358] Update id-authentication-default.properties

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index c3a652896e0..5f469c94a0b 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -555,7 +555,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=https://${mosip.api.public.host},https://${mosip.api.internal.host}
+mosip.ida.allowed.domain.uris=${mosip.api.external.host},${mosip.api.external.host}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 

From a3ffd20c8678e3a689956bfb2dee8f8a06329c2e Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:39:45 +0530
Subject: [PATCH 0434/1358] Update application-default.properties

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 5d101306d7c..abff46cd50e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -24,6 +24,8 @@ prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
 prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
+print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
+
 
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80

From a88a431af7a2743a9425f76468a0be5c0acd879e Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:41:50 +0530
Subject: [PATCH 0435/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index abff46cd50e..097e1386d19 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -25,7 +25,7 @@ prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
 mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
 print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
-
+idrepo.websub.vid.credential.update.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80

From 88c7fd125293bbd470fd559927f8203c71209cb9 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:47:23 +0530
Subject: [PATCH 0436/1358] Update id-authentication-default.properties

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 5f469c94a0b..ac8248a14a7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -555,7 +555,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.external.host},${mosip.api.external.host}
+mosip.ida.allowed.domain.uris=${mosip.api.external.url},${mosip.api.external.url}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 

From b07e7d73eefa0622e83d46ffe2334d0d469fa590 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:48:57 +0530
Subject: [PATCH 0437/1358] Update websub-consolidator.toml

---
 websub-consolidator.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index dcccde82d82..6a611ba4c78 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -1,6 +1,6 @@
 [consolidatorService.config]
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
+KAFKA_BOOTSTRAP_NODE = "http://kafka.default:9092"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration

From 6a7abc66ade4c4934cad72de5286a12fb3752b0c Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:54:42 +0530
Subject: [PATCH 0438/1358] Update application-default.properties

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 097e1386d19..d7b46af4d07 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -22,8 +22,8 @@ softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5
 softhsm.ida.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
 prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
 prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
-mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
-mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
+mosip.kernel.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
+mosip.kernel.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
 print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
 idrepo.websub.vid.credential.update.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 

From cb887745c2aff559398d806a77e70f85acf39cd1 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:56:48 +0530
Subject: [PATCH 0439/1358] Update id-repository-default.properties

---
 id-repository-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index f993f4dce11..1de722581d5 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -369,8 +369,8 @@ id-repo-ida-credential-type=auth
 id-repo-ida-credential-recepiant=IDA
 
 # Kernel token ID generator properties
-mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
-mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kerne.partnercode.salt}
 
 ## Auth token generator 
 auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey

From 7c3e89e96b37fdf762c56dd815bb38b27aa7b070 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:57:43 +0530
Subject: [PATCH 0440/1358] Update websub-service.toml

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index a03f61015d1..3fb13010557 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -7,7 +7,7 @@ SECURITY_ON = true
 SERVER_ID = "server-1"
 
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
+KAFKA_BOOTSTRAP_NODE = "http://kafka.default:9092"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration

From d08c1184e3d7d6eca1fc5a68bd12020d2aee8aea Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:58:51 +0530
Subject: [PATCH 0441/1358] Update id-authentication-default.properties

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index ac8248a14a7..1bf17d39056 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -476,8 +476,8 @@ mosip.kernel.salt-generator.db.key-alias=javax.persistence.jdbc
 mosip.kernel.salt-generator.schemaName=${javax.persistence.jdbc.schema}
 
 ## TokenId generator
-mosip.kernel.tokenid.uin.salt=${mosip.kernel.tokenid.uin.salt}
-mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
 ## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM

From caf85677a3804e3df2ff5675fd8d7dcb3eae333a Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:04:49 +0530
Subject: [PATCH 0442/1358] Update id-repository-default.properties

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 1de722581d5..d0a3fcb0161 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -370,7 +370,7 @@ id-repo-ida-credential-recepiant=IDA
 
 # Kernel token ID generator properties
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
-mosip.kernel.tokenid.partnercode.salt=${mosip.kerne.partnercode.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
 ## Auth token generator 
 auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey

From 81929f1422f5f32a32208dc6fa4b2aa96bc18d9c Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:09:15 +0530
Subject: [PATCH 0443/1358] Update application-default.properties

---
 application-default.properties | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index d7b46af4d07..a581ef2f4c9 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -27,6 +27,15 @@ mosip.kernel.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
 print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
 idrepo.websub.vid.credential.update.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 
+ida.websub.authtype.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+ida.websub.credential.issue.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+
+
+
 mosip.activemq.url=http://activemq.default:80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80

From 8439a1da2eb76fb26ba989b9d24ca66dd1d592f4 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:15:15 +0530
Subject: [PATCH 0444/1358] Update application-default-dmz.properties

---
 application-default-dmz.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 07055a7badd..9724d22e9df 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -1,5 +1,6 @@
 #---------------------------------------Common properties-----------------------
 aplication.configuration.level.version=LTS
+mz.ingress.base.url=http://mz.ingress:30080
 mz.ingress.base.url=${mz.ingress.base.url}
 mosip.keymanager.base.url=${mosip.kernel-keymanager-service.url}
 
@@ -372,4 +373,4 @@ mosip.default.user-preferred-language-attribute=preferredLang
 auth.server.admin.issuer.uri=${mosipbox.public.url}/keycloak/auth/realms/
 
 # Map to find the realm for the inputted appid to get the token from OIDC provider.
-mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
\ No newline at end of file
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}

From 1ae7f17f2f54e2fd3e283c006f36b6e0c1003318 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:18:38 +0530
Subject: [PATCH 0445/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index a581ef2f4c9..82077d9464f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -33,7 +33,7 @@ ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8
 ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-
+ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 
 
 mosip.activemq.url=http://activemq.default:80

From 005006537411fa8c4001197ffa0d25a46f03d744 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:22:17 +0530
Subject: [PATCH 0446/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1222531cbc7..1645e93df23 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -506,7 +506,7 @@ mosip.regproc.eventbus.type=kafka
 
 #Kafka event bus config, will be used only when the type is kafka
 #Kafka cluster servers comma separated, common for all stages and camel
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.kafka:9092,kafka-1.kafka-headless.kafka:9092,kafka-2.kafka-headless.kafka:9092
+mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default:9092,kafka-1.kafka-headless.default:9092,kafka-2.kafka-headless.default:9092
 
 # Stage Group Configuratoins
 # Default base packages for stage beans to be scanned in a stage group

From 2f501451f0c987bb5d6f00e0d052d4bfd407412b Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:24:05 +0530
Subject: [PATCH 0447/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1645e93df23..76faf41f17e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -506,7 +506,7 @@ mosip.regproc.eventbus.type=kafka
 
 #Kafka event bus config, will be used only when the type is kafka
 #Kafka cluster servers comma separated, common for all stages and camel
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default:9092,kafka-1.kafka-headless.default:9092,kafka-2.kafka-headless.default:9092
+mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default.svc.cluster.local:9092,kafka-1.kafka-headless.default.svc.cluster.local:9092,kafka-2.kafka-headless.default.svc.cluster.local:9092
 
 # Stage Group Configuratoins
 # Default base packages for stage beans to be scanned in a stage group

From 4e32f9fe49a0a9574f5ab123db6363158d8bbeea Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:25:07 +0530
Subject: [PATCH 0448/1358] Update id-authentication-default.properties

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 1bf17d39056..51e53db6ba2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -16,7 +16,7 @@
 # ida.websub.masterdata.templates.callback.secret
 # ida.websub.masterdata.titles.callback.secret
 
-mosip.api.internal.url=https://${mosip.api.internal.host}
+
 ## Client
 # The Online Verification partner ID associated to the IDA instance.
 # This is used to subscribe to the credential issuance event notification sent by credential service.

From 2c825ed55ca973782aaf185afe3f739441b748c6 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Wed, 22 Dec 2021 22:28:41 +0530
Subject: [PATCH 0449/1358] Update application-default-dmz.properties

---
 application-default-dmz.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 9724d22e9df..3de03a1e1aa 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -1,7 +1,6 @@
 #---------------------------------------Common properties-----------------------
 aplication.configuration.level.version=LTS
 mz.ingress.base.url=http://mz.ingress:30080
-mz.ingress.base.url=${mz.ingress.base.url}
 mosip.keymanager.base.url=${mosip.kernel-keymanager-service.url}
 
 #Kernel-idobjectalidator

From 1a8611ab42c5caa0453c8a1d94395220b886d22f Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 06:55:29 +0530
Subject: [PATCH 0450/1358] updated config.

---
 application-default.properties       | 4 ++++
 id-authentication-default.properties | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 82077d9464f..ba0f155d17d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -152,6 +152,10 @@ s3.region=
 activemq.host=tcp://activemq
 activemq.core.port=80
 
+
+
+
+
 #--------------------------------------------------------------------------------------------------
 #mosip.masterdata.base.url = http://masterdata.kernel
 #mosip.syncdata.base.url=http://syncdata.kernel
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 51e53db6ba2..a00bad0067d 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -223,6 +223,7 @@ ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.con
 ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
 ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
 ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
+ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
 ida-websub-partner-service-apikey-approved-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/apikey_approved
@@ -486,7 +487,7 @@ mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
 mosip.iam.adapter.clientsecret=${mosip.ida.auth.secretKey}
 mosip.iam.adapter.appid=${mosip.ida.auth.appId}
-mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.api.external.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## IDA key generator 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver

From 233e175725c4003df8f3bf9625e6884e4d503b30 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 07:01:16 +0530
Subject: [PATCH 0451/1358] updated config.

---
 application-default.properties            | 6 ++----
 registration-processor-default.properties | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index ba0f155d17d..d38d71c6239 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -35,8 +35,8 @@ ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977
 ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
 
-
-mosip.activemq.url=http://activemq.default:80
+activemq.host=tcp://activemq
+activemq.core.port=80
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
 mosip.admin-ui.url=http://admin-ui.default:80
@@ -149,8 +149,6 @@ s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a
 s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
 s3.region=
 
-activemq.host=tcp://activemq
-activemq.core.port=80
 
 
 
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 76faf41f17e..62a29427eaf 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -275,7 +275,7 @@ registration.processor.updated.subject=UIN Details Updated
 ## Queue
 registration.processor.queue.username=artemis
 registration.processor.queue.password=${activemq.password}
-registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
+registration.processor.queue.url=${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
 
 registration.processor.queue.manualverification.request=mosip-to-mv
@@ -924,7 +924,7 @@ regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TE
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
 
-openapi.registrationProcessor.servers[0].url=${mosip.api.external.host}/registrationprocessor/v1/registrationtransaction
+openapi.registrationProcessor.servers[0].url=${mosip.api.external.url}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
 NGINXDMZURL=${mosip.packet-receiver-service.url}

From 97b2e1454da93143b09bfe9c602fe21f33431ca7 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 07:23:56 +0530
Subject: [PATCH 0452/1358] updated config.

---
 application-default.properties            | 11 +++++------
 pre-registration-default.properties       |  2 +-
 print-default.properties                  |  3 ---
 registration-processor-default.properties |  4 +---
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d38d71c6239..1bdaea88ea0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -37,6 +37,9 @@ ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b
 
 activemq.host=tcp://activemq
 activemq.core.port=80
+kafka.profile=default.svc.cluster.local
+kafka.port=9092
+
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
 mosip.admin-ui.url=http://admin-ui.default:80
@@ -53,10 +56,6 @@ mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
 mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
 mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
 mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.default:80
-mosip.kafka.url=http://kafka.default:80
-mosip.kafka-headless.url=http://kafka-headless.default:80
-mosip.kafka-zookeeper.url=http://kafka-zookeeper.default:80
-mosip.kafka-zookeeper-headless.url=http://kafka-zookeeper-headless.default:80
 mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
 mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
 mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
@@ -149,7 +148,7 @@ s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a
 s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
 s3.region=
 
-
+config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 
 
@@ -215,7 +214,7 @@ mosip.kernel.xsdfile=mosip-cbeff.xsd
 ## Applicant type
 mosip.kernel.applicant.type.age.limit = 5
 mosip.kernel.applicantType.mvel.file=applicanttype.mvel
-mosip.kernel.config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+
 
 ## Various length parameters
 mosip.kernel.pin.length=6
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 370b542139a..c22aad3cbdd 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -399,7 +399,7 @@ mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recapt
 mosip.security.csrf-enable:false
 mosip.security.cors-enable:false
 # Comma Separated Allowed Origins
-mosip.security.origins:localhost:8080,localhost:4200,${mosipbox.public.url}
+mosip.security.origins:localhost:8080,localhost:4200,${mosip.api.external.url}
 mosip.security.secure-cookie:false
 
 ## for prereg booking notification name validation
diff --git a/print-default.properties b/print-default.properties
index c1c6fdfa709..a37787632e7 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -74,8 +74,6 @@ mosip.optional-languages=fra,ara
 mosip.mandatory-languages=eng
 
 ## CBEFF util
-# Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
-mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 # Cbeff XSD file name in config server
 mosip.kernel.xsdfile=mosip-cbeff.xsd
 
@@ -103,7 +101,6 @@ server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t"
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 registration.processor.unMaskedUin.length=5
 
-config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 62a29427eaf..d2eb7b6736d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -190,8 +190,6 @@ mosip.registration.processor.postalcode.req.url=${MASTER}/registrationcenters
 mosip.registration.processor.demographic.deduplication.enable=true
 
 
-config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
-
 ## OSI validate
 registration.processor.applicant.dob.format=yyyy/MM/dd
 mosip.identity.auth.internal.requestid=mosip.identity.auth.internal
@@ -506,7 +504,7 @@ mosip.regproc.eventbus.type=kafka
 
 #Kafka event bus config, will be used only when the type is kafka
 #Kafka cluster servers comma separated, common for all stages and camel
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default.svc.cluster.local:9092,kafka-1.kafka-headless.default.svc.cluster.local:9092,kafka-2.kafka-headless.default.svc.cluster.local:9092
+mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
 
 # Stage Group Configuratoins
 # Default base packages for stage beans to be scanned in a stage group

From 1c9a13841f18f6accd366d5d75d9711032c0c4cf Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 07:34:27 +0530
Subject: [PATCH 0453/1358] updated config.

---
 registration-processor-default.properties | 1 -
 syncdata-default.properties               | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d2eb7b6736d..8b2b31bcf29 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -9,7 +9,6 @@
 # activemq.host
 # activemq.core.port
 
-mosip.api.internal.url=https://${mosip.api.internal.host}
 registration.processor.zone=default
 
 ## Health check
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 5b9f075adac..188c216d5e8 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -414,7 +414,7 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel-masterdata-se
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-mosip.sync.entity.url.APPLICANTTYPE.MVEL=https://${mosip.api.internal.host}/v1/syncdata/scripts/applicanttype.mvel
+mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.external.url}/v1/syncdata/scripts/applicanttype.mvel
 mosip.sync.entity.auth-required.APPLICANTTYPE.MVEL=true
 mosip.sync.entity.auth-token.APPLICANTTYPE.MVEL=Authorization:OAUTH
 mosip.sync.entity.encrypted.APPLICANTTYPE.MVEL=false

From b7d594a9b590909358fc53343423f2d4885346f5 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 09:09:41 +0530
Subject: [PATCH 0454/1358] updated config.

---
 application-default-dmz.properties            | 2 +-
 application-default.properties                | 6 +++---
 id-authentication-default.properties          | 6 +++---
 id-authentication-external-default.properties | 6 +++---
 id-authentication-internal-default.properties | 6 +++---
 id-authentication-otp-default.properties      | 6 +++---
 print-default.properties                      | 2 +-
 registration-processor-default-dmz.properties | 6 +++---
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 3de03a1e1aa..c64f949c2cf 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -369,7 +369,7 @@ mosip.recommended.centers.locCode=6
 mosip.default.user-preferred-language-attribute=preferredLang
 
 # URL to get new Auth Token from OIDC provider & to do online validation of auth token with OIDC provider.
-auth.server.admin.issuer.uri=${mosipbox.public.url}/keycloak/auth/realms/
+auth.server.admin.issuer.uri=${mosip.api.external.url}/keycloak/auth/realms/
 
 # Map to find the realm for the inputted appid to get the token from OIDC provider.
 mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
diff --git a/application-default.properties b/application-default.properties
index 1bdaea88ea0..d24ea457607 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,8 +14,8 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.api.internal.url=${mosipbox.public.url}
-mosip.api.external.url=${mosipbox.public.url}
+mosip.api.internal.url=${mosip.api.external.url}
+mosip.api.external.url=${mosip.api.external.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
 softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
@@ -115,7 +115,7 @@ mosip.regproc-status-service.url=http://regproc-registration-status-service:80
 mosip.websub.url=${mosip.api.external.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
-keycloak.host=${mosip.keycloak.url}
+keycloak.host=${mosip.api.external.url}
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
 mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index a00bad0067d..616d7ab952a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -216,9 +216,9 @@ ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.template
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 
 ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=${mosipbox.public.url}${ida-websub-auth-type-callback-relative-url}
+ida-websub-auth-type-callback-url=${mosip.api.external.url}${ida-websub-auth-type-callback-relative-url}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=${mosipbox.public.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchage-callback-url=${mosip.api.external.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
 ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
 ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
 ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
@@ -234,7 +234,7 @@ ida-websub-partner-service-misp-license-generated-callback-relative-url=${server
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=${mosipbox.public.url}${ida-websub-hotlist-callback-relative-url}
+ida-websub-hotlist-callback-url=${mosip.api.external.url}${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index ae02ba0b445..cfdc535cb03 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosipbox.public.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.external.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosipbox.public.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.external.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosipbox.public.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.external.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 481ab0482c5..07bf51461dd 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -1,12 +1,12 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosipbox.public.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.external.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosipbox.public.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.external.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosipbox.public.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.external.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index 0c8bafa86ca..09579b4d31f 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosipbox.public.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.external.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosipbox.public.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.external.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosipbox.public.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.external.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/print-default.properties b/print-default.properties
index a37787632e7..700fec2ea05 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -112,7 +112,7 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${mosipbox.public.url}/keycloak/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${mosip.api.external.url}/keycloak/auth/realms/mosip
 mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
index ef0db576212..fc0c776f28e 100644
--- a/registration-processor-default-dmz.properties
+++ b/registration-processor-default-dmz.properties
@@ -60,7 +60,7 @@ token.request.appid=regproc
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+token.request.issuerUrl=${mosip.api.external.url}/keycloak/auth/realms/mosip
 
 # Request id to be used for various internal services
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
@@ -242,9 +242,9 @@ packet.default.source=id
 # the default schema field cagegory (ex - private)
 schema.default.fieldCategory=pvt
 
-registration.processor.notification_service_subscriber_hub_url=${mosipbox.public.url}/hub/
+registration.processor.notification_service_subscriber_hub_url=${mosip.api.external.url}/hub/
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 registration.processor.notification_service_subscriber_topic=registration_processor_workflow_completed_event
-registration.processor.notification_service_subscriber_callback_url=${mosipbox.public.url}/registrationprocessor/v1/notification/callback/notify
+registration.processor.notification_service_subscriber_callback_url=${mosip.api.external.url}/registrationprocessor/v1/notification/callback/notify
 
 mosip.regproc.message.tag.loading.disable=true
\ No newline at end of file

From cc8875ee7151381b5c3cce3ac4e6113ed5cbe7a8 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 09:15:10 +0530
Subject: [PATCH 0455/1358] updated config.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d24ea457607..ae7e5bff910 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,8 +14,8 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.api.internal.url=${mosip.api.external.url}
-mosip.api.external.url=${mosip.api.external.url}
+mosip.api.internal.url=${mosipbox.public.url}
+mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
 softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f

From 6625172c3f895c6ed7b01bf6012bead556cff3ab Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 09:24:07 +0530
Subject: [PATCH 0456/1358] updated config.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index ae7e5bff910..3b8fbcde91a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -115,7 +115,7 @@ mosip.regproc-status-service.url=http://regproc-registration-status-service:80
 mosip.websub.url=${mosip.api.external.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
-keycloak.host=${mosip.api.external.url}
+keycloak.host=${mosip.api.external.url}/keycloak
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
 mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f

From f0ac8657c4deac752c83b0142892af8762d012a5 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 09:43:39 +0530
Subject: [PATCH 0457/1358] updated config.

---
 application-default-dmz.properties                     | 2 ++
 hazelcast-default-dmz.xml => hazelcast_default-dmz.xml | 0
 2 files changed, 2 insertions(+)
 rename hazelcast-default-dmz.xml => hazelcast_default-dmz.xml (100%)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index c64f949c2cf..f7b0ab14134 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -3,6 +3,8 @@ aplication.configuration.level.version=LTS
 mz.ingress.base.url=http://mz.ingress:30080
 mosip.keymanager.base.url=${mosip.kernel-keymanager-service.url}
 
+
+
 #Kernel-idobjectalidator
 # Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key
 mosip.kernel.idobjectvalidator.property-source=APPLICATION_CONTEXT
diff --git a/hazelcast-default-dmz.xml b/hazelcast_default-dmz.xml
similarity index 100%
rename from hazelcast-default-dmz.xml
rename to hazelcast_default-dmz.xml

From 45d06ccbf178f5c2daef06705f702feca1fe7807 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 09:50:30 +0530
Subject: [PATCH 0458/1358] updated config.

---
 hazelcast_default-dmz.xml => hazelcast_dmz-default-dmz.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename hazelcast_default-dmz.xml => hazelcast_dmz-default-dmz.xml (100%)

diff --git a/hazelcast_default-dmz.xml b/hazelcast_dmz-default-dmz.xml
similarity index 100%
rename from hazelcast_default-dmz.xml
rename to hazelcast_dmz-default-dmz.xml

From 5564d2bca887d395f70b3523e829c7c716af30e4 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 23 Dec 2021 10:30:30 +0530
Subject: [PATCH 0459/1358] 3 language setup

---
 application-default-dmz.properties |  9 +++++----
 application-default.properties     | 13 +++++++------
 registration-default.properties    |  3 +++
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index f7b0ab14134..0f27c15d791 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -34,7 +34,7 @@ mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registra
 mosip.country.code=WOR
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 
 # Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
@@ -273,6 +273,7 @@ mosip.kernel.virus-scanner.port=80
 
 #------------------------Transliteration-----------------------------------------------
 mosip.kernel.transliteration.arabic-language-code=ara
+mosip.kernel.transliteration.franch-language-code=fra
 mosip.kernel.transliteration.english-language-code=eng
 
 
@@ -288,7 +289,7 @@ mosip.login.mode= email,mobile
 
 #---Language orientation-----
 mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng
+mosip.left_to_right_orientation=eng,fra
 
 
 
@@ -363,8 +364,8 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 
 mosip.mandatory-languages=eng
 mosip.optional-languages=ara,eng
-mosip.min-languages.count=1
-mosip.max-languages.count=2
+mosip.min-languages.count=2
+mosip.max-languages.count=3
 mosip.recommended.centers.locCode=6
 
 #Config key to pick the preferred language for communicating to the Resident
diff --git a/application-default.properties b/application-default.properties
index 3b8fbcde91a..8b842eb3304 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -189,8 +189,8 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,fra
-mosip.right_to_left_orientation=
+mosip.supported-languages=eng,ara,fra
+mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng,fra
 
 ## Application IDs
@@ -370,7 +370,8 @@ mosip.kernel.virus-scanner.port=80
 
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
-mosip.kernel.transliteration.franch-language-code=
+mosip.kernel.transliteration.franch-language-code=fra
+mosip.kernel.transliteration.english-language-code=eng
 
 ## DOB
 mosip.default.dob.month=01
@@ -506,11 +507,11 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.hub.url=${mosip.websub.url}/hub/
 websub.publish.url=${mosip.websub.url}/hub/
 
-mosip.mandatory-languages=eng,fra
+mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=
+mosip.optional-languages=ara,fra
 mosip.min-languages.count=2
-mosip.max-languages.count=2
+mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
 mosip.default.template-languages=eng,fra
diff --git a/registration-default.properties b/registration-default.properties
index 9a3a5146f06..70a00c3ba11 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -324,6 +324,9 @@ mosip.kernel.transliteration.arabic-language-code=ara
 #Language Code for French Language. Should not be modified
 mosip.kernel.transliteration.franch-language-code=fra
 
+#Language Code for English Language. Should not be modified
+mosip.kernel.transliteration.english-language-code=eng
+
 #----For CBEFF Component----
 
 #CBEFF XSD Storage URI. Should not be modified

From 6efbf756be162fe1310dba961d78870176a48655 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 11:44:30 +0530
Subject: [PATCH 0460/1358] updated config.

---
 syncdata-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 188c216d5e8..9d2afab5f43 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -428,6 +428,8 @@ syncdata.cache.snapshot.cron=0 0 23 * * *
 
 mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/publickey/{applicationId}
 
+mosip.kernel.keymanager.unique.identifier.autoupdate=false
+
 ## Roles
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From 13a22c3875f4b2d917ff4e5f1f1f70d5dc3cc741 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 12:05:11 +0530
Subject: [PATCH 0461/1358] updated config.

---
 admin-default.properties                      |  2 +-
 application-default-dmz.properties            |  2 +-
 application-default.properties                | 10 +++++-----
 id-authentication-default.properties          | 10 +++++-----
 id-authentication-external-default.properties |  6 +++---
 id-authentication-internal-default.properties |  6 +++---
 id-authentication-otp-default.properties      |  6 +++---
 partner-management-default.properties         |  2 +-
 pre-registration-default.properties           |  2 +-
 print-default.properties                      |  2 +-
 registration-default.properties               |  2 +-
 registration-processor-default-dmz.properties |  6 +++---
 registration-processor-default.properties     |  2 +-
 syncdata-default.properties                   |  2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 0fff3054455..1ca61084a9f 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -183,7 +183,7 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 
 #tempuri=https://admin.v3box1.mosip.net
 #mosip.admin-services.redirecturi=${tempuri}/v1/admin/login-redirect/
-mosip.admin-services.redirecturi=${mosip.api.external.url}/v1/admin/login-redirect/
+mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
 mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 0f27c15d791..4a0be38f021 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -372,7 +372,7 @@ mosip.recommended.centers.locCode=6
 mosip.default.user-preferred-language-attribute=preferredLang
 
 # URL to get new Auth Token from OIDC provider & to do online validation of auth token with OIDC provider.
-auth.server.admin.issuer.uri=${mosip.api.external.url}/keycloak/auth/realms/
+auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
 
 # Map to find the realm for the inputted appid to get the token from OIDC provider.
 mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
diff --git a/application-default.properties b/application-default.properties
index 8b842eb3304..d53ddb33543 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -15,7 +15,7 @@ aplication.configuration.level.version=LTS
 mosip.recommended.centers.locCode=5
 
 mosip.api.internal.url=${mosipbox.public.url}
-mosip.api.external.url=${mosipbox.public.url}
+#mosip.api.external.url=${mosipbox.public.url}
 
 db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
 softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
@@ -110,12 +110,12 @@ mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.def
 mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
 mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.default:80
-mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage:80
-mosip.regproc-status-service.url=http://regproc-registration-status-service:80
-mosip.websub.url=${mosip.api.external.url}
+mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.default:80
+mosip.regproc-status-service.url=http://regproc-registration-status-service.default:80
+mosip.websub.url=${mosip.api.internal.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
-keycloak.host=${mosip.api.external.url}/keycloak
+keycloak.host=${mosip.keycloak.url}/keycloak/
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
 mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 616d7ab952a..160e3700d60 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -216,9 +216,9 @@ ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.template
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 
 ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=${mosip.api.external.url}${ida-websub-auth-type-callback-relative-url}
+ida-websub-auth-type-callback-url=${mosip.api.internal.url}${ida-websub-auth-type-callback-relative-url}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=${mosip.api.external.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchage-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
 ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
 ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
 ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
@@ -234,7 +234,7 @@ ida-websub-partner-service-misp-license-generated-callback-relative-url=${server
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=${mosip.api.external.url}${ida-websub-hotlist-callback-relative-url}
+ida-websub-hotlist-callback-url=${mosip.api.internal.url}${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
@@ -487,7 +487,7 @@ mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
 mosip.iam.adapter.clientsecret=${mosip.ida.auth.secretKey}
 mosip.iam.adapter.appid=${mosip.ida.auth.appId}
-mosip.authmanager.client-token-endpoint=${mosip.api.external.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.api.internal.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## IDA key generator 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
@@ -556,7 +556,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.external.url},${mosip.api.external.url}
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},${mosip.api.internal.url}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index cfdc535cb03..9a2221ff31b 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.external.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.external.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.external.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 07bf51461dd..60dacdd2a52 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -1,12 +1,12 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.external.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.external.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.external.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index 09579b4d31f..9ba6e16ddfd 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.external.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.external.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.external.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 1674489b550..3f7bdb6d0d0 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -193,7 +193,7 @@ policy.auth.allowed.token.types=random,partner,policy
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
 mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
-mosip.iam.module.redirecturi=${mosip.api.external.url}/v1/partnermanager/login-redirect/
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c22aad3cbdd..47c40ed6cf4 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -399,7 +399,7 @@ mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recapt
 mosip.security.csrf-enable:false
 mosip.security.cors-enable:false
 # Comma Separated Allowed Origins
-mosip.security.origins:localhost:8080,localhost:4200,${mosip.api.external.url}
+mosip.security.origins:localhost:8080,localhost:4200,${mosip.api.internal.url}
 mosip.security.secure-cookie:false
 
 ## for prereg booking notification name validation
diff --git a/print-default.properties b/print-default.properties
index 700fec2ea05..ff305efd84c 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -112,7 +112,7 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${mosip.api.external.url}/keycloak/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${mosip.api.internal.url}/keycloak/auth/realms/mosip
 mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
diff --git a/registration-default.properties b/registration-default.properties
index 70a00c3ba11..24d857edad3 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -364,7 +364,7 @@ mosip.registration.quality_check_with_sdk=N
 mosip.registration.replace_sdk_quality_score=N
 
 #URL for reset password
-mosip.registration.reset_password_url=${mosip.api.external.url}/keycloak/auth/realms/mosip/account/
+mosip.registration.reset_password_url=${mosip.api.internal.url}/keycloak/auth/realms/mosip/account/
 #Flag to check / bypass device cert validation
 
 mosip.registration.onboard_yourself_url=https://docs.mosip.io/platform/modules/registration-client/first-user-registration-and-onboarding
diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
index fc0c776f28e..0bb508d0924 100644
--- a/registration-processor-default-dmz.properties
+++ b/registration-processor-default-dmz.properties
@@ -60,7 +60,7 @@ token.request.appid=regproc
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-token.request.issuerUrl=${mosip.api.external.url}/keycloak/auth/realms/mosip
+token.request.issuerUrl=${mosip.api.internal.url}/keycloak/auth/realms/mosip
 
 # Request id to be used for various internal services
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
@@ -242,9 +242,9 @@ packet.default.source=id
 # the default schema field cagegory (ex - private)
 schema.default.fieldCategory=pvt
 
-registration.processor.notification_service_subscriber_hub_url=${mosip.api.external.url}/hub/
+registration.processor.notification_service_subscriber_hub_url=${mosip.api.internal.url}/hub/
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 registration.processor.notification_service_subscriber_topic=registration_processor_workflow_completed_event
-registration.processor.notification_service_subscriber_callback_url=${mosip.api.external.url}/registrationprocessor/v1/notification/callback/notify
+registration.processor.notification_service_subscriber_callback_url=${mosip.api.internal.url}/registrationprocessor/v1/notification/callback/notify
 
 mosip.regproc.message.tag.loading.disable=true
\ No newline at end of file
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8b2b31bcf29..f6353257ae5 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -921,7 +921,7 @@ regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TE
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
 
-openapi.registrationProcessor.servers[0].url=${mosip.api.external.url}/registrationprocessor/v1/registrationtransaction
+openapi.registrationProcessor.servers[0].url=${mosip.api.internal.url}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
 NGINXDMZURL=${mosip.packet-receiver-service.url}
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 9d2afab5f43..c022289c429 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -414,7 +414,7 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel-masterdata-se
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.external.url}/v1/syncdata/scripts/applicanttype.mvel
+mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.internal.url}/v1/syncdata/scripts/applicanttype.mvel
 mosip.sync.entity.auth-required.APPLICANTTYPE.MVEL=true
 mosip.sync.entity.auth-token.APPLICANTTYPE.MVEL=Authorization:OAUTH
 mosip.sync.entity.encrypted.APPLICANTTYPE.MVEL=false

From 8e6b33740830d5919b06e036f2e904ae941b8671 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 23 Dec 2021 12:56:08 +0530
Subject: [PATCH 0462/1358] masterdata fix

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index d53ddb33543..9c6b2f36fd8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -214,6 +214,7 @@ mosip.kernel.xsdfile=mosip-cbeff.xsd
 ## Applicant type
 mosip.kernel.applicant.type.age.limit = 5
 mosip.kernel.applicantType.mvel.file=applicanttype.mvel
+mosip.kernel.config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 
 ## Various length parameters

From 54ff36f78a26cfce582f40526d3381f4701cca4c Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 13:59:31 +0530
Subject: [PATCH 0463/1358] updated config.

---
 application-default.properties       |  4 ++++
 id-authentication-default.properties |  2 ++
 pre-registration-default.properties  | 18 ++----------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d53ddb33543..9ce6bd42294 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -117,6 +117,7 @@ mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
 keycloak.host=${mosip.keycloak.url}/keycloak/
 
+
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
 mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 mosip.mosip.auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
@@ -135,9 +136,12 @@ mosip.mosip.datsha.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb702
 mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.mpartner-default-auth.client.secret=
 keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
 mosip.mosip.idrepo.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 
+
+
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
 email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
 email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 160e3700d60..b55a98fa4f2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -207,6 +207,8 @@ id-masterdata-template-service-multilang.rest.httpMethod=GET
 id-masterdata-template-service-multilang.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service-multilang.rest.timeout=${mosip.ida.request.timeout.secs}
 
+
+
 ## Websub
 ida-websub-authtype-callback-secret=${ida.websub.authtype.callback.secret}
 ida-websub-credential-issue-callback-secret=${ida.websub.credential.issue.callback.secret}
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 47c40ed6cf4..376d2f8335a 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -165,18 +165,6 @@ expiredStatus.url=${batch.resource.url}/expiredStatus
 batch.appointment.cancel=${batch.service.env}/preregistration/v1
 
 ## Login service
-secret_url.id=string
-secret_url.requesttime=2018-12-10T06:12:52.994Z
-secret_url.version=string
-otp.request.flooding.duration=1
-otp.request.flooding.max-count=3
-datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-mail-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-sms-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
-otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
-pre.reg.login.otp.sms.template=otp-sms-template
-pre.reg.login.otp.mail.subject.template=otp-email-subject-template
-pre.reg.login.otp.mail.content.template=otp-email-content-template
 
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
 id-masterdata-template-service-multilang.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
@@ -193,7 +181,7 @@ regCenter.url=${masterdata.resource.url}/registrationcenters
 holiday.url=${masterdata.resource.url}/getregistrationcenterholidays/
 holiday.exceptional.url=${masterdata.resource.url}/exceptionalholidays/
 working.day.url=${masterdata.resource.url}/weekdays/
-mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/all?pageSize
+mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/all?pageSize=50
 ##Kernel Service URL for fetching templates
 resource.template.url=${masterdata.resource.url}/templates
 mosip.pre-registration.notification.id=mosip.pre-registration.notification.notify
@@ -280,7 +268,6 @@ otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/g
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
-mosip.pre.reg.clientId=mosip.pre.reg.clientId
 
 ## Login service 
 mosip.preregistration.login.service.version=1.0
@@ -310,8 +297,7 @@ mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${masterdata.reso
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${masterdata.resource.url}/documentcategories
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${masterdata.resource.url}/documenttypes/{documentcategorycode}/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${masterdata.resource.url}/locations/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${masterdata.resource.url}/locations/locationhierarchy/{hierarchyname} 
-mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode}
+mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${masterdata.resource.url}/locations/locationhierarchy/{hierarchyname}
 
 ## Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator

From 5878da100126b9b176aca69db18a78e6a8239527 Mon Sep 17 00:00:00 2001
From: Monobikash Das <M1045447@mindtree.com>
Date: Thu, 23 Dec 2021 14:58:18 +0530
Subject: [PATCH 0464/1358] Updated manual-verification to manual-adjudication
 route

---
 ...tration-processor-camel-routes-lost-default.xml | 10 +++++-----
 ...stration-processor-camel-routes-new-default.xml | 14 +++++++-------
 ...n-processor-camel-routes-res-update-default.xml |  6 +++---
 ...ation-processor-camel-routes-update-default.xml | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index c7ae8c2c665..278f1467030 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -286,8 +286,8 @@
             <to uri="eventbus://abis-handler-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
-            <to uri="eventbus://manual-verification-bus-in" />
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -363,9 +363,9 @@
          <to uri="eventbus://abis-handler-bus-in" />
       </otherwise>
    </route>
-   <route id="manual-verification-lost-->uin-generation lost route">
-      <from uri="eventbus://manual-verification-lost-bus-out" />
-      <log message="manual-verification-lost-->uin-generation lost route ${bodyAs(String)}" />
+   <route id="manual-adjudication-lost-->uin-generation lost route">
+      <from uri="eventbus://manual-adjudication-lost-bus-out" />
+      <log message="manual-adjudication-lost-->uin-generation lost route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 87cdcb5ac47..70d8311cd61 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -284,8 +284,8 @@
             <to uri="eventbus://abis-handler-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
-            <to uri="eventbus://manual-verification-bus-in" />
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://bio-dedupe-bus-in" />
@@ -351,8 +351,8 @@
             <to uri="eventbus://abis-handler-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
-            <to uri="eventbus://manual-verification-bus-in" />
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -401,9 +401,9 @@
          </otherwise>
       </choice>
    </route>
-   <route id="manual-verification-->uin-generation new route">
-      <from uri="eventbus://manual-verification-new-bus-out" />
-      <log message="manual-verification-->uin-generation new route ${bodyAs(String)}" />
+   <route id="manual-adjudication-->uin-generation new route">
+      <from uri="eventbus://manual-adjudication-new-bus-out" />
+      <log message="manual-adjudication-->uin-generation new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index 26b4ac736e6..09fe9701bd5 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -158,9 +158,9 @@
          </otherwise>
       </choice>
    </route>
-   <route id="manual-verification-->uin-generation res_update route">
-      <from uri="eventbus://manual-verification-res_update-bus-out" />
-      <log message="manual-verification-->uin-generation res_update route ${bodyAs(String)}" />
+   <route id="manual-adjudication-->uin-generation res_update route">
+      <from uri="eventbus://manual-adjudication-res_update-bus-out" />
+      <log message="manual-adjudication-->uin-generation res_update route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 4be966b2cde..e8be3d24ba9 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -308,8 +308,8 @@
             <to uri="eventbus://abis-handler-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-verification-bus-in')]</jsonpath>
-            <to uri="eventbus://manual-verification-bus-in" />
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://bio-dedupe-bus-in" />
@@ -421,9 +421,9 @@
          </otherwise>
       </choice>
    </route>
-   <route id="manual-verification-->uin-generation update route">
-      <from uri="eventbus://manual-verification-update-bus-out" />
-      <log message="manual-verification-->uin-generation update route ${bodyAs(String)}" />
+   <route id="manual-adjudication-->uin-generation update route">
+      <from uri="eventbus://manual-adjudication-update-bus-out" />
+      <log message="manual-adjudication-->uin-generation update route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>

From 405eed43311c108c985f25280fc44f17308b856c Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 15:32:49 +0530
Subject: [PATCH 0465/1358] updated config.

---
 application-default.properties      | 2 +-
 pre-registration-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 638cea2eaf3..9fc70b552a0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -116,7 +116,7 @@ mosip.websub.url=${mosip.api.internal.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
 keycloak.host=${mosip.keycloak.url}/keycloak/
-
+keycloak.external.host=${mosip.api.internal.url}/keycloak/
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
 mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 376d2f8335a..b7c9fd1ea85 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -282,7 +282,7 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-iam.base.url=${keycloak.host}
+iam.base.url=${keycloak.external.host}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
 validationStatus=success
 context=auth-otp

From 2f0497f724576b697e9eb979d2e0b67a63315e1c Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 15:37:20 +0530
Subject: [PATCH 0466/1358] updated config.

---
 id-authentication-default.properties | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index b55a98fa4f2..f41f0a10b7d 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -54,7 +54,6 @@ javax.persistence.jdbc.uinEncryptTable=uin_encrypt_salt
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.hbm2ddl.auto=none
-hibernate.show_sql=true
 hibernate.format_sql=true
 hibernate.connection.charSet=utf8
 hibernate.cache.use_second_level_cache=false
@@ -64,7 +63,6 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 hibernate.temp.use_jdbc_metadata_defaults=false
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
 log4j.logger.org.hibernate=warn
 hibernate.show_sql=false
 
@@ -272,9 +270,6 @@ ida-topic-masterdata-titles=MASTERDATA_TITLES
 ida-topic-pmp-misp-license-generated=MISP_LICENSE_GENERATED
 ida-topic-pmp-misp-license-updated=MISP_LICENSE_UPDATED
 ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
-ida-topic-pmp-partner-updated=PARTNER_UPDATED
-ida-topic-pmp-partner-api-key-updated=APIKEY_UPDATED
-ida-topic-pmp-policy-updated=POLICY_UPDATED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
 

From 8839ef1c8384fd4a72705ec3be1c864eb3ffa614 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 15:52:10 +0530
Subject: [PATCH 0467/1358] updated config.

---
 admin-default.properties              |  8 ++++----
 kernel-default.properties             | 16 ++++++++--------
 partner-management-default.properties | 12 ++++++------
 syncdata-default.properties           | 18 +++++++++---------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 1ca61084a9f..e650588b0ee 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -186,8 +186,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${mosip.open-id.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.external.hostl}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -207,9 +207,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
diff --git a/kernel-default.properties b/kernel-default.properties
index 41b446ae260..5d35e73c432 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -211,25 +211,25 @@ ridgenerator_database_password=${db.dbuser.password}
 mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url=${mosip.iam.base-url}/auth/admin/
+mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.host}/auth/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.host}/auth/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${mosip.iam.base-url}/auth
+keycloak.auth-server-url=${keycloak.host}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 3f7bdb6d0d0..bcec7602a81 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -134,14 +134,14 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 ## Keycloak
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
-mosip.iam.base-url=${keycloak.host}
-mosip.iam.realm.operations.base-url = ${mosip.iam.base-url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${mosip.iam.base-url}/auth/admin/
+
+mosip.iam.realm.operations.base-url = ${keycloak.host}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.host}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
@@ -196,10 +196,10 @@ mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
diff --git a/syncdata-default.properties b/syncdata-default.properties
index c022289c429..476e58271ce 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -210,9 +210,9 @@ ridgenerator_database_password=${db.dbuser.password}
 mosip.iam.base-url=${keycloak.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${mosip.iam.base-url}/admin/realms/{realmId}
-mosip.iam.admin-url=${mosip.iam.base-url}/admin/
+mosip.iam.open-id-url =${keycloak.external.host}/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.host}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.host}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -221,7 +221,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${mosip.iam.base-url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -229,16 +229,16 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${mosip.iam.base-url}
+keycloak.auth-server-url=${keycloak.host}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/realms/{realmId}/protocol/openid-connect/token
-mosip.iam.authorization_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base-url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.external.host}/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.host}/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 12e74815754eef8aff4d2cec5e26c5aff5c9d8ef Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 15:52:46 +0530
Subject: [PATCH 0468/1358] updated config.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 9fc70b552a0..6e02698c6fc 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -115,8 +115,8 @@ mosip.regproc-status-service.url=http://regproc-registration-status-service.defa
 mosip.websub.url=${mosip.api.internal.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
-keycloak.host=${mosip.keycloak.url}/keycloak/
-keycloak.external.host=${mosip.api.internal.url}/keycloak/
+keycloak.host=${mosip.keycloak.url}/keycloak
+keycloak.external.host=${mosip.api.internal.url}/keycloak
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
 mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f

From 5c6c217e7142ef25b4da860bef3c6919909e3b13 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 16:15:33 +0530
Subject: [PATCH 0469/1358] updated config.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 6e02698c6fc..1ef5d7e7665 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -115,7 +115,7 @@ mosip.regproc-status-service.url=http://regproc-registration-status-service.defa
 mosip.websub.url=${mosip.api.internal.url}
 mz.ingress.base.url=http://mz.ingress:30080
 dmz.ingress.base.url=http://dmz.ingress:30080
-keycloak.host=${mosip.keycloak.url}/keycloak
+keycloak.host=${mosip.api.internal.url}/keycloak
 keycloak.external.host=${mosip.api.internal.url}/keycloak
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
@@ -313,7 +313,7 @@ mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
-mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
+#mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
 
 ## Crypto

From de4b1a57cd77db9ee78c9c6087f05e39a3369ff1 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 16:19:28 +0530
Subject: [PATCH 0470/1358] updated config.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 1ef5d7e7665..c096fdaa7d5 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -313,7 +313,7 @@ mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
-#mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
+mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
 
 ## Crypto

From ffd11974483aa50f5815bd5c860bf5e45df85281 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 16:52:00 +0530
Subject: [PATCH 0471/1358] updated config.

---
 application-default.properties | 2 --
 kernel-default.properties      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index c096fdaa7d5..298929b6ca8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -155,8 +155,6 @@ s3.region=
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 
-
-
 #--------------------------------------------------------------------------------------------------
 #mosip.masterdata.base.url = http://masterdata.kernel
 #mosip.syncdata.base.url=http://syncdata.kernel
diff --git a/kernel-default.properties b/kernel-default.properties
index 5d35e73c432..5936412dd7c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -402,7 +402,7 @@ mosip.kernel.keymanager.113nothumbprint.support=false
 # Pause & resume api proeprties
 PACKET_RESUME_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflowaction
 PACKET_PAUSE_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflow/search
-KEYBASEDTOKENAPI=${mosip.kernel-syncdata-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## resubscription and subscription initial delay for masterdata service
 masterdata.websub.resubscription.delay.millis=48000000

From 97f1ba415f1b124d40b235d7e42b5a5c56493f69 Mon Sep 17 00:00:00 2001
From: Mayura Deshmukh <52281514+mayuradesh@users.noreply.github.com>
Date: Thu, 23 Dec 2021 17:13:09 +0530
Subject: [PATCH 0472/1358] changed applicant mvel as per develop2

---
 applicanttype.mvel | 97 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 29 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 535f9fc5e8f..69da629d5dc 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -9,8 +9,9 @@ import java.time.temporal.ValueRange;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-String CHILD = "CHL";
-String ADULT = "ADL";
+String CHILD = "INFANT";
+String ADULT = "ADULT";
+String MINOR = "MINOR";
 String MALE = 'MLE';
 String FEMALE = 'FLE';
 String NonResident = "FR";
@@ -76,7 +77,7 @@ def getAgeCode(identity) {
         }
     }
 
-   return ageGroup == null ? null : (ageGroup == 'INFANT' ? CHILD : ADULT);
+   return ageGroup == null ? null : ageGroup;
 }
 
 
@@ -95,59 +96,97 @@ def getApplicantType() {
   if( ageCode == 'KER-MSD-151' ) { return "KER-MSD-151"; }
   
   if(itc == null || genderType == null || ageCode == null || isBioExPresent == null ) { 
-      return isUpdateFlow(identity) ? "A000" : "KER-MSD-147";
+      return isUpdateFlow(identity) ? "000" : "KER-MSD-147";
   }
   
   System.out.println(itc + " - " + genderType + " - " + ageCode + " - " + isBioExPresent);
 
   if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "A001";
+    return "001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "A002";
+    return "002";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "A003";
+    return "003";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "A004";
+    return "004";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "A005";
+    return "005";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "A006";
+    return "006";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "A007";
+    return "007";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "A008";
+    return "008";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "A005";
+    return "005";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "A006";
+    return "006";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "A007";
+    return "007";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "A008";
+    return "008";
   } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "A009";
+    return "009";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "A010";
+    return "010";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "A011";
+    return "011";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "A012";
+    return "012";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "A013";
+    return "013";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "A015";
+    return "015";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "A016";
+    return "016";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "A013";
+    return "013";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "A015";
+    return "015";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "A016";
+    return "016";
+  } 
+    
+	else if (itc == NonResident && genderType == MALE && ageCode == MINOR && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == MALE && ageCode == MINOR && isBioExPresent) {
+    return "015";
+  }
+  
+  else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && isBioExPresent) {
+    return "015";
+  }
+  
+  else if (itc == NonResident && genderType == Others && ageCode == MINOR && isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == Others && ageCode == MINOR && isBioExPresent) {
+    return "015";
+  }
+  
+  else if (itc == NonResident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
+    return "015";
   }
-  return "A000";
+  
+   else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
+    return "015";
+  }
+  
+  else if (itc == NonResident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
+    return "014";
+  } else if (itc == Resident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
+    return "015";
+  }
+  
+  
+  return "000";
 }

From 4f46242997e157eaef571cd6302162f8a49e1422 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 23 Dec 2021 17:17:06 +0530
Subject: [PATCH 0473/1358] updated config.

---
 application-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 298929b6ca8..67c85bac769 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -136,10 +136,11 @@ mosip.mosip.datsha.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb702
 mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.mpartner-default-auth.client.secret=
 keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
 mosip.mosip.idrepo.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-
+mosip.mosip.syncdata.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.mpartner-default-auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+mosip.mosip.mpartner-default-print.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 
 
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505

From de7d43facdd0266c51a9232f746821a23cb93715 Mon Sep 17 00:00:00 2001
From: Monobikash Das <M1045447@mindtree.com>
Date: Thu, 23 Dec 2021 18:01:24 +0530
Subject: [PATCH 0474/1358] corrected host

---
 application-default.properties            | 2 +-
 registration-processor-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 638cea2eaf3..e44afaaf3f1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -370,7 +370,7 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.host=clamav
 mosip.kernel.virus-scanner.port=80
 
 ## Transliteration
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f6353257ae5..3781731e8c2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -233,7 +233,7 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.host=clamav
 mosip.kernel.virus-scanner.port=80
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10

From 0b3d2722dd7eff583dbb7a015e41e1a347c00f2f Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 09:49:57 +0530
Subject: [PATCH 0475/1358] updated config.

---
 partner-management-default.properties | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index bcec7602a81..e96733c981e 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -155,6 +155,15 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=15
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=15
+#this should be false if you don't use this restTemplate true if you do
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable= false
 
 #To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
 mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
@@ -165,13 +174,6 @@ mosip.pms.misp.partner.type=MISP_Partner
 # Role for partner admin =
 mosip.pms.partneradmin.role=PARTNER_ADMIN
 
-#To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
-mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
-# To configure misp partner type
-mosip.pms.misp.partner.type=MISP_Partner
-# Role for partner admin =
-mosip.pms.partneradmin.role=PARTNER_ADMIN
-
 ## Security
 mosip.security.csrf-enable:false
 mosip.security.secure-cookie:false

From 4b8b26a9e584ee2c9badad7d01ea15ffa142b358 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 10:05:39 +0530
Subject: [PATCH 0476/1358] updated config.

---
 application-default.properties | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 251c99303ed..49fc1d2513c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -40,6 +40,9 @@ activemq.core.port=80
 kafka.profile=default.svc.cluster.local
 kafka.port=9092
 
+
+mz.ingress.base.url=http://mz.ingress:30080
+dmz.ingress.base.url=http://dmz.ingress:30080
 mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
 mosip.admin-service.url=http://admin-service.default:80
 mosip.admin-ui.url=http://admin-ui.default:80
@@ -112,9 +115,7 @@ mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.default:80
 mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.default:80
 mosip.regproc-status-service.url=http://regproc-registration-status-service.default:80
-mosip.websub.url=${mosip.api.internal.url}
-mz.ingress.base.url=http://mz.ingress:30080
-dmz.ingress.base.url=http://dmz.ingress:30080
+mosip.websub.url=${dmz.ingress.base.url}
 keycloak.host=${mosip.api.internal.url}/keycloak
 keycloak.external.host=${mosip.api.internal.url}/keycloak
 
@@ -511,6 +512,7 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.hub.url=${mosip.websub.url}/hub/
 websub.publish.url=${mosip.websub.url}/hub/
 
+
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
 mosip.optional-languages=ara,fra

From 178924578de7e74cae61a6361347285fe3c3ccb7 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 10:11:30 +0530
Subject: [PATCH 0477/1358] updated config.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 49fc1d2513c..d60da9e7d15 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -115,7 +115,7 @@ mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.default:80
 mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.default:80
 mosip.regproc-status-service.url=http://regproc-registration-status-service.default:80
-mosip.websub.url=${dmz.ingress.base.url}
+mosip.websub.url=${mosip.api.internal.url}
 keycloak.host=${mosip.api.internal.url}/keycloak
 keycloak.external.host=${mosip.api.internal.url}/keycloak
 

From 505d85420a2833258babb22d744d4680516e9b79 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 10:34:31 +0530
Subject: [PATCH 0478/1358] updated config.

---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 45e262c3ce8..9f80581d0fc 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -31,6 +31,6 @@ mosip.data.share.includeCertificateHash=false
 mosip.data.share.includeCertificate=false
 mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
-mosip.data.share.prependThumbprint=true
+mosip.data.share.prependThumbprint=false
 
 auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client

From b1ff380b4d7810cd4e8b25e724ffe322abe80a40 Mon Sep 17 00:00:00 2001
From: Manoj SP <Manoj.SP@mindtree.com>
Date: Fri, 24 Dec 2021 10:59:08 +0530
Subject: [PATCH 0479/1358] [MOSIP-19025] Updated idrepo properties for
 keycloack auth

---
 application-default.properties        |  2 +-
 credential-request-default.properties |  2 +-
 credential-service-default.properties |  3 +-
 id-repository-default.properties      | 71 +++++++++++----------------
 kernel-default.properties             |  8 +--
 5 files changed, 35 insertions(+), 51 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d60da9e7d15..ebacc620ed1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -314,7 +314,7 @@ mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
 mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
-mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 
 ## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
diff --git a/credential-request-default.properties b/credential-request-default.properties
index 9c893b7fe00..a1b46b8e7be 100644
--- a/credential-request-default.properties
+++ b/credential-request-default.properties
@@ -1,6 +1,6 @@
 #IDRepo credential request generator authentication detalis
 mosip.idrepo.credential-req-generator.auth.client-id=mosip-crereq-client
-mosip.idrepo.credential-req-generator.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential-req-generator.auth.secret-key=${mosip.mosip.crereq.client.secret}
 mosip.idrepo.credential-req-generator.auth.app-id=crereq
 
 #------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
diff --git a/credential-service-default.properties b/credential-service-default.properties
index aa4dae0fcbb..f44e7cbc60d 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -1,9 +1,8 @@
 #IDRepo credential service authentication detalis
 mosip.idrepo.credential.auth.client-id=mosip-creser-client
-mosip.idrepo.credential.auth.secret-key={cipher}b5fb76d3a57ce10fc27aee1685ce906836970d52c4cf13a01282bfe99565bedf
+mosip.idrepo.credential.auth.secret-key=${mosip.mosip.creser.client.secret}
 mosip.idrepo.credential.auth.app-id=creser
 
-
 #------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
 mosip.iam.adapter.clientid.credential-service=${mosip.idrepo.credential.auth.client-id}
 mosip.iam.adapter.clientsecret.credential-service=${mosip.idrepo.credential.auth.secret-key}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index d0a3fcb0161..ed0d4048c6e 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -31,21 +31,9 @@ mosip.idrepo.auth.client-id=mosip-idrepo-client
 mosip.idrepo.auth.secret-key=${mosip.mosip.idrepo.client.secret}
 mosip.idrepo.auth.app-id=idrepo
 
-#IDRepo credential service authentication detalis
-mosip.idrepo.credential.auth.client-id=mosip-creser-client
-mosip.idrepo.credential.auth.secret-key=${mosip.mosip.creser.client.secret}
-mosip.idrepo.credential.auth.app-id=creser
-
-#IDRepo credential request generator authentication detalis
-mosip.idrepo.credential-req-generator.auth.client-id=mosip-crereq-client
-mosip.idrepo.credential-req-generator.auth.secret-key=${mosip.mosip.crereq.client.secret}
-mosip.idrepo.credential-req-generator.auth.app-id=crereq
-
 # For auditing
 mosip.idrepo.application.name=ID-Repository
 mosip.idrepo.application.version.pattern=^v\\d+(\\.\\d+)?$
-# Modulo value used to evaluate expression (UIN % modulo) used to get the salt from salt table 
-mosip.idrepo.modulo-value=1000
 # Configuration for +/- time period adjustment in minutes for the request time validation, so that 
 #the requests originating from a system that is not in time-sync will be accepted for the time period
 mosip.idrepo.datetime.future-time-adjustment=2
@@ -183,6 +171,7 @@ mosip.idrepo.credential.request.rest.uri=${mosip.idrepo-credential-request-gener
 mosip.idrepo.credential.request.rest.httpMethod=POST
 mosip.idrepo.credential.request.rest.headers.mediaType=application/json
 mosip.idrepo.credential.request.rest.timeout=100
+
 mosip.idrepo.credential.cancel-request.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/cancel/{requestId}
 mosip.idrepo.credential.cancel-request.rest.httpMethod=GET
 mosip.idrepo.credential.cancel-request.rest.headers.mediaType=application/json
@@ -215,7 +204,7 @@ mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 
 ## Auth adapter
 mosip.iam.adapter.clientid.id-repository=${mosip.idrepo.auth.client-id}
-mosip.iam.adapter.clientsecret.id-repository=${mosip.mosip.reg.client.secret}
+mosip.iam.adapter.clientsecret.id-repository=${mosip.idrepo.auth.secret-key}
 mosip.iam.adapter.appid.id-repository=${mosip.idrepo.auth.app-id}
 mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
@@ -248,7 +237,7 @@ hibernate.show_sql=false
 # Token generator properties 
 credential.request.token.request.appid=${mosip.idrepo.credential-req-generator.auth.app-id}
 credential.request.token.request.clientId=${mosip.idrepo.credential-req-generator.auth.client-id}
-credential.request.token.request.secretKey=${mosip.mosip.reg.client.secret}
+credential.request.token.request.secretKey=${mosip.idrepo.credential-req-generator.auth.secret-key}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
 credential.request.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
@@ -280,6 +269,8 @@ credential.request.reprocess.locktimeout=60000
 CRDENTIALSERVICE=${mosip.idrepo-credential-service.url}/v1/credentialservice/issue
 KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 CALLBACKURL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/callback/notifyStatus
+ENCRYPTION=${mosip.idrepo.encryptor.rest.uri}
+DECRYPTION=${mosip.idrepo.decryptor.rest.uri}
 
 # Websub
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
@@ -372,12 +363,6 @@ id-repo-ida-credential-recepiant=IDA
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
-## Auth token generator 
-auth-token-generator.rest.uri=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
-auth-token-generator.rest.appId=regproc
-auth-token-generator.rest.clientId=mosip-regproc-client
-auth-token-generator.rest.secretKey=${mosip.mosip.regproc.client.secret}
-
 # Enabling below property will start logging performance logs in identity and vid service
 mosip.idrepo.aspect-logging.enabled=false
 
@@ -388,33 +373,33 @@ springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
 # Roles
-mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST
-mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST
+mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST,ID_REPOSITORY
+mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST,ID_REPOSITORY
 mosip.role.idrepo.credentialrequest.getgetrequestid=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.getgetrequestids=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.putretriggerrequestid=CREDENTIAL_REQUEST
 
 mosip.role.idrepo.credentialservice.postissue=CREDENTIAL_REQUEST
 
-mosip.role.idrepo.identity.postidrepo=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.getidvidid=REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION
-mosip.role.idrepo.identity.patchidrepo=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.getauthtypesstatusindividualidtypeindividualid=RESIDENT
-mosip.role.idrepo.identity.postauthtypesstatus=RESIDENT
-mosip.role.idrepo.identity.postdraftcreateregistrationId=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.patchdraftupdateregistrationId=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.getdraftpublishregistrationId=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.draftregistrationId=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR
-mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR
-
-mosip.role.idrepo.vid.postvid=RESIDENT,REGISTRATION_PROCESSOR
-mosip.role.idrepo.vid.getvid=REGISTRATION_PROCESSOR,ID_AUTHENTICATION,RESIDENT
-mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR
-mosip.role.idrepo.vid.patchvid=ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.idrepo.vid.postvidregenerate=RESIDENT
-mosip.role.idrepo.vid.postviddeactivate=RESIDENT
-mosip.role.idrepo.vid.postvidreactivate=RESIDENT
-mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR
+mosip.role.idrepo.identity.postidrepo=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.getidvidid=REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION,ID_REPOSITORY
+mosip.role.idrepo.identity.patchidrepo=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.getauthtypesstatusindividualidtypeindividualid=RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.identity.postauthtypesstatus=RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.identity.postdraftcreateregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.patchdraftupdateregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.getdraftpublishregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.draftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+
+mosip.role.idrepo.vid.postvid=RESIDENT,REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.vid.getvid=REGISTRATION_PROCESSOR,ID_AUTHENTICATION,RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.vid.patchvid=ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
 
diff --git a/kernel-default.properties b/kernel-default.properties
index 5936412dd7c..64c0dd228d9 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -651,7 +651,7 @@ mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,ID_REPOSITORY
 mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -717,15 +717,15 @@ mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESI
 mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN,ID_REPOSITORY
 mosip.role.keymanager.postcssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postcsverifysign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmsigningpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmencryptionpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY
 mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT

From 65f31494ce8fd638931e6784585a48eaea937a01 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 11:55:10 +0530
Subject: [PATCH 0480/1358] updated config.

---
 admin-default.properties                  |  2 +-
 application-default.properties            |  7 +++----
 data-share-default.properties             |  2 +-
 id-repository-default.properties          |  4 ++--
 kernel-default.properties                 |  8 ++++----
 partner-management-default.properties     |  4 ++--
 print-default.properties                  |  5 ++---
 registration-processor-default.properties |  2 +-
 syncdata-default.properties               | 23 ++++++-----------------
 9 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index e650588b0ee..6c0ecb0e116 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -174,7 +174,7 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/au
 
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
-mosip.open-id.base-url=${keycloak.host}
+mosip.open-id.base-url=${keycloak.external.host}
 mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
diff --git a/application-default.properties b/application-default.properties
index ebacc620ed1..d482175ed32 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -116,7 +116,6 @@ mosip.packetmanager-service.url=http://packetmanager-service.default:80
 mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.default:80
 mosip.regproc-status-service.url=http://regproc-registration-status-service.default:80
 mosip.websub.url=${mosip.api.internal.url}
-keycloak.host=${mosip.api.internal.url}/keycloak
 keycloak.external.host=${mosip.api.internal.url}/keycloak
 
 mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
@@ -306,9 +305,9 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.host}/auth/realms/
-auth-token-generator.rest.issuerUrl=${keycloak.host}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.host}/auth/realms/mosip
+auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
+auth-token-generator.rest.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
diff --git a/data-share-default.properties b/data-share-default.properties
index 9f80581d0fc..5e886b17ff7 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -24,7 +24,7 @@ data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
-data.share.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
+data.share.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
 mosip.data.share.protocol=http
 mosip.data.share.includeCertificateHash=false
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ed0d4048c6e..e5c168583ae 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -240,7 +240,7 @@ credential.request.token.request.clientId=${mosip.idrepo.credential-req-generato
 credential.request.token.request.secretKey=${mosip.idrepo.credential-req-generator.auth.secret-key}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
-credential.request.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
+credential.request.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 mosip.credential.request.service.id=mosip.credential.request.generator
 mosip.credential.request.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.request.service.version=1.0
@@ -324,7 +324,7 @@ KEYMANAGER_ENCRYPT_PIN=${mosip.kernel-keymanager-service.url}/v1/keymanager/encr
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel-keymanager-service.url}/v1/keymanager/zkEncrypt
 PARTNER_POLICY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 PARTNER_EXTRACTION_POLICY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
-credential.service.token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
+credential.service.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 # BioSDK service
 mosip.biosdk.default.service.url=${mosip.mock-biosdk-service.url}/biosdk-service
diff --git a/kernel-default.properties b/kernel-default.properties
index 64c0dd228d9..7d9dfe596c1 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -208,19 +208,19 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.host}
+mosip.iam.base-url=${keycloak.external.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
 mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.host}/auth/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.host}/auth/admin/
+mosip.iam.realm.operations.base-url=${keycloak.external.host}/auth/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.external.host}/auth/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.host}/auth
+keycloak.auth-server-url=${keycloak.external.host}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
diff --git a/partner-management-default.properties b/partner-management-default.properties
index e96733c981e..5ce69ab79ef 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -135,8 +135,8 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.host}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.host}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.external.host}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.external.host}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
diff --git a/print-default.properties b/print-default.properties
index ff305efd84c..631f125ff94 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -6,8 +6,7 @@
 # print.websub.hub.secret
 
 ## Websub
-websub.base.url=${mosip.websub.url}
-mosip.event.hubURL=${websub.base.url}/hub
+mosip.event.hubURL=${mosip.websub.url}/hub
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
@@ -27,7 +26,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 3781731e8c2..af527fee060 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -78,7 +78,7 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 476e58271ce..11d61e6d95b 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -207,12 +207,12 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.host}
+mosip.iam.base-url=${keycloak.external.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.external.host}/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.host}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.host}/admin/
+mosip.iam.open-id-url =${keycloak.external.host}//auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.external.host}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.external.host}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -221,7 +221,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -229,14 +229,12 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.host}/auth
+keycloak.auth-server-url=${keycloak.external.host}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.external.host}/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.host}/realms/{realmId}/protocol/openid-connect/token
 mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
@@ -266,13 +264,6 @@ mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 mosip.authmanager.base-url=${mosip.kernel-auditmanager-service.url}/v1/authmanager
-mosip.admin.login_flow.name=authorization_code
-mosip.admin.login_flow.response_type=code
-mosip.admin.login_flow.scope=cls
-mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
-mosip.admin_realm_id=mosip
 
 master.search.maximum.rows=50
 mosip.level=2
@@ -358,8 +349,6 @@ mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,RE
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 
-datastores=db_1_DS,db_2_DS
-
 mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 
 # Keymanager service keystore cache properties

From 818267321c58cb2e3d44a97f16a0b6d260a1a3bb Mon Sep 17 00:00:00 2001
From: Vishwa <visu.vs1@gmail.com>
Date: Fri, 24 Dec 2021 12:37:42 +0530
Subject: [PATCH 0481/1358] MOSIP-18060 : Config added for client crypto to use
 resident keys and resident role added to machine search api

---
 kernel-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 7d9dfe596c1..aa050763479 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -64,6 +64,8 @@ mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.pin}
+# Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
+mosip.kernel.client.crypto.use-resident-service-module-key=true
 
 ## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log
@@ -580,7 +582,7 @@ mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_AD
 mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT
 mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN

From 6c2122e371692c3b9d979b60c573e13969c24b1e Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 13:22:16 +0530
Subject: [PATCH 0482/1358] updated config.

---
 data-share-default.properties | 2 +-
 resident-default.properties   | 2 +-
 syncdata-default.properties   | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 5e886b17ff7..cbfbf12e82d 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -10,7 +10,7 @@ mosip.data.share.service.version=1.0
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
 KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
 PARTNER_POLICY=${mosip.pms-policy-manager-service.url}/v1/policymanager/policies/{policyId}/partner/{partnerId}
-KEYBASEDTOKENAPI=${mosip.kernel-auditmanager-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 
 
 data.share.application.id=PARTNER
diff --git a/resident-default.properties b/resident-default.properties
index 9bb4d25defb..28e5e591da3 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -39,7 +39,7 @@ resident.secretKey=${mosip.mosip.resident.client.secret}
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services
-KERNELAUTHMANAGER=${mosip.kernel-auditmanager-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KERNELAUTHMANAGER=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=${mosip.regproc-print-service.url}/registrationprocessor/v1/print/uincard
 INTERNALAUTH=${mosip.ida-internal-service.url}/idauthentication/v1/internal/auth
 INTERNALAUTHTRANSACTIONS=${mosip.ida-internal-service.url}/idauthentication/v1/internal/authTransactions
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 11d61e6d95b..d0976efd8cf 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -24,7 +24,6 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
-mosip.kernel.masterdata.locationhierarchylevels.uri =${mosip.kernel-masterdata-service.url}/v1/masterdata/locationHierarchyLevels
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -263,7 +262,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel-auditmanager-service.url}/v1/authmanager
+mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
 
 master.search.maximum.rows=50
 mosip.level=2

From 0f7926735c69f4d602076d5976e2480f0e80befb Mon Sep 17 00:00:00 2001
From: Vishwa <visu.vs1@gmail.com>
Date: Fri, 24 Dec 2021 13:44:05 +0530
Subject: [PATCH 0483/1358] MOSIP-18060 : Added resident role to create
 machines

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index aa050763479..92a309e6ac5 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -585,7 +585,7 @@ mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PR
 mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT
 mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT
 mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN

From ae6394f13d5a267108f2e118cbdeca23a9f06883 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 14:08:02 +0530
Subject: [PATCH 0484/1358] updated config.

---
 id-authentication-default.properties          | 8 ++++----
 id-authentication-external-default.properties | 6 +++---
 id-authentication-internal-default.properties | 6 +++---
 id-authentication-otp-default.properties      | 6 +++---
 kernel-default.properties                     | 3 +--
 print-default.properties                      | 2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f41f0a10b7d..ae6d1e323b0 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -216,16 +216,16 @@ ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.template
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 
 ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=${mosip.api.internal.url}${ida-websub-auth-type-callback-relative-url}
+ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchage-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
 ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
 ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
 ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
 ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
-ida-websub-partner-service-callback-url=${mosip.api.internal.url}${server.servlet.context-path}/callback/partnermanagement/{eventType}
+ida-websub-partner-service-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
 ida-websub-partner-service-apikey-approved-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/apikey_approved
 ida-websub-partner-service-partner-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_updated
 ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/policy_updated
@@ -234,7 +234,7 @@ ida-websub-partner-service-misp-license-generated-callback-relative-url=${server
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=${mosip.api.internal.url}${ida-websub-hotlist-callback-relative-url}
+ida-websub-hotlist-callback-url=${mosip.api.internal.url}/${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index 9a2221ff31b..1f6672a5c35 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 60dacdd2a52..75568ed80ca 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -1,12 +1,12 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
 
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index 9ba6e16ddfd..11256a5d2bc 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/kernel-default.properties b/kernel-default.properties
index aa050763479..1b3fe33b328 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -441,7 +441,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=${mosip.kernel-masterdata-service.url}/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
-#openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.path:}}
+#openapi.service.servers[0].url=https://${mosip.api.internal.host}/${server.servlet.context-path:${server.servlet.path:}}
 #openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 
@@ -707,7 +707,6 @@ mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMI
 mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
 mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
diff --git a/print-default.properties b/print-default.properties
index 631f125ff94..20522924b8a 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -6,7 +6,7 @@
 # print.websub.hub.secret
 
 ## Websub
-mosip.event.hubURL=${mosip.websub.url}/hub
+mosip.event.hubURL=${mosip.websub.url}/hub/
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident

From e43941353ad104ffdca2284abf204d78a75923c6 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 14:15:32 +0530
Subject: [PATCH 0485/1358] updated config.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index d482175ed32..486596b4699 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -72,7 +72,7 @@ mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
 mosip.kernel.syncdata.syncjob.url=http://kernel-syncjob-service:8099
 mosip.keycloak.url=http://keycloak.default:80
 mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:80
+mosip.minio.url=http://minio.default:9000
 mosip.mock-abis.url=http://mock-abis.default:80
 mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
 mosip.mock-mv.url=http://mock-mv.default:80

From 3bc09379b97f1a3dae8adc204106207cbafb4861 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 15:51:26 +0530
Subject: [PATCH 0486/1358] updated config.

---
 hazelcast_cache-default.xml => hazelcast_cache.xml         | 0
 hazelcast_dmz-default-dmz.xml => hazelcast_deafult-dmz.xml | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename hazelcast_cache-default.xml => hazelcast_cache.xml (100%)
 rename hazelcast_dmz-default-dmz.xml => hazelcast_deafult-dmz.xml (100%)

diff --git a/hazelcast_cache-default.xml b/hazelcast_cache.xml
similarity index 100%
rename from hazelcast_cache-default.xml
rename to hazelcast_cache.xml
diff --git a/hazelcast_dmz-default-dmz.xml b/hazelcast_deafult-dmz.xml
similarity index 100%
rename from hazelcast_dmz-default-dmz.xml
rename to hazelcast_deafult-dmz.xml

From b41cd49cac00bed453e455edba340323244aefe3 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 16:23:48 +0530
Subject: [PATCH 0487/1358] updated config.

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 2f0c1476faf..f531470cbf3 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
+        "brokerUrl": "${activemq.host}:${activemq.core.port}",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From 7ef4e2748ccb3dd43e24ad9d81e8b64e09da4532 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 24 Dec 2021 16:32:33 +0530
Subject: [PATCH 0488/1358] updated config.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 486596b4699..8a12ac3851e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -468,8 +468,8 @@ hazelcast.config=classpath:hazelcast_default.xml
 ## S3 object store adapter. 
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000. 
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=${mosip.minio.url}
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 

From 45ead7ef329fa5074bb98be4278badbfa02eaedd Mon Sep 17 00:00:00 2001
From: Mayura Deshmukh <mayura.deshmukh@gmail.com>
Date: Fri, 24 Dec 2021 17:32:28 +0530
Subject: [PATCH 0489/1358] updated all as per develop2

---
 pre-registration-default.properties | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index b7c9fd1ea85..0720a363596 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -115,18 +115,19 @@ mosip.preregistration.sync.sign.refid=SIGN
 ## Booking 
 ## Sync every n days 
 preregistration.availability.sync=30
-## Number of days for which booking slots will be available
+## Number of days for which booking slots will be available. Should be lesser than or equal to preregistration.availability.sync days. 
 preregistration.availability.noOfDays=140
 ## Gap between the date of booking and the first appointment date to be shown
 ## Ex: If a user has logged in pre-reg application today then, he can select booking slots after n days
 preregistration.booking.offset=2
 ## Number of hours from the appointment time before which an appicant can change/re-book the appointment
-preregistration.timespan.rebook=24
+preregistration.timespan.rebook=0
 ## Number of hours before the appointment time before which an applicant can cancel an appointment 
-preregistration.timespan.cancel=24
+preregistration.timespan.cancel=0
 
-## Time zone. Used for converting the time zones to UTC
-preregistration.country.specific.zoneId=GMT+05:30
+## Time Zone 
+# Not used anymore. 
+# preregistration.country.specific.zoneId=GMT+05:30
 
 ## Batch job service
 batch.service.version=v1
@@ -162,7 +163,8 @@ bookingAvailablity.url=${booking.resource.url}/appointment/availability/sync
 updateConsumedStatus.url=${batch.resource.url}/consumedStatus
 #BatchJob-service URL for updating to expiredStatus
 expiredStatus.url=${batch.resource.url}/expiredStatus
-batch.appointment.cancel=${batch.service.env}/preregistration/v1
+#batch.appointment.cancel=${batch.service.env}/preregistration/v1
+batch.appointment.cancel=${mosip.prereg-application-service.url}/preregistration/v1/internal/applications/appointment/{preRegistrationId}
 
 ## Login service
 
@@ -180,7 +182,7 @@ masterdata.resource.url=${masterdata.service.env}/${masterdata.service.version}/
 regCenter.url=${masterdata.resource.url}/registrationcenters
 holiday.url=${masterdata.resource.url}/getregistrationcenterholidays/
 holiday.exceptional.url=${masterdata.resource.url}/exceptionalholidays/
-working.day.url=${masterdata.resource.url}/weekdays/
+working.day.url=${masterdata.resource.url}/workingdays/
 mosip.kernel.masterdata.validdoc.rest.uri=${masterdata.resource.url}/validdocuments/all?pageSize=50
 ##Kernel Service URL for fetching templates
 resource.template.url=${masterdata.resource.url}/templates
@@ -196,10 +198,11 @@ cancel.appoinment.template=cancel-appointment
 notification.service.version=v1
 notification.service.env=${mosip.prereg-application-service.url}
 notification.service.contextpath=preregistration/${notification.service.version}
-notification.url=${notification.service.env}/${notification.service.version}/${notification.service.contextpath}/notification
+#notification.url=${notification.service.env}/${notification.service.version}/${notification.service.contextpath}/notification
+notification.url=${notification.service.env}/${notification.service.contextpath}/internal/notification
 mosip.pre-registration.notification.id.send=mosip.pre-registration.notification.notify
-# TimeZone to get an email or SMS templates
-timeZone=Asia/Calcutta
+# TimeZone to get an Email or SMS Templates
+# timeZone=Asia/Calcutta
 
 ## Email service 
 email.service.env=${mosip.kernel-notification-service.url}
@@ -293,12 +296,12 @@ prereg.auth.jwt.token.roles=INDIVIDUAL
 ## ID object validation
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${masterdata.resource.url}/languages
-mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${masterdata.resource.url}/gendertypes
+#mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${masterdata.resource.url}/gendertypes
 mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${masterdata.resource.url}/documentcategories
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${masterdata.resource.url}/documenttypes/{documentcategorycode}/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${masterdata.resource.url}/locations/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${masterdata.resource.url}/locations/locationhierarchy/{hierarchyname}
-
+mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode}
 ## Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 

From 4a08366467dde12c04011bd9a42d512e721644be Mon Sep 17 00:00:00 2001
From: Manoj SP <43261486+manojsp12@users.noreply.github.com>
Date: Fri, 24 Dec 2021 19:06:25 +0530
Subject: [PATCH 0490/1358] Added CREDENTIAL_REQUEST role for keymanager
 encrypt decrypt

---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 695ea0cdd07..5c48eeee743 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -725,8 +725,8 @@ mosip.role.keymanager.posttpmencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTH
 mosip.role.keymanager.posttpmdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmsigningpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmencryptionpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY
-mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST
 mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT

From 006eabb4de692189546826b3ac33f4ca6e27db79 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Sun, 26 Dec 2021 13:13:03 +0530
Subject: [PATCH 0491/1358] updated config.

---
 hazelcast_deafult-dmz.xml => hazelcast_dmz-deafult-dmz.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename hazelcast_deafult-dmz.xml => hazelcast_dmz-deafult-dmz.xml (100%)

diff --git a/hazelcast_deafult-dmz.xml b/hazelcast_dmz-deafult-dmz.xml
similarity index 100%
rename from hazelcast_deafult-dmz.xml
rename to hazelcast_dmz-deafult-dmz.xml

From cc95abe41d331f005012ae657384c922a1adf8b8 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Sun, 26 Dec 2021 13:16:54 +0530
Subject: [PATCH 0492/1358] updated config.

---
 hazelcast_dmz-deafult-dmz.xml => hazelcast_dmz.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename hazelcast_dmz-deafult-dmz.xml => hazelcast_dmz.xml (100%)

diff --git a/hazelcast_dmz-deafult-dmz.xml b/hazelcast_dmz.xml
similarity index 100%
rename from hazelcast_dmz-deafult-dmz.xml
rename to hazelcast_dmz.xml

From d0ea333d7b3675db76a74853be7b2589abed7448 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Sun, 26 Dec 2021 13:22:31 +0530
Subject: [PATCH 0493/1358] updated config.

---
 application-default-dmz.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
index 4a0be38f021..3c6632bf8c7 100644
--- a/application-default-dmz.properties
+++ b/application-default-dmz.properties
@@ -1,5 +1,6 @@
 #---------------------------------------Common properties-----------------------
 aplication.configuration.level.version=LTS
+mosip.api.internal.url=${mosipbox.public.url}
 mz.ingress.base.url=http://mz.ingress:30080
 mosip.keymanager.base.url=${mosip.kernel-keymanager-service.url}
 

From 03f2db7c6bdd11c35512dec0d58a51050135d05e Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 11:00:10 +0530
Subject: [PATCH 0494/1358] updated config.

---
 kernel-default.properties                     | 1 -
 registration-processor-default-dmz.properties | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 5c48eeee743..69eadebc945 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -447,7 +447,6 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=${mosip.kernel-auth-service.url}/v1/authmanager/userdetails
 
-auth.server.admin.offline.token.validate=false
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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.iam.adapter.appid=admin
diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
index 0bb508d0924..e0dcca6fdf6 100644
--- a/registration-processor-default-dmz.properties
+++ b/registration-processor-default-dmz.properties
@@ -247,4 +247,11 @@ registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60ab
 registration.processor.notification_service_subscriber_topic=registration_processor_workflow_completed_event
 registration.processor.notification_service_subscriber_callback_url=${mosip.api.internal.url}/registrationprocessor/v1/notification/callback/notify
 
-mosip.regproc.message.tag.loading.disable=true
\ No newline at end of file
+mosip.regproc.message.tag.loading.disable=true
+
+
+mosip.iam.adapter.appid=regproc
+mosip.iam.adapter.clientid=mosip-regproc-client
+mosip.iam.adapter.clientsecret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client

From 1c668c4e8fd217fcb722ab6635a690e6e58e08d6 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 11:25:34 +0530
Subject: [PATCH 0495/1358] updated config.

---
 id-repository-default.properties          | 2 +-
 registration-processor-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index e5c168583ae..d29e7a69ad0 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -316,7 +316,7 @@ mosip.credential.service.retry.maxDelay=100
 
 IDREPOGETIDBYID=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
-mosip.data.share.internal.domain.name=datashare.datashare
+mosip.data.share.internal.domain.name=${mosip.datashare-service.url}
 CREATEDATASHARE=/v1/datashare/create
 KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
 KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index af527fee060..68c35d8ea2d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -452,7 +452,7 @@ DATASHAREGETEURL=${mosip.datashare-service.url}/v1/datashare/get
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
 
-mosip.regproc.data.share.internal.domain.name=datashare.datashare
+mosip.regproc.data.share.internal.domain.name=${mosip.datashare-service.url}
 mosip.regproc.data.share.protocol=http
 
 #iam adapter

From 13c381f1efba0bade34cac4b7bdbf00f959c204d Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 11:44:19 +0530
Subject: [PATCH 0496/1358] updated config.

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 8a12ac3851e..ce3f4c42e50 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -535,3 +535,5 @@ mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}
 ## Swagger
 #openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
 #openapi.service.servers[0].description=For Swagger
+
+mosip.auth.filter_disable= false
\ No newline at end of file

From 2210578b02c7f6c14d9df86add48fd2fb4d61e3a Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 11:44:34 +0530
Subject: [PATCH 0497/1358] updated config.

---
 data-share-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data-share-default.properties b/data-share-default.properties
index cbfbf12e82d..426aec4992e 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -34,3 +34,5 @@ mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=false
 
 auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client
+
+mosip.auth.filter_disable= false
\ No newline at end of file

From 98b4f250605ca8c79a01688f0874d76fbce54caa Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 11:55:16 +0530
Subject: [PATCH 0498/1358] updated config.

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 68c35d8ea2d..5eb8bfc16dc 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -950,3 +950,4 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 
+mosip.auth.filter_disable= false
\ No newline at end of file

From 341197cd4514134038ee79cee112aed4ea462990 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 12:07:46 +0530
Subject: [PATCH 0499/1358] updated config.

---
 credential-request-default.properties | 4 +++-
 credential-service-default.properties | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/credential-request-default.properties b/credential-request-default.properties
index a1b46b8e7be..f4f8be83333 100644
--- a/credential-request-default.properties
+++ b/credential-request-default.properties
@@ -6,4 +6,6 @@ mosip.idrepo.credential-req-generator.auth.app-id=crereq
 #------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
 mosip.iam.adapter.clientid.credential-request=${mosip.idrepo.credential-req-generator.auth.client-id}
 mosip.iam.adapter.clientsecret.credential-request=${mosip.idrepo.credential-req-generator.auth.secret-key}
-mosip.iam.adapter.appid.credential-request=${mosip.idrepo.credential-req-generator.auth.app-id}
\ No newline at end of file
+mosip.iam.adapter.appid.credential-request=${mosip.idrepo.credential-req-generator.auth.app-id}
+
+mosip.auth.filter_disable= false
\ No newline at end of file
diff --git a/credential-service-default.properties b/credential-service-default.properties
index f44e7cbc60d..206b13df32f 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -6,4 +6,7 @@ mosip.idrepo.credential.auth.app-id=creser
 #------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
 mosip.iam.adapter.clientid.credential-service=${mosip.idrepo.credential.auth.client-id}
 mosip.iam.adapter.clientsecret.credential-service=${mosip.idrepo.credential.auth.secret-key}
-mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id}
\ No newline at end of file
+mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id}
+
+
+mosip.auth.filter_disable= false
\ No newline at end of file

From 69ee237c46949433d4fb3e3af10cc7c19cd1f69f Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 27 Dec 2021 12:25:39 +0530
Subject: [PATCH 0500/1358] updated camel route names

---
 registration-processor-default-dmz.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
index e0dcca6fdf6..f35c9c28716 100644
--- a/registration-processor-default-dmz.properties
+++ b/registration-processor-default-dmz.properties
@@ -142,7 +142,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-brdige-dmz
 
 # Camel Route xml files corresponding to the dmz flow
-camel.dmz.active.flows.file.names=registration-processor-camel-routes-new-dmz.xml,registration-processor-camel-routes-update-dmz.xml,registration-processor-camel-routes-activate-dmz.xml,registration-processor-camel-routes-res-update-dmz.xml,registration-processor-camel-routes-deactivate-dmz.xml,registration-processor-camel-routes-lost-dmz.xml,registration-processor-camel-routes-res-reprint-dmz.xml,registration-processor-camel-routes-biometric-correction-dmz.xml
+camel.dmz.active.flows.file.names=registration-processor-camel-routes-new-default-dmz.xml,registration-processor-camel-routes-update-default-dmz.xml,registration-processor-camel-routes-activate-default-dmz.xml,registration-processor-camel-routes-res-update-default-dmz.xml,registration-processor-camel-routes-deactivate-default-dmz.xml,registration-processor-camel-routes-lost-default-dmz.xml,registration-processor-camel-routes-res-reprint-default-dmz.xml,registration-processor-camel-routes-biometric-correction-default-dmz.xml
 # Current zone on which services and stages are runnning, can be dmz or mz
 registration.processor.zone=dmz
 # Pause settings used by camel to match expression and pause packet processing

From e803debb3671899b6915a9337ff1d5fca5d854f9 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 12:47:22 +0530
Subject: [PATCH 0501/1358] updated config.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5eb8bfc16dc..85f67d5012d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -924,7 +924,7 @@ regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_
 openapi.registrationProcessor.servers[0].url=${mosip.api.internal.url}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
-NGINXDMZURL=${mosip.packet-receiver-service.url}
+NGINXDMZURL=${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/registrationpackets
 
 # modifiable delay in websub subscription
 mosip.regproc.websub.resubscription.delay.millisecs=43200000

From 6e0643d48e95e991ed95edb5e826297b949230bc Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Mon, 27 Dec 2021 13:08:41 +0530
Subject: [PATCH 0502/1358] Added packet-manger and packet-upload properties

---
 admin-default.properties | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 6c0ecb0e116..894cba451d4 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -222,6 +222,14 @@ KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/cl
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=1440
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=1440
+#this should be false if you don?t use this restTemplate true if you do
+mosip.iam.adapter.self-token-renewal-enable=true
 
 # LostRid 
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
@@ -235,3 +243,36 @@ mosip.role.admin.postbulkupload=GLOBAL_ADMIN
 mosip.role.admin.getbulkuploadtranscationtranscationid=GLOBAL_ADMIN
 mosip.role.admin.getbulkuploadgetalltransactions=GLOBAL_ADMIN
 mosip.role.admin.postauditmanagerlog=GLOBAL_ADMIN,ZONAL_ADMIN
+
+# packet-manager
+mosip.commons.packetnames=id,evidence,optional
+provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
+provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketWriterImpl
+objectstore.adapter.name=PosixAdapter
+objectstore.crypto.name=OnlinePacketCryptoServiceImpl
+default.provider.version=v1.0
+object.store.base.location=./packets
+objectstore.packet.source=REGISTRATION_CLIENT
+packet.manager.account.name=PACKET_MANAGER_ACCOUNT
+objectstore.packet.supervisor_biometrics_file_name=supervisor_bio_cbeff
+objectstore.packet.officer_biometrics_file_name=officer_bio_cbeff
+mosip.kernel.xsdstorage-uri = LOCAL
+mosip.kernel.xsdfile = LOCAL
+#----JSON Validator Component----
+#Property Source of the Identity Schema. LOCAL specifies the schema is stored within the application. Should not be modified
+mosip.kernel.jsonvalidator.property-source = LOCAL
+#Storage Location of the Identity Schema. LOCAL specifies the schema is stored within the application. Should not be modified
+mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
+
+mosip.kernel.machineid.length=5
+auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
+MACHINE_GET_API=${mosip.kernel-masterdata-service.url}/v1/masterdata/machines/mappedmachines/?pageNumber=0&pageSize=100&orderBy=cr_dtimes&direction=DESC
+CRYPTOMANAGERDECRYPT_API=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
+packetmanager.packet.signature.disable-verification=true
+mosip.admin.packetupload.packetsync.url=${mosip.regproc-registration-status-service.url}/registrationprocessor/v1/registrationstatus/syncV2
+mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,lastName
+mosip.admin.packetupload.packetsync.email=email
+mosip.admin.packetupload.packetsync.phone=phone

From bc6a487225ac54e99165bf215b685fc80ae5cb4d Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Mon, 27 Dec 2021 13:58:58 +0530
Subject: [PATCH 0503/1358] Update admin-default.properties

---
 admin-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 894cba451d4..250acb4f5fe 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -271,7 +271,6 @@ CRYPTOMANAGERDECRYPT_API=${mosip.kernel-keymanager-service.url}/v1/keymanager/de
 CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
 mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
-packetmanager.packet.signature.disable-verification=true
 mosip.admin.packetupload.packetsync.url=${mosip.regproc-registration-status-service.url}/registrationprocessor/v1/registrationstatus/syncV2
 mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,lastName
 mosip.admin.packetupload.packetsync.email=email

From 42ce3707946a9913646a841edf62f48275625eb6 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 15:26:32 +0530
Subject: [PATCH 0504/1358] updated config.

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 250acb4f5fe..a4aa7d11ce3 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -271,7 +271,7 @@ CRYPTOMANAGERDECRYPT_API=${mosip.kernel-keymanager-service.url}/v1/keymanager/de
 CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
 mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
-mosip.admin.packetupload.packetsync.url=${mosip.regproc-registration-status-service.url}/registrationprocessor/v1/registrationstatus/syncV2
+mosip.admin.packetupload.packetsync.url=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/syncV2
 mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,lastName
 mosip.admin.packetupload.packetsync.email=email
 mosip.admin.packetupload.packetsync.phone=phone

From 603ce5d41e5385933dec7f3ad9d95a1a3b1e05fc Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 15:30:33 +0530
Subject: [PATCH 0505/1358] updated config.

---
 application-default.properties            | 3 ++-
 partner-management-default.properties     | 2 +-
 print-default.properties                  | 2 +-
 registration-processor-default.properties | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index ce3f4c42e50..32e9394d157 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -49,7 +49,8 @@ mosip.admin-ui.url=http://admin-ui.default:80
 mosip.artifactory-service.url=http://artifactory-service.default:80
 mosip.clamav.url=http://clamav.default:80
 mosip.config-server.url=http://config-server.default:80
-mosip.datashare-service.url=http://datashare-service.default:80
+#datashare is using domain externally so removed http(handled by protocol property.)
+mosip.datashare-service.url=datashare-service.default:80
 mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
 mosip.ida-auth-service.url=http://ida-auth-service.default:80
 mosip.ida-internal-service.url=http://ida-internal-service.default:80
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 5ce69ab79ef..4077ee6cdd3 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -126,7 +126,7 @@ mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
-pmp.certificaticate.datashare.rest.uri=${mosip.datashare-service.url}/v1/datashare/create
+pmp.certificaticate.datashare.rest.uri=http://${mosip.datashare-service.url}/v1/datashare/create
 # Used for generating the datashare url
 pms.certs.datashare.policyId=mpolicy-default-cert
 pms.certs.datashare.subscriberId=mpartner-default-cert
diff --git a/print-default.properties b/print-default.properties
index 20522924b8a..4cfdcd08e60 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -103,7 +103,7 @@ registration.processor.unMaskedUin.length=5
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=${mosip.datashare-service.url}/v1/datashare/create
+CREATEDATASHARE=http://${mosip.datashare-service.url}/v1/datashare/create
 DECRYPTPINBASSED=${mosip.kernel-keymanager-service.url}/v1/keymanager/decryptWithPin
 mosip.print.prependThumbprint=true
 
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 85f67d5012d..b6d8c7e954e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -447,7 +447,7 @@ PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdate
 PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
 PACKETMANAGER_GET_TAGS=${packetmanager.base.url}/v1/packetmanager/getTags
 DATASHARECREATEURL=/v1/datashare/create
-DATASHAREGETEURL=${mosip.datashare-service.url}/v1/datashare/get
+DATASHAREGETEURL=http://${mosip.datashare-service.url}/v1/datashare/get
 # Default abis is mock-abis provided by MOSIP
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis

From 9d8c6b2a4703fe099c2407854afa0ffada1d1801 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 18:12:41 +0530
Subject: [PATCH 0506/1358] updated config.

---
 partner-management-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4077ee6cdd3..d95a9457ca9 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -109,9 +109,9 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/au
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
-mosip.pmp.auth.clientId=mosip-partner-client
+mosip.pmp.auth.clientId=mpartner-default-auth
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
+mosip.pmp.auth.secretKey= ${mosip.mosip.mpartner-default-auth.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -122,7 +122,7 @@ pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel-keymanager-servi
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
-mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.mosip.mpartner-default-auth.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub

From 512c596a1705bfc7c8165d235b30b5eba28ecc90 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 18:39:30 +0530
Subject: [PATCH 0507/1358] updated config.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 0720a363596..9e02916f0de 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -402,7 +402,7 @@ spring.cache.type=none
 
 mosip.preregistration.appointment.getavailablity.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment/availability/{registrationCenterId}
 mosip.preregistration.appointment.book.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment/{preRegistrationId}
-mosip.preregistration.appointment.multi.book.url={mosip.prereg-booking-service.url}/preregistration/v1/appointment
+mosip.preregistration.appointment.multi.book.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment
 mosip.preregistration.applications.status.get = mosip.preregistration.applications.status
 mosip.preregistration.applications.details.get = mosip.preregistration.applications.detail.info
 mosip.preregistration.uispec.latest=mosip.preregistration.uispec.latest

From 7c16c6a18565d2f3c1983582d03f8b14c2b75a57 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 18:58:58 +0530
Subject: [PATCH 0508/1358] updated config.

---
 partner-management-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index d95a9457ca9..4077ee6cdd3 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -109,9 +109,9 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/au
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
-mosip.pmp.auth.clientId=mpartner-default-auth
+mosip.pmp.auth.clientId=mosip-partner-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.mosip.mpartner-default-auth.client.secret}
+mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -122,7 +122,7 @@ pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel-keymanager-servi
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
-mosip.iam.adapter.clientsecret=${mosip.mosip.mpartner-default-auth.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub

From f0eff6ea32eee08c0f1946b63bf6aefcf9cfcf32 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 27 Dec 2021 19:53:57 +0530
Subject: [PATCH 0509/1358] updated config.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b6d8c7e954e..083e899ef88 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -924,7 +924,7 @@ regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_
 openapi.registrationProcessor.servers[0].url=${mosip.api.internal.url}/registrationprocessor/v1/registrationtransaction
 openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
-NGINXDMZURL=${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+NGINXDMZURL=${dmz.ingress.base.url}/registrationprocessor/v1/dmzpacketserver
 
 # modifiable delay in websub subscription
 mosip.regproc.websub.resubscription.delay.millisecs=43200000

From 0c98657f7b7f79ddb2ee8d1cccf08f966178d40a Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Tue, 28 Dec 2021 11:18:31 +0530
Subject: [PATCH 0510/1358] corrected url

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 32e9394d157..c2a9f6aa8ec 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -113,7 +113,7 @@ mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.defau
 mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
 mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
 mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.default:80
+mosip.packetmanager-service.url=http://packetmanager-service.packetmanager:80
 mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.default:80
 mosip.regproc-status-service.url=http://regproc-registration-status-service.default:80
 mosip.websub.url=${mosip.api.internal.url}
@@ -537,4 +537,4 @@ mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}
 #openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
 #openapi.service.servers[0].description=For Swagger
 
-mosip.auth.filter_disable= false
\ No newline at end of file
+mosip.auth.filter_disable= false

From 81adcab0f8ea02bca7ad553ee4786b85d3ae458a Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Tue, 28 Dec 2021 16:11:23 +0530
Subject: [PATCH 0511/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index d0976efd8cf..c6a051f844d 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -354,7 +354,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/masterdata/machines/%s/eng
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/masterdata/machines/%s
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments

From 198836d63e045e711c02fdde766fd67f38bc3537 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Tue, 28 Dec 2021 16:20:19 +0530
Subject: [PATCH 0512/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index c6a051f844d..3de29c50561 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -354,7 +354,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/masterdata/machines/%s
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/machines/%s
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments

From d7569f587e2af9e28f90c39c0c1633fa92a653de Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 28 Dec 2021 18:00:01 +0530
Subject: [PATCH 0513/1358] updated config.

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 3fb13010557..8fa07af653a 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -42,7 +42,7 @@ MESSAGE_DELIVERY_COUNT = 3
 MESSAGE_DELIVERY_TIMEOUT = 10.0
 
 # The base URL of IDP
-MOSIP_AUTH_BASE_URL = "https://dev2.mosip.net/v1/authmanager"
+MOSIP_AUTH_BASE_URL = "${mosip.api.internal.url}/v1/authmanager"
 
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"

From 9dda72eaadc97c99052ec5898ecba4078a58f7af Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 28 Dec 2021 18:47:24 +0530
Subject: [PATCH 0514/1358] updated config.

---
 credential-request-default.properties     |  2 +-
 credential-service-default.properties     |  2 +-
 data-share-default.properties             |  2 +-
 partner-management-default.properties     |  2 +-
 registration-processor-default.properties | 14 +++++++++++++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/credential-request-default.properties b/credential-request-default.properties
index f4f8be83333..cc34d671297 100644
--- a/credential-request-default.properties
+++ b/credential-request-default.properties
@@ -8,4 +8,4 @@ mosip.iam.adapter.clientid.credential-request=${mosip.idrepo.credential-req-gene
 mosip.iam.adapter.clientsecret.credential-request=${mosip.idrepo.credential-req-generator.auth.secret-key}
 mosip.iam.adapter.appid.credential-request=${mosip.idrepo.credential-req-generator.auth.app-id}
 
-mosip.auth.filter_disable= false
\ No newline at end of file
+mosip.auth.filter_disable=false
\ No newline at end of file
diff --git a/credential-service-default.properties b/credential-service-default.properties
index 206b13df32f..213de396373 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -9,4 +9,4 @@ mosip.iam.adapter.clientsecret.credential-service=${mosip.idrepo.credential.auth
 mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id}
 
 
-mosip.auth.filter_disable= false
\ No newline at end of file
+mosip.auth.filter_disable=false
\ No newline at end of file
diff --git a/data-share-default.properties b/data-share-default.properties
index 426aec4992e..4cf3b43ae71 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -35,4 +35,4 @@ mosip.data.share.prependThumbprint=false
 
 auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client
 
-mosip.auth.filter_disable= false
\ No newline at end of file
+mosip.auth.filter_disable=false
\ No newline at end of file
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4077ee6cdd3..816fdecbc24 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -163,7 +163,7 @@ mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
 #this should be false if you don't use this restTemplate true if you do
 mosip.iam.adapter.self-token-renewal-enable=true
-mosip.auth.filter_disable= false
+mosip.auth.filter_disable=false
 
 #To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
 mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 083e899ef88..f4afba953f0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -950,4 +950,16 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 
-mosip.auth.filter_disable= false
\ No newline at end of file
+mosip.iam.adapter.clientid=mosip-regproc-client
+mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.appid=regproc
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=30
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=30
+#this should be false if you don�t use this restTemplate true if you do
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false

From a9e68783b272728aee6024b7e610a07058c3f32e Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Tue, 28 Dec 2021 19:25:14 +0530
Subject: [PATCH 0515/1358] making true

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f4afba953f0..b7714be1ec9 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -960,6 +960,6 @@ mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authentica
 mosip.iam.adapter.validate-expiry-check-rate=30
 # in minutes
 mosip.iam.adapter.renewal-before-expiry-interval=30
-#this should be false if you don�t use this restTemplate true if you do
+#this should be false if you don’t use this restTemplate true if you do
 mosip.iam.adapter.self-token-renewal-enable=true
-mosip.auth.filter_disable=false
+mosip.auth.filter_disable=true

From dd7e4e2c6a4fdd020041626dc2fece0fe6aff0ca Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Tue, 28 Dec 2021 20:02:13 +0530
Subject: [PATCH 0516/1358] removed unnecessary pause settings

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b7714be1ec9..a0d5d6e8208 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -520,7 +520,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"ADULT_APPLICANT","matchExpression": "$.tags[?(@['AGE_GROUP']== 'ADULT')]","pauseFor": 6000,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident child applicant packet"},{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single

From 1d6d016bddf5134d0e68ecd8c5bf80037abc01dc Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 29 Dec 2021 09:57:01 +0530
Subject: [PATCH 0517/1358] updated config

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 28e5e591da3..f21cd830734 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -70,7 +70,7 @@ EMAILNOTIFIER=${mosip.kernel-notification-service.url}/v1/notifier/email/send
 AUTHTYPESTATUSUPDATE=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/authtypes/status
 #Regitstration processor reprint service
 #Registration status service
-REGISTRATIONSTATUSSEARCH=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
+REGISTRATIONSTATUSSEARCH=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
 resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service

From 0fd3408f82bb7f97ee1b907f90b17283fdc532e7 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 29 Dec 2021 12:14:27 +0530
Subject: [PATCH 0518/1358] updated config

---
 syncdata-default.properties | 2 +-
 websub-consolidator.toml    | 2 +-
 websub-service.toml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3de29c50561..d6a91873b43 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -218,7 +218,7 @@ mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 #Self token resttemplate related to configuration
 mosip.iam.adapter.clientid=mosip-syncdata-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.reg.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
 mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index 6a611ba4c78..f18db075710 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -1,6 +1,6 @@
 [consolidatorService.config]
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "http://kafka.default:9092"
+KAFKA_BOOTSTRAP_NODE = "kafka.default:9092"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration
diff --git a/websub-service.toml b/websub-service.toml
index 8fa07af653a..5b62f66431c 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -7,7 +7,7 @@ SECURITY_ON = true
 SERVER_ID = "server-1"
 
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "http://kafka.default:9092"
+KAFKA_BOOTSTRAP_NODE = "kafka.default:9092"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration

From 35c95bd00a8415bf8432cc97f610a8ebe29a335b Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 29 Dec 2021 12:33:40 +0530
Subject: [PATCH 0519/1358] updated config

---
 application-default.properties | 2 +-
 kernel-default.properties      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index c2a9f6aa8ec..c26a1f7396c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -537,4 +537,4 @@ mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}
 #openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
 #openapi.service.servers[0].description=For Swagger
 
-mosip.auth.filter_disable= false
+mosip.auth.filter_disable=false
\ No newline at end of file
diff --git a/kernel-default.properties b/kernel-default.properties
index 69eadebc945..70686645792 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -754,3 +754,7 @@ mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATI
 mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+
+
+mosip.kernel.masterdata.template_idauthentication_event=MASTERDATA_IDAUTHENTICATION_TEMPLATES
+mosip.kernel.masterdata.title_event=MASTERDATA_TITLES
\ No newline at end of file

From 5a2a730bc17909bb5e8d4cdbd201ac42422f12a9 Mon Sep 17 00:00:00 2001
From: Abubacker Siddik A <abu@makinus.com>
Date: Wed, 29 Dec 2021 19:50:20 +0530
Subject: [PATCH 0520/1358] MOSIP-19185: Update machine search and create url
 configs

---
 resident-default.properties | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resident-default.properties b/resident-default.properties
index f21cd830734..4b248566185 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -56,12 +56,16 @@ resident.notification.message=Notification has been sent to the provided contact
 MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
+MACHINESEARCH=${MASTER}/machines/search
+MACHINECREATE=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
 RIDGENERATION=${mosip.kernel-ridgenerator-service.url}/v1/ridgenerator/generate/rid
 CREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
 IDREPOSITORY=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/
 ENCRYPTURL=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+PACKETSIGNPUBLICKEY=${mosip.kernel-keymanager-service.url}/v1/keymanager/tpmsigning/publickey
 MIDSCHEMAURL=${mosip.kernel-keymanager-service.url}/v1/syncdata/latestidschema
+
 # DMZ service call
 SYNCSERVICE=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/sync
 PACKETRECEIVER=${mosip.regproc-group1-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
@@ -109,3 +113,8 @@ auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client
 
 #Mapping Identity json to map with the applicant id json
 registration.processor.identityjson=identity-mapping.json
+
+#machine creation and search configs
+resident.update-uin.machine-name-prefix = resident_machine_
+resident.update-uin.machine-spec-id = 1001
+resident.update-uin.machine-zone-code = MOR

From e6c0e986e909914e4c34e6c1a3ff023f02c222c9 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 29 Dec 2021 20:17:24 +0530
Subject: [PATCH 0521/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index d6a91873b43..03a77a0e405 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -384,7 +384,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=${mosip.kernel-syncdata-service.url}/v1/syncdata/websub/callback/cacert
+syncdata.websub.callback.url.ca-cert=${mosip.api.internal.url}/${server.servlet.context-path}/websub/callback/cacert
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a

From a6a1a687dc285190f8da80cf497210a4ad5bf2cc Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 29 Dec 2021 20:59:48 +0530
Subject: [PATCH 0522/1358] updated config

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 03a77a0e405..0bf598bebf9 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -289,7 +289,7 @@ kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
 auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client,mosip-syncdata-client
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111

From 7b0304c15f09e007fba7d8bb54204b114f906ded Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 29 Dec 2021 21:22:57 +0530
Subject: [PATCH 0523/1358] Added mosip-syncdata-client audience

---
 data-share-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 4cf3b43ae71..c0bd0d83889 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -33,6 +33,6 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=false
 
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client
 
-mosip.auth.filter_disable=false
\ No newline at end of file
+mosip.auth.filter_disable=false

From 80934e4f57b0207b98e1071ecfe94ca8ad4b7de6 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 29 Dec 2021 21:23:22 +0530
Subject: [PATCH 0524/1358] Update syncdata-default.properties

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 0bf598bebf9..03a77a0e405 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -289,7 +289,7 @@ kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
 auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client,mosip-syncdata-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client
 
 ## Proxy otp
 mosip.kernel.auth.proxy-otp-value=111111

From 67c13734682ed0d4997197890a78f6b50ea5056c Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Thu, 30 Dec 2021 16:26:17 +0530
Subject: [PATCH 0525/1358] Disabled debug logging

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index a4aa7d11ce3..5b6521cabd1 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -235,7 +235,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.lostrid.version=1.0
 LOST_RID_API=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/lostridsearch
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
+#logging.level.org.springframework.web.client.RestTemplate=DEBUG
 
 # Roles
 mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN

From 0433fef934d5c0ceff62698f267f02126a19f572 Mon Sep 17 00:00:00 2001
From: HimajaDhanyamraju2
 <43470317+HimajaDhanyamraju2@users.noreply.github.com>
Date: Fri, 31 Dec 2021 12:42:40 +0530
Subject: [PATCH 0526/1358] Update application-default.properties

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index c26a1f7396c..3c30a86b044 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -285,7 +285,7 @@ mosip.kernel.uin.restricted-numbers=786,666
 # limit is 3, then 12 is allowed but 123 is not allowed in id (in both
 # ascending and descending order)
 # to disable sequence limit validation assign 0 or negative value
-mosip.kernel.uin.length.sequence-limit=3
+mosip.kernel.uin.length.sequence-limit=0
 # Number of digits in repeating block allowed in id. For example if limit is 2,
 # then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
 #to disable validation assign zero or negative value
@@ -537,4 +537,4 @@ mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}
 #openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
 #openapi.service.servers[0].description=For Swagger
 
-mosip.auth.filter_disable=false
\ No newline at end of file
+mosip.auth.filter_disable=false

From 3904a2efd83e3a4ee3ce3831daf06958c6ab7e2f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 13:23:58 +0530
Subject: [PATCH 0527/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 38 ++++++++++-------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a0d5d6e8208..0e9b7b17f7b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -137,7 +137,7 @@ ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
 DIGITALSIGNATURE=${KEYMANAGER}/v1/keymanager/sign
 mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
 
-#Status for matched records in demo dedupe stage.
+# Status for matched records in demo dedupe stage.
 # 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
 registration.processor.demodedupe.manual.adjudication.status=REJECTED
 
@@ -411,7 +411,6 @@ mosip.regproc.workflow.manager.eventbus.kafka.poll.frequency=100
 mosip.regproc.workflow.manager.eventbus.kafka.group.id=workflow-manager
 mosip.regproc.workflow.manager.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
-
 #Service Ids
 #Audit request id
 mosip.registration.processor.audit.id=mosip.applicanttype.getApplicantType
@@ -601,9 +600,7 @@ mosip.regproc.packet.classifier.server.port=8092
 mosip.regproc.packet.classifier.eventbus.port=5724
 mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/packetclassifier
 
-
 ## Quality classifier stage
-
 mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
 mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
@@ -666,7 +663,7 @@ mosip.regproc.bio.dedupe.server.port=9096
 mosip.regproc.bio.dedupe.eventbus.port=5718
 mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
-#uin-generator-stage
+# uin-generator-stage
 mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
 mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
 mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
@@ -676,7 +673,7 @@ mosip.regproc.uin.generator.server.port=8099
 mosip.regproc.uin.generator.eventbus.port=5719
 mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-generator
 
-#abis-middle-ware-stage
+# abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
@@ -707,7 +704,7 @@ mosip.regproc.finalization.eventbus.port=5728
 mosip.regproc.finalization.server.servlet.path=/registrationprocessor/v1/finalization
 mosip.regproc.finalization.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 
-#biometric-authentication-stage
+# biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
 mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
@@ -717,7 +714,7 @@ mosip.regproc.biometric.authentication.server.port=8020
 mosip.regproc.biometric.authentication.eventbus.port=5777
 mosip.regproc.biometric.authentication.server.servlet.path=/registrationprocessor/v1/bioauth
 
-#reprocessor-stage
+# reprocessor-stage
 mosip.regproc.reprocessor.eventbus.kafka.commit.type=single
 mosip.regproc.reprocessor.eventbus.kafka.max.poll.records=100
 mosip.regproc.reprocessor.eventbus.kafka.poll.frequency=100
@@ -727,7 +724,6 @@ mosip.regproc.reprocessor.eventbus.port=5750
 mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reprocessor
 
 ## Supervisor validator stage
-
 mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
 mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
@@ -737,7 +733,6 @@ mosip.regproc.supervisor-validator.server.port=8094
 mosip.regproc.supervisor-validator.eventbus.port=5725
 mosip.regproc.supervisor-validator.server.servlet.path=/registrationprocessor/v1/supervisorvalidator
 
-
 ## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
 mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
@@ -939,17 +934,6 @@ mosip.registration.processor.registration.external.status.version=1.0
 # Packet Status Version
 mosip.registration.processor.packet.external.status.version=1.0
 
-# Roles
-mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
-mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
-mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
-mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
@@ -963,3 +947,15 @@ mosip.iam.adapter.renewal-before-expiry-interval=30
 #this should be false if you don’t use this restTemplate true if you do
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=true
+
+# Roles
+mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
+mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
+mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
+mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
+

From 26b4c2ab3b35b177776c276547e09bc607512c37 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:10:28 +0530
Subject: [PATCH 0528/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 0e9b7b17f7b..036bccaccb3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -52,8 +52,6 @@ registration.processor.sourcepackets=id,evidence,optional
 packet.default.source=id
 # the default schema field cagegory (ex - private)
 schema.default.fieldCategory=pvt,none
-# The IDSchemaVersion used to create packets in reg-proc
-IDSchema.Version=0.1
 packet.info.storage.service=*
 mosip.preferred-language.enabled=false
 

From 640d6b77761989965b204b4ac14b956be1680316 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:20:58 +0530
Subject: [PATCH 0529/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 036bccaccb3..c439db5b18a 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -157,6 +157,7 @@ PMS=${mosip.pms-policy-manager-service.url}/v1/policymanager/policies
 PARTNERGETBIOEXTRACTOR=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners
 
 ## Registration status properties
+## Max retries allowed by registration client if sanity check of packet fails in packet uploader stage.
 registration.processor.max.retry=10
 mosip.registration.processor.registration.status.id=mosip.registration.status
 mosip.registration.processor.registration.sync.id=mosip.registration.sync

From 6f43665e25de072dc7a076ab9c9e23f2b090e563 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:25:31 +0530
Subject: [PATCH 0530/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c439db5b18a..d52ef17e3d7 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -184,10 +184,9 @@ mosip.registration.processor.registration.status.external-statuses-to-consider-p
 # this property is used in lostrid api to get postal code
 mosip.registration.processor.postalcode.req.url=${MASTER}/registrationcenters
 
-# Status for matched records in demo dedupe stage
+# To enable/disable demo dedup
 mosip.registration.processor.demographic.deduplication.enable=true
 
-
 ## OSI validate
 registration.processor.applicant.dob.format=yyyy/MM/dd
 mosip.identity.auth.internal.requestid=mosip.identity.auth.internal

From b38a6cf715bb17a8ed16d585a9edb397c9b2fbe8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:49:30 +0530
Subject: [PATCH 0531/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d52ef17e3d7..fd2b92483a2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -280,7 +280,6 @@ registration.processor.queue.manualverification.response=mv-to-mosip
 ## Packet validator
 registration.processor.applicant.type=applicanttype-document-mapping.json
 mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT
-mosip.kernel.jsonvalidator.schema-name=mosip-identity-json-schema.json
 mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 ## Reprocessor stage

From d9a0752a02e13e24d6b73d79972ae67393f3bad5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:50:26 +0530
Subject: [PATCH 0532/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index fd2b92483a2..420e439dfb2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -279,8 +279,6 @@ registration.processor.queue.manualverification.response=mv-to-mosip
 
 ## Packet validator
 registration.processor.applicant.type=applicanttype-document-mapping.json
-mosip.kernel.jsonvalidator.property-source=APPLICATION_CONTEXT
-mosip.kernel.jsonvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 ## Reprocessor stage
 # Number of the reprocess records to be fetched at a time

From 23022b62ed39a488c9d85bc42b7fc5f946f91bc6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 15:56:24 +0530
Subject: [PATCH 0533/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 420e439dfb2..d4948daee2e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -417,7 +417,7 @@ mosip.registration.processor.sms.id=mosip.sms.send
 #Kernel Crypto signature
 registration.processor.signature.isEnabled=true
 
-#BioDedupe stage
+## Enable this flag only if infant biometrics are captured, and dedup is desired.
 registration.processor.infant.dedupe=N
 
 # ID Authentication 

From 38aba45b26f3e52072c391e6d92cdd5917304471 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 16:09:37 +0530
Subject: [PATCH 0534/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d4948daee2e..a3747dd0850 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -579,7 +579,7 @@ mosip.regproc.cmd-validator.device-validation.processes=NEW,UPDATE,LOST,BIOMETRI
 # To enable or disable the Center working hour validation
 mosip.regproc.cmd-validator.working-hour-validation-required=true
 # To enable/disable trust validation of a digital id signature of a device
-mosip.regproc.cmd-validator.device.disable-trust-validation=false
+mosip.regproc.cmd-validator.device.disable-trust-validation=true
 # Maximum duration in minutes permissible between digital id timestamp and packet creation time
 mosip.regproc.cmd-validator.device.allowed-digital-id-timestamp-variation=30
 # Timestamp format followed in digital id and biometrics payload

From 4b5ccb6d926abdb3e80a438bc43838b198ef31e2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <48353425+pjoshi751@users.noreply.github.com>
Date: Fri, 31 Dec 2021 16:18:28 +0530
Subject: [PATCH 0535/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a3747dd0850..a8e20cdb67d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -749,7 +749,6 @@ mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 
 packetmanager.name.source.resident=RESIDENT
-packetmanager.name.source.cnie=CNIE
 packetmanager.name.source.default=REGISTRATION_CLIENT
 object.store.s3.use.account.as.bucketname=true
 

From f279e9cac27a01d330f3a80651fd95fbee85af0c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 31 Dec 2021 16:24:37 +0530
Subject: [PATCH 0536/1358] CNIE removed.

---
 application-default.properties            |  2 +-
 registration-processor-default.properties | 88 +++++++++++------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 3c30a86b044..ee59cc5af26 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -448,7 +448,7 @@ mosip.registration.gps_device_enable_flag=n
 ## 2.  'defaultPriority' : use default priority packetmanager.default.priority.
 packetmanager.default.read.strategy=defaultPriority
 packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.name.source={cnie:'CNIE',default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
+packetmanager.name.source={default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
 packetmanager.packet.signature.disable-verification=true
 mosip.commons.packetnames=id,evidence,optional
 provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a8e20cdb67d..bd35830e9b7 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -755,50 +755,50 @@ object.store.s3.use.account.as.bucketname=true
 # default priority for correction packets
 # To define priority use below stage names. For example, field 'gender' has priority in uin-generator-stage. The key for uin-generator-stage is 'uingenerator'. So the key would be 'packetmanager.provider.uingenerator.gender'
 # packetreceiver,packetuploader,packetvalidator,qualitychecker,osivalidator,demodedupe,classification,biodedupe,bioauth,manualverification,uingenerator,messagesender
-packetmanager.provider.uingenerator.lastName=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.gender=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.city=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.modeOfClaim=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.cregion=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.postalCode=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.cprovince=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.suffix=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.bloodType=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.referenceIdentityNumber=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.individualBiometrics[Finger]=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.individualBiometrics[Iris]=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.individualBiometrics[Face]=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.province=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.caddressLine4=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.zone=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.caddressLine3=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.caddressLine2=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.caddressLine1=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.addressLine1=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.addressLine2=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.residenceStatus=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.addressLine3=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.addressLine4=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.email=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.czone=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.dateOfBirth=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.cpostalCode=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.ccity=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.firstName=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.IDSchemaVersion=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.phone=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.registrationType=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.middleName=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.UIN=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.region=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.maritalStatus=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.parentOrGuardianUIN=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.parentOrGuardianRID=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.proofOfAddress=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.proofOfDateOfBirth=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.proofOfIdentity=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.proofOfRelationship=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.provider.uingenerator.proofOfException=source:CNIE\/process:CORRECTION,source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.lastName=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.gender=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.city=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.modeOfClaim=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.cregion=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.postalCode=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.cprovince=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.suffix=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.bloodType=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.referenceIdentityNumber=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.individualBiometrics[Finger]=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.individualBiometrics[Iris]=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.individualBiometrics[Face]=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.province=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.caddressLine4=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.zone=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.caddressLine3=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.caddressLine2=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.caddressLine1=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.addressLine1=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.addressLine2=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.residenceStatus=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.addressLine3=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.addressLine4=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.email=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.czone=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.dateOfBirth=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.cpostalCode=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.ccity=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.firstName=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.IDSchemaVersion=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.phone=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.registrationType=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.middleName=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.UIN=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.region=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.maritalStatus=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.parentOrGuardianUIN=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.parentOrGuardianRID=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.proofOfAddress=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.proofOfDateOfBirth=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.proofOfIdentity=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.proofOfRelationship=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.provider.uingenerator.proofOfException=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 
 # packet-classifier-stage
 # List of tag generator that should be run on every packet

From 53d1727c5d366f4e05f744d3e4f56725d680309d Mon Sep 17 00:00:00 2001
From: Monobikash Das <M1045447@mindtree.com>
Date: Fri, 31 Dec 2021 17:38:59 +0530
Subject: [PATCH 0537/1358] added anonymous-profile route

---
 ...rocessor-camel-routes-activate-default.xml | 119 ++++++++++++++++++
 ...cessor-camel-routes-deactivate-default.xml |   8 ++
 ...on-processor-camel-routes-lost-default.xml |  37 +++++-
 ...ion-processor-camel-routes-new-default.xml |  38 +++++-
 ...essor-camel-routes-res-reprint-default.xml |   8 +-
 ...cessor-camel-routes-res-update-default.xml |  19 ++-
 ...-processor-camel-routes-update-default.xml |  36 +++++-
 7 files changed, 256 insertions(+), 9 deletions(-)

diff --git a/registration-processor-camel-routes-activate-default.xml b/registration-processor-camel-routes-activate-default.xml
index 28eb1ba4264..72af7fa8757 100644
--- a/registration-processor-camel-routes-activate-default.xml
+++ b/registration-processor-camel-routes-activate-default.xml
@@ -34,4 +34,123 @@
          </otherwise>
       </choice>
    </route>
+   <route id="securezone-notification-->packet-uploader activated route">
+      <from uri="eventbus://securezone-notification-activated-bus-out" />
+      <log message="securezone-notification-->packet-uploader activated route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- Packet uploader to uin-generator Route -->
+   <route id="packet-uploader-->uin-generator activated route">
+      <from uri="eventbus://packet-uploader-activated-bus-out" />
+      <log message="packet-uploader-->uin-generator activated route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- UIN Generator to biometric-extraction Route -->
+   <route id="uin-generation route-->biometric-extraction-stage activated route">
+      <from uri="eventbus://uin-generator-activated-bus-out" />
+      <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://biometric-extraction-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- biometric-extraction to finalization Route -->
+   <route id="biometric-extraction route-->finalization-stage activated route">
+      <from uri="eventbus://biometric-extraction-activated-bus-out" />
+      <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <!-- finalization to activated Route -->
+   <route id="finalization route--> activated route">
+      <from uri="eventbus://finalization-activated-bus-out" />
+      <log message="finalization--> activated route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
 </routes>
diff --git a/registration-processor-camel-routes-deactivate-default.xml b/registration-processor-camel-routes-deactivate-default.xml
index 146348baff8..d4d48e2fc4c 100644
--- a/registration-processor-camel-routes-deactivate-default.xml
+++ b/registration-processor-camel-routes-deactivate-default.xml
@@ -63,6 +63,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -71,6 +72,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -85,6 +87,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -93,6 +96,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://biometric-extraction-bus-in" />
@@ -107,6 +111,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -115,6 +120,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://finalization-bus-in" />
@@ -129,6 +135,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -137,6 +144,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index 278f1467030..caac0d18368 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -86,6 +86,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -94,6 +95,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://packet-classifier-bus-in" />
@@ -108,6 +110,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -116,6 +119,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://c-m-d-validator-bus-in" />
@@ -129,6 +133,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -137,6 +142,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
@@ -148,6 +154,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -158,6 +165,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -166,6 +174,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
@@ -183,6 +192,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -191,6 +201,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
@@ -208,6 +219,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -216,6 +228,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://quality-classifier-bus-in" />
@@ -229,6 +242,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -237,6 +251,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
@@ -257,6 +272,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -267,6 +283,7 @@
         <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+           <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -301,6 +318,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -309,6 +327,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -322,6 +341,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -330,6 +350,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
@@ -341,6 +362,7 @@
          </when>
 		 <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -350,6 +372,7 @@
       <when>
          <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
          <to uri="workflow-cmd://complete-as-failed" />
+         <to uri="workflow-cmd://anonymous-profile" />
       </when>
       <when>
          <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -358,6 +381,7 @@
       <when>
          <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
          <to uri="workflow-cmd://complete-as-failed" />
+         <to uri="workflow-cmd://anonymous-profile" />
       </when>
       <otherwise>
          <to uri="eventbus://abis-handler-bus-in" />
@@ -370,6 +394,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -393,6 +418,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -401,6 +427,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://biometric-extraction-bus-in" />
@@ -415,6 +442,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -423,6 +451,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://finalization-bus-in" />
@@ -437,6 +466,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -445,10 +475,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
@@ -459,6 +490,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -467,10 +499,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="workflow-cmd://anonymous-profile" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 70d8311cd61..134267ae97c 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -85,6 +85,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -93,6 +94,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://packet-classifier-bus-in" />
@@ -107,6 +109,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -115,6 +118,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://c-m-d-validator-bus-in" />
@@ -128,6 +132,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -136,6 +141,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
@@ -147,6 +153,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -157,6 +164,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -165,6 +173,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
@@ -186,6 +195,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -194,6 +204,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
@@ -211,6 +222,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -219,6 +231,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://quality-classifier-bus-in" />
@@ -232,6 +245,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -240,6 +254,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
@@ -260,6 +275,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -270,6 +286,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -278,6 +295,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
@@ -299,6 +317,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -307,6 +326,7 @@
           <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
@@ -322,6 +342,7 @@
          </when>
 		 <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -332,6 +353,7 @@
         <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+           <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -366,6 +388,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -374,6 +397,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -387,6 +411,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -395,6 +420,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://abis-handler-bus-in" />
@@ -408,6 +434,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -416,6 +443,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -430,6 +458,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -438,6 +467,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://biometric-extraction-bus-in" />
@@ -453,6 +483,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -461,6 +492,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://finalization-bus-in" />
@@ -475,6 +507,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -483,10 +516,10 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
-			<to uri="workflow-cmd://anonymous-profile" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
@@ -498,6 +531,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -506,8 +540,10 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
+            <to uri="workflow-cmd://anonymous-profile" />
             <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index fc79de8bcc6..044226a2cd4 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -64,6 +64,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -72,10 +73,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
@@ -86,6 +88,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -94,10 +97,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="workflow-cmd://anonymous-profile" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index 09fe9701bd5..bcd11c32aa7 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -85,6 +85,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -93,6 +94,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://demo-dedupe-bus-in" />
@@ -106,6 +108,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -132,6 +135,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -140,6 +144,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
@@ -155,6 +160,7 @@
          </when>
 		 <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -165,6 +171,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -188,6 +195,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -196,6 +204,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://biometric-extraction-bus-in" />
@@ -210,6 +219,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -218,6 +228,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://finalization-bus-in" />
@@ -232,6 +243,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -240,10 +252,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
@@ -254,6 +267,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -262,10 +276,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="workflow-cmd://anonymous-profile" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index e8be3d24ba9..c8683a1c5a6 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -86,6 +86,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -94,6 +95,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://packet-classifier-bus-in" />
@@ -107,6 +109,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -115,6 +118,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://c-m-d-validator-bus-in" />
@@ -128,6 +132,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -136,6 +141,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-officerId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
@@ -147,6 +153,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -157,6 +164,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -165,6 +173,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '' &amp;&amp; @['tags']['META_INFO-OPERATIONS_DATA-supervisorId'] != '--TAG_VALUE_NOT_AVAILABLE--')]</jsonpath>
@@ -186,6 +195,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -194,6 +204,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR' || @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
@@ -211,6 +222,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -233,6 +245,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -241,6 +254,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['FAILED'] || @['tags']['BIOMETRIC_CORRECTION_FLOW_STATUS'] in ['REJECTED'])]</jsonpath>
@@ -261,6 +275,7 @@
          </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -271,6 +286,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -293,6 +309,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -323,6 +340,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -331,6 +349,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
@@ -346,6 +365,7 @@
          </when>
 		 <otherwise>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
@@ -356,6 +376,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -386,6 +407,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -394,6 +416,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
@@ -407,6 +430,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -415,6 +439,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://abis-handler-bus-in" />
@@ -428,6 +453,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -451,6 +477,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -459,6 +486,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://biometric-extraction-bus-in" />
@@ -473,6 +501,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -481,6 +510,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
             <to uri="eventbus://finalization-bus-in" />
@@ -495,6 +525,7 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -503,10 +534,11 @@
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
@@ -527,8 +559,8 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="workflow-cmd://anonymous-profile" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>

From cd5425a7b93f9a445a6ec475b060c0dc5e089fea Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Fri, 31 Dec 2021 19:36:48 +0530
Subject: [PATCH 0538/1358] updated uin & vid length.sequence-limit

---
 application-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index ee59cc5af26..d6061577911 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -262,7 +262,7 @@ mosip.kernel.vid.length=16
 # Upper bound of number of digits in sequence allowed in id. For example if
 # limit is 3, then 12 is allowed but 123 is not allowed in id (in both
 # ascending and descending order)
-# to disable sequence limit validation assign 0 or negative value
+# to disable sequence limit validation assign 1
 mosip.kernel.vid.length.sequence-limit=3
 # Number of digits in repeating block allowed in id. For example if limit is 2,
 # then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
@@ -284,8 +284,8 @@ mosip.kernel.uin.restricted-numbers=786,666
 # Upper bound of number of digits in sequence allowed in id. For example if
 # limit is 3, then 12 is allowed but 123 is not allowed in id (in both
 # ascending and descending order)
-# to disable sequence limit validation assign 0 or negative value
-mosip.kernel.uin.length.sequence-limit=0
+# to disable sequence limit validation assign 1
+mosip.kernel.uin.length.sequence-limit=3
 # Number of digits in repeating block allowed in id. For example if limit is 2,
 # then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
 #to disable validation assign zero or negative value

From 1598ef7f63059cb6fb0269342354f9b383b02977 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 3 Jan 2022 11:19:57 +0530
Subject: [PATCH 0539/1358] Stray file removed.

---
 res.diff | 144 -------------------------------------------------------
 1 file changed, 144 deletions(-)
 delete mode 100644 res.diff

diff --git a/res.diff b/res.diff
deleted file mode 100644
index 4945cc9ba83..00000000000
--- a/res.diff
+++ /dev/null
@@ -1,144 +0,0 @@
-DIFFERENT VALUES:
-
-SYNCSERVICE:
-< ${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/sync
-> http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/sync
-
-IDREPOSITORY:
-< http://idrepo-identity-service/idrepository/v1/identity/
-> http://identity.idrepo/idrepository/v1/identity/
-
-INTERNALAUTHTRANSACTIONS:
-< http://ida-internal-service/idauthentication/v1/internal/authTransactions
-> http://ida-internal.ida/idauthentication/v1/internal/authTransactions
-
-token.request.secretKey:
-< {cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-> ${mosip.mosip.resident.client.secret}
-
-IDREPOGETIDBYUIN:
-< http://idrepo-identity-service/idrepository/v1/identity/idvid
-> http://identity.idrepo/idrepository/v1/identity/idvid
-
-resident.secretKey:
-< {cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-> ${mosip.mosip.resident.client.secret}
-
-SMSNOTIFIER:
-< http://kernel-notification-service/v1/notifier/sms/send
-> http://notifier.kernel/v1/notifier/sms/send
-
-POLICY_REQ_URL:
-< http://pms-partner-manager-service/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-> http://pms-partner.pms/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-
-IDAUTHCREATEVID:
-< http://idrepo-vid-service/idrepository/v1/vid
-> http://vid.idrepo/idrepository/v1/vid
-
-RIDGENERATION:
-< http://kernel-ridgenerator-service/v1/ridgenerator/generate/rid
-> http://ridgenerator.kernel/v1/ridgenerator/generate/rid
-
-AUTHTYPESTATUSUPDATE:
-< http://idrepo-identity-service/idrepository/v1/identity/authtypes/status
-> http://identity.idrepo/idrepository/v1/identity/authtypes/status
-
-CREATEVID:
-< http://idrepo-vid-service/idrepository/v1/vid
-> http://vid.idrepo/idrepository/v1/vid
-
-CREDENTIAL_REQ_URL:
-< http://idrepo-credential-request-generator/v1/credentialrequest/requestgenerator
-> http://credentialrequest.idrepo/v1/credentialrequest/requestgenerator
-
-IDAUTHREVOKEVID:
-< http://idrepo-vid-service/idrepository/v1/vid
-> http://vid.idrepo/idrepository/v1/vid/deactivate
-
-MASTER:
-< http://kernel-masterdata-service/v1/masterdata
-> http://masterdata.kernel/v1/masterdata
-
-mosip.kernel.masterdata.audit-url:
-< http://kernel-auditmanager-service/v1/auditmanager/audits
-> http://auditmanager.kernel/v1/auditmanager/audits
-
-GETUINBYVID:
-< http://idrepo-vid-service/idrepository/v1/vid
-> http://vid.idrepo/idrepository/v1/vid
-
-REGISTRATIONSTATUSSEARCH:
-< ${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
-> http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
-
-IDREPOGETIDBYRID:
-< http://idrepo-identity-service/idrepository/v1/identity/idvid
-> http://identity.idrepo/idrepository/v1/identity/idvid
-
-KERNELENCRYPTIONSERVICE:
-< http://ida-internal-service/idauthentication/v1/internal/getCertificate
-> http://ida-internal.ida/idauthentication/v1/internal/getCertificate
-
-auth.server.admin.allowed.audience:
-< mosip-resident-client
-> mosip-resident-client,mosip-reg-client
-
-EMAILNOTIFIER:
-< http://kernel-notification-service/v1/notifier/email/send
-> http://notifier.kernel/v1/notifier/email/send
-
-ENCRYPTURL:
-< http://kernel-keymanager-service/v1/keymanager/encrypt
-> http://keymanager.kernel/v1/keymanager/encrypt
-
-DECRYPT_API_URL:
-< http://kernel-keymanager-service/v1/keymanager/decrypt
-> http://keymanager.kernel/v1/keymanager/decrypt
-
-PARTNER_API_URL:
-< http://pms-partner-manager-service/v1/partnermanager/partners
-> http://pms-partner.pms/v1/partnermanager/partners
-
-CREDENTIAL_STATUS_URL:
-< http://idrepo-credential-request-generator/v1/credentialrequest/get/
-> http://credentialrequest.idrepo/v1/credentialrequest/get/
-
-KERNELAUTHMANAGER:
-< http://kernel-auth-service/v1/authmanager/authenticate/clientidsecretkey
-> http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
-
-MIDSCHEMAURL:
-< http://kernel-syncdata-service/v1/syncdata/latestidschema
-> http://syncdata.kernel/v1/syncdata/latestidschema
-
-CREDENTIAL_CANCELREQ_URL:
-< http://idrepo-credential-request-generator/v1/credentialrequest/cancel/
-> http://credentialrequest.idrepo/v1/credentialrequest/cancel/
-
-OTP_GEN_URL:
-< http://ida-internal-service/idauthentication/v1/internal/otp
-> http://ida-internal.ida/idauthentication/v1/internal/otp
-
-CREDENTIAL_TYPES_URL:
-< http://idrepo-credential-service/v1/credentialservice/types
-> http://credential.idrepo/v1/credentialservice/types
-
-PACKETRECEIVER:
-< ${dmz.ingress.base.url}/registrationprocessor/v1/packetreceiver/registrationpackets
-> http://regproc-group1/registrationprocessor/v1/packetreceiver/registrationpackets
-
-INTERNALAUTH:
-< http://ida-internal-service/idauthentication/v1/internal/auth
-> http://ida-internal.ida/idauthentication/v1/internal/auth
-
-=======================================================
-
-NEW PROPERTIES in /Users/puneet/Documents/mosip/develop2/mosip-config/sandbox/resident-mz.properties
-set(['dmz.ingress.base.url'])
-
-=======================================================
-
-NEW PROPERITES in resident-default.properties
-set([])
-

From 22783ad0b2cb6de0686f833d96b3a0290b249af9 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 12:50:37 +0530
Subject: [PATCH 0540/1358] updated config for v3 deployment (dev3)

---
 application-default.properties | 222 ++++++++++++++++-----------------
 kernel-default.properties      |   4 +-
 2 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d6061577911..113f2a46ed2 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -14,99 +14,99 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.api.internal.url=${mosipbox.public.url}
+mosip.api.internal.url=${mosip.api.internal.host}
 #mosip.api.external.url=${mosipbox.public.url}
 
-db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
-softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
-softhsm.ida.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
-prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
-prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
-mosip.kernel.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
-mosip.kernel.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
-print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
-idrepo.websub.vid.credential.update.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-
-ida.websub.authtype.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-ida.websub.credential.issue.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-
-activemq.host=tcp://activemq
-activemq.core.port=80
+#db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
+#softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
+#softhsm.ida.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
+#prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
+#prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
+mosip.kernel.uin.salt=${mosip.kernel.tokenid.uin.salt}
+mosip.kernel.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
+#print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
+#idrepo.websub.vid.credential.update.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+
+#ida.websub.authtype.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#ida.websub.credential.issue.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+
+#activemq.host=tcp://activemq.activemq
+#activemq.core.port=80
 kafka.profile=default.svc.cluster.local
 kafka.port=9092
 
 
-mz.ingress.base.url=http://mz.ingress:30080
+mz.ingress.base.url=${mosip.api.internal.url}
 dmz.ingress.base.url=http://dmz.ingress:30080
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.default:80
-mosip.admin-service.url=http://admin-service.default:80
-mosip.admin-ui.url=http://admin-ui.default:80
-mosip.artifactory-service.url=http://artifactory-service.default:80
-mosip.clamav.url=http://clamav.default:80
-mosip.config-server.url=http://config-server.default:80
+mosip.admin-hotlist-service.url=http://admin-hotlist-service.admin:80
+mosip.admin-service.url=http://admin-service.admin:80
+mosip.admin-ui.url=http://admin-ui.admin:80
+mosip.artifactory-service.url=http://artifactory-service.artifactory:80
+mosip.clamav.url=http://clamav.clamav:80
+mosip.config-server.url=http://config-server.config-server:80
 #datashare is using domain externally so removed http(handled by protocol property.)
-mosip.datashare-service.url=datashare-service.default:80
+mosip.datashare-service.url=datashare-service.datashare:80
 mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.default:80
-mosip.ida-internal-service.url=http://ida-internal-service.default:80
-mosip.ida-otp-service.url=http://ida-otp-service.default:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.default:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.default:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.default:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.default:80
-mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.default:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.default:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.default:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.default:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.default:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.default:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.default:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.default:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.default:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.default:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.default:80
+mosip.ida-auth-service.url=http://ida-auth-service.ida:80
+mosip.ida-internal-service.url=http://ida-internal-service.ida:80
+mosip.ida-otp-service.url=http://ida-otp-service.ida:80
+mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.idrepo:80
+mosip.idrepo-credential-service.url=http://idrepo-credential-service.idrepo:80
+mosip.idrepo-identity-service.url=http://idrepo-identity-service.idrepo:80
+mosip.idrepo-vid-service.url=http://idrepo-vid-service.idrepo:80
+mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.idrepo:80
+mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.kernel:80
+mosip.kernel-auth-service.url=http://kernel-auth-service.kernel:80
+mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.kernel:80
+mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.keymanager:80
+mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.kernel:80
+mosip.kernel-notification-service.url=http://kernel-notification-service.kernel:80
+mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.kernel:80
+mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.kernel:80
+mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.kernel:80
+mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.kernel:80
 mosip.kernel.syncdata.syncjob.url=http://kernel-syncjob-service:8099
-mosip.keycloak.url=http://keycloak.default:80
+mosip.keycloak.url=http://keycloak.keycloak:80
 mosip.kubernetes.url=http://kubernetes.default:80
 mosip.minio.url=http://minio.default:9000
-mosip.mock-abis.url=http://mock-abis.default:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.default:80
+mosip.mock-abis.url=http://mock-abis.abis:80
+mosip.mock-biosdk-service.url=http://mock-biosdk-service.biosdk:80
 mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.default:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.default:80
-mosip.pms-ui.url=http://pms-ui.default:80
-mosip.postgres.url=http://postgres.default:80
-mosip.prereg-application-service.url=http://prereg-application-service.default:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.default:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.default:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.default:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.default:80
-mosip.prereg-ui.url=http://prereg-ui.default:80
-mosip.print-service.url=http://print-service.default:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.default:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.default:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.default:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.default:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.default:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.default:80
-mosip.regproc-print-service.url=http://regproc-print-service.default:80
-mosip.regproc-group1-service.url=http://regproc-group1.default.80
-mosip.resident-service.url=http://resident-service.default:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.default:80
-mosip.softhsm-ida.url=http://softhsm-ida.default:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.default:80
+mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.pms:80
+mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.pms:80
+mosip.pms-ui.url=http://pms-ui.pms:80
+mosip.postgres.url=http://postgres.postgres:80
+mosip.prereg-application-service.url=http://prereg-application-service.prereg:80
+mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.prereg:80
+mosip.prereg-booking-service.url=http://prereg-booking-service.prereg:80
+mosip.prereg-captcha-service.url=http://prereg-captcha-service.prereg:80
+mosip.prereg-datasync-service.url=http://prereg-datasync-service.prereg:80
+mosip.prereg-ui.url=http://prereg-ui.prereg:80
+mosip.print-service.url=http://print-service.print:80
+mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.regproc:80
+mosip.regproc-notification-service.url=http://regproc-notification-service.regproc:80
+mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.regproc:80
+mosip.regproc-reprocessor.url=http://regproc-reprocessor.regproc:80
+mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.regproc:80
+mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.regproc:80
+mosip.regproc-print-service.url=http://regproc-print-service.regproc:80
+mosip.regproc-group1-service.url=http://regproc-group1.regproc.80
+mosip.resident-service.url=http://resident-service.resident:80
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.regproc:80
+mosip.softhsm-ida.url=http://softhsm-ida.ida:80
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.keymanager:80
 mosip.ingress-nginx.url=http://ingress-nginx.default:80
 mosip.kube-dns.url=http://kube-dns.default:80
 mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
 mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.default:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.default:80
-mosip.graf-grafana.url=http://graf-grafana.default:80
+mosip.elasticsearch-master.url=http://elasticsearch-master.cattle-logging-system:80
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.cattle-logging-system:80
+mosip.graf-grafana.url=http://graf-grafana.rancher-monitoring-grafana:80
 mosip.kibana-kibana.url=http://kibana-kibana.default:80
 mosip.metrics-server.url=http://metrics-server.default:80
 mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
@@ -114,45 +114,45 @@ mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.def
 mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
 mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
 mosip.packetmanager-service.url=http://packetmanager-service.packetmanager:80
-mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.default:80
-mosip.regproc-status-service.url=http://regproc-registration-status-service.default:80
+mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.regproc:80
+mosip.regproc-status-service.url=http://regproc-registration-status-service.regproc:80
 mosip.websub.url=${mosip.api.internal.url}
-keycloak.external.host=${mosip.api.internal.url}/keycloak
-
-mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
-mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.ida.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.reg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-preregistration.mosip.prereg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.misp.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.partner.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.policymanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.partnermanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.resident.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.admin.services.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.crereq.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.creser.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.datsha.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
-mosip.mosip.idrepo.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.syncdata.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.mpartner-default-auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-mosip.mosip.mpartner-default-print.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+keycloak.external.host=${keycloak.host}
+
+#mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
+#mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.ida.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.reg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#preregistration.mosip.prereg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.misp.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.partner.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.policymanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.partnermanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.resident.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.admin.services.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.crereq.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.creser.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.datsha.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+#mosip.mosip.idrepo.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.syncdata.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.mpartner-default-auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
+#mosip.mosip.mpartner-default-print.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
 
 
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
-email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
-email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
-email.smtp.secret={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
-activemq.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
-
-s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
-s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
-s3.region=
+#email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
+#email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
+#email.smtp.secret={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
+#activemq.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
+
+#s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+#s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
+#s3.region=
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
diff --git a/kernel-default.properties b/kernel-default.properties
index 70686645792..35374c38150 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -96,8 +96,8 @@ mosip.kernel.ida.client.id=mosip-ida-client
 mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
 ## Token id salts
-mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
-mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
 ## VID generator service
 mosip.kernel.vid.min-unused-threshold=100000

From 614d2705758edf79b162148855bb3bc587ff8485 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 14:52:10 +0530
Subject: [PATCH 0541/1358] updated config for

---
 application-default.properties | 213 ++++++++++++++++-----------------
 syncdata-default.properties    |   4 +-
 2 files changed, 108 insertions(+), 109 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 113f2a46ed2..41857cb9f4b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -1,11 +1,43 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
+# override below properties for v2 deployment
 #   keycloak.host
 #   s3.accesskey 
 #   s3.region
 #   s3.secretkey
 #   mosip.api.internal.host
+#   mosip.mosip.admin.client.secret
+#   mosip.mosip.regproc.client.secret
+#   mosip.mosip.auth.client.secret
+#   mosip.mosip.ida.client.secret
+#   mosip.mosip.reg.client.secret
+#   preregistration.mosip.prereg.client.secret
+#   mosip.mosip.misp.client.secret
+#   mosip.mosip.partner.client.secret
+#   mosip.mosip.policymanager.client.secret
+#   mosip.mosip.partnermanager.client.secret
+#   mosip.mosip.resident.client.secret
+#   mosip.mosip.admin.services.client.secret
+#   mosip.mosip.crereq.client.secret
+#   mosip.mosip.creser.client.secret
+#   mosip.mosip.datsha.client.secret
+#   mosip.mosip.abis.client.secret
+#   mosip.mosip.creser.idpass.client.secret
+#   mosip.mosip.pms.client.secret
+#   keycloak.admin.password
+#   mosip.mosip.idrepo.client.secret
+#   mosip.mosip.syncdata.client.secret
+#   mosip.mosip.mpartner-default-auth.client.secret
+#   mosip.mosip.mpartner-default-print.client.secret
+#   email.smtp.host
+#   email.smtp.username
+#   email.smtp.secret
+#   activemq.password
+
+#s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
+#s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
+#s3.region=
 
 aplication.configuration.level.version=LTS
 
@@ -42,117 +74,84 @@ kafka.port=9092
 
 
 mz.ingress.base.url=${mosip.api.internal.url}
-dmz.ingress.base.url=http://dmz.ingress:30080
-mosip.admin-hotlist-service.url=http://admin-hotlist-service.admin:80
-mosip.admin-service.url=http://admin-service.admin:80
-mosip.admin-ui.url=http://admin-ui.admin:80
-mosip.artifactory-service.url=http://artifactory-service.artifactory:80
-mosip.clamav.url=http://clamav.clamav:80
-mosip.config-server.url=http://config-server.config-server:80
+#dmz.ingress.base.url=http://dmz.ingress:30080
+mosip.admin-hotlist-service.url=http://admin-hotlist.admin
+mosip.admin-service.url=http://admin-service.admin
+mosip.admin-ui.url=http://admin-ui.admin
+mosip.artifactory-service.url=http://artifactory.artifactory
+mosip.clamav.url=http://clamav.clamav
+mosip.config-server.url=http://config-server.config-server
 #datashare is using domain externally so removed http(handled by protocol property.)
-mosip.datashare-service.url=datashare-service.datashare:80
-mosip.healthcheck-app-service.url=http://healthcheck-app-service.default:80
-mosip.ida-auth-service.url=http://ida-auth-service.ida:80
-mosip.ida-internal-service.url=http://ida-internal-service.ida:80
-mosip.ida-otp-service.url=http://ida-otp-service.ida:80
-mosip.idrepo-credential-request-generator.url=http://idrepo-credential-request-generator.idrepo:80
-mosip.idrepo-credential-service.url=http://idrepo-credential-service.idrepo:80
-mosip.idrepo-identity-service.url=http://idrepo-identity-service.idrepo:80
-mosip.idrepo-vid-service.url=http://idrepo-vid-service.idrepo:80
-mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.idrepo:80
-mosip.kernel-auditmanager-service.url=http://kernel-auditmanager-service.kernel:80
-mosip.kernel-auth-service.url=http://kernel-auth-service.kernel:80
-mosip.kernel-idgenerator-service.url=http://kernel-idgenerator-service.kernel:80
-mosip.kernel-keymanager-service.url=http://kernel-keymanager-service.keymanager:80
-mosip.kernel-masterdata-service.url=http://kernel-masterdata-service.kernel:80
-mosip.kernel-notification-service.url=http://kernel-notification-service.kernel:80
-mosip.kernel-otpmanager-service.url=http://kernel-otpmanager-service.kernel:80
-mosip.kernel-pridgenerator-service.url=http://kernel-pridgenerator-service.kernel:80
-mosip.kernel-ridgenerator-service.url=http://kernel-ridgenerator-service.kernel:80
-mosip.kernel-syncdata-service.url=http://kernel-syncdata-service.kernel:80
-mosip.kernel.syncdata.syncjob.url=http://kernel-syncjob-service:8099
-mosip.keycloak.url=http://keycloak.keycloak:80
-mosip.kubernetes.url=http://kubernetes.default:80
-mosip.minio.url=http://minio.default:9000
-mosip.mock-abis.url=http://mock-abis.abis:80
-mosip.mock-biosdk-service.url=http://mock-biosdk-service.biosdk:80
-mosip.mock-mv.url=http://mock-mv.default:80
-mosip.pms-partner-manager-service.url=http://pms-partner-manager-service.pms:80
-mosip.pms-policy-manager-service.url=http://pms-policy-manager-service.pms:80
-mosip.pms-ui.url=http://pms-ui.pms:80
-mosip.postgres.url=http://postgres.postgres:80
-mosip.prereg-application-service.url=http://prereg-application-service.prereg:80
-mosip.prereg-batchjob-service.url=http://prereg-batchjob-service.prereg:80
-mosip.prereg-booking-service.url=http://prereg-booking-service.prereg:80
-mosip.prereg-captcha-service.url=http://prereg-captcha-service.prereg:80
-mosip.prereg-datasync-service.url=http://prereg-datasync-service.prereg:80
-mosip.prereg-ui.url=http://prereg-ui.prereg:80
-mosip.print-service.url=http://print-service.print:80
-mosip.regproc-manual-verification-stage.url=http://regproc-manual-verification-stage.regproc:80
-mosip.regproc-notification-service.url=http://regproc-notification-service.regproc:80
-mosip.regproc-registration-transaction-service.url=http://regproc-registration-transaction-service.regproc:80
-mosip.regproc-reprocessor.url=http://regproc-reprocessor.regproc:80
-mosip.regproc-securezone-notification-stage.url=http://regproc-securezone-notification-stage.regproc:80
-mosip.regproc-workflowmanager.url=http://regproc-workflowmanager.regproc:80
-mosip.regproc-print-service.url=http://regproc-print-service.regproc:80
-mosip.regproc-group1-service.url=http://regproc-group1.regproc.80
-mosip.resident-service.url=http://resident-service.resident:80
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.regproc:80
-mosip.softhsm-ida.url=http://softhsm-ida.ida:80
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.keymanager:80
-mosip.ingress-nginx.url=http://ingress-nginx.default:80
-mosip.kube-dns.url=http://kube-dns.default:80
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default:80
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default:80
-mosip.elasticsearch-master.url=http://elasticsearch-master.cattle-logging-system:80
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.cattle-logging-system:80
-mosip.graf-grafana.url=http://graf-grafana.rancher-monitoring-grafana:80
-mosip.kibana-kibana.url=http://kibana-kibana.default:80
-mosip.metrics-server.url=http://metrics-server.default:80
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default:80
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default:80
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default:80
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default:80
-mosip.packetmanager-service.url=http://packetmanager-service.packetmanager:80
-mosip.packet-receiver-service.url=http://regproc-packet-receiver-stage.regproc:80
-mosip.regproc-status-service.url=http://regproc-registration-status-service.regproc:80
+mosip.datashare-service.url=http://datashare.datashare
+#mosip.healthcheck-app-service.url=http://healthcheck-app-service.default
+mosip.ida-auth-service.url=http://ida-auth.ida
+mosip.ida-internal-service.url=http://ida-internal.ida
+mosip.ida-otp-service.url=http://ida-otp.ida
+mosip.idrepo-credential-request-generator.url=http://credentialrequest.idrepo
+mosip.idrepo-credential-service.url=http://credential.idrepo
+mosip.idrepo-identity-service.url=http://identity.idrepo
+mosip.idrepo-vid-service.url=http://vid.idrepo
+mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.idrepo
+mosip.kernel-auditmanager-service.url=http://auditmanager.kernel
+mosip.kernel-auth-service.url=http://authmanager.kernel
+mosip.kernel-idgenerator-service.url=http://idgenerator.kernel
+mosip.kernel-keymanager-service.url=http://keymanager.keymanager
+mosip.kernel-masterdata-service.url=http://masterdata.kernel
+mosip.kernel-notification-service.url=http://notifier.kernel
+mosip.kernel-otpmanager-service.url=http://otpmanager.kernel
+mosip.kernel-pridgenerator-service.url=http://pridgenerator.kernel
+mosip.kernel-ridgenerator-service.url=http://ridgenerator.kernel
+mosip.kernel-syncdata-service.url=http://syncdata.kernel
+mosip.kernel.syncdata.syncjob.url=http://kernel-syncjob-service99
+mosip.keycloak.url=http://keycloak.keycloak
+mosip.kubernetes.url=http://kubernetes.default
+mosip.minio.url=http://minio.minio:9000
+mosip.mock-abis.url=http://mock-abis.abis
+mosip.mock-biosdk-service.url=http://biosdk-service.biosdk
+mosip.mock-mv.url=http://mock-mv.regproc
+mosip.pms-partner-manager-service.url=http://pms-partner.pms
+mosip.pms-policy-manager-service.url=http://pms-policy.pms
+mosip.pms-ui.url=http://pms-ui.pms
+mosip.postgres.url=http://postgres.postgres
+mosip.prereg-application-service.url=http://prereg-application.prereg
+mosip.prereg-batchjob-service.url=http://prereg-batchjob.prereg
+mosip.prereg-booking-service.url=http://prereg-booking.prereg
+mosip.prereg-captcha-service.url=http://prereg-captcha.prereg
+mosip.prereg-datasync-service.url=http://prereg-datasync.prereg
+mosip.prereg-ui.url=http://prereg-ui.prereg
+mosip.print-service.url=http://print-service.print
+mosip.regproc-manual-verification-stage.url=${mosip.mock-mv.url}
+mosip.regproc-notification-service.url=http://regproc-notifier.regproc
+mosip.regproc-registration-transaction-service.url=http://regproc-trans.regproc
+mosip.regproc-reprocessor.url=http://regproc-reprocess.regproc
+mosip.regproc-securezone-notification-stage.url=http://regproc-group2.regproc
+mosip.regproc-workflowmanager.url=http://regproc-workflow.regproc
+mosip.regproc-print-service.url=http://regproc-print-service.regproc
+mosip.regproc-group1-service.url=http://regproc-group1.regproc
+mosip.resident-service.url=http://resident-service.resident
+mosip.service-hazelcast-server.url=http://service-hazelcast-server.regproc
+mosip.softhsm-ida.url=http://softhsm-ida.ida
+mosip.softhsm-keymanager.url=http://softhsm-keymanager.keymanager
+mosip.ingress-nginx.url=http://ingress-nginx.default
+mosip.kube-dns.url=http://kube-dns.default
+mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default
+mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default
+mosip.elasticsearch-master.url=http://elasticsearch-master.cattle-logging-system
+mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.cattle-logging-system
+mosip.graf-grafana.url=http://graf-grafana.rancher-monitoring-grafana
+mosip.kibana-kibana.url=http://kibana-kibana.cattle-logging-system
+mosip.metrics-server.url=http://metrics-server.default
+mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default
+mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default
+mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default
+mosip.prom-prometheus-server.url=http://prom-prometheus-server.default
+mosip.packetmanager-service.url=http://packetmanager.packetmanager
+mosip.packet-receiver-service.url=http://regproc-group1.regproc
+mosip.regproc-status-service.url=http://regproc-status.regproc
 mosip.websub.url=${mosip.api.internal.url}
 keycloak.external.host=${keycloak.host}
 
-#mosip.mosip.admin.client.secret={cipher}d1eac77ebe38f6a4b735a5a51055d2a8f71b9669ee68e78564b5d27a7b61f960
-#mosip.mosip.regproc.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.ida.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.reg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#preregistration.mosip.prereg.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.misp.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.partner.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.policymanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.partnermanager.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.resident.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.admin.services.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.crereq.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.creser.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.datsha.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.abis.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.creser.idpass.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.pms.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#keycloak.admin.password={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
-#mosip.mosip.idrepo.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.syncdata.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.mpartner-default-auth.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-#mosip.mosip.mpartner-default-print.client.secret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-
-
 mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
-#email.smtp.host={cipher}26eb5384a1817305bc289b19a84cde1ec1bfdd0501afce4a40e50b26223671aee69da2d5781802ab1072c29424d9bff4
-#email.smtp.username={cipher}7b2ac139bc75bd2e26ae3aedd11c7c102cb3fe51c280d2db988783e484ea9e30
-#email.smtp.secret={cipher}c9e3b4e78507e2d3d6c26163ab12b7c2a269168b4edd45b09ad091e68ebad44ba3a3f9dd7e0c4790bd2c3edcf23289f960cfb0a26d81a7c1a12a7bd4d99f3c2c3a2651c27647265548e9f346878243dcd7b311e69fe5efda27c6399a18b87b5c
-#activemq.password={cipher}3c7b6d545f11105e9a9a7e1d4dfd7829662d73c713576a877536ac783921c9f0
-
-#s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
-#s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
-#s3.region=
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
@@ -477,7 +476,7 @@ object.store.s3.readlimit=10000000
 ## Swift
 object.store.swift.username=test
 object.store.swift.password=test
-object.store.swift.url=http://localhost:8080
+object.store.swift.url=http://localhost80
 
 packet.manager.account.name=packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 03a77a0e405..a9971bdb169 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -92,8 +92,8 @@ mosip.kernel.ida.client.id=mosip-ida-client
 mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
 ## Token id salts
-mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf
-mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
 ## VID generator service
 mosip.kernel.vid.min-unused-threshold=100000

From 17014169ea6372499cf9a85104a46b4ec9e6d66f Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 14:57:54 +0530
Subject: [PATCH 0542/1358] updated config

---
 application-default.properties | 40 ++++++++++++++--------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 41857cb9f4b..ae012239eb4 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -34,10 +34,22 @@
 #   email.smtp.username
 #   email.smtp.secret
 #   activemq.password
-
-#s3.accesskey={cipher}e16f132dc80ad5043acb6c2173c95be217ee5f5246a589ca58d5f75fa0a9d63d
-#s3.secretkey={cipher}e419b23e688cc23991001afddbda206d42f7df5090c65f3566be7651c90128c1
-#s3.region=
+#   ida.websub.authtype.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.credential.issue.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   db.dbuser.password
+#   softhsm.kernel.pin
+#   softhsm.ida.pin
+#   prereg.captcha.site.key
+#   prereg.captcha.secret.key
+#   print.websub.hub.secret
+#   idrepo.websub.vid.credential.update.secret
+#   activemq.host
+#   activemq.core.port
 
 aplication.configuration.level.version=LTS
 
@@ -49,32 +61,13 @@ mosip.recommended.centers.locCode=5
 mosip.api.internal.url=${mosip.api.internal.host}
 #mosip.api.external.url=${mosipbox.public.url}
 
-#db.dbuser.password={cipher}447a3783548004f6059aeee54383781ba2aad71eab81d49457a2a19b51d1b523
-#softhsm.kernel.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
-#softhsm.ida.pin={cipher}2d6aa328be521b2be6f33f476f7df2ea39c7ae1a3e2146ec169c5fac3225da3f
-#prereg.captcha.site.key=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX
-#prereg.captcha.secret.key=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI
 mosip.kernel.uin.salt=${mosip.kernel.tokenid.uin.salt}
 mosip.kernel.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
-#print.websub.hub.secret={cipher}29ef73e366406ea1e7ac1d43e8d96002c3bd814a8b8cde9a961d897f2dadede5
-#idrepo.websub.vid.credential.update.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-
-#ida.websub.authtype.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#ida.websub.credential.issue.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-
-#activemq.host=tcp://activemq.activemq
-#activemq.core.port=80
 kafka.profile=default.svc.cluster.local
 kafka.port=9092
 
 
 mz.ingress.base.url=${mosip.api.internal.url}
-#dmz.ingress.base.url=http://dmz.ingress:30080
 mosip.admin-hotlist-service.url=http://admin-hotlist.admin
 mosip.admin-service.url=http://admin-service.admin
 mosip.admin-ui.url=http://admin-ui.admin
@@ -83,7 +76,6 @@ mosip.clamav.url=http://clamav.clamav
 mosip.config-server.url=http://config-server.config-server
 #datashare is using domain externally so removed http(handled by protocol property.)
 mosip.datashare-service.url=http://datashare.datashare
-#mosip.healthcheck-app-service.url=http://healthcheck-app-service.default
 mosip.ida-auth-service.url=http://ida-auth.ida
 mosip.ida-internal-service.url=http://ida-internal.ida
 mosip.ida-otp-service.url=http://ida-otp.ida

From 15aae990fbb72a4ea4ce8185f0878dca1304b798 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 14:59:31 +0530
Subject: [PATCH 0543/1358] updated config for "object.store.swift.url"

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index ae012239eb4..075fe17ae8a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -468,7 +468,7 @@ object.store.s3.readlimit=10000000
 ## Swift
 object.store.swift.username=test
 object.store.swift.password=test
-object.store.swift.url=http://localhost80
+object.store.swift.url=http://localhost:8080
 
 packet.manager.account.name=packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt

From c55eada117c2156148a316d174ffb7afb06402c9 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 15:17:45 +0530
Subject: [PATCH 0544/1358] updated config
 "mosip.idrepo-bioextractor-service.url"

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 075fe17ae8a..9dadf834371 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -83,7 +83,7 @@ mosip.idrepo-credential-request-generator.url=http://credentialrequest.idrepo
 mosip.idrepo-credential-service.url=http://credential.idrepo
 mosip.idrepo-identity-service.url=http://identity.idrepo
 mosip.idrepo-vid-service.url=http://vid.idrepo
-mosip.idrepo-bioextractor-service.url=http://idrepo-bioextractor-service.idrepo
+mosip.idrepo-bioextractor-service.url=http://bioextractor.idrepo
 mosip.kernel-auditmanager-service.url=http://auditmanager.kernel
 mosip.kernel-auth-service.url=http://authmanager.kernel
 mosip.kernel-idgenerator-service.url=http://idgenerator.kernel

From 651c7f35a4bbba9721e1964db1e3e770dcf653d8 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 15:32:26 +0530
Subject: [PATCH 0545/1358] commented mosip.api.internal.url

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 9dadf834371..8ccdcf9eae0 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -58,7 +58,7 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-mosip.api.internal.url=${mosip.api.internal.host}
+#mosip.api.internal.url=${mosip.api.internal.host}
 #mosip.api.external.url=${mosipbox.public.url}
 
 mosip.kernel.uin.salt=${mosip.kernel.tokenid.uin.salt}

From ca293b6417f4bc4bc79bf00f01fcc9b63c8cdd59 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 15:33:50 +0530
Subject: [PATCH 0546/1358] commented kernel salt tokenid

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 8ccdcf9eae0..04a04fa91d8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -61,8 +61,8 @@ mosip.recommended.centers.locCode=5
 #mosip.api.internal.url=${mosip.api.internal.host}
 #mosip.api.external.url=${mosipbox.public.url}
 
-mosip.kernel.uin.salt=${mosip.kernel.tokenid.uin.salt}
-mosip.kernel.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
+#mosip.kernel.uin.salt=${mosip.kernel.tokenid.uin.salt}
+#mosip.kernel.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
 kafka.profile=default.svc.cluster.local
 kafka.port=9092
 

From 154616a76ef78680ea165bf45ea969d7baf1150f Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 3 Jan 2022 15:53:39 +0530
Subject: [PATCH 0547/1358] updated config

---
 application-default.properties | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 04a04fa91d8..e6a073c2459 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -34,13 +34,13 @@
 #   email.smtp.username
 #   email.smtp.secret
 #   activemq.password
-#   ida.websub.authtype.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#   ida.websub.credential.issue.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#   ida.websub.partner.service.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#   ida.websub.hotlist.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#   ida.websub.masterdata.templates.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#   ida.websub.masterdata.titles.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
-#   ida.websub.ca.certificate.callback.secret={cipher}8cee1868024e9c525f44b977b31b8b70a9ba510f85dc9d4bab1491c9b2b96da9
+#   ida.websub.authtype.callback.secret
+#   ida.websub.credential.issue.callback.secret
+#   ida.websub.partner.service.callback.secret
+#   ida.websub.hotlist.callback.secret
+#   ida.websub.masterdata.templates.callback.secret
+#   ida.websub.masterdata.titles.callback.secret
+#   ida.websub.ca.certificate.callback.secret
 #   db.dbuser.password
 #   softhsm.kernel.pin
 #   softhsm.ida.pin

From 969c3d51606829857b281717b07966c7cac26fa1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 08:12:35 +0530
Subject: [PATCH 0548/1358] DMZ files removed as not required in V3.

---
 application-default-dmz.properties            | 379 ------------------
 ...ssor-camel-routes-activate-default-dmz.xml |  37 --
 ...outes-biometric-correction-default-dmz.xml |  37 --
 ...or-camel-routes-deactivate-default-dmz.xml |  37 --
 ...rocessor-camel-routes-lost-default-dmz.xml |  37 --
 ...processor-camel-routes-new-default-dmz.xml |  37 --
 ...r-camel-routes-res-reprint-default-dmz.xml |  38 --
 ...or-camel-routes-res-update-default-dmz.xml |  37 --
 ...cessor-camel-routes-update-default-dmz.xml |  37 --
 registration-processor-default-dmz.properties | 257 ------------
 10 files changed, 933 deletions(-)
 delete mode 100644 application-default-dmz.properties
 delete mode 100644 registration-processor-camel-routes-activate-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-biometric-correction-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-deactivate-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-lost-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-new-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-res-reprint-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-res-update-default-dmz.xml
 delete mode 100644 registration-processor-camel-routes-update-default-dmz.xml
 delete mode 100644 registration-processor-default-dmz.properties

diff --git a/application-default-dmz.properties b/application-default-dmz.properties
deleted file mode 100644
index 3c6632bf8c7..00000000000
--- a/application-default-dmz.properties
+++ /dev/null
@@ -1,379 +0,0 @@
-#---------------------------------------Common properties-----------------------
-aplication.configuration.level.version=LTS
-mosip.api.internal.url=${mosipbox.public.url}
-mz.ingress.base.url=http://mz.ingress:30080
-mosip.keymanager.base.url=${mosip.kernel-keymanager-service.url}
-
-
-
-#Kernel-idobjectalidator
-# Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key
-mosip.kernel.idobjectvalidator.property-source=APPLICATION_CONTEXT
-mosip.kernel.idobjectvalidator.schema-name=mosip-identity-json-schema.json
-mosip.kernel.idobjectvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-mosip.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable=NA
-
-
-
-mosip.masterdata.base.url = ${mz.ingress.base.url}
-mosip.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/languages
-mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/gendertypes
-mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documentcategories
-mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/documenttypes/{documentcategorycode}/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/{langcode}
-mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/locations/locationhierarchy/{hierarchyname}
-mosip.kernel.idobjectvalidator.masterdata.individualtypes.rest.uri=${mosip.masterdata.base.url}/v1/masterdata/individualtypes
-
-mosip.kernel.idobjectvalidator.mandatory-attributes.id-repository.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.new-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber
-mosip.kernel.idobjectvalidator.mandatory-attributes.pre-registration.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-client.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
-mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registration=fullName,dateOfBirth|age,gender,addressLine1,region,province,city,zone,postalCode,residenceStatus,referenceIdentityNumber,parentOrGuardianName,parentOrGuardianRID|parentOrGuardianUIN,parentOrGuardianBiometrics
-
-mosip.country.code=WOR
-
-# Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
-
-# Application IDs
-mosip.prereg.app-id=PRE_REGISTRATION
-mosip.reg.app-id=REGISTRATION
-mosip.regproc.app-id=REGISTRATION_PROCESSOR
-mosip.ida.app-id=IDA
-mosip.ida.ref-id=INTERNAL
-mosip.idrepo.app-id=ID_REPO
-
-# UTC ISO Date Time Pattern
-mosip.utc-datetime-pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-mosip.sign.header=response-signature
-mosip.signed.response.header=response-signature
-
-#----------------------- CBEFF Util--------------------------------------------------
-# Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
-mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
-# Cbeff XSD file name in config server
-mosip.kernel.xsdfile=mosip-cbeff.xsd
-
-#----------------------------- Applicant Type --------------------------------------------------
-mosip.kernel.applicant.type.age.limit = 5
-
-#----------------------------- Static PIN --------------------------------------------------
-mosip.kernel.pin.length=6
-
-#-----------------------------TspId -----------------------------------------------
-#length of the Tsp id
-mosip.kernel.tspid.length=4
-
-#-----------------------------partnerId -----------------------------------------------
-#length of the partner id
-mosip.kernel.partnerid.length=4
-
-#-----------------------------TOKEN-ID Properties---------------------------------
-#length of the token id
-mosip.kernel.tokenid.length=36
-
-#-----------------------------Registration Center Id -----------------------------------------------
-#length of the registration center id
-mosip.kernel.registrationcenterid.length=5
-
-#-----------------------------Machine Id -----------------------------------------------
-#length of the machine id
-mosip.kernel.machineid.length=5
-
-#-----------------------------RID Properties---------------------------------------
-# length of the rid
-mosip.kernel.rid.length=29
-# length of the timestamp
-mosip.kernel.rid.timestamp-length=14
-# rid sequence max digits
-mosip.kernel.rid.sequence-length=5
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-mosip.kernel.tokenid.sequence-limit=3
-
-#-----------------------------PRID Properties------------------------------------
-#prid-length
-mosip.kernel.prid.length=14
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-#to disable validation assign zero or negative value
-mosip.kernel.prid.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-#to disable validation assign zero or negative value
-mosip.kernel.prid.repeating-block-limit=3
-
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit) to disable validation assign zero or negative value
-mosip.kernel.prid.repeating-limit=2
-
-# list of number that id should not be start with to disable null
-mosip.kernel.prid.not-start-with=0,1
-
-#restricted numbers for prid
-mosip.kernel.prid.restricted-numbers=786,666
-
-
-#-----------------------------VID Properties--------------------------------------
-# length of the vid
-mosip.kernel.vid.length=16
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-# to disable sequence limit validation assign 0 or negative value
-mosip.kernel.vid.length.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-# to disable repeating block validation assign 0 or negative value
-mosip.kernel.vid.length.repeating-block-limit=2
-
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
-# to disable repeating limit validation, assign 0  or negative value
-mosip.kernel.vid.length.repeating-limit=2
-
-# list of number that id should not be start with
-# to disable null
-mosip.kernel.vid.not-start-with=0,1
-
-#restricted numbers for vid
-mosip.kernel.vid.restricted-numbers=786,666
-
-#-----------------------------UIN Properties--------------------------------------
-#length of the uin
-mosip.kernel.uin.length=10
-#minimum threshold of unused uin
-mosip.kernel.uin.min-unused-threshold=200000
-#number of uins to generate
-mosip.kernel.uin.uins-to-generate=500000
-#restricted numbers for uin
-mosip.kernel.uin.restricted-numbers=786,666
-
-# Upper bound of number of digits in sequence allowed in id. For example if
-# limit is 3, then 12 is allowed but 123 is not allowed in id (in both
-# ascending and descending order)
-# to disable sequence limit validation assign 0 or negative value
-mosip.kernel.uin.length.sequence-limit=3
-
-# Number of digits in repeating block allowed in id. For example if limit is 2,
-# then 4xxx4 is allowed but 48xxx48 is not allowed in id (x is any digit)
-#to disable validation assign zero or negative value
-mosip.kernel.uin.length.repeating-block-limit=2
-
-# Lower bound of number of digits allowed in between two repeating digits in
-# id. For example if limit is 2, then 11 and 1x1 is not allowed in id (x is any digit)
-# to disable repeating limit validation, assign 0  or negative value
-mosip.kernel.uin.length.repeating-limit=2
-
-#reverse group digit limit for uin filter
-mosip.kernel.uin.length.reverse-digits-limit=5
-
-#group digit limit for uin filter
-mosip.kernel.uin.length.digits-limit=5
-
-#should not start with
-mosip.kernel.uin.not-start-with=0,1
-
-#adjacent even digit limit for uin filter
-mosip.kernel.uin.length.conjugative-even-digits-limit=3
-
-
-
-#------------------------Auth-Adapter-----------------------------------------------
-auth.server.validate.url=${mz.ingress.base.url}/v1/authmanager/authorize/admin/validateToken
-#----------------------- Crypto --------------------------------------------------
-#Crypto asymmetric algorithm name
-mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
-#Crypto symmetric algorithm name
-mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
-#Keygenerator asymmetric algorithm name
-mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Keygenerator symmetric algorithm name
-mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-#Asymmetric algorithm key length
-mosip.kernel.keygenerator.asymmetric-key-length=2048
-#Symmetric algorithm key length
-mosip.kernel.keygenerator.symmetric-key-length=256
-#Keygenerator symmetric algorithm name
-mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-# keygenerator asymmetric algorithm name
-mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Encrypted data and encrypted symmetric key separator
-mosip.kernel.data-key-splitter=#KEY_SPLITTER#
-#GCM tag length
-mosip.kernel.crypto.gcm-tag-length=128
-#Hash algo name
-mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
-#Symmtric key length used in hash
-mosip.kernel.crypto.hash-symmetric-key-length=256
-#No of iterations in hash
-mosip.kernel.crypto.hash-iteration=100000
-#Sign algo name
-mosip.kernel.crypto.sign-algorithm-name=RS256
-
-
-mosip.kernel.keymanager-service-decrypt-url=${mosip.keymanager.base.url}/v1/keymanager/decrypt
-mosip.kernel.keymanager-service-sign-url=${mosip.keymanager.base.url}/v1/keymanager/sign
-mosip.sign.applicationid=KERNEL
-mosip.sign.refid=SIGN
-mosip.kernel.cryptomanager.request_id=CRYPTOMANAGER.REQUEST
-mosip.kernel.cryptomanager.request_version=v1.0
-mosip.kernel.signature.signature-request-id=SIGNATURE.REQUEST
-mosip.kernel.signature.signature-version-id=v1.0
-
-
-
-#----------------------------------ID Repo------------------------------------------
-mosip.idrepo.identity.uin-status.registered=ACTIVATED
-mosip.idrepo.identity.uin-status=ACTIVATED,BLOCKED,DEACTIVATED
-
-#---------------------------------------otp manager service-------------------------------
-#the default length for otp(in number)
-mosip.kernel.otp.default-length=6
-#the default crypto function
-#It can be: HmacSHA512, HmacSHA256, HmacSHA1.
-mosip.kernel.otp.mac-algorithm=HmacSHA512
-#the OTP expires after the given time(in seconds).
-mosip.kernel.otp.expiry-time=180
-#the key is freezed for the given time(in seconds).
-mosip.kernel.otp.key-freeze-time=1800
-#the number of validation attempts allowed(in number).
-#mosip.kernel.otp.validation-attempt-threshold =3 means , the validation and generation will be blocked from 4th time.
-mosip.kernel.otp.validation-attempt-threshold=10
-#minimum length of key(in number).
-mosip.kernel.otp.min-key-length=3
-#maximum length of key(in number).
-mosip.kernel.otp.max-key-length=64
-
-
-#--------------------------------------Licensekeymanager  Service--------------------------------------
-#the license key length.
-mosip.kernel.licensekey.length=16
-#List of permissions
-# NOTE: ',' in the below list is used as splitter in the implementation.
-# Use of ',' in the values for below key should be avoided.
-# Use of spaces before and after ',' also should be avoided.
-mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authentication - Identity Data Match,Demo Authentication - Address Data Match,Demo Authentication - Full Address Data Match,Demo Authentication - Secondary Language Match,Biometric Authentication - FMR Data Match,Biometric Authentication - IIR Data Match,Biometric Authentication - FID Data Match,Static Pin Authentication,eKYC - limited,eKYC - Full,eKYC - No
-
-
-
-#-----------------------------Virus Scanner--------------------------------------
-mosip.kernel.virus-scanner.host=clamav 
-mosip.kernel.virus-scanner.port=80
-
-#------------------------Transliteration-----------------------------------------------
-mosip.kernel.transliteration.arabic-language-code=ara
-mosip.kernel.transliteration.franch-language-code=fra
-mosip.kernel.transliteration.english-language-code=eng
-
-
-
-#-------Registration processor Notification types------------
-mosip.registration.processor.notification.types=SMS|EMAIL
-
-
-mosip.default.dob.month=01
-mosip.default.dob.day=01
-mosip.login.mode= email,mobile
-
-
-#---Language orientation-----
-mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng,fra
-
-
-
-#**************** Notification Type *************
-#mosip.notificationtype=SMS|EMAIL
-mosip.notificationtype=EMAIL
-mosip.kernel.sms.proxy-sms=false
-#******** Notification lanugage types - either PRIMARY or BOTH ********
-mosip.notification.language-type=BOTH
-
-
-#-------------------System---------------
-logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
-
-#-------------------Admin---------------
-mosip.min-digit-longitude-latitude=4
-mosip.kernel.filtervalue.max_columns=20
-
-auth.server.admin.validate.url=${mz.ingress.base.url}/v1/authmanager/authorize/admin/validateToken
-
-#------------------PDF Genration-----------------------------------------
-mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-#------------------Quality Check-----------------------------------------
-#Quality threshold for applicant iris
-mosip.iris_threshold=0
-#Quality threshold for applicant leftslap fingerprint
-mosip.leftslap_fingerprint_threshold=0
-#Quality threshold for applicant rightslap fingerprint
-mosip.rightslap_fingerprint_threshold=0
-#Quality threshold for applicant thumbs fingerprint
-mosip.thumbs_fingerprint_threshold=0
-#Quality threshold for applicant face
-mosip.facequalitythreshold=0
-#Bio SDK Integration
-mosip.fingerprint.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
-mosip.face.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
-mosip.iris.provider=io.mosip.kernel.bioapi.impl.BioApiImpl
-
-#-------UIN Alias-------------------
-mosip.uin.alias=
-
-#---------------------------------kernel Salt Generator---------------------------------------------------#
-mosip.kernel.salt-generator.chunk-size=10
-mosip.kernel.salt-generator.start-sequence=0
-mosip.kernel.salt-generator.end-sequence=999
-#----------------------------------------------------------------------------------------------------------#
-server.max-http-header-size=10000000
-
-mosip.kernel.auth.adapter.ssl-bypass=true
-
-# device registration/deregistration config
-mosip.stage.environment=Developer
-
-# log level
-logging.level.root=WARN
-logging.level.io.mosip=INFO
-logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
-
-#iam adapter
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
-
-# tomcat access logs
-server.tomcat.accesslog.enabled=true
-server.tomcat.accesslog.directory=/dev
-server.tomcat.accesslog.prefix=stdout
-server.tomcat.accesslog.buffered=false
-server.tomcat.accesslog.suffix=
-server.tomcat.accesslog.file-date-format=
-server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}","req.userAgent":"%{User-Agent}i","req.xForwardedFor":"%{X-Forwarded-For}i","req.referer":"%{Referer}i","req.method":"%m","req.remoteHost":"%a"}
-server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
-
-
-mosip.mandatory-languages=eng
-mosip.optional-languages=ara,eng
-mosip.min-languages.count=2
-mosip.max-languages.count=3
-mosip.recommended.centers.locCode=6
-
-#Config key to pick the preferred language for communicating to the Resident
-mosip.default.user-preferred-language-attribute=preferredLang
-
-# URL to get new Auth Token from OIDC provider & to do online validation of auth token with OIDC provider.
-auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
-
-# Map to find the realm for the inputted appid to get the token from OIDC provider.
-mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
diff --git a/registration-processor-camel-routes-activate-default-dmz.xml b/registration-processor-camel-routes-activate-default-dmz.xml
deleted file mode 100644
index 71c3b1b90dc..00000000000
--- a/registration-processor-camel-routes-activate-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification activated route">
-      <from uri="eventbus://packet-receiver-activated-bus-out" />
-      <log message="packet-reciever-->securezone-notification activated-route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-biometric-correction-default-dmz.xml b/registration-processor-camel-routes-biometric-correction-default-dmz.xml
deleted file mode 100644
index d23999be45e..00000000000
--- a/registration-processor-camel-routes-biometric-correction-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification biometric_correction route">
-      <from uri="eventbus://packet-receiver-biometric_correction-bus-out" />
-      <log message="packet-reciever-->securezone-notification biometric_correction ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-deactivate-default-dmz.xml b/registration-processor-camel-routes-deactivate-default-dmz.xml
deleted file mode 100644
index 9157eb14f19..00000000000
--- a/registration-processor-camel-routes-deactivate-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification deactivated route">
-      <from uri="eventbus://packet-receiver-deactivated-bus-out" />
-      <log message="packet-reciever-->securezone-notification deactivated-route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-lost-default-dmz.xml b/registration-processor-camel-routes-lost-default-dmz.xml
deleted file mode 100644
index 55cbf750ce1..00000000000
--- a/registration-processor-camel-routes-lost-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification lost Route -->
-   <route id="packet-reciever-->securezone-notification lost route">
-      <from uri="eventbus://packet-receiver-lost-bus-out" />
-      <log message="packet-reciever-->securezone-notification ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-new-default-dmz.xml b/registration-processor-camel-routes-new-default-dmz.xml
deleted file mode 100644
index a633ab73b07..00000000000
--- a/registration-processor-camel-routes-new-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification new route">
-      <from uri="eventbus://packet-receiver-new-bus-out" />
-      <log message="packet-reciever-->securezone-notification new ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-res-reprint-default-dmz.xml b/registration-processor-camel-routes-res-reprint-default-dmz.xml
deleted file mode 100644
index d1aab074d9d..00000000000
--- a/registration-processor-camel-routes-res-reprint-default-dmz.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification res_reprint route">
-      <from uri="eventbus://packet-receiver-res_reprint-bus-out" />
-      <log message="packet-reciever-->securezone-notification res_reprint ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-            `
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-res-update-default-dmz.xml b/registration-processor-camel-routes-res-update-default-dmz.xml
deleted file mode 100644
index e6ddcb64b7e..00000000000
--- a/registration-processor-camel-routes-res-update-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification res_update route">
-      <from uri="eventbus://packet-receiver-res_update-bus-out" />
-      <log message="packet-reciever-->securezone-notification res_update ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-camel-routes-update-default-dmz.xml b/registration-processor-camel-routes-update-default-dmz.xml
deleted file mode 100644
index 5dab02e7839..00000000000
--- a/registration-processor-camel-routes-update-default-dmz.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <!-- Packet-Reciever to securezone-notification Route -->
-   <route id="packet-reciever-->securezone-notification update route">
-      <from uri="eventbus://packet-receiver-update-bus-out" />
-      <log message="packet-reciever-->securezone-notification update ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://mz.ingress:30080/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
\ No newline at end of file
diff --git a/registration-processor-default-dmz.properties b/registration-processor-default-dmz.properties
deleted file mode 100644
index f35c9c28716..00000000000
--- a/registration-processor-default-dmz.properties
+++ /dev/null
@@ -1,257 +0,0 @@
-####################################################################################################
-#---------------------------------------- COMMON PROPERTIES ----------------------------------------
-####################################################################################################
-
-#------------------------------------------Spring properties---------------------------------------#
-
-# DB details to which regproc dmz services and stage will connect
-mosip.registration.processor.database.hostname=mz.ingress
-mosip.registration.processor.database.port=30090
-
-# URL prefix to connect to mz services cluster
-mz.ingress.url=${mz.ingress.base.url}
-
-# Persistence properties
-javax.persistence.jdbc.driver=org.postgresql.Driver
-javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
-javax.persistence.jdbc.user=regprcuser
-javax.persistence.jdbc.password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
-
-# Hibernate properties
-hibernate.hbm2ddl.auto=none
-hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-hibernate.jdbc.lob.non_contextual_creation=true
-hibernate.show_sql=false
-
-# Health checker config followed by all spring apps
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=info,health,refresh
-
-#----------------------------------Registration processor rest client API's------------------------#
-
-# Audit Service URLs
-AUDIT=${mz.ingress.url}/v1/auditmanager/audits
-
-# Auth Services URLs
-KEYBASEDTOKENAPI=${mz.ingress.url}/v1/authmanager/authenticate/clientidsecretkey
-GETINDIVIDUALIDFROMUSERID=${mz.ingress.url}/v1/authmanager/individualId
-TOKENVALIDATE=${mz.ingress.url}/v1/authmanager/authorize/admin/validateToken
-DIGITALSIGNATURE=${mz.ingress.url}/v1/keymanager/sign
-
-# IDA Services URLs
-ida-internal-auth-uri=${mz.ingress.url}/idauthentication/v1/internal/auth
-ida-internal-get-certificate-uri=${mz.ingress.url}/idauthentication/v1/internal/getCertificate
-
-# Keymanager service URLs
-CRYPTOMANAGERDECRYPT=${mz.ingress.url}/v1/keymanager/decrypt
-ENCRYPTURL=${mz.ingress.url}/v1/keymanager/encrypt
-
-#------------------------------------Other common libraries properties-----------------------------#
-
-# Landing zone folder where uploaded files are temporarily kept
-registration.processor.LANDING_ZONE = /mnt/regproc/landing
-
-# Base base package to be used for scanning components of the IAM adapter to autowire
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
-
-# Token generation request details
-token.request.id=io.mosip.registration.processor
-token.request.appid=regproc
-token.request.version=1.0
-token.request.clientId=mosip-regproc-client
-token.request.secretKey={cipher}215f555ae8266e12fed8144620b34fa3f2be2f805a3d28f9e0cfca3e777d18db
-token.request.issuerUrl=${mosip.api.internal.url}/keycloak/auth/realms/mosip
-
-# Request id to be used for various internal services
-mosip.registration.processor.digital.signature.id=io.mosip.registration.processor
-mosip.registration.processor.audit.id=mosip.applicanttype.getApplicantType
-mosip.registration.processor.crypto.decrypt.id=mosip.cryptomanager.decrypt
-
-# Kernel Crypto signature
-registration.processor.signature.isEnabled=true
-
-# The elapse time beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=300
-
-# Virus Scanner Connection details
-mosip.kernel.virus-scanner.host=clamav
-mosip.kernel.virus-scanner.port=80
-# virus scanner provider to be passed during runtime. This property will load provider during startup
-mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl
-
-# Extension used for the packets
-registration.processor.packet.ext=.zip
-# Id used for referencing keys in keymanager belonging to regproc module
-registration.processor.application.id=REGISTRATION
-# Version string that will be used in the reponses
-mosip.registration.processor.application.version=1.0
-# Date time pattern that should be followed in timestamp for both request and response
-mosip.registration.processor.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-# Date pattern for registrationDate that should be followed in lostrid request
-mosip.registration.processor.lostrid.registrationdate.pattern=yyyy-MM-dd
-# Timezone that is expected to be followed in the request and response
-mosip.registration.processor.timezone=GMT
-# Allowed time difference between the request time and the curren time
-mosip.registration.processor.grace.period=10800
-
-# The list of comma separated stages that should be successfully completed before packet
-# reaches the stage that uploads packets to the packet store
-mosip.registration.processor.registration.status.stages-before-reaching-packet-store=PacketReceiverStage,SecurezoneNotificationStage
-
-# Stage Group Configuratoins
-# Default base packages for stage beans to be scanned in a stage group
-mosip.regproc.mosip-stage-executor.stage-beans-base-packages.default=io.mosip.registration.processor,io.mosip.registrationprocessor,io.mosip.registartion.processor
-# Add any new base package of Stage bean specific to stage group as below
-# mosip.regproc.stage-groups.stage-beans-base-packages.<stage_group_name>=${mosip.regproc.stage-groups.stage-beans-base-packages.default}
-# Example: mosip.regproc.stage-groups.stage-beans-base-packages.stage-group-1=${mosip.regproc.stage-groups.stage-beans-base-packages.default},my.stage.bean.base.package
-
-# Mostly used for forming the config server URI in stages
-packet.info.storage.service=*
-registration.processor.identityjson=identity-mapping.json
-config.server.file.storage.uri=${spring.cloud.config.uri}/${packet.info.storage.service}/${spring.profiles.active}/${spring.cloud.config.label}/
-
-# main processor used in stages
-registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE
-# sub processor used in stages
-registration.processor.sub-processes=BIOMETRIC_CORRECTION
-
-#--------------------------------Registration core library properties------------------------------#
-
-# Regproc supported eventbus types: vertx, kafka. Defaults to vertx if the config is not present
-mosip.regproc.eventbus.type=kafka
-
-# Kafka event bus config, will be used only when the type is kafka
-# Kafka cluster servers comma separated, common for all stages and camel bridge
-mosip.regproc.eventbus.kafka.bootstrap.servers=kafka-0.kafka-headless.default.svc.cluster.local:9092,kafka-1.kafka-headless.default.svc.cluster.local:9092,kafka-2.kafka-headless.default.svc.cluster.local:9092
-
-# workel pool size to process multiple requests parallely by stages
-worker.pool.size=10
-
-####################################################################################################
-#------------------------------------ WORKFLOW ENGINE PROPERTIES -----------------------------------
-####################################################################################################
-
-#------------------------------------------camel-bridge--------------------------------------------#
-
-mosip.regproc.camel.bridge.eventbus.kafka.commit.type=single
-mosip.regproc.camel.bridge.eventbus.kafka.max.poll.records=100
-mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
-# Above 3 camel kafka config will have no effect, it is kept because MosipBridgeFactory extends
-# MosipVerticleAPIManager
-# Kafka consumer group id, used by kafka to identify multiple instances of the same consumer
-mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-brdige-dmz
-
-# Camel Route xml files corresponding to the dmz flow
-camel.dmz.active.flows.file.names=registration-processor-camel-routes-new-default-dmz.xml,registration-processor-camel-routes-update-default-dmz.xml,registration-processor-camel-routes-activate-default-dmz.xml,registration-processor-camel-routes-res-update-default-dmz.xml,registration-processor-camel-routes-deactivate-default-dmz.xml,registration-processor-camel-routes-lost-default-dmz.xml,registration-processor-camel-routes-res-reprint-default-dmz.xml,registration-processor-camel-routes-biometric-correction-default-dmz.xml
-# Current zone on which services and stages are runnning, can be dmz or mz
-registration.processor.zone=dmz
-# Pause settings used by camel to match expression and pause packet processing
-# Eg: [{"matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","resumeRemoveTags" : "HOTLISTED"}]
-mosip.regproc.camelbridge.pause-settings=[]
-# Prefix used by all the address in the camel flow
-mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-
-
-####################################################################################################
-#------------------------------------ REGPROC SERVICES PROPERTIES ----------------------------------
-####################################################################################################
-
-#-------------------------------------Registration Status service----------------------------------#
-
-# Exposed API ids and versions used for request validation
-mosip.registration.processor.registration.status.id=mosip.registration.status
-mosip.registration.processor.registration.sync.id=mosip.registration.sync
-mosip.registration.processor.lostrid.id=mosip.registration.lostrid
-# Registration External Status Id
-mosip.registration.processor.registration.external.status.id=mosip.registration.external.status
-# Packet external Status Id
-mosip.registration.processor.packet.external.status.id=mosip.registration.packet.external.status
-mosip.registration.processor.sync.version=1.0
-mosip.registration.processor.registration.status.version=1.0
-mosip.registration.processor.lostrid.version=1.0
-# Registration External Status Version
-mosip.registration.processor.registration.external.status.version=1.0
-# Packet Status Version
-mosip.registration.processor.packet.external.status.version=1.0
-
-# LatestTransactionTypeCodes Before uploading to Object Store
-mosip.registration.processor.packet.status.transactiontypecodes-before-uploading-to-objectstore=PACKET_RECEIVER,SECUREZONE_NOTIFICATION
-# LatestTransactionTypeCode  uploading to Object Store
-mosip.registration.processor.packet.status.transactiontypecodes-uploading-to-objectstore=UPLOAD_PACKET
-# LatestTransactionTypeCodes  time based resend required
-mosip.registration.processor.packet.status.transactiontypecodes-time-based-resend-required=PACKET_RECEIVER
-
-# Maximum no of time client is allowed to upload a packet on failure
-registration.processor.max.retry=3
-
-# The comma separate list of external statuses that should be considered as processed
-# for search API response consumed by regclient
-mosip.registration.processor.registration.status.external-statuses-to-consider-processed=UIN_GENERATED,REREGISTER,REJECTED,REPROCESS_FAILED
-
-# this property is used in lostrid api to get postal code
-mosip.registration.processor.postalcode.req.url=${mz.ingress.url}/v1/masterdata/registrationcenters
-#registration status api controller assigned roles
-mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
-mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
-mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostexternalstatussearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-
-####################################################################################################
-#------------------------------------- STAGE SPECIFIC PROPERTIES -----------------------------------
-####################################################################################################
-
-#-----------------------------------------Packet Receiver Stage------------------------------------#
-
-# Supported commmit config: auto, batch, single
-mosip.regproc.packet.receiver.eventbus.kafka.commit.type=single
-# Maximum records that can be received in one poll from kafka
-mosip.regproc.packet.receiver.eventbus.kafka.max.poll.records=100
-# Interval between each poll calls to kafka in milli sec
-mosip.regproc.packet.receiver.eventbus.kafka.poll.frequency=100
-# Kafka consumer group id, used by kafka to identify multiple instances of the same consumer
-mosip.regproc.packet.receiver.eventbus.kafka.group.id=packet-receiver-stage
-
-# Base sevlet path for the stage
-mosip.regproc.packet.receiver.server.servlet.path=/registrationprocessor/v1/packetreceiver
-# Port number in which the application will run
-mosip.regproc.packet.receiver.server.port=8081
-# Port number to be used by eventbus for communicating with other vertx apps in the cluster
-mosip.regproc.packet.receiver.eventbus.port=5711
-
-# Flag to disable the copying of tags from the packet manger to the message event
-mosip.regproc.packet.receiver.message.tag.loading.disable=true
-#Maximum file size to be upload from packet receiver
-registration.processor.max.file.size=5
-# Module id that should be added in the responses
-mosip.registration.processor.packet.id=mosip.registration.packet
-
-####################################################################################################
-#----------------------------- NOT USED PROPERTIES (To be removed later) ---------------------------
-####################################################################################################
-
-#-----packet-utility----------
-# The known packet sources. Should be set as all fieldCategory present in idschema
-# (NOTE : if fieldCategory is set as pvt then the source should be id)
-registration.processor.sourcepackets=id,evidence,optional
-# The mandatory default source packet.(In default configuration this is thd id packet)
-packet.default.source=id
-# the default schema field cagegory (ex - private)
-schema.default.fieldCategory=pvt
-
-registration.processor.notification_service_subscriber_hub_url=${mosip.api.internal.url}/hub/
-registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
-registration.processor.notification_service_subscriber_topic=registration_processor_workflow_completed_event
-registration.processor.notification_service_subscriber_callback_url=${mosip.api.internal.url}/registrationprocessor/v1/notification/callback/notify
-
-mosip.regproc.message.tag.loading.disable=true
-
-
-mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret={cipher}9f6a1d9751bdd7e59ca3a9dbe66b47db3ecb7025e66a6746911de2bd841c804f
-
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client

From a64fe2491779dbe83ca038517562a0428640f388 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 11:38:30 +0530
Subject: [PATCH 0549/1358] [MOSIP-19369] Cleanup. WIP.

---
 admin-default.properties                  |  40 ++---
 applicanttype.mvel                        |  76 ++++----
 application-default.properties            | 208 +++++-----------------
 data-share-default.properties             |   8 +-
 hazelcast_dmz.xml                         |  47 -----
 hotlist-default.properties                |   8 +-
 id-authentication-default.properties      |  24 +--
 id-repository-default.properties          |  54 +++---
 kernel-default.properties                 |  38 ++--
 mock-abis-default.properties              |   2 +-
 partner-management-default.properties     |  32 ++--
 pre-registration-default.properties       |  60 +++----
 print-default.properties                  |  12 +-
 registration-processor-default.properties |  69 +++----
 resident-default.properties               |  44 ++---
 syncdata-default.properties               |  36 ++--
 16 files changed, 295 insertions(+), 463 deletions(-)
 delete mode 100644 hazelcast_dmz.xml

diff --git a/admin-default.properties b/admin-default.properties
index 5b6521cabd1..9752702ef76 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -16,8 +16,8 @@ mosip.kernel.database.hostname=postgres
 mosip.kernel.database.port=80
 
 ## Account management
-authmanager.base.url=${mosip.kernel-auth-service.url}/v1/authmanager
-mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
+authmanager.base.url=${mosip.authmanager.url}/v1/authmanager
+mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
 mosip.admin.accountmgmt.user-name-url=/username/
 mosip.admin.accountmgmt.user-detail-url=/userdetail/
 mosip.admin.accountmgmt.unblock-url=/unblock/
@@ -25,9 +25,9 @@ mosip.admin.accountmgmt.change-passoword-url=/changepassword/
 mosip.admin.accountmgmt.reset-password-url=/resetpassword/
 mosip.admin.app-id=admin
 
-mosip.kernel.signature.cryptomanager-encrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/private/encrypt
-auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.refreshToken.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/refreshToken
+mosip.kernel.signature.cryptomanager-encrypt-url=${mosip.kernel.keymanager.url}/v1/keymanager/private/encrypt
+auth.server.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.refreshToken.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/refreshToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client
 auth.role.prefix=ROLE_
 auth.header.name=Authorization
@@ -49,10 +49,10 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
 ## Use registration
-auth.server.user-register-url=${mosip.kernel-auth-service.url}/v1/authmanager/user
-mosip.kernel.emailnotifier-url=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-auth.server.sendotp-url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/sendotp
-auth.server.user-add-password-url=${mosip.kernel-auth-service.url}/v1/authmanager/user/addpassword
+auth.server.user-register-url=${mosip.authmanager.url}/v1/authmanager/user
+mosip.kernel.emailnotifier-url=${mosip.kernel.notification.url}/v1/notifier/email/send
+auth.server.sendotp-url=${mosip.authmanager.url}/v1/authmanager/authenticate/sendotp
+auth.server.user-add-password-url=${mosip.authmanager.url}/v1/authmanager/user/addpassword
 mosip.admin-appid=admin
 mosip.admin-otp-context=auth-otp
 mosip.admin-userid-otp-type=USERID 
@@ -66,7 +66,7 @@ mosip.admin.security.policy.type1=password
 mosip.admin.security.policy.type2=password,otp
 mosip.admin.security.policy.type3=otp
 mosip.admin.security.policy.role-policy-mapping={ZONAL_ADMIN:'type2',ZONAL_APPROVER:'type1',CENTRAL_ADMIN:'type1',CENTRAL_APPROVER:'type1',REGISTRATION_OFFICER:'type1',REGISTRATION_SUPERVISOR:'type1',REGISTRATION_OPERATOR:'type1'}
-mosip.admin.security.policy.userrole-auth-url=${mosip.kernel-auth-service.url}/v1/authmanager/role/{appId}/{username}
+mosip.admin.security.policy.userrole-auth-url=${mosip.authmanager.url}/v1/authmanager/role/{appId}/{username}
 
 ## Masterdata cards
 
@@ -164,13 +164,13 @@ mosip.admin.masterdata.card.valid-document-fra=Documents valides
 mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u0635\u0627\u0644\u062D\u0629
 
 ## UIN activate/deactivate
-mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
+mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
 mosip.kernel.packet-status-update-url=${mosip.regproc-registration-transaction-service.url}/v1/registrationtransaction/search
 mosip.kernel.packet-reciever-api-url=${mosip.packet-receiver-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
-mosip.kernel.zone-validation-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/zones/authorize
+mosip.kernel.zone-validation-url=${mosip.kernel.masterdata.url}/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
-mosip.kernel.audit.manager.api=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
-mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.kernel.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
@@ -216,14 +216,14 @@ regproc.token.request.clientId=mosip-regproc-client
 regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
-KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 # IAM adapter
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
-mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
 # in minutes
@@ -266,10 +266,10 @@ mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
 auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
-MACHINE_GET_API=${mosip.kernel-masterdata-service.url}/v1/masterdata/machines/mappedmachines/?pageNumber=0&pageSize=100&orderBy=cr_dtimes&direction=DESC
-CRYPTOMANAGERDECRYPT_API=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
-CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
-CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/?pageNumber=0&pageSize=100&orderBy=cr_dtimes&direction=DESC
+CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
 mosip.admin.packetupload.packetsync.url=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/syncV2
 mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,lastName
diff --git a/applicanttype.mvel b/applicanttype.mvel
index 69da629d5dc..5ae1fcdcd1f 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -96,97 +96,97 @@ def getApplicantType() {
   if( ageCode == 'KER-MSD-151' ) { return "KER-MSD-151"; }
   
   if(itc == null || genderType == null || ageCode == null || isBioExPresent == null ) { 
-      return isUpdateFlow(identity) ? "000" : "KER-MSD-147";
+      return isUpdateFlow(identity) ? "A000" : "KER-MSD-147";
   }
   
   System.out.println(itc + " - " + genderType + " - " + ageCode + " - " + isBioExPresent);
 
   if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "001";
+    return "A001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "002";
+    return "A002";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "003";
+    return "A003";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "004";
+    return "A004";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "005";
+    return "A005";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "006";
+    return "A006";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "007";
+    return "A007";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "008";
+    return "A008";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "005";
+    return "A005";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "006";
+    return "A006";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "007";
+    return "A007";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "008";
+    return "A008";
   } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "009";
+    return "A009";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "010";
+    return "A010";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "011";
+    return "A011";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "012";
+    return "A012";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "013";
+    return "A013";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "015";
+    return "A015";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "016";
+    return "A016";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "013";
+    return "A013";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "015";
+    return "A015";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "016";
+    return "A016";
   } 
     
 	else if (itc == NonResident && genderType == MALE && ageCode == MINOR && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == MALE && ageCode == MINOR && isBioExPresent) {
-    return "015";
+    return "A015";
   }
   
   else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && isBioExPresent) {
-    return "015";
+    return "A015";
   }
   
   else if (itc == NonResident && genderType == Others && ageCode == MINOR && isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == Others && ageCode == MINOR && isBioExPresent) {
-    return "015";
+    return "A015";
   }
   
   else if (itc == NonResident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
-    return "015";
+    return "A015";
   }
   
    else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
-    return "015";
+    return "A015";
   }
   
   else if (itc == NonResident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
-    return "014";
+    return "A014";
   } else if (itc == Resident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
-    return "015";
+    return "A015";
   }
   
   
-  return "000";
+  return "A000";
 }
diff --git a/application-default.properties b/application-default.properties
index e6a073c2459..5a25aec012c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -2,54 +2,11 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # override below properties for v2 deployment
-#   keycloak.host
+#   keycloak.internal.url
 #   s3.accesskey 
 #   s3.region
 #   s3.secretkey
 #   mosip.api.internal.host
-#   mosip.mosip.admin.client.secret
-#   mosip.mosip.regproc.client.secret
-#   mosip.mosip.auth.client.secret
-#   mosip.mosip.ida.client.secret
-#   mosip.mosip.reg.client.secret
-#   preregistration.mosip.prereg.client.secret
-#   mosip.mosip.misp.client.secret
-#   mosip.mosip.partner.client.secret
-#   mosip.mosip.policymanager.client.secret
-#   mosip.mosip.partnermanager.client.secret
-#   mosip.mosip.resident.client.secret
-#   mosip.mosip.admin.services.client.secret
-#   mosip.mosip.crereq.client.secret
-#   mosip.mosip.creser.client.secret
-#   mosip.mosip.datsha.client.secret
-#   mosip.mosip.abis.client.secret
-#   mosip.mosip.creser.idpass.client.secret
-#   mosip.mosip.pms.client.secret
-#   keycloak.admin.password
-#   mosip.mosip.idrepo.client.secret
-#   mosip.mosip.syncdata.client.secret
-#   mosip.mosip.mpartner-default-auth.client.secret
-#   mosip.mosip.mpartner-default-print.client.secret
-#   email.smtp.host
-#   email.smtp.username
-#   email.smtp.secret
-#   activemq.password
-#   ida.websub.authtype.callback.secret
-#   ida.websub.credential.issue.callback.secret
-#   ida.websub.partner.service.callback.secret
-#   ida.websub.hotlist.callback.secret
-#   ida.websub.masterdata.templates.callback.secret
-#   ida.websub.masterdata.titles.callback.secret
-#   ida.websub.ca.certificate.callback.secret
-#   db.dbuser.password
-#   softhsm.kernel.pin
-#   softhsm.ida.pin
-#   prereg.captcha.site.key
-#   prereg.captcha.secret.key
-#   print.websub.hub.secret
-#   idrepo.websub.vid.credential.update.secret
-#   activemq.host
-#   activemq.core.port
 
 aplication.configuration.level.version=LTS
 
@@ -58,102 +15,27 @@ aplication.configuration.level.version=LTS
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
-#mosip.api.internal.url=${mosip.api.internal.host}
-#mosip.api.external.url=${mosipbox.public.url}
-
-#mosip.kernel.uin.salt=${mosip.kernel.tokenid.uin.salt}
-#mosip.kernel.partnercode.salt=${mosip.kernel.tokenid.partnercode.salt}
-kafka.profile=default.svc.cluster.local
-kafka.port=9092
-
-
-mz.ingress.base.url=${mosip.api.internal.url}
-mosip.admin-hotlist-service.url=http://admin-hotlist.admin
-mosip.admin-service.url=http://admin-service.admin
-mosip.admin-ui.url=http://admin-ui.admin
-mosip.artifactory-service.url=http://artifactory.artifactory
-mosip.clamav.url=http://clamav.clamav
-mosip.config-server.url=http://config-server.config-server
-#datashare is using domain externally so removed http(handled by protocol property.)
-mosip.datashare-service.url=http://datashare.datashare
-mosip.ida-auth-service.url=http://ida-auth.ida
-mosip.ida-internal-service.url=http://ida-internal.ida
-mosip.ida-otp-service.url=http://ida-otp.ida
-mosip.idrepo-credential-request-generator.url=http://credentialrequest.idrepo
-mosip.idrepo-credential-service.url=http://credential.idrepo
-mosip.idrepo-identity-service.url=http://identity.idrepo
-mosip.idrepo-vid-service.url=http://vid.idrepo
-mosip.idrepo-bioextractor-service.url=http://bioextractor.idrepo
-mosip.kernel-auditmanager-service.url=http://auditmanager.kernel
-mosip.kernel-auth-service.url=http://authmanager.kernel
-mosip.kernel-idgenerator-service.url=http://idgenerator.kernel
-mosip.kernel-keymanager-service.url=http://keymanager.keymanager
-mosip.kernel-masterdata-service.url=http://masterdata.kernel
-mosip.kernel-notification-service.url=http://notifier.kernel
-mosip.kernel-otpmanager-service.url=http://otpmanager.kernel
-mosip.kernel-pridgenerator-service.url=http://pridgenerator.kernel
-mosip.kernel-ridgenerator-service.url=http://ridgenerator.kernel
-mosip.kernel-syncdata-service.url=http://syncdata.kernel
-mosip.kernel.syncdata.syncjob.url=http://kernel-syncjob-service99
-mosip.keycloak.url=http://keycloak.keycloak
-mosip.kubernetes.url=http://kubernetes.default
-mosip.minio.url=http://minio.minio:9000
-mosip.mock-abis.url=http://mock-abis.abis
-mosip.mock-biosdk-service.url=http://biosdk-service.biosdk
-mosip.mock-mv.url=http://mock-mv.regproc
-mosip.pms-partner-manager-service.url=http://pms-partner.pms
-mosip.pms-policy-manager-service.url=http://pms-policy.pms
-mosip.pms-ui.url=http://pms-ui.pms
-mosip.postgres.url=http://postgres.postgres
-mosip.prereg-application-service.url=http://prereg-application.prereg
-mosip.prereg-batchjob-service.url=http://prereg-batchjob.prereg
-mosip.prereg-booking-service.url=http://prereg-booking.prereg
-mosip.prereg-captcha-service.url=http://prereg-captcha.prereg
-mosip.prereg-datasync-service.url=http://prereg-datasync.prereg
-mosip.prereg-ui.url=http://prereg-ui.prereg
-mosip.print-service.url=http://print-service.print
-mosip.regproc-manual-verification-stage.url=${mosip.mock-mv.url}
-mosip.regproc-notification-service.url=http://regproc-notifier.regproc
-mosip.regproc-registration-transaction-service.url=http://regproc-trans.regproc
-mosip.regproc-reprocessor.url=http://regproc-reprocess.regproc
-mosip.regproc-securezone-notification-stage.url=http://regproc-group2.regproc
-mosip.regproc-workflowmanager.url=http://regproc-workflow.regproc
-mosip.regproc-print-service.url=http://regproc-print-service.regproc
-mosip.regproc-group1-service.url=http://regproc-group1.regproc
-mosip.resident-service.url=http://resident-service.resident
-mosip.service-hazelcast-server.url=http://service-hazelcast-server.regproc
-mosip.softhsm-ida.url=http://softhsm-ida.ida
-mosip.softhsm-keymanager.url=http://softhsm-keymanager.keymanager
-mosip.ingress-nginx.url=http://ingress-nginx.default
-mosip.kube-dns.url=http://kube-dns.default
-mosip.dashboard-metrics-scraper.url=http://dashboard-metrics-scraper.default
-mosip.kubernetes-dashboard.url=http://kubernetes-dashboard.default
-mosip.elasticsearch-master.url=http://elasticsearch-master.cattle-logging-system
-mosip.elasticsearch-master-headless.url=http://elasticsearch-master-headless.cattle-logging-system
-mosip.graf-grafana.url=http://graf-grafana.rancher-monitoring-grafana
-mosip.kibana-kibana.url=http://kibana-kibana.cattle-logging-system
-mosip.metrics-server.url=http://metrics-server.default
-mosip.prom-prometheus-alertmanager.url=http://prom-prometheus-alertmanager.default
-mosip.prom-prometheus-node-exporter.url=http://prom-prometheus-node-exporter.default
-mosip.prom-prometheus-pushgateway.url=http://prom-prometheus-pushgateway.default
-mosip.prom-prometheus-server.url=http://prom-prometheus-server.default
-mosip.packetmanager-service.url=http://packetmanager.packetmanager
-mosip.packet-receiver-service.url=http://regproc-group1.regproc
-mosip.regproc-status-service.url=http://regproc-status.regproc
-mosip.websub.url=${mosip.api.internal.url}
-keycloak.external.host=${keycloak.host}
-
-mosip.kernel.notification.email.from={cipher}36c31e62f69626c1a027747fae8657588c6ab527322d6fbdf4ea5b1934732505
+## Common properties used across different modules
+mosip.api.internal.url=https://${mosip.api.internal.host}
+mosip.kernel.authmanager.url=http://authmanager.kernel
+mosip.kernel.masterdata.url=http://masterdata.kernel
+mosip.kernel.keymanager.url=http://keymanager.kernel
+mosip.kernel.auditmanager.url=http://auditmanager.kernel
+mosip.kernel.notification.url=http://notifier.kernel
+mosip.kernel.idgenerator.url=http://idgenerator.kernel
+mosip.idrepo.identity.url=http://idrepo-identity.idrepo
+mosip.idrepo.vid.url=http://idrepo-vid.idrepo
+mosip.admin.hotlist.url=http://admin-hotlist.admin
+mosip.pms.policymanager.url=http://pms-policy.pms
+mosip.pms.partnermanager.url=http://pms-partner.pms
+mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
+mosip.datashare.url=http://datashare.datashare
+mosip.biosdk.service.url=http://biosdk-service.biosdk
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
-
-#--------------------------------------------------------------------------------------------------
-#mosip.masterdata.base.url = http://masterdata.kernel
-#mosip.syncdata.base.url=http://syncdata.kernel
-
 # masterdata field data url
-mosip.idobjectvalidator.masterdata.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/possiblevalues/{subType}
+mosip.idobjectvalidator.masterdata.rest.uri=${mosip.kernel.masterdata.url}/v1/masterdata/possiblevalues/{subType}
 # Path to IDSchemaVersion. Path is defined as per JsonPath.compile.
 mosip.kernel.idobjectvalidator.identity.id-schema-version-path=identity.IDSchemaVersion
 # Path to dateOfBirth field. Path is defined as per JsonPath.compile.
@@ -184,8 +66,8 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara,fra
-mosip.right_to_left_orientation=ara
+mosip.supported-languages=eng,fra
+mosip.right_to_left_orientation=
 mosip.left_to_right_orientation=eng,fra
 
 ## Application IDs
@@ -294,14 +176,13 @@ mosip.kernel.uin.not-start-with=0,1
 #adjacent even digit limit for uin filter
 mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
-
 ## Auth adapter
-auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
-auth-token-generator.rest.issuerUrl=${keycloak.external.host}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+auth.server.validate.url=${mosip.kernel.auth..url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
-#iam adapter
+## iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
 mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
@@ -320,12 +201,12 @@ mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
 mosip.kernel.crypto.hash-symmetric-key-length=256
 mosip.kernel.crypto.hash-iteration=100000
 mosip.kernel.crypto.sign-algorithm-name=RS256
-mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/publickey/{applicationId}
-mosip.kernel.keymanager-service-decrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
-mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/auth/decrypt
-mosip.kernel.keymanager-service-sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/sign
-mosip.kernel.keymanager.cert.url=${mosip.kernel-keymanager-service.url}/v1/keymanager/getCertificate
-mosip.kernel.keymanager-service-CsSign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/cssign
+mosip.kernel.keymanager-service-publickey-url=${mosip.kernel.keymanager.url}/v1/keymanager/publickey/{applicationId}
+mosip.kernel.keymanager-service-decrypt-url=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+mosip.kernel.keymanager-service-auth-decrypt-url=${mosip.kernel.keymanager.url}/v1/keymanager/auth/decrypt
+mosip.kernel.keymanager-service-sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/sign
+mosip.kernel.keymanager.cert.url=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate
+mosip.kernel.keymanager-service-CsSign-url=${mosip.kernel.keymanager.url}/v1/keymanager/cssign
 mosip.sign.applicationid=KERNEL
 mosip.sign.refid=SIGN
 mosip.kernel.cryptomanager.request_id=CRYPTOMANAGER.REQUEST
@@ -361,7 +242,7 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav
+mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=80
 
 ## Transliteration
@@ -389,7 +270,7 @@ logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
 ## Admin
 mosip.min-digit-longitude-latitude=4
 mosip.kernel.filtervalue.max_columns=20
-auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 
 ## PDF generation. TODO: this password must be passed as config server env variable
 mosip.kernel.pdf_owner_password={cipher}6cbd7358f7a821132862475c16cf48e575c8e2c5f994fa7140ee08f364015b24
@@ -424,11 +305,11 @@ management.endpoints.web.exposure.include=*
 management.endpoint.prometheus.enabled=true
 management.metrics.export.prometheus.enabled=true
 
-mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
-mosip.kernel.syncdata-service-dynamicfield-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/dynamicfields
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-dynamicfield-url=${mosip.kernel.masterdata.url}/v1/masterdata/dynamicfields
 mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
-mosip.kernel.keymanager-service-validate-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/validate
-mosip.kernel.keymanager-service-csverifysign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/csverifysign
+mosip.kernel.keymanager-service-validate-url=${mosip.kernel.keymanager.url}/v1/keymanager/validate
+mosip.kernel.keymanager-service-csverifysign-url=${mosip.kernel.keymanager.url}/v1/keymanager/csverifysign
 
 ## GPS
 mosip.registration.gps_device_enable_flag=n
@@ -471,11 +352,11 @@ object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
 packet.manager.account.name=packet-manager
-CRYPTOMANAGER_DECRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
-CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
-IDSCHEMAURL=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
-KEYMANAGER_SIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/sign
-AUDIT_URL=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
+IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
+KEYMANAGER_SIGN=${mosip.kernel.keymanager.url}/v1/keymanager/sign
+AUDIT_URL=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 packet.default.source=id
 schema.default.fieldCategory=pvt,none
 
@@ -503,12 +384,11 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.hub.url=${mosip.websub.url}/hub/
 websub.publish.url=${mosip.websub.url}/hub/
 
-
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=ara,fra
+mosip.optional-languages=fra
 mosip.min-languages.count=2
-mosip.max-languages.count=3
+mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
 mosip.default.template-languages=eng,fra
diff --git a/data-share-default.properties b/data-share-default.properties
index c0bd0d83889..7aa1f4c753c 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -7,10 +7,10 @@
 mosip.data.share.service.id=mosip.data.share
 mosip.data.share.service.version=1.0
 
-CRYPTOMANAGER_ENCRYPT=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
-KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
-PARTNER_POLICY=${mosip.pms-policy-manager-service.url}/v1/policymanager/policies/{policyId}/partner/{partnerId}
-KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
+KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
+PARTNER_POLICY=${mosip.pms.policymanager.url}/v1/policymanager/policies/{policyId}/partner/{partnerId}
+KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 
 data.share.application.id=PARTNER
diff --git a/hazelcast_dmz.xml b/hazelcast_dmz.xml
deleted file mode 100644
index 3ab6b64f7d0..00000000000
--- a/hazelcast_dmz.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ Copyright 2017 Red Hat, Inc. ~ ~ Red Hat licenses this file to you 
-     	under the Apache License, version 2.0 ~ (the "License"); you may not use 
-	this file except in compliance with the ~ License. You may obtain a copy 
-	of the License at: ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless 
-	required by applicable law or agreed to in writing, software ~ distributed 
-	under the License is distributed on an "AS IS" BASIS, WITHOUT ~ WARRANTIES 
-	OR CONDITIONS OF ANY KIND, either express or implied. See the ~ License for 
-	the specific language governing permissions and limitations ~ under the License. -->
-
-<hazelcast
-	xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-	xmlns="http://www.hazelcast.com/schema/config"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <properties>
-   <property name="hazelcast.discovery.enabled">true</property>
-	 <property name="hazelcast.logging.type">slf4j</property>
- </properties>
-<group>
-		<name>k8s</name>
-		<password/>
-	</group>
- <network>
- <join>
-        <multicast enabled="false"/>
-        <tcp-ip enabled="true">
-            <interface>127.0.0.1</interface>
-        </tcp-ip>
-    </join>
-    <interfaces enabled="true">
-        <interface>127.0.0.1</interface>
-    </interfaces>
-<!-- For vertx uncomment the below join section and comment the above join and interfaces section. -->
-<!--   <join>
-     <multicast enabled="false"/>
-     <tcp-ip enabled="false" />
-     <discovery-strategies>
-       <discovery-strategy enabled="true"
-           class="com.hazelcast.kubernetes.HazelcastKubernetesDiscoveryStrategy">
-         <properties>
-           <property name="service-dns">service-hazelcast-server.default.svc.cluster.local</property>
-         </properties>
-       </discovery-strategy>
-     </discovery-strategies>
-   </join> -->
- </network>
-</hazelcast>
diff --git a/hotlist-default.properties b/hotlist-default.properties
index d64a5cf7cdc..fdd711fcef4 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -37,21 +37,21 @@ mosip.hotlist.cleanup-schedule.init-delay=24
 mosip.hotlist.cleanup-schedule.fixed-rate=24
 
 ## REST services
-mosip.idrepo.audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.idrepo.audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
 mosip.idrepo.audit.rest.headers.mediaType=application/json
 
-mosip.hotlist.encryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+mosip.hotlist.encryptor.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 mosip.hotlist.encryptor.rest.httpMethod=POST
 mosip.hotlist.encryptor.rest.headers.mediaType=application/json
 mosip.hotlist.encryptor.rest.timeout=100
 
-mosip.hotlist.decryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+mosip.hotlist.decryptor.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 mosip.hotlist.decryptor.rest.httpMethod=POST
 mosip.hotlist.decryptor.rest.headers.mediaType=application/json
 mosip.hotlist.decryptor.rest.timeout=100
 
-mosip.hotlist.audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.hotlist.audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.hotlist.audit.rest.httpMethod=POST
 mosip.hotlist.audit.rest.headers.mediaType=application/json
 
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index ae6d1e323b0..2adeccf5797 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -109,7 +109,7 @@ mosip.date-of-birth.pattern=yyyy/MM/dd
 
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
-mosip.biosdk.default.service.url=${mosip.mock-biosdk-service.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -133,7 +133,7 @@ mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.version=0.9
 mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.default=${mosip.biosdk.default.service.url}
 
 ## Kernel-Audit
-audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 audit.rest.httpMethod=POST
 audit.rest.headers.mediaType=${mosip.ida.request.mediaType}
 audit.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -151,31 +151,31 @@ otp-generate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-generate.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Mail Notification
-mail-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/email/send
+mail-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/email/send
 mail-notification.rest.httpMethod=POST
 mail-notification.rest.headers.mediaType=multipart/form-data
 mail-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## SMS Notification
-sms-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
+sms-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/sms/send
 sms-notification.rest.httpMethod=POST
 sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid/{rid}?type={type}
+rid-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid/{rid}
+rid-uin-auth.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Partner service API to validate MISP Lisence Key - Partner ID - Partner API Key combination
-id-pmp-service.rest.uri=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
+id-pmp-service.rest.uri=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partner_id}/apikey/{partner_api_key}/misp/{misp_license_key}/validate?needPartnerCert={need_partner_cert}
 id-pmp-service.rest.httpMethod=GET
 id-pmp-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-pmp-service.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -188,19 +188,19 @@ data-share-get.rest.timeout=10
 data-share-get-decrypt-ref-id=${ida-auth-partner-id}
 
 ## Title Service rest api-GET
-id-masterdata-title-service.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/title
+id-masterdata-title-service.rest.uri=${mosip.kernel.masterdata.url}/v1/masterdata/title
 id-masterdata-title-service.rest.httpMethod=GET
 id-masterdata-title-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-title-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Master Data - Template Single Language
-id-masterdata-template-service.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
+id-masterdata-template-service.rest.uri=${mosip.kernel.masterdata.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 id-masterdata-template-service.rest.httpMethod=GET
 id-masterdata-template-service.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Master Data - Template Multi language
-id-masterdata-template-service-multilang.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/templatetypecodes/{code}
+id-masterdata-template-service-multilang.rest.uri=${mosip.kernel.masterdata.url}/v1/masterdata/templates/templatetypecodes/{code}
 id-masterdata-template-service-multilang.rest.httpMethod=GET
 id-masterdata-template-service-multilang.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service-multilang.rest.timeout=${mosip.ida.request.timeout.secs}
@@ -513,13 +513,13 @@ cred-request-service-get-request-ids.pageSize=10
 cred-request-service-get-request-ids.statusCode=ISSUED
 ida-max-credential-pull-window-days=2
 ida-max-websub-messages-pull-window-days=2
-cred-request-service-get-request-ids.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/getRequestIds?direction=ASC&orderBy=updateDateTime&pageNumber={pageNumber}&pageSize=${cred-request-service-get-request-ids.pageSize}&statusCode=${cred-request-service-get-request-ids.statusCode}&effectivedtimes={effectivedtimes}
+cred-request-service-get-request-ids.rest.uri=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/getRequestIds?direction=ASC&orderBy=updateDateTime&pageNumber={pageNumber}&pageSize=${cred-request-service-get-request-ids.pageSize}&statusCode=${cred-request-service-get-request-ids.statusCode}&effectivedtimes={effectivedtimes}
 cred-request-service-get-request-ids.rest.httpMethod=GET
 cred-request-service-get-request-ids.rest.headers.mediaType=${mosip.ida.request.mediaType}
 cred-request-service-get-request-ids.rest.timeout=${mosip.ida.request.timeout.secs}
 
 # Credential Request API to get Request IDs for the given status, pageStart and page
-cred-request-service-retrigger-cred-issuance.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/retrigger/{requestId}
+cred-request-service-retrigger-cred-issuance.rest.uri=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/retrigger/{requestId}
 cred-request-service-retrigger-cred-issuance.rest.httpMethod=PUT
 cred-request-service-retrigger-cred-issuance.rest.headers.mediaType=${mosip.ida.request.mediaType}
 cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index d29e7a69ad0..b7b7c9fcdef 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -120,26 +120,26 @@ mosip.idrepo.vid.policy-file-url=${mosip.idrepo.mosip-config-url}mosip-vid-polic
 mosip.idrepo.draft-vid.default-type-to-create=PERPETUAL
 
 ## Rest servies 
-mosip.idrepo.audit.rest.uri=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.idrepo.audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.idrepo.audit.rest.httpMethod=POST
 mosip.idrepo.audit.rest.headers.mediaType=application/json
 
-mosip.idrepo.encryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
+mosip.idrepo.encryptor.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 mosip.idrepo.encryptor.rest.httpMethod=POST
 mosip.idrepo.encryptor.rest.headers.mediaType=application/json
 mosip.idrepo.encryptor.rest.timeout=100
 
-mosip.idrepo.decryptor.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+mosip.idrepo.decryptor.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 mosip.idrepo.decryptor.rest.httpMethod=POST
 mosip.idrepo.decryptor.rest.headers.mediaType=application/json
 mosip.idrepo.decryptor.rest.timeout=100
 
-mosip.idrepo.vid-service.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/uin/{uin}
+mosip.idrepo.vid-service.rest.uri=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin/{uin}
 mosip.idrepo.vid-service.rest.httpMethod=GET
 mosip.idrepo.vid-service.rest.headers.mediaType=application/json
 mosip.idrepo.vid-service.rest.timeout=100
 
-mosip.idrepo.retrieve-uin-by-vid.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/{vid}
+mosip.idrepo.retrieve-uin-by-vid.rest.uri=${mosip.idrepo.vid.url}/idrepository/v1/vid/{vid}
 mosip.idrepo.retrieve-uin-by-vid.rest.httpMethod=GET
 mosip.idrepo.retrieve-uin-by-vid.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-uin-by-vid.rest.timeout=100
@@ -157,22 +157,22 @@ mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
 mosip.idrepo.bio-extractor-service.rest.timeout=100
 
-mosip.idrepo.syncdata-service.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
+mosip.idrepo.syncdata-service.rest.uri=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 mosip.idrepo.syncdata-service.rest.httpMethod=GET
 mosip.idrepo.syncdata-service.rest.headers.mediaType=application/json
 mosip.idrepo.syncdata-service.rest.timeout=100
 
-mosip.idrepo.pmp.partner.rest.uri=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners?partnerType=Online_Verification_Partner
+mosip.idrepo.pmp.partner.rest.uri=${mosip.pms.partnermanager.url}/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 mosip.idrepo.pmp.partner.rest.httpMethod=GET
 mosip.idrepo.pmp.partner.rest.headers.mediaType=application/json
 mosip.idrepo.pmp.partner.rest.timeout=100
 
-mosip.idrepo.credential.request.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/requestgenerator
+mosip.idrepo.credential.request.rest.uri=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
 mosip.idrepo.credential.request.rest.httpMethod=POST
 mosip.idrepo.credential.request.rest.headers.mediaType=application/json
 mosip.idrepo.credential.request.rest.timeout=100
 
-mosip.idrepo.credential.cancel-request.rest.uri=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/cancel/{requestId}
+mosip.idrepo.credential.cancel-request.rest.uri=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/cancel/{requestId}
 mosip.idrepo.credential.cancel-request.rest.httpMethod=GET
 mosip.idrepo.credential.cancel-request.rest.headers.mediaType=application/json
 mosip.idrepo.credential.cancel-request.rest.timeout=100
@@ -186,18 +186,18 @@ mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 # the credential request with below partner id to issue credential to new IDA partners.
 idrepo-dummy-online-verification-partner-id=MOVP
 
-mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid/{uin}
+mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-by-uin.rest.timeout=100
 
-mosip.idrepo.vid-generator.rest.uri=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/vid
+mosip.idrepo.vid-generator.rest.uri=${mosip.kernel.idgenerator.url}/v1/idgenerator/vid
 mosip.idrepo.vid-generator.rest.httpMethod=GET
 mosip.idrepo.vid-generator.rest.headers.mediaType=application/json
 mosip.idrepo.vid-generator.rest.timeout=100
 
 ## Websub
-mosip.idrepo.websub.vid-credential-update.callback-url=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/callback/vid_credential_status_update
+mosip.idrepo.websub.vid-credential-update.callback-url=${mosip.idrepo.identity.url}/idrepository/v1/identity/callback/vid_credential_status_update
 mosip.idrepo.websub.vid-credential-update.topic=VID_CRED_STATUS_UPDATE
 mosip.idrepo.websub.vid-credential-update.secret= ${idrepo.websub.vid.credential.update.secret}
 mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
@@ -206,19 +206,19 @@ mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 mosip.iam.adapter.clientid.id-repository=${mosip.idrepo.auth.client-id}
 mosip.iam.adapter.clientsecret.id-repository=${mosip.idrepo.auth.secret-key}
 mosip.iam.adapter.appid.id-repository=${mosip.idrepo.auth.app-id}
-mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
-mosip.idrepo.uin-generator.rest.uri=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/uin
+mosip.idrepo.uin-generator.rest.uri=${mosip.kernel.idgenerator.url}/v1/idgenerator/uin
 mosip.idrepo.uin-generator.rest.httpMethod=GET
 mosip.idrepo.uin-generator.rest.headers.mediaType=application/json
 mosip.idrepo.uin-generator.rest.timeout=100
 
-mosip.idrepo.draft-vid.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/draft/vid
+mosip.idrepo.draft-vid.rest.uri=${mosip.idrepo.vid.url}/idrepository/v1/draft/vid
 mosip.idrepo.draft-vid.rest.httpMethod=POST
 mosip.idrepo.draft-vid.rest.headers.mediaType=application/json
 mosip.idrepo.draft-vid.rest.timeout=100
 
-mosip.idrepo.update-vid.rest.uri=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/{vid}
+mosip.idrepo.update-vid.rest.uri=${mosip.idrepo.vid.url}/idrepository/v1/vid/{vid}
 mosip.idrepo.update-vid.rest.httpMethod=PATCH
 mosip.idrepo.update-vid.rest.headers.mediaType=application/json
 mosip.idrepo.update-vid.rest.timeout=100
@@ -267,8 +267,8 @@ credential.request.reprocess.locktimeout=60000
 
 ## Rest services
 CRDENTIALSERVICE=${mosip.idrepo-credential-service.url}/v1/credentialservice/issue
-KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
-CALLBACKURL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/callback/notifyStatus
+KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+CALLBACKURL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/callback/notifyStatus
 ENCRYPTION=${mosip.idrepo.encryptor.rest.uri}
 DECRYPTION=${mosip.idrepo.decryptor.rest.uri}
 
@@ -314,20 +314,20 @@ mosip.credential.service.share.prependThumbprint=false
 mosip.credential.service.retry.maxAttempts=3
 mosip.credential.service.retry.maxDelay=100
 
-IDREPOGETIDBYID=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
+IDREPOGETIDBYID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
-mosip.data.share.internal.domain.name=${mosip.datashare-service.url}
+mosip.data.share.internal.domain.name=${mosip.datashare.url}
 CREATEDATASHARE=/v1/datashare/create
-KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
-KEYMANAGER_JWTSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
-KEYMANAGER_ENCRYPT_PIN=${mosip.kernel-keymanager-service.url}/v1/keymanager/encryptWithPin
-KEYMANAGER_ENCRYPT_ZK=${mosip.kernel-keymanager-service.url}/v1/keymanager/zkEncrypt
-PARTNER_POLICY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-PARTNER_EXTRACTION_POLICY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
+KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
+KEYMANAGER_ENCRYPT_PIN=${mosip.kernel.keymanager.url}/v1/keymanager/encryptWithPin
+KEYMANAGER_ENCRYPT_ZK=${mosip.kernel.keymanager.url}/v1/keymanager/zkEncrypt
+PARTNER_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+PARTNER_EXTRACTION_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
 credential.service.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 # BioSDK service
-mosip.biosdk.default.service.url=${mosip.mock-biosdk-service.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
diff --git a/kernel-default.properties b/kernel-default.properties
index 35374c38150..6417e799b4b 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -25,7 +25,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -81,11 +81,11 @@ auth.primary.language=eng
 
 otp.manager.api.generate=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
 otp.manager.api.verify=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
-otp.sender.api.email.send=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-otp.sender.api.sms.send=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
-masterdata.api.template=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/
+otp.sender.api.email.send=${mosip.kernel.notification.url}/v1/notifier/email/send
+otp.sender.api.sms.send=${mosip.kernel.notification.url}/v1/notifier/sms/send
+masterdata.api.template=${mosip.kernel.masterdata.url}/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
+idrepo.api.getuindetails=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
@@ -258,7 +258,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.authmanager.base-url=${mosip.authmanager.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -269,12 +269,12 @@ mosip.admin_realm_id=mosip
 
 master.search.maximum.rows=50
 mosip.level=2
-mosip.kernel.masterdata.audit-url= ${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url= ${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
 # Keymanager runs in separate namespace "keymanager"
-mosip.kernel.sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/sign
+mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
@@ -292,7 +292,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 
 
 ## Proxy otp
@@ -308,7 +308,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -360,7 +360,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/machines/%s/eng
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel.masterdata.url}/v1/masterdata/machines/%s/eng
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments
@@ -372,10 +372,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.authmanager.url}/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
@@ -404,7 +404,7 @@ mosip.kernel.keymanager.113nothumbprint.support=false
 # Pause & resume api proeprties
 PACKET_RESUME_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflowaction
 PACKET_PAUSE_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflow/search
-KEYBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## resubscription and subscription initial delay for masterdata service
 masterdata.websub.resubscription.delay.millis=48000000
@@ -428,7 +428,7 @@ mosip.admin.ui.configs=version:${aplication.configuration.level.version};locatio
 mosip.kernel.keymanager.113nothumbprint.support=false
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 
 ## identity schema backward compatability ########
@@ -439,13 +439,13 @@ scheduling.job.cron=0 0 2 * * ?
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 
 # masterdata swagger openApi
-#openapi.masterdata.servers[0].url=${mosip.kernel-masterdata-service.url}/v1/masterdata
+#openapi.masterdata.servers[0].url=${mosip.kernel.masterdata.url}/v1/masterdata
 #openapi.masterdata.servers[0].description=Admin Masterdata url
 #openapi.service.servers[0].url=https://${mosip.api.internal.host}/${server.servlet.context-path:${server.servlet.path:}}
 #openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 
-zone.user.details.url=${mosip.kernel-auth-service.url}/v1/authmanager/userdetails
+zone.user.details.url=${mosip.authmanager.url}/v1/authmanager/userdetails
 
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 
diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index d087a4f593c..e05913976fb 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -8,7 +8,7 @@ management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
 abis.return.duplicate=false
-secret_url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+secret_url=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string
 secret_url.secretKey=${mosip.mosip.regproc.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 816fdecbc24..fb4b076ccba 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -102,9 +102,9 @@ pmp.partner.mobileNumbe.max.length=16
 masterdata.registerdevice.timestamp.validate=+5
 
 ## Keymanager
-mosip.kernel.sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
+mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 ## Kernel services
-mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 # ApplicationId for partner
 mosip.pmp.auth.appId =partner
@@ -114,11 +114,11 @@ mosip.pmp.auth.clientId=mosip-partner-client
 mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
-pms.cert.service.token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
-pmp.ca.certificaticate.upload.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadCACertificate
-pmp.partner.certificaticate.upload.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadPartnerCertificate
-pmp.partner.certificaticate.get.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
-pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadOtherDomainCertificate
+pms.cert.service.token.request.issuerUrl=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+pmp.ca.certificaticate.upload.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/uploadCACertificate
+pmp.partner.certificaticate.upload.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/uploadPartnerCertificate
+pmp.partner.certificaticate.get.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
+pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/uploadOtherDomainCertificate
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
@@ -126,7 +126,7 @@ mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
-pmp.certificaticate.datashare.rest.uri=http://${mosip.datashare-service.url}/v1/datashare/create
+pmp.certificaticate.datashare.rest.uri=http://${mosip.datashare.url}/v1/datashare/create
 # Used for generating the datashare url
 pms.certs.datashare.policyId=mpolicy-default-cert
 pms.certs.datashare.subscriberId=mpartner-default-cert
@@ -149,14 +149,14 @@ mosip.keycloak.admin.user.id=admin
 mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
 ## Auth adapter
-auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
 mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
-mosip.authmanager.client-token-endpoint=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
 # in minutes
@@ -205,20 +205,20 @@ mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/op
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
-mosip.kernel.device.search-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/devices/search
+mosip.kernel.device.search-url=${mosip.kernel.masterdata.url}/v1/masterdata/devices/search
 token.request.appid=admin
 token.request.password=mosip
 token.request.username=110005
 token.request.version=string
 token.request.id=v1
-token.request.issuerUrl=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+token.request.issuerUrl=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 token.request.clientId=admin
-PASSWORDBASEDTOKENAPI=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/useridPwd
+PASSWORDBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/useridPwd
 application.env.local=false
 
 # Notifications
-emailResourse.url=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-resource.template.url=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
+emailResourse.url=${mosip.kernel.notification.url}/v1/notifier/email/send
+resource.template.url=${mosip.kernel.masterdata.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 notifications.sent.before.days = 3
 partner.registration.sub-template = partner-reg-sub-template
 partner.reg.content-template=partner-reg-content-template
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 9e02916f0de..bcf4b935c29 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -11,8 +11,8 @@
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
 javax.persistence.jdbc.driver=org.postgresql.Driver
-mosip.database.ip=postgres
-mosip.database.port=80
+mosip.database.ip=postgres-postgresql.postgres
+mosip.database.port=5432
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_prereg?useSSL=false
 javax.persistence.jdbc.user=prereguser
 javax.persistence.jdbc.password=${db.dbuser.password}
@@ -37,9 +37,11 @@ mosip.adult.age=${mosip.kernel.applicant.type.age.limit}
 ## This version is set in the ID object created in pre-registration
 mosip.idschema.version=0.1
 
+mosip.prereg.application.url=http://prereg-application.prereg
+
 ## Demographic Service 
 demographic.service.version=v1
-demographic.service.env=${mosip.prereg-application-service.url}
+demographic.service.env=${mosip.prereg.application.url}
 demographic.service.contextpath=preregistration/${demographic.service.version}
 demographic.resource.url=${demographic.service.env}/${demographic.service.contextpath}
 # ID values for application APIs
@@ -61,7 +63,7 @@ mosip.id.preregistration.demographic.retrieve.date=mosip.pre-registration.demogr
 
 ## Document Service
 document.service.version=v1
-document.service.env=${mosip.prereg-application-service.url}
+document.service.env=${mosip.prereg.application.url}
 document.service.contextpath=preregistration/${document.service.version}
 document.resource.url=${document.service.env}/${document.service.contextpath}
 
@@ -131,7 +133,7 @@ preregistration.timespan.cancel=0
 
 ## Batch job service
 batch.service.version=v1
-batch.service.env=${mosip.prereg-batchjob-service.url}
+batch.service.env=http://prereg-batchjob.prereg
 batch.service.contextpath=preregistration/${batch.service.version}/batch
 batch.resource.url=${batch.service.env}/${batch.service.contextpath}
 ## Id values of batch job service
@@ -163,20 +165,17 @@ bookingAvailablity.url=${booking.resource.url}/appointment/availability/sync
 updateConsumedStatus.url=${batch.resource.url}/consumedStatus
 #BatchJob-service URL for updating to expiredStatus
 expiredStatus.url=${batch.resource.url}/expiredStatus
-#batch.appointment.cancel=${batch.service.env}/preregistration/v1
-batch.appointment.cancel=${mosip.prereg-application-service.url}/preregistration/v1/internal/applications/appointment/{preRegistrationId}
+batch.appointment.cancel=${mosip.prereg.application.url}/preregistration/v1/internal/applications/appointment/{preRegistrationId}
 
 ## Login service
-
 mosip.pre.reg.clientId=mosip.pre.reg.clientId
-id-masterdata-template-service-multilang.rest.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
+id-masterdata-template-service-multilang.rest.uri=${mosip.kernel.masterdata.url}/v1/masterdata/templates/{langcode}/{templatetypecode}
 
 ## Masterdata service
 ## Base url is only used for masterdata. We give the in-cluster url here
-mosip.base.url=${mosip.kernel-masterdata-service.url}
-
+mosip.base.url=${mosip.kernel.masterdata.url}
 masterdata.service.version=v1
-masterdata.service.env=${mosip.kernel-masterdata-service.url}
+masterdata.service.env=${mosip.kernel.masterdata.url}
 masterdata.service.contextpath=masterdata
 masterdata.resource.url=${masterdata.service.env}/${masterdata.service.version}/${masterdata.service.contextpath}
 regCenter.url=${masterdata.resource.url}/registrationcenters
@@ -196,7 +195,7 @@ cancel.appoinment.template=cancel-appointment
 
 ## Notification service
 notification.service.version=v1
-notification.service.env=${mosip.prereg-application-service.url}
+notification.service.env=${mosip.prereg.application.url}
 notification.service.contextpath=preregistration/${notification.service.version}
 #notification.url=${notification.service.env}/${notification.service.version}/${notification.service.contextpath}/notification
 notification.url=${notification.service.env}/${notification.service.contextpath}/internal/notification
@@ -205,24 +204,24 @@ mosip.pre-registration.notification.id.send=mosip.pre-registration.notification.
 # timeZone=Asia/Calcutta
 
 ## Email service 
-email.service.env=${mosip.kernel-notification-service.url}
+email.service.env=${mosip.kernel.notification.url}
 email.service.contextpath=notifier
 #Kernel Service URL for Sending Emails
 emailResourse.url=${email.service.env}/${masterdata.service.version}/${email.service.contextpath}/email/send
 
 ## SMS service
-sms.service.env=${mosip.kernel-notification-service.url}
+sms.service.env=${mosip.kernel.notification.url}
 sms.service.contextpath=notifier
 #Kernel service URL for sending SMS
 smsResourse.url=${sms.service.env}/${masterdata.service.version}/${sms.service.contextpath}/sms/send
 
 ## Audit service 
-audit.service.env=${mosip.kernel-auditmanager-service.url}
+audit.service.env=${mosip.kernel.auditmanager.url}
 audit.service.contextpath=auditmanager
 audit.url=${audit.service.env}/${masterdata.service.version}/${audit.service.contextpath}/audits
 
 ## Crypto service 
-crypto.service.env=${mosip.kernel-keymanager-service.url}
+crypto.service.env=${mosip.kernel.keymanager.url}
 crypto.service.contextpath=keymanager
 ## Kernel Service URL for Encryption and decryption 
 cryptoResource.url=${crypto.service.env}/${masterdata.service.version}/${crypto.service.contextpath}
@@ -240,9 +239,9 @@ userIdType=USERID
 appId=prereg
 
 ## Auth service 
-kernel.auth.env=${mosip.kernel-auditmanager-service.url}
+kernel.auth.env=${mosip.kernel.auditmanager.url}
 kernel.auth.contextpath=authmanager
-auth.server.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## PRID service 
@@ -265,8 +264,8 @@ secret_url.version=string
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=3
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
-mail-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-sms-notification.rest.uri=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
+mail-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/email/send
+sms-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/sms/send
 otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
@@ -417,6 +416,15 @@ mosip.iam.adapter.clientsecret=${preregistration.mosip.prereg.client.secret}
 # preregistration.mosip.prereg.client.secret
 mosip.iam.adapter.appid=prereg
 
+# To generate token from keycloak in PreReg Data Sync Service. Used by kernel auth adapter.
+mosip.iam.adapter.clientid.pre-registration-datasync-service=mosip-reg-client
+mosip.iam.adapter.clientsecret.pre-registration-datasync-service=${mosip.mosip.reg.client.secret}
+mosip.iam.adapter.appid.pre-registration-datasync-service=registrationclient
+
+#the custom auth provider component names list
+mosip.security.authentication.provider.beans.list.pre-registration-application-service=customJWTAuthProvider
+mosip.security.authentication.provider.beans.list.pre-registration-booking-service=customJWTAuthProvider
+
 # Roles
 mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.putapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
@@ -447,10 +455,8 @@ mosip.role.prereg.postpreregsync=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RE
 mosip.role.prereg.getsyncpreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getsyncpreregistrationidmachineid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.postsyncconsumedpreregids=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-
 mosip.role.prereg.cancelappointmentpreregid=REGISTRATION_OFFICER,INDIVIDUAL,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.deleteappointmentpreregid=REGISTRATION_OFFICER,INDIVIDUAL,PRE_REGISTRATION_ADMIN
-
 mosip.role.prereg.getappointmentavailability=INDIVIDUAL
 mosip.role.prereg.postappointmentpreregistrationid=INDIVIDUAL
 mosip.role.prereg.postappointment=INDIVIDUAL
@@ -461,11 +467,3 @@ mosip.role.prereg.deleteappointment=INDIVIDUAL
 mosip.role.prereg.getappointmentpreregistrationidregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getappointmentregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 
-# To generate token from keycloak in PreReg Data Sync Service. Used by kernel auth adapter.
-mosip.iam.adapter.clientid.pre-registration-datasync-service=mosip-reg-client
-mosip.iam.adapter.clientsecret.pre-registration-datasync-service={cipher}f4ba53f63109c6559d882fda0b7e9f16620cbe15604ea83c940af995520905d7
-mosip.iam.adapter.appid.pre-registration-datasync-service=registrationclient
-
-#the custom auth provider component names list
-mosip.security.authentication.provider.beans.list.pre-registration-application-service=customJWTAuthProvider
-mosip.security.authentication.provider.beans.list.pre-registration-booking-service=customJWTAuthProvider
diff --git a/print-default.properties b/print-default.properties
index 4cfdcd08e60..ef472d2fb74 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -29,15 +29,15 @@ token.request.secretKey= ${mosip.mosip.regproc.client.secret}
 token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 # Audit service
-AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.kernel.pdf_owner_password=123456
 
 ## Auth service
-authmanager.base.url=${mosip.kernel-auth-service.url}
+authmanager.base.url=${mosip.authmanager.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## Master data services
-MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
+MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 mosip.print.audit.id=mosip.applicanttype.getApplicantType
 
@@ -45,7 +45,7 @@ mosip.print.application.version=1.0
 mosip.print.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 
 ## Encrypt services
-PDFSIGN=${mosip.kernel-keymanager-service.url}/v1/keymanager/pdf/sign
+PDFSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/pdf/sign
 
 
 mosip.print.service.id=mosip.print
@@ -103,8 +103,8 @@ registration.processor.unMaskedUin.length=5
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=http://${mosip.datashare-service.url}/v1/datashare/create
-DECRYPTPINBASSED=${mosip.kernel-keymanager-service.url}/v1/keymanager/decryptWithPin
+CREATEDATASHARE=http://${mosip.datashare.url}/v1/datashare/create
+DECRYPTPINBASSED=${mosip.kernel.keymanager.url}/v1/keymanager/decryptWithPin
 mosip.print.prependThumbprint=true
 
 # websub authentication
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index bd35830e9b7..cc7a6d9cca5 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -4,13 +4,15 @@
 # helm chart:
 # db.dbuser.password 
 # mosip.mosip.regproc.client.secret
-# mosip.api.internal.host
-# keycloak.host
+# keycloak.internal.url
 # activemq.host
 # activemq.core.port
 
 registration.processor.zone=default
 
+mosip.regproc.notification.url=http://regproc-notifier.regproc
+packetmanager.base.url=http://packetmanager.packetmanger
+
 ## Health check
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=info,health,refresh
@@ -29,8 +31,8 @@ registration.processor.bio.dedupe.reprocess.buffer.time=900
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.registration.processor.database.hostname=postgres
-mosip.registration.processor.database.port=80
+mosip.registration.processor.database.hostname=postgres-postgresql.postgres
+mosip.registration.processor.database.port=5432
 javax.persistence.jdbc.driver=org.postgresql.Driver
 javax.persistence.jdbc.url=jdbc:postgresql://${mosip.registration.processor.database.hostname}:${mosip.registration.processor.database.port}/mosip_regprc?currentSchema=regprc
 javax.persistence.jdbc.user=regprcuser
@@ -76,13 +78,13 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 ## Audit Service
-AUDIT=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 ## Auth Service
-authmanager.base.url=${mosip.kernel-auth-service.url}
+authmanager.base.url=${mosip.authmanager.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateToken
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
@@ -91,7 +93,7 @@ INTERNALAUTH=${IDAINTERNAL}/idauthentication/v1/internal/auth
 GETINDIVIDUALIDFROMUSERID=${authmanager.base.url}/v1/authmanager/individualId
 
 ## Master Data Services
-MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
+MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 MACHINEHISTORY=${MASTER}/machineshistories
 CENTERHISTORY=${MASTER}/registrationcentershistory
 CENTERUSERMACHINEHISTORY=${MASTER}/getregistrationmachineusermappinghistory
@@ -103,22 +105,22 @@ REGISTRATIONCENTERDEVICEHISTORY=${MASTER}/registrationcenterdevicehistory
 REGISTRATIONCENTERTIMESTAMP=${MASTER}/registrationcenters/validate
 USERDETAILS=${MASTER}/users
 TEMPLATES=${MASTER}/templates
-DEVICEVALIDATEHISTORY=${mosip.pms-partner-manager-service.url}/v1/partnermanager/deviceprovidermanagement/validate
+DEVICEVALIDATEHISTORY=${mosip.pms.partnermanager.url}/v1/partnermanager/deviceprovidermanagement/validate
 #To get the idschema from masterdata db
 IDSCHEMA=${MASTER}/idschema/latest
 LANGUAGE=${MASTER}/languages
 
 ## ID Repository Services
-IDENTITY=${mosip.idrepo-identity-service.url}
+IDENTITY=${mosip.idrepo.identity.url}
 IDREPOSITORY=${IDENTITY}/idrepository/v1/identity/
 IDREPOGETIDBYUIN=${IDENTITY}/idrepository/v1/identity/idvid
-UINGENERATOR=${mosip.kernel-idgenerator-service.url}/v1/idgenerator/uin
+UINGENERATOR=${mosip.kernel.idgenerator.url}/v1/idgenerator/uin
 RETRIEVEIDENTITYFROMRID=${IDENTITY}/idrepository/v1/identity/idvid
 RETRIEVEIDENTITY=${IDENTITY}/idrepository/v1/identity/idvid
-CREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
-GETUINBYVID=${mosip.idrepo-vid-service.url}/idrepository/v1/idvid
-CREDENTIALREQUEST=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/requestgenerator
-GETVIDSBYUIN=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/uin
+CREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
+GETUINBYVID=${mosip.idrepo.vid.url}/idrepository/v1/idvid
+CREDENTIALREQUEST=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
+GETVIDSBYUIN=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin
 IDREPOHASDRAFT=${IDENTITY}/idrepository/v1/identity/draft
 IDREPOGETDRAFT=${IDENTITY}/idrepository/v1/identity/draft
 IDREPOCREATEDRAFT=${IDENTITY}/idrepository/v1/identity/draft/create
@@ -127,7 +129,7 @@ IDREPOPUBLISHDRAFT=${IDENTITY}/idrepository/v1/identity/draft/publish
 IDREPOEXTRACTBIOMETRICS=${IDENTITY}/idrepository/v1/identity/draft/extractbiometrics/
 
 ## Encrypt Services
-KEYMANAGER=${mosip.kernel-keymanager-service.url}
+KEYMANAGER=${mosip.kernel.keymanager.url}
 ENCRYPTURL=${KEYMANAGER}/v1/keymanager/encrypt
 ENCRYPTIONSERVICE=${KEYMANAGER}/v1/keymanager/publickey
 
@@ -140,7 +142,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 registration.processor.demodedupe.manual.adjudication.status=REJECTED
 
 # Validate hostlisted devices
-DEVICEHOTLIST=${mosip.admin-hotlist-service.url}/v1/hotlist/status
+DEVICEHOTLIST=${mosip.admin.hotlist.url}/v1/hotlist/status
 JWTVERIFY=${KEYMANAGER}/v1/keymanager/jwtVerify
 
 ## Crypto
@@ -148,13 +150,13 @@ CRYPTOMANAGERDECRYPT=${KEYMANAGER}/v1/keymanager/decrypt
 crypto.PrependThumbprint.enable=true
 
 ## SMS and EMAIL notification services
-NOTIFIER=${mosip.kernel-notification-service.url}
+NOTIFIER=${mosip.kernel.notification.url}
 SMSNOTIFIER=${NOTIFIER}/v1/notifier/sms/send
 EMAILNOTIFIER=${NOTIFIER}/v1/notifier/email/send
 
 ## PMS
-PMS=${mosip.pms-policy-manager-service.url}/v1/policymanager/policies
-PARTNERGETBIOEXTRACTOR=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners
+PMS=${mosip.pms.policymanager.url}/v1/policymanager/policies
+PARTNERGETBIOEXTRACTOR=${mosip.pms.partnermanager.url}/v1/partnermanager/partners
 
 ## Registration status properties
 ## Max retries allowed by registration client if sanity check of packet fails in packet uploader stage.
@@ -246,10 +248,10 @@ registration.processor.notification.emails=
 
 ## Notification service
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
-registration.processor.notification_service_subscriber_callback_url=${mosip.regproc-notification-service.url}/registrationprocessor/v1/notification/callback/notify
+registration.processor.notification_service_subscriber_callback_url=${mosip.regproc.notification.url}/registrationprocessor/v1/notification/callback/notify
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_workflow_paused_for_additional_info_event
-registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosip.regproc-notification-service.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
+registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosip.regproc.notification.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
 
 # Email template code for PauseForAdditionalInfo
 mosip.regproc.notification_service.biometric_correction.email=RPR_PAUSED_FOR_ADD_INFO_EMAIL
@@ -258,7 +260,6 @@ mosip.regproc.notification_service.biometric_correction.sms=RPR_PAUSED_FOR_ADD_I
 # SUBJECT template code for PauseForAdditionalInfo
 mosip.regproc.notification_service.biometric_correction.subject=Requesting the additional details for progressing on the application of UIN
 
-
 ## Email
 registration.processor.uin.generated.subject=UIN Generated
 registration.processor.duplicate.uin.subject=Registration Failed because you have already Registered
@@ -428,7 +429,6 @@ ida-internal-auth-uri=${IDAINTERNAL}/idauthentication/v1/internal/auth
 ida-internal-get-certificate-uri=${IDAINTERNAL}/idauthentication/v1/internal/getCertificate
 
 registration.processor.objectstore.adapter.name=S3Adapter
-packetmanager.base.url=${mosip.packetmanager-service.url}/commons
 PACKETMANAGER_SEARCH_FIELD=${packetmanager.base.url}/v1/packetmanager/searchField
 PACKETMANAGER_SEARCH_FIELDS=${packetmanager.base.url}/v1/packetmanager/searchFields
 PACKETMANAGER_SEARCH_METAINFO=${packetmanager.base.url}/v1/packetmanager/metaInfo
@@ -441,20 +441,21 @@ PACKETMANAGER_UPDATE_TAGS=${packetmanager.base.url}/v1/packetmanager/addOrUpdate
 PACKETMANAGER_DELETE_TAGS=${packetmanager.base.url}/v1/packetmanager/deleteTag
 PACKETMANAGER_GET_TAGS=${packetmanager.base.url}/v1/packetmanager/getTags
 DATASHARECREATEURL=/v1/datashare/create
-DATASHAREGETEURL=http://${mosip.datashare-service.url}/v1/datashare/get
+DATASHAREGETEURL=${mosip.datashare.url}/v1/datashare/get
 # Default abis is mock-abis provided by MOSIP
 registration.processor.policy.id=mpolicy-default-abis
 registration.processor.subscriber.id=mpartner-default-abis
 
-mosip.regproc.data.share.internal.domain.name=${mosip.datashare-service.url}
+## TODO: check if this is needed 'cause are not using pure domain anymore.
+mosip.regproc.data.share.internal.domain.name=datashare.datashare
 mosip.regproc.data.share.protocol=http
 
 #iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
-mosip.biosdk.default.host=${mosip.mock-biosdk-service.url}
-mosip.biosdk.default.service.url=${mosip.biosdk.default.host}/biosdk-service
+#mosip.biosdk.default.host=${mosip.mock.biosdk.url}
+mosip.biosdk.default.service.url=${mosip.biosdk.service.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -910,10 +911,11 @@ regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TE
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
 
-openapi.registrationProcessor.servers[0].url=${mosip.api.internal.url}/registrationprocessor/v1/registrationtransaction
-openapi.registrationProcessor.servers[0].description=Registration Processor URL
+## TODO: these are not needed. Check.
+#openapi.registrationProcessor.servers[0].url=${mosip.api.internal.url}/registrationprocessor/v1/registrationtransaction
+#openapi.registrationProcessor.servers[0].description=Registration Processor URL
 
-NGINXDMZURL=${dmz.ingress.base.url}/registrationprocessor/v1/dmzpacketserver
+NGINXDMZURL=http://regproc-pktserver.regproc/
 
 # modifiable delay in websub subscription
 mosip.regproc.websub.resubscription.delay.millisecs=43200000
@@ -931,9 +933,8 @@ mosip.registration.processor.packet.external.status.version=1.0
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
-mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
-mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
 # in minutes
diff --git a/resident-default.properties b/resident-default.properties
index 4b248566185..a11dddd6d7b 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -27,7 +27,7 @@ vid.revoke.id=mosip.vid.update
 resident.revokevid.id=mosip.resident.vidstatus
 PARTNER_REFERENCE_Id=mpartner-default-resident
 APPLICATION_Id=RESIDENT
-DECRYPT_API_URL=${mosip.kernel-keymanager-service.url}/v1/keymanager/decrypt
+DECRYPT_API_URL=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 
 ## Token generation
 token.request.id=io.mosip.resident
@@ -39,53 +39,53 @@ resident.secretKey=${mosip.mosip.resident.client.secret}
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services
-KERNELAUTHMANAGER=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/clientidsecretkey
+KERNELAUTHMANAGER=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=${mosip.regproc-print-service.url}/registrationprocessor/v1/print/uincard
 INTERNALAUTH=${mosip.ida-internal-service.url}/idauthentication/v1/internal/auth
 INTERNALAUTHTRANSACTIONS=${mosip.ida-internal-service.url}/idauthentication/v1/internal/authTransactions
 KERNELENCRYPTIONSERVICE=${mosip.ida-internal-service.url}/idauthentication/v1/internal/getCertificate
-IDAUTHCREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
-IDAUTHREVOKEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid/deactivate
+IDAUTHCREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
+IDAUTHREVOKEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid/deactivate
 ## Notification service
-IDREPOGETIDBYUIN=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
-IDREPOGETIDBYRID=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/idvid
-GETUINBYVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
+IDREPOGETIDBYUIN=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
+IDREPOGETIDBYRID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
+GETUINBYVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 resident.notification.emails=mosiptestuser@gmail.com
 resident.notification.message=Notification has been sent to the provided contact detail(s)
 ## templates
-MASTER=${mosip.kernel-masterdata-service.url}/v1/masterdata
+MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
 MACHINESEARCH=${MASTER}/machines/search
 MACHINECREATE=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
 RIDGENERATION=${mosip.kernel-ridgenerator-service.url}/v1/ridgenerator/generate/rid
-CREATEVID=${mosip.idrepo-vid-service.url}/idrepository/v1/vid
-IDREPOSITORY=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/
-ENCRYPTURL=${mosip.kernel-keymanager-service.url}/v1/keymanager/encrypt
-PACKETSIGNPUBLICKEY=${mosip.kernel-keymanager-service.url}/v1/keymanager/tpmsigning/publickey
-MIDSCHEMAURL=${mosip.kernel-keymanager-service.url}/v1/syncdata/latestidschema
+CREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
+IDREPOSITORY=${mosip.idrepo.identity.url}/idrepository/v1/identity/
+ENCRYPTURL=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
+PACKETSIGNPUBLICKEY=${mosip.kernel.keymanager.url}/v1/keymanager/tpmsigning/publickey
+MIDSCHEMAURL=${mosip.kernel.keymanager.url}/v1/syncdata/latestidschema
 
 # DMZ service call
 SYNCSERVICE=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/sync
 PACKETRECEIVER=${mosip.regproc-group1-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
-SMSNOTIFIER=${mosip.kernel-notification-service.url}/v1/notifier/sms/send
-EMAILNOTIFIER=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-AUTHTYPESTATUSUPDATE=${mosip.idrepo-identity-service.url}/idrepository/v1/identity/authtypes/status
+SMSNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/sms/send
+EMAILNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/email/send
+AUTHTYPESTATUSUPDATE=${mosip.idrepo.identity.url}/idrepository/v1/identity/authtypes/status
 #Regitstration processor reprint service
 #Registration status service
 REGISTRATIONSTATUSSEARCH=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
 resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service
-POLICY_REQ_URL=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
+POLICY_REQ_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 OTP_GEN_URL=${mosip.ida-internal-service.url}/idauthentication/v1/internal/otp
-CREDENTIAL_STATUS_URL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/get/
-CREDENTIAL_REQ_URL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/requestgenerator
-CREDENTIAL_CANCELREQ_URL=${mosip.idrepo-credential-request-generator.url}/v1/credentialrequest/cancel/
+CREDENTIAL_STATUS_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/get/
+CREDENTIAL_REQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
+CREDENTIAL_CANCELREQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/cancel/
 CREDENTIAL_TYPES_URL=${mosip.idrepo-credential-service.url}/v1/credentialservice/types
-PARTNER_API_URL=${mosip.pms-partner-manager-service.url}/v1/partnermanager/partners
-mosip.kernel.masterdata.audit-url=${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+PARTNER_API_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners
+mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 ## Config data
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
diff --git a/syncdata-default.properties b/syncdata-default.properties
index a9971bdb169..dc5169ebc2b 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -13,7 +13,7 @@
 # softhsm.kernel.pin
 
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.kernel.syncdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -23,7 +23,7 @@ mosip.kernel.syncdata.registration-center-config-file=registration-${spring.prof
 # Name of the file that is present in the config server which has global config.
 mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
 mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/idschema/latest
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
@@ -77,11 +77,11 @@ auth.primary.language=eng
 
 otp.manager.api.generate=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
 otp.manager.api.verify=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
-otp.sender.api.email.send=${mosip.kernel-notification-service.url}/v1/notifier/email/send
-otp.sender.api.sms.send={mosip.kernel-notification-service.url}/v1/notifier/sms/send
-masterdata.api.template=${mosip.kernel-masterdata-service.url}/v1/masterdata/templates/
+otp.sender.api.email.send=${mosip.kernel.notification.url}/v1/notifier/email/send
+otp.sender.api.sms.send={mosip.kernel.notification.url}/v1/notifier/sms/send
+masterdata.api.template=${mosip.kernel.masterdata.url}/v1/masterdata/templates/
 masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=${mosip.idrepo-identity-service.url}/v1/identity/uin/{uin}
+idrepo.api.getuindetails=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
@@ -262,15 +262,15 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.authmanager.base-url=${mosip.authmanager.url}/v1/authmanager
 
 master.search.maximum.rows=50
 mosip.level=2
-mosip.kernel.masterdata.audit-url= ${mosip.kernel-auditmanager-service.url}/v1/auditmanager/audits
+mosip.kernel.masterdata.audit-url= ${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.keycloak.max-no-of-users=20000
 
 ## Register device
-mosip.kernel.keymanager-service-sign-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/jwtSign
+mosip.kernel.keymanager-service-sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
@@ -288,7 +288,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client
 
 ## Proxy otp
@@ -304,7 +304,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -354,7 +354,7 @@ mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
 
 # API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=${mosip.kernel-masterdata-service.url}/v1/masterdata/machines/%s
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel.masterdata.url}/v1/masterdata/machines/%s
 
 # Flag added to choose client crypto implementation in syncdata service
 # Needs to be updated to true in prod deployments
@@ -366,10 +366,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel-auth-service.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=${mosip.kernel-auth-service.url}/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.authmanager.url}/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
@@ -396,7 +396,7 @@ syncdata.websub.resubscription.delay.millis=43200000
 subscriptions-delay-on-startup=120000
 
 #Property to fetch location hierarchies during client settings sync
-mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel-masterdata-service.url}/v1/masterdata/locationHierarchyLevels
+mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel.masterdata.url}/v1/masterdata/locationHierarchyLevels
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
 # Make it to true if support is required.
@@ -414,7 +414,7 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 syncdata.cache.evict.delta-sync.cron=0 0/15 * * * *
 syncdata.cache.snapshot.cron=0 0 23 * * * 
 
-mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/publickey/{applicationId}
+mosip.kernel.keymanager-service-publickey-url=${mosip.kernel.keymanager.url}/v1/keymanager/publickey/{applicationId}
 
 mosip.kernel.keymanager.unique.identifier.autoupdate=false
 

From 010d65e08f9da4e3053f153135427e8d5839daa1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 12:05:00 +0530
Subject: [PATCH 0550/1358] [MOSIP-19369] WIP.

---
 application-default.properties       |  2 ++
 id-authentication-default.properties |  4 +--
 kernel-default.properties            | 47 ++++++++++++----------------
 pre-registration-default.properties  |  2 +-
 syncdata-default.properties          |  4 +--
 5 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 5a25aec012c..80b0e9a62e1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -23,6 +23,7 @@ mosip.kernel.keymanager.url=http://keymanager.kernel
 mosip.kernel.auditmanager.url=http://auditmanager.kernel
 mosip.kernel.notification.url=http://notifier.kernel
 mosip.kernel.idgenerator.url=http://idgenerator.kernel
+mosip.kernel.otpmanager.url=http://otpmanager.kernel
 mosip.idrepo.identity.url=http://idrepo-identity.idrepo
 mosip.idrepo.vid.url=http://idrepo-vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin
@@ -31,6 +32,7 @@ mosip.pms.partnermanager.url=http://pms-partner.pms
 mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
 mosip.datashare.url=http://datashare.datashare
 mosip.biosdk.service.url=http://biosdk-service.biosdk
+mosip.regproc.workflow.url=http://regproc-workflow.regproc
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 2adeccf5797..9ce35de6c26 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -139,13 +139,13 @@ audit.rest.headers.mediaType=${mosip.ida.request.mediaType}
 audit.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Kernel OTP Validator
-otp-validate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
+otp-validate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/validate
 otp-validate.rest.httpMethod=GET
 otp-validate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-validate.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Kernel OTP Generator
-otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
+otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
 otp-generate.rest.httpMethod=POST
 otp-generate.rest.headers.mediaType=${mosip.ida.request.mediaType}
 otp-generate.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/kernel-default.properties b/kernel-default.properties
index 6417e799b4b..7784aa19f8e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.host
+# keycloak.internal.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.ida.client.secret
@@ -15,7 +15,6 @@
 # email.smtp.secret
 
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel-syncdata-service.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -79,8 +78,8 @@ auth.refreshtoken.header=RefreshToken
 auth.jwt.refresh.expiry=86400000
 auth.primary.language=eng
 
-otp.manager.api.generate=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
-otp.manager.api.verify=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
+otp.manager.api.generate=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+otp.manager.api.verify=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/validate
 otp.sender.api.email.send=${mosip.kernel.notification.url}/v1/notifier/email/send
 otp.sender.api.sms.send=${mosip.kernel.notification.url}/v1/notifier/sms/send
 masterdata.api.template=${mosip.kernel.masterdata.url}/v1/masterdata/templates/
@@ -135,8 +134,8 @@ kernel.prid.revoke-scheduler-days_of_week=*
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres
-mosip.kernel.database.port=80
+mosip.kernel.database.hostname=postgres-postgresql.postgres
+mosip.kernel.database.port=5432
 
 javax.persistence.jdbc.driver=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
@@ -210,33 +209,33 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.external.host}
+mosip.iam.base.url=${keycloak.internal.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.external.host}/auth/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.external.host}/auth/admin/
+mosip.iam.open-id-url=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${mosip.iam.base.url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url=${mosip.iam.base.url}/auth/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.external.host}/auth
+keycloak.auth-server-url=${mosip.iam.base.url}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
 mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret={cipher}46b4a98aac7347e6a2d4f723e281cfd1e7b859100cc17494fc7ed9fb357a6cd9
+mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
 mosip.admin_realm_id=mosip
 mosip.iam.master.realm-id=master
@@ -402,8 +401,8 @@ subscriptions-delay-on-startup=120000
 mosip.kernel.keymanager.113nothumbprint.support=false
 
 # Pause & resume api proeprties
-PACKET_RESUME_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflowaction
-PACKET_PAUSE_API=${mosip.regproc-workflowmanager.url}/registrationprocessor/v1/workflowmanager/workflow/search
+PACKET_RESUME_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflowaction
+PACKET_PAUSE_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflow/search
 KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## resubscription and subscription initial delay for masterdata service
@@ -457,12 +456,12 @@ mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.service-context=/v1/masterdata
 mosip.service.end-points={cipher}dd5737cb38b0d354e925a031d1662cae45feb891135577d72d75017f71a3c72d38d157158eb9e12d8e51ffb3e66e1397eb0e20040939ad145363a00c458f247c53a712c564467770d08b0cab22b967ba71d09e75a4c53492f23bb29e4c529a87787e7652c720b8eb7ce61ffc4ea6efe89be9d85034fcb135582af662290eacc0392ea96c15fef0a20694cd24c553ec3325e1450e4fb6ea773b200fcdc5d097014e7ff1794d93330c40f50fce4c20d15fc9b0ddced67877cf51ecf38d7b3fb352e176fe12956e0e2e1d43ac77dd200085dac1d3e3fe49475d5077b6bff6162c53a2d00fdbc5cd12a0aa983165916cb9cd72b2eff9c8bf7bc92bea2619fc0900b5936655a16a96fe8b188fa06a625760f78b1273a66137228095305ca32093b1fda5faac87b1ae172caa990776fa6dc52f6f1863848b21e42eb1af5ee530f12af7ef94aa8bccb254fe65c69870338e7bae1a95f344c9fcb806ac7801466168c81de7262e1a0bf49c62ee0c3676babbc718ba790e7b9428482443f6e612c9ef497702a79c9a49d47ab98d97a868e7f2ce1b7febc3d09afadbf5555e21234290aaaef94681c78326d7c178316b7d211f2a72dfb5a39e6badda11d4ee42b79c003fdf1d83d72aee288f6c8ad6e5f66c2dae350d50f5aec39360b8cce5e3682ef6f8adb7a6377a9580d420944f98c98390d3a2f7a0682d26991a60e3ab79401c63233c5a18b1902f715ebf595107563d9a60d3280c1baed1777e894660ea1e05b6433e2653af499b286fdb6380b29d32953bd23de2ec8f2c441b0e22c3877f85aa23046e2830fb9f94dced2ee55f107c8160f05bfa5436620898b36d18ae26bd4c7400e3d51f85bad2a81665aa7baf7d10cb792067b600fb0277fb0119aa9186c3d1a2079c56ca999ce1d4930b9ea77f80d88bb2afbb93002b77c3d5f5a895822dacc6038112160bf280d392599c268d504aff4e933fa4308ab50d25793c93fd2a51b1c7d2938219ff84202ae286cb1b9650ec5dfd79dabad2acf2b44fbc08170c097c93a9d663b4c130392bd536d86a87cd11ab074d3db666dcf2f40349d1056ce2708cfcfbcdd868a8073acd9a2241159e64cae84eceabd8acb83afbeeafa822defd7616bfd5801f1976392872f61e637bc21c3db4fe30d6c1de644d2291ce9d48ff1afff9f1ab596620553fd669cfa38dc5ccea6286abbcd93ca8b434b2b6d42129d72e7daa91001d43005d781369c054b36a6158d4f2cc6c6136565733b13cd7d306c715809f2d9a5024abcffbc0ef3b58585b881f6509bd1876b923494445a2a430ddf5e517b49b65647f54a2e10a002224269c78a38b6ddbddc02176d93e1e280cfdefc317efe361babe0eb3688c9d3406c4ef7a1851ddc7d511703b1d4e2c449792abd523c6eadfbfea13cf862478d75196f8133deadc31222fa6be3cd1cac015f2af1865d834bda4e7f3352cc72116d732ed384a0b94237810bf5909ea453f9052aeb0ae6d492e7ed4d2c33145e38a79742ca23294f3dc89e3cafcfbc8349aae712172bd661137ad6179df3bcc1f03b80af7c82b8a1aa91140086e663ff257d8084680c00c9a31f9c96e0b3d350192851c0c279b8159070e5f1f06153d132447fddbbf1dbb7378b84c38dc1c5f2f8cbbfcd8a478f78b1ed6ed44a0d81a88be605b66a5caad776ab1ae7c8a88362efef9b43d261dd292324e173606fabd3b8ade5fce14671d274d33e93f975d12071473fa7b0289a99a151ce67b3070f44001b5d74b3087ad1fbd071605fd62fa5f86454b881fd1ad86bd565b33248d47100d862dcc57dc0e9f673e25b0845b27d06b38c30ca975efb8031444459d776f6221a90fa51b971a4054332411de943afd8b
 
-
-
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
-## Roles
+mosip.kernel.masterdata.template_idauthentication_event=MASTERDATA_IDAUTHENTICATION_TEMPLATES
+mosip.kernel.masterdata.title_event=MASTERDATA_TITLES
 
+## Roles
 mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
@@ -514,7 +513,6 @@ mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MA
 mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getdocumentcategories=GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -524,7 +522,6 @@ mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONA
 mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-#mosip.role.admin.masterdata.getdocumenttypesdocumentcategorycode=INDIVIDUAL,ID_AUTHENTICATION,ZONAL_ADMIN,PARTNER,PARTNER_ADMIN,PRE_REGISTRATION,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -754,7 +751,3 @@ mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATI
 mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-
-
-mosip.kernel.masterdata.template_idauthentication_event=MASTERDATA_IDAUTHENTICATION_TEMPLATES
-mosip.kernel.masterdata.title_event=MASTERDATA_TITLES
\ No newline at end of file
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index bcf4b935c29..1789c139f61 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -266,7 +266,7 @@ otp.request.flooding.max-count=3
 datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
 mail-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/email/send
 sms-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/sms/send
-otp-generate.rest.uri=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
+otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
diff --git a/syncdata-default.properties b/syncdata-default.properties
index dc5169ebc2b..c4556e002b3 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -75,8 +75,8 @@ auth.refreshtoken.header=RefreshToken
 auth.jwt.refresh.expiry=86400000
 auth.primary.language=eng
 
-otp.manager.api.generate=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/generate
-otp.manager.api.verify=${mosip.kernel-otpmanager-service.url}/v1/otpmanager/otp/validate
+otp.manager.api.generate=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+otp.manager.api.verify=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/validate
 otp.sender.api.email.send=${mosip.kernel.notification.url}/v1/notifier/email/send
 otp.sender.api.sms.send={mosip.kernel.notification.url}/v1/notifier/sms/send
 masterdata.api.template=${mosip.kernel.masterdata.url}/v1/masterdata/templates/

From 06842aa37e5df0475e366e256e8138d5f8c0307a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 12:11:14 +0530
Subject: [PATCH 0551/1358] [MOSIP-19369] WIP.

---
 admin-default.properties            | 22 +++++++++-------------
 application-default.properties      |  4 +++-
 kernel-default.properties           |  2 +-
 pre-registration-default.properties |  4 ++--
 resident-default.properties         |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 9752702ef76..7ad39faf3d7 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -2,10 +2,9 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.host
+# keycloak.internal.url
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.regproc.client.secret
-# mosip.api.internal.host
 
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
@@ -180,14 +179,11 @@ mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
 mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
-
-#tempuri=https://admin.v3box1.mosip.net
-#mosip.admin-services.redirecturi=${tempuri}/v1/admin/login-redirect/
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.external.hostl}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.interanl.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -207,9 +203,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
@@ -234,7 +230,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 # LostRid 
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.lostrid.version=1.0
-LOST_RID_API=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/lostridsearch
+LOST_RID_API=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/lostridsearch
 #logging.level.org.springframework.web.client.RestTemplate=DEBUG
 
 # Roles
@@ -265,13 +261,13 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/?pageNumber=0&pageSize=100&orderBy=cr_dtimes&direction=DESC
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
-mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
-mosip.admin.packetupload.packetsync.url=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/syncV2
+mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel.syncdata.url}/v1/syncdata/tpm/publickey/
+mosip.admin.packetupload.packetsync.url=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/syncV2
 mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,lastName
 mosip.admin.packetupload.packetsync.email=email
 mosip.admin.packetupload.packetsync.phone=phone
diff --git a/application-default.properties b/application-default.properties
index 80b0e9a62e1..24268dda3d8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -24,6 +24,7 @@ mosip.kernel.auditmanager.url=http://auditmanager.kernel
 mosip.kernel.notification.url=http://notifier.kernel
 mosip.kernel.idgenerator.url=http://idgenerator.kernel
 mosip.kernel.otpmanager.url=http://otpmanager.kernel
+mosip.kernel.syncdata.url=http://syncdata.kernel
 mosip.idrepo.identity.url=http://idrepo-identity.idrepo
 mosip.idrepo.vid.url=http://idrepo-vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin
@@ -33,6 +34,7 @@ mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
 mosip.datashare.url=http://datashare.datashare
 mosip.biosdk.service.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
+mosip.regproc.status.service.url=http://regproc-status.regproc
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
@@ -309,7 +311,7 @@ management.metrics.export.prometheus.enabled=true
 
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 mosip.kernel.syncdata-service-dynamicfield-url=${mosip.kernel.masterdata.url}/v1/masterdata/dynamicfields
-mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel-syncdata-service.url}/v1/syncdata/tpm/publickey/
+mosip.kernel.syncdata-service-get-tpm-publicKey-url=${mosip.kernel.syncdata.url}/v1/syncdata/tpm/publickey/
 mosip.kernel.keymanager-service-validate-url=${mosip.kernel.keymanager.url}/v1/keymanager/validate
 mosip.kernel.keymanager-service-csverifysign-url=${mosip.kernel.keymanager.url}/v1/keymanager/csverifysign
 
diff --git a/kernel-default.properties b/kernel-default.properties
index 7784aa19f8e..eaedd79913d 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -389,7 +389,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/callback/partner/ca_certificate
-syncdata.websub.callback.url.ca-cert=${mosip.kernel-syncdata-service.url}/v1/syncdata/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=${mosip.kernel.syncdata.url}/v1/syncdata/callback/partner/ca_certificate
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 1789c139f61..16ec9248169 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -251,8 +251,8 @@ mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid
 
 ## Syncdata service
 latestidschema.service.contextpath=latestidschemafetch the latest ID Schema for the ID object validator
-mosip.preregistration.id-schema=${mosip.kernel-syncdata-service.url}/v1/syncdata/latestidschema
-syncdata.resource.url=${mosip.kernel-syncdata-service.url}/v1/syncdata
+mosip.preregistration.id-schema=${mosip.kernel.syncdata.url}/v1/syncdata/latestidschema
+syncdata.resource.url=${mosip.kernel.syncdata.url}/v1/syncdata
 
 ## OTP 
 sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}
diff --git a/resident-default.properties b/resident-default.properties
index a11dddd6d7b..36a688c1805 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -67,7 +67,7 @@ PACKETSIGNPUBLICKEY=${mosip.kernel.keymanager.url}/v1/keymanager/tpmsigning/publ
 MIDSCHEMAURL=${mosip.kernel.keymanager.url}/v1/syncdata/latestidschema
 
 # DMZ service call
-SYNCSERVICE=${mosip.regproc-status-service.url}/registrationprocessor/v1/registrationstatus/sync
+SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
 PACKETRECEIVER=${mosip.regproc-group1-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
 SMSNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/sms/send
 EMAILNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/email/send

From cb86f6a0b0bd09fc8c21da0614dd57f6e0ec77b7 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 12:34:12 +0530
Subject: [PATCH 0552/1358] [MOSIP-19369] WIP.

---
 data-share-default.properties        |  4 ++--
 hotlist-default.properties           |  4 ++--
 id-authentication-default.properties | 14 ++++----------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 7aa1f4c753c..9d7eda40fd6 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -1,7 +1,7 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# keycloak.host
+# keycloak.internal.url
 # mosip.mosip.datsha.client.secret
 
 mosip.data.share.service.id=mosip.data.share
@@ -24,7 +24,7 @@ data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
-data.share.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+data.share.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
 mosip.data.share.protocol=http
 mosip.data.share.includeCertificateHash=false
diff --git a/hotlist-default.properties b/hotlist-default.properties
index fdd711fcef4..2761d26d2ff 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -5,8 +5,8 @@
 spring.application.name=HOTLIST
 
 ## DB
-mosip.hotlist.db.url=postgres
-mosip.hotlist.db.port=80
+mosip.hotlist.db.url=postgres-postgresql.postgres
+mosip.hotlist.db.port=5432
 mosip.hotlist.db.db-name=mosip_hotlist
 mosip.hotlist.db.username=hotlistuser
 mosip.hotlist.db.password=${db.dbuser.password}
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 9ce35de6c26..fda55ab1236 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -11,12 +11,9 @@
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # softhsm.ida.pin
-# mosip.api.internal.host
-# mosip.api.public.host
 # ida.websub.masterdata.templates.callback.secret
 # ida.websub.masterdata.titles.callback.secret
 
-
 ## Client
 # The Online Verification partner ID associated to the IDA instance.
 # This is used to subscribe to the credential issuance event notification sent by credential service.
@@ -35,8 +32,8 @@ mosip.ida.auth.appId=ida
 ## Database
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.ida.database.hostname=postgres
-mosip.ida.database.port=80
+mosip.ida.database.hostname=postgres-postgresql.postgres
+mosip.ida.database.port=5432
 mosip.ida.database.user=idauser
 mosip.ida.database.password=${db.dbuser.password}
 
@@ -205,8 +202,6 @@ id-masterdata-template-service-multilang.rest.httpMethod=GET
 id-masterdata-template-service-multilang.rest.headers.mediaType=${mosip.ida.request.mediaType}
 id-masterdata-template-service-multilang.rest.timeout=${mosip.ida.request.timeout.secs}
 
-
-
 ## Websub
 ida-websub-authtype-callback-secret=${ida.websub.authtype.callback.secret}
 ida-websub-credential-issue-callback-secret=${ida.websub.credential.issue.callback.secret}
@@ -214,7 +209,6 @@ ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
-
 ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
 ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
@@ -484,7 +478,7 @@ mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
 mosip.iam.adapter.clientsecret=${mosip.ida.auth.secretKey}
 mosip.iam.adapter.appid=${mosip.ida.auth.appId}
-mosip.authmanager.client-token-endpoint=${mosip.api.internal.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## IDA key generator 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
@@ -553,7 +547,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url},${mosip.api.internal.url}
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 

From 90c85c018b43852ed9dd801a9f7ad0a629ebb7de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 12:52:42 +0530
Subject: [PATCH 0553/1358] [MOSIP-19369] WIP.

---
 application-default.properties                |  1 +
 id-authentication-internal-default.properties |  1 -
 id-repository-default.properties              | 15 +++++----------
 resident-default.properties                   |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 24268dda3d8..587964cc1cb 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -31,6 +31,7 @@ mosip.admin.hotlist.url=http://admin-hotlist.admin
 mosip.pms.policymanager.url=http://pms-policy.pms
 mosip.pms.partnermanager.url=http://pms-partner.pms
 mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
+mosip.idrepo.credential.service.url=http://idrepo-credential.idrepo
 mosip.datashare.url=http://datashare.datashare
 mosip.biosdk.service.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 75568ed80ca..4ea87b06ce2 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -3,7 +3,6 @@ ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-web
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
 ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
 
-
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
 ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index b7b7c9fcdef..6387b4b0db8 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -5,17 +5,16 @@
 # mosip.mosip.crereq.client.secret
 # mosip.mosip.creser.client.secret
 # mosip.mosip.regproc.client.secret
-# keycloak.host
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
-#idrepo.websub.vid.credential.update.secret
+# idrepo.websub.vid.credential.update.secret
 
 management.endpoint.restart.enabled=true
 
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.idrepo.db.url=postgres
-mosip.idrepo.db.port=80
+mosip.idrepo.db.url=postgres-postgresql.postgres
+mosip.idrepo.db.port=5432
 mosip.idrepo.db.identity.db-name=mosip_idrepo
 mosip.idrepo.db.identity.username=idrepouser
 mosip.idrepo.db.identity.password=${db.dbuser.password}
@@ -152,7 +151,7 @@ mosip.iam.adapter.renewal-before-expiry-interval=15
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 
-mosip.idrepo.bio-extractor-service.rest.uri=${mosip.idrepo-bioextractor-service.url}/v1/bioextractor/{extractionFormat}/extracttemplates
+mosip.idrepo.bio-extractor-service.rest.uri=${mosip.mock.biosdk.url}/biosdk-service/{extractionFormat}/extracttemplates
 mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
 mosip.idrepo.bio-extractor-service.rest.timeout=100
@@ -266,7 +265,7 @@ credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
 
 ## Rest services
-CRDENTIALSERVICE=${mosip.idrepo-credential-service.url}/v1/credentialservice/issue
+CRDENTIALSERVICE=${mosip.idrepo.credential.service.url}/v1/credentialservice/issue
 KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 CALLBACKURL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/callback/notifyStatus
 ENCRYPTION=${mosip.idrepo.encryptor.rest.uri}
@@ -378,9 +377,7 @@ mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST,ID_REP
 mosip.role.idrepo.credentialrequest.getgetrequestid=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.getgetrequestids=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.putretriggerrequestid=CREDENTIAL_REQUEST
-
 mosip.role.idrepo.credentialservice.postissue=CREDENTIAL_REQUEST
-
 mosip.role.idrepo.identity.postidrepo=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.getidvidid=REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION,ID_REPOSITORY
 mosip.role.idrepo.identity.patchidrepo=REGISTRATION_PROCESSOR,ID_REPOSITORY
@@ -393,7 +390,6 @@ mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESS
 mosip.role.idrepo.identity.draftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
-
 mosip.role.idrepo.vid.postvid=RESIDENT,REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.vid.getvid=REGISTRATION_PROCESSOR,ID_AUTHENTICATION,RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR,ID_REPOSITORY
@@ -402,4 +398,3 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
-
diff --git a/resident-default.properties b/resident-default.properties
index 36a688c1805..c7242a4aecf 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -83,7 +83,7 @@ OTP_GEN_URL=${mosip.ida-internal-service.url}/idauthentication/v1/internal/otp
 CREDENTIAL_STATUS_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/get/
 CREDENTIAL_REQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
 CREDENTIAL_CANCELREQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/cancel/
-CREDENTIAL_TYPES_URL=${mosip.idrepo-credential-service.url}/v1/credentialservice/types
+CREDENTIAL_TYPES_URL=${mosip.idrepo.credential.service.url}/v1/credentialservice/types
 PARTNER_API_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 

From 79d70245a5acfcf20d4239931c832934bdaae2ab Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 13:08:08 +0530
Subject: [PATCH 0554/1358] [MOSIP-19369] WIP.

---
 application-default.properties            |  2 ++
 partner-management-default.properties     | 18 +++++++++---------
 print-default.properties                  | 10 +++++-----
 registration-default.properties           |  2 +-
 registration-processor-default.properties |  2 +-
 resident-default.properties               | 15 ++++++++-------
 syncdata-default.properties               |  4 ++--
 7 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 587964cc1cb..8e3c27225fc 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -36,6 +36,8 @@ mosip.datashare.url=http://datashare.datashare
 mosip.biosdk.service.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
 mosip.regproc.status.service.url=http://regproc-status.regproc
+mosip.websub.url=http://websub.websub
+mosip.ida.internal.url=http://ida-internal.ida
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
diff --git a/partner-management-default.properties b/partner-management-default.properties
index fb4b076ccba..81bd7acc6f9 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -4,15 +4,15 @@
 ## db.dbuser.password 
 ## mosip.mosip.partner.client.secret
 ## mosip.mosip.pms.client.secret
-## keycloak.host
+## keycloak.internal.url
 ## keycloak.admin.password
 ## mosip.api.public.url
 
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 ## If database is external to production, provide the DNS or ip of the host and port 
-mosip.pmp.database.hostname=postgres
-mosip.pmp.database.port=80
+mosip.pmp.database.hostname=postgres-postgresql.postgres
+mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
 
@@ -135,13 +135,13 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.external.host}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.external.host}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.internal.url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.internal.url}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
@@ -155,7 +155,7 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -229,6 +229,8 @@ apikey.status.content-template=apikey-status-content-template
 pms.notifications-schedule.init-delay = 24
 pms.notifications-schedule.fixed-rate=24
 
+partner.register.as.user.in.iam.enable=false
+
 ## Roles
 mosip.role.pms.postpoliciesgroupnew=PARTNER_ADMIN,POLICYMANAGER
 mosip.role.pms.putpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
@@ -303,5 +305,3 @@ mosip.role.pms.postmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.putmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmispsmispidlicensekey=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
-
-partner.register.as.user.in.iam.enable=false
diff --git a/print-default.properties b/print-default.properties
index ef472d2fb74..edccf0eb7be 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # mosip.mosip.regproc.client.secret
-# keycloak.host
+# keycloak.internal.url
 # print.websub.hub.secret
 
 ## Websub
@@ -26,7 +26,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -111,8 +111,8 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${mosip.api.internal.url}/keycloak/auth/realms/mosip
-mosip.authmanager.base-url=http://kernel-auth-service/v1/authmanager
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
 
@@ -125,4 +125,4 @@ mosip.iam.adapter.renewal-before-expiry-interval=1440
 
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
\ No newline at end of file
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
diff --git a/registration-default.properties b/registration-default.properties
index 24d857edad3..9d4b120c091 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -403,7 +403,7 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':
 # it is comma separated list of field ids
 mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferredLang
 
-
+## Roles
 mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
 mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index cc7a6d9cca5..2bcb787b6eb 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -88,7 +88,7 @@ authmanager.base.url=${mosip.authmanager.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateToken
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
-IDAINTERNAL=${mosip.ida-internal-service.url}
+IDAINTERNAL=${mosip.ida.internal.url}
 INTERNALAUTH=${IDAINTERNAL}/idauthentication/v1/internal/auth
 GETINDIVIDUALIDFROMUSERID=${authmanager.base.url}/v1/authmanager/individualId
 
diff --git a/resident-default.properties b/resident-default.properties
index c7242a4aecf..76293ce7933 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -39,11 +39,12 @@ resident.secretKey=${mosip.mosip.resident.client.secret}
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services
+
 KERNELAUTHMANAGER=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
-REGPROCPRINT=${mosip.regproc-print-service.url}/registrationprocessor/v1/print/uincard
-INTERNALAUTH=${mosip.ida-internal-service.url}/idauthentication/v1/internal/auth
-INTERNALAUTHTRANSACTIONS=${mosip.ida-internal-service.url}/idauthentication/v1/internal/authTransactions
-KERNELENCRYPTIONSERVICE=${mosip.ida-internal-service.url}/idauthentication/v1/internal/getCertificate
+REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
+INTERNALAUTH=${mosip.ida.internal.url}/idauthentication/v1/internal/auth
+INTERNALAUTHTRANSACTIONS=${mosip.ida.internal.url}/idauthentication/v1/internal/authTransactions
+KERNELENCRYPTIONSERVICE=${mosip.ida.internal.url}/idauthentication/v1/internal/getCertificate
 IDAUTHCREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 IDAUTHREVOKEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid/deactivate
 ## Notification service
@@ -68,18 +69,18 @@ MIDSCHEMAURL=${mosip.kernel.keymanager.url}/v1/syncdata/latestidschema
 
 # DMZ service call
 SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=${mosip.regproc-group1-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+PACKETRECEIVER=http://regproc-group1.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
 SMSNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/sms/send
 EMAILNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/email/send
 AUTHTYPESTATUSUPDATE=${mosip.idrepo.identity.url}/idrepository/v1/identity/authtypes/status
 #Regitstration processor reprint service
 #Registration status service
-REGISTRATIONSTATUSSEARCH=${dmz.ingress.base.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
+REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
 resident.center.id=10001
 resident.machine.id=10001
 #Credential Req service
 POLICY_REQ_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-OTP_GEN_URL=${mosip.ida-internal-service.url}/idauthentication/v1/internal/otp
+OTP_GEN_URL=${mosip.ida.internal.url}/idauthentication/v1/internal/otp
 CREDENTIAL_STATUS_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/get/
 CREDENTIAL_REQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
 CREDENTIAL_CANCELREQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/cancel/
diff --git a/syncdata-default.properties b/syncdata-default.properties
index c4556e002b3..18d49a89926 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -131,8 +131,8 @@ kernel.prid.revoke-scheduler-days_of_week=*
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres
-mosip.kernel.database.port=80
+mosip.kernel.database.hostname=postgres-postgresql.postgres
+mosip.kernel.database.port=5432
 
 javax.persistence.jdbc.driver=org.postgresql.Driver
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect

From 1c32f56804baf2cfc56dcda6a37dc04c3ab0f08b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 13:12:23 +0530
Subject: [PATCH 0555/1358] Synced with develop2-v2.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index eaedd79913d..d51b8b92daa 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -446,7 +446,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 #To fetch user details based on user id and user name in zone API's 
 zone.user.details.url=${mosip.authmanager.url}/v1/authmanager/userdetails
 
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client

From fa4fb89e8f7731d4be10917b4dc1215abe59be3d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 14:55:07 +0530
Subject: [PATCH 0556/1358] Minor

---
 resident-default.properties | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 76293ce7933..f736b466343 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -3,7 +3,8 @@
 # helm chart:
 # mosip.mosip.resident.client.secret
 # mosip.mosip.regproc.client.secret
-#--------------ID and Version --------------
+# keycloak.internal.url.
+
 auth.internal.id=mosip.identity.auth.internal
 auth.internal.version=1.0
 mosip.registration.processor.print.id=mosip.registration.print
@@ -39,7 +40,6 @@ resident.secretKey=${mosip.mosip.resident.client.secret}
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services
-
 KERNELAUTHMANAGER=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
 INTERNALAUTH=${mosip.ida.internal.url}/idauthentication/v1/internal/auth
@@ -119,3 +119,9 @@ registration.processor.identityjson=identity-mapping.json
 resident.update-uin.machine-name-prefix = resident_machine_
 resident.update-uin.machine-spec-id = 1001
 resident.update-uin.machine-zone-code = MOR
+
+#Auth Adapter rest template authentication configs
+mosip.iam.adapter.appid=resident
+mosip.iam.adapter.clientid=mosip-resident-client
+mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/ 

From bc28a26ef2a72b79a4411f4ae23330ee708c0329 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 4 Jan 2022 14:58:01 +0530
Subject: [PATCH 0557/1358] Synced with develop2-v2.

---
 registration-processor-camel-routes-lost-default.xml        | 2 +-
 registration-processor-camel-routes-new-default.xml         | 2 +-
 registration-processor-camel-routes-res-reprint-default.xml | 2 +-
 registration-processor-camel-routes-res-update-default.xml  | 2 +-
 registration-processor-camel-routes-update-default.xml      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index caac0d18368..b0a03fb8020 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -478,8 +478,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 134267ae97c..9826531d15c 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -519,8 +519,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index 044226a2cd4..5fa2dcafede 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -76,8 +76,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index bcd11c32aa7..3b19bb160a4 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -255,8 +255,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index c8683a1c5a6..7b9be37c84a 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -537,8 +537,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
+            <to uri="workflow-cmd://complete-as-processed" />
          </otherwise>
       </choice>
    </route>

From c97a573b24c01f8cd478feb5b7177471672dae01 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 5 Jan 2022 11:20:11 +0530
Subject: [PATCH 0558/1358] Synced with develop2-v2.

---
 print-default.properties                                   | 7 ++++---
 registration-processor-camel-routes-lost-default.xml       | 2 +-
 registration-processor-camel-routes-new-default.xml        | 2 +-
 ...stration-processor-camel-routes-res-reprint-default.xml | 2 +-
 registration-processor-camel-routes-res-update-default.xml | 2 +-
 registration-processor-camel-routes-update-default.xml     | 2 +-
 registration-processor-default.properties                  | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/print-default.properties b/print-default.properties
index edccf0eb7be..f567af8b839 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -10,12 +10,13 @@ mosip.event.hubURL=${mosip.websub.url}/hub/
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
-mosip.event.callBackUrl=${mosip.print-service.url}/v1/print/print/callback/notifyPrint
+mosip.event.callBackUrl=${mosip.api.internal.url}/${server.servlet.context-path}/print/callback/notifyPrint
+
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
 mosip.event.secret=${print.websub.hub.secret}
 csrf.disabled=true
-mosip.event.delay=120000
-print-websub-resubscription-delay-secs=43200
+mosip.event.delay-millisecs=120000
+print-websub-resubscription-delay-millisecs=21600000
 registration.processor.print.textfile=registration-processor-print-text-file.json
 
 ## Token
diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index b0a03fb8020..caac0d18368 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -478,8 +478,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 9826531d15c..134267ae97c 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -519,8 +519,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index 5fa2dcafede..044226a2cd4 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -76,8 +76,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index 3b19bb160a4..bcd11c32aa7 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -255,8 +255,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 7b9be37c84a..c8683a1c5a6 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -537,8 +537,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2bcb787b6eb..2cae8320013 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -944,7 +944,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=true
 
 # Roles
-mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
+mosip.role.registration.getsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
 mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
 mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
 mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT

From 8660b5923cf55181a1f1010bff14f1aaf822e2fa Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 5 Jan 2022 14:55:09 +0530
Subject: [PATCH 0559/1358] Minor correction.

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index f736b466343..7057e92657d 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -124,4 +124,4 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/ 
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/

From d747ffb1c66e6c0fe962c49be98151083b0fc57b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 17:43:44 +0530
Subject: [PATCH 0560/1358] Auth url corrected.

---
 admin-default.properties                  | 20 ++++++++++----------
 data-share-default.properties             |  2 +-
 id-repository-default.properties          |  6 +++---
 kernel-default.properties                 | 20 ++++++++++----------
 mock-abis-default.properties              |  2 +-
 partner-management-default.properties     | 12 ++++++------
 pre-registration-default.properties       |  2 +-
 print-default.properties                  |  2 +-
 registration-processor-default.properties |  2 +-
 resident-default.properties               |  2 +-
 syncdata-default.properties               | 16 ++++++++--------
 11 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 7ad39faf3d7..3ca32e53fb0 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -15,8 +15,8 @@ mosip.kernel.database.hostname=postgres
 mosip.kernel.database.port=80
 
 ## Account management
-authmanager.base.url=${mosip.authmanager.url}/v1/authmanager
-mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
+authmanager.base.url=${mosip.kernel.authmanager.url}/v1/authmanager
+mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.accountmgmt.user-name-url=/username/
 mosip.admin.accountmgmt.user-detail-url=/userdetail/
 mosip.admin.accountmgmt.unblock-url=/unblock/
@@ -25,8 +25,8 @@ mosip.admin.accountmgmt.reset-password-url=/resetpassword/
 mosip.admin.app-id=admin
 
 mosip.kernel.signature.cryptomanager-encrypt-url=${mosip.kernel.keymanager.url}/v1/keymanager/private/encrypt
-auth.server.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.refreshToken.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/refreshToken
+auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.refreshToken.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/refreshToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client
 auth.role.prefix=ROLE_
 auth.header.name=Authorization
@@ -48,10 +48,10 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 
 ## Use registration
-auth.server.user-register-url=${mosip.authmanager.url}/v1/authmanager/user
+auth.server.user-register-url=${mosip.kernel.authmanager.url}/v1/authmanager/user
 mosip.kernel.emailnotifier-url=${mosip.kernel.notification.url}/v1/notifier/email/send
-auth.server.sendotp-url=${mosip.authmanager.url}/v1/authmanager/authenticate/sendotp
-auth.server.user-add-password-url=${mosip.authmanager.url}/v1/authmanager/user/addpassword
+auth.server.sendotp-url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/sendotp
+auth.server.user-add-password-url=${mosip.kernel.authmanager.url}/v1/authmanager/user/addpassword
 mosip.admin-appid=admin
 mosip.admin-otp-context=auth-otp
 mosip.admin-userid-otp-type=USERID 
@@ -65,7 +65,7 @@ mosip.admin.security.policy.type1=password
 mosip.admin.security.policy.type2=password,otp
 mosip.admin.security.policy.type3=otp
 mosip.admin.security.policy.role-policy-mapping={ZONAL_ADMIN:'type2',ZONAL_APPROVER:'type1',CENTRAL_ADMIN:'type1',CENTRAL_APPROVER:'type1',REGISTRATION_OFFICER:'type1',REGISTRATION_SUPERVISOR:'type1',REGISTRATION_OPERATOR:'type1'}
-mosip.admin.security.policy.userrole-auth-url=${mosip.authmanager.url}/v1/authmanager/role/{appId}/{username}
+mosip.admin.security.policy.userrole-auth-url=${mosip.kernel.authmanager.url}/v1/authmanager/role/{appId}/{username}
 
 ## Masterdata cards
 
@@ -212,14 +212,14 @@ regproc.token.request.clientId=mosip-regproc-client
 regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
-KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 # IAM adapter
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
-mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
 # in minutes
diff --git a/data-share-default.properties b/data-share-default.properties
index 9d7eda40fd6..ef8c6df6838 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -10,7 +10,7 @@ mosip.data.share.service.version=1.0
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 PARTNER_POLICY=${mosip.pms.policymanager.url}/v1/policymanager/policies/{policyId}/partner/{partnerId}
-KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 
 data.share.application.id=PARTNER
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 6387b4b0db8..1bd4e13d127 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -205,7 +205,7 @@ mosip.idrepo.websub.credential-status-update.topic=CREDENTIAL_STATUS_UPDATE
 mosip.iam.adapter.clientid.id-repository=${mosip.idrepo.auth.client-id}
 mosip.iam.adapter.clientsecret.id-repository=${mosip.idrepo.auth.secret-key}
 mosip.iam.adapter.appid.id-repository=${mosip.idrepo.auth.app-id}
-mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 mosip.idrepo.uin-generator.rest.uri=${mosip.kernel.idgenerator.url}/v1/idgenerator/uin
 mosip.idrepo.uin-generator.rest.httpMethod=GET
@@ -266,7 +266,7 @@ credential.request.reprocess.locktimeout=60000
 
 ## Rest services
 CRDENTIALSERVICE=${mosip.idrepo.credential.service.url}/v1/credentialservice/issue
-KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 CALLBACKURL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/callback/notifyStatus
 ENCRYPTION=${mosip.idrepo.encryptor.rest.uri}
 DECRYPTION=${mosip.idrepo.decryptor.rest.uri}
@@ -317,7 +317,7 @@ IDREPOGETIDBYID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
 mosip.data.share.internal.domain.name=${mosip.datashare.url}
 CREATEDATASHARE=/v1/datashare/create
-KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 KEYMANAGER_ENCRYPT_PIN=${mosip.kernel.keymanager.url}/v1/keymanager/encryptWithPin
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel.keymanager.url}/v1/keymanager/zkEncrypt
diff --git a/kernel-default.properties b/kernel-default.properties
index d51b8b92daa..1dca75911ee 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -257,7 +257,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.authmanager.url}/v1/authmanager
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -291,7 +291,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 
 
 ## Proxy otp
@@ -307,7 +307,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -371,10 +371,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=${mosip.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=${mosip.authmanager.url}/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
@@ -403,7 +403,7 @@ mosip.kernel.keymanager.113nothumbprint.support=false
 # Pause & resume api proeprties
 PACKET_RESUME_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflowaction
 PACKET_PAUSE_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflow/search
-KEYBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## resubscription and subscription initial delay for masterdata service
 masterdata.websub.resubscription.delay.millis=48000000
@@ -427,7 +427,7 @@ mosip.admin.ui.configs=version:${aplication.configuration.level.version};locatio
 mosip.kernel.keymanager.113nothumbprint.support=false
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 
 ## identity schema backward compatability ########
@@ -444,7 +444,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
 #openapi.service.servers[0].description=For Swagger
 
 #To fetch user details based on user id and user name in zone API's 
-zone.user.details.url=${mosip.authmanager.url}/v1/authmanager/userdetails
+zone.user.details.url=${mosip.kernel.authmanager.url}/v1/authmanager/userdetails
 
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 
diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index e05913976fb..e2463c3688e 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -8,7 +8,7 @@ management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
 abis.return.duplicate=false
-secret_url=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string
 secret_url.secretKey=${mosip.mosip.regproc.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 81bd7acc6f9..7a7abf108cd 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -114,7 +114,7 @@ mosip.pmp.auth.clientId=mosip-partner-client
 mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
-pms.cert.service.token.request.issuerUrl=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+pms.cert.service.token.request.issuerUrl=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 pmp.ca.certificaticate.upload.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/uploadCACertificate
 pmp.partner.certificaticate.upload.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/uploadPartnerCertificate
 pmp.partner.certificaticate.get.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
@@ -149,14 +149,14 @@ mosip.keycloak.admin.user.id=admin
 mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 
 ## Auth adapter
-auth.server.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
-mosip.authmanager.client-token-endpoint=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
 # in minutes
@@ -211,9 +211,9 @@ token.request.password=mosip
 token.request.username=110005
 token.request.version=string
 token.request.id=v1
-token.request.issuerUrl=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+token.request.issuerUrl=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 token.request.clientId=admin
-PASSWORDBASEDTOKENAPI=${mosip.authmanager.url}/v1/authmanager/authenticate/useridPwd
+PASSWORDBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/useridPwd
 application.env.local=false
 
 # Notifications
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 16ec9248169..8894ef81440 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -241,7 +241,7 @@ appId=prereg
 ## Auth service 
 kernel.auth.env=${mosip.kernel.auditmanager.url}
 kernel.auth.contextpath=authmanager
-auth.server.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## PRID service 
diff --git a/print-default.properties b/print-default.properties
index f567af8b839..c5fa9b94e83 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -34,7 +34,7 @@ AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.kernel.pdf_owner_password=123456
 
 ## Auth service
-authmanager.base.url=${mosip.authmanager.url}
+authmanager.base.url=${mosip.kernel.authmanager.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## Master data services
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2cae8320013..5c829a8459a 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -84,7 +84,7 @@ token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 ## Auth Service
-authmanager.base.url=${mosip.authmanager.url}
+authmanager.base.url=${mosip.kernel.authmanager.url}
 KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsecretkey
 TOKENVALIDATE=${authmanager.base.url}/v1/authmanager/authorize/admin/validateToken
 GETRIDFROMUSERID=${authmanager.base.url}/v1/authmanager/rid
diff --git a/resident-default.properties b/resident-default.properties
index 7057e92657d..e1f1fd58551 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -40,7 +40,7 @@ resident.secretKey=${mosip.mosip.resident.client.secret}
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ## Auth Services
-KERNELAUTHMANAGER=${mosip.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+KERNELAUTHMANAGER=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
 INTERNALAUTH=${mosip.ida.internal.url}/idauthentication/v1/internal/auth
 INTERNALAUTHTRANSACTIONS=${mosip.ida.internal.url}/idauthentication/v1/internal/authTransactions
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 18d49a89926..9e09f8f8634 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -13,7 +13,7 @@
 # softhsm.kernel.pin
 
 ## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
+mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -262,7 +262,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.authmanager.url}/v1/authmanager
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 
 master.search.maximum.rows=50
 mosip.level=2
@@ -288,7 +288,7 @@ kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
 
 ## UIN Auth adapter config
-auth.server.admin.validate.url=${mosip.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client,mosip-resident-client
 
 ## Proxy otp
@@ -304,7 +304,7 @@ mosip.ui.spec.default.domain=registration-client
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
 
 ## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.authmanager.url}/v1/authmanager
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
@@ -366,10 +366,10 @@ mosip.kernel.registrationclient.client.id=mosip-reg-client
 mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=${mosip.authmanager.url}/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=${mosip.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=${mosip.authmanager.url}/v1/authmanager/authenticate/sendotp
+mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/sendotp
 
 # Sample Additional configuration required for real HSM configured though JCE.
 # Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key

From 191f7ed4f8c35bd58f6abc52d4323b989d42b6fe Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 17:48:10 +0530
Subject: [PATCH 0561/1358] Keycloak base url added.

---
 kernel-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 1dca75911ee..36d8492fdd4 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -210,6 +210,7 @@ ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
 mosip.iam.base.url=${keycloak.internal.url}
+mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
 mosip.iam.open-id-url=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/

From 1eecba55f760180f2826d72f6fcd11ec5b2012ad Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 17:49:26 +0530
Subject: [PATCH 0562/1358] Keycloak url fixed.

---
 syncdata-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 9e09f8f8634..3ed04a3cf96 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.host
+# keycloak.internal.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
 # mosip.mosip.ida.client.secret
@@ -206,7 +206,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.external.host}
+mosip.iam.base-url=${keycloak.internal.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
 mosip.iam.open-id-url =${keycloak.external.host}//auth/realms/{realmId}/protocol/openid-connect/

From a27dc6b7323985da11c61b7b9019a48397cd2d2c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 22:15:06 +0530
Subject: [PATCH 0563/1358] S3 url fixed.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 8e3c27225fc..9036e5ee0c7 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -349,7 +349,7 @@ hazelcast.config=classpath:hazelcast_default.xml
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=${mosip.minio.url}
+object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 

From 712d321b39d1e6d0d7f4c45d5267dc823ef065de Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 22:35:02 +0530
Subject: [PATCH 0564/1358] Keycloak urls corrected.

---
 admin-default.properties              |  5 +++--
 id-repository-default.properties      |  5 +++--
 partner-management-default.properties |  4 ++--
 pre-registration-default.properties   |  3 ++-
 syncdata-default.properties           | 15 ++++++++-------
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 3ca32e53fb0..4860fecb33e 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -3,6 +3,7 @@
 # helm chart:
 # db.dbuser.password 
 # keycloak.internal.url
+# keycloak.external.url
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.regproc.client.secret
 
@@ -173,7 +174,7 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanag
 
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
-mosip.open-id.base-url=${keycloak.external.host}
+mosip.open-id.base-url=${keycloak.external.url}
 mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
@@ -218,7 +219,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 1bd4e13d127..a74cefff2bb 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -8,6 +8,7 @@
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # idrepo.websub.vid.credential.update.secret
+# keycloak.internal.url
 
 management.endpoint.restart.enabled=true
 
@@ -239,7 +240,7 @@ credential.request.token.request.clientId=${mosip.idrepo.credential-req-generato
 credential.request.token.request.secretKey=${mosip.idrepo.credential-req-generator.auth.secret-key}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
-credential.request.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+credential.request.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.credential.request.service.id=mosip.credential.request.generator
 mosip.credential.request.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.request.service.version=1.0
@@ -323,7 +324,7 @@ KEYMANAGER_ENCRYPT_PIN=${mosip.kernel.keymanager.url}/v1/keymanager/encryptWithP
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel.keymanager.url}/v1/keymanager/zkEncrypt
 PARTNER_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 PARTNER_EXTRACTION_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
-credential.service.token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+credential.service.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # BioSDK service
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 7a7abf108cd..3c74e36e4fb 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -198,10 +198,10 @@ mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 8894ef81440..cca53af5bed 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -6,6 +6,7 @@
 # keycloak.host
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
+# keycloak.internal.url
 
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
@@ -284,7 +285,7 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-iam.base.url=${keycloak.external.host}
+iam.base.url=${keycloak.internal.url}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
 validationStatus=success
 context=auth-otp
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3ed04a3cf96..d78dd38e673 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -9,6 +9,7 @@
 # mosip.mosip.admin.client.secret
 # mosip.mosip.reg.client.secret
 # preregistration.mosip.prereg.client.secret
+# mosip.mosip.syncdata.client.secret
 # mosip.api.internal.host
 # softhsm.kernel.pin
 
@@ -209,9 +210,9 @@ ridgenerator_database_password=${db.dbuser.password}
 mosip.iam.base-url=${keycloak.internal.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.external.host}//auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.external.host}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.external.host}/admin/
+mosip.iam.open-id-url =${keycloak.internal.url}//auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.internal.url}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.internal.url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -220,7 +221,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -228,14 +229,14 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.external.host}/auth
+keycloak.auth-server-url=${keycloak.internal.url}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 6708b26c778e349aae0167fe6cf775968a5be9d5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 22:38:55 +0530
Subject: [PATCH 0565/1358] Prereg prop corrected.

---
 pre-registration-default.properties | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index cca53af5bed..c9d5ff863ec 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -94,7 +94,9 @@ mosip.kernel.objectstore.account-name=prereg
 
 ## Booking Service
 booking.service.version=v1
-booking.service.env=${mosip.prereg-booking-service.url}
+
+mosip.prereg.booking.url=http://prereg-booking.prereg
+booking.service.env=${mosip.prereg.booking.url}
 booking.service.contextpath=preregistration/${booking.service.version}
 booking.resource.url=${booking.service.env}/${booking.service.contextpath}
 appointmentResourse.url=${booking.resource.url}
@@ -400,9 +402,9 @@ object.store.s3.use.account.as.bucketname=true
 ## Spring cache
 spring.cache.type=none
 
-mosip.preregistration.appointment.getavailablity.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment/availability/{registrationCenterId}
-mosip.preregistration.appointment.book.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment/{preRegistrationId}
-mosip.preregistration.appointment.multi.book.url=${mosip.prereg-booking-service.url}/preregistration/v1/appointment
+mosip.preregistration.appointment.getavailablity.url=${mosip.prereg.booking.url}/preregistration/v1/appointment/availability/{registrationCenterId}
+mosip.preregistration.appointment.book.url=${mosip.prereg.booking.url}/preregistration/v1/appointment/{preRegistrationId}
+mosip.preregistration.appointment.multi.book.url=${mosip.prereg.booking.url}/preregistration/v1/appointment
 mosip.preregistration.applications.status.get = mosip.preregistration.applications.status
 mosip.preregistration.applications.details.get = mosip.preregistration.applications.detail.info
 mosip.preregistration.uispec.latest=mosip.preregistration.uispec.latest

From 8768c8a02339122dc64ba9a05c7e438080a16835 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 22:40:37 +0530
Subject: [PATCH 0566/1358] Prereg prop corrected.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c9d5ff863ec..56b34c86211 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -383,7 +383,7 @@ mosip.preregistration.captcha.enable=true
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}
-mosip.preregistration.captcha.resourse.url=${mosip.prereg-captcha-service.url}/preregistration/v1/captcha/validatecaptcha
+mosip.preregistration.captcha.resourse.url=http://prereg-captcha.prereg/preregistration/v1/captcha/validatecaptcha
 mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
 
 ## Security 

From e674d07250227d5bd1f17a252b0ae92cc3233208 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 22:43:16 +0530
Subject: [PATCH 0567/1358] Prereg prop corrected.

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 56b34c86211..7ae08f5d987 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -248,7 +248,7 @@ auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authoriz
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-reg-client
 
 ## PRID service 
-kernel.prid.env=${mosip.kernel-pridgenerator-service.url}
+kernel.prid.env=${mosip.kernel.pridgenerator.url}
 kernel.prid.contextpath=pridgenerator
 mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid.contextpath}/prid
 

From bc4e74a4f165351ee037f583e9d746457e0184c9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 6 Jan 2022 22:44:38 +0530
Subject: [PATCH 0568/1358] Prop added.

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 9036e5ee0c7..8294edddd95 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -25,6 +25,7 @@ mosip.kernel.notification.url=http://notifier.kernel
 mosip.kernel.idgenerator.url=http://idgenerator.kernel
 mosip.kernel.otpmanager.url=http://otpmanager.kernel
 mosip.kernel.syncdata.url=http://syncdata.kernel
+mosip.kernel.pridgenerator.url=http://pridgenerator.kernel
 mosip.idrepo.identity.url=http://idrepo-identity.idrepo
 mosip.idrepo.vid.url=http://idrepo-vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin

From 3cce032057395040ec9f25479454c51e22acddf0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 07:08:22 +0530
Subject: [PATCH 0569/1358] Mock biosdk missing url added.

---
 application-default.properties            | 2 +-
 registration-processor-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 8294edddd95..3d58128569e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -34,7 +34,7 @@ mosip.pms.partnermanager.url=http://pms-partner.pms
 mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
 mosip.idrepo.credential.service.url=http://idrepo-credential.idrepo
 mosip.datashare.url=http://datashare.datashare
-mosip.biosdk.service.url=http://biosdk-service.biosdk
+mosip.mock.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
 mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.websub.url=http://websub.websub
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5c829a8459a..c88d23b0d0b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -455,7 +455,7 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
 #mosip.biosdk.default.host=${mosip.mock.biosdk.url}
-mosip.biosdk.default.service.url=${mosip.biosdk.service.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0

From b3bc362093b5401325ab9686fd670c711fec1ee4 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 07:22:29 +0530
Subject: [PATCH 0570/1358] Postgres url fixed.

---
 id-repository-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index a74cefff2bb..d9f2bcd49eb 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -224,8 +224,9 @@ mosip.idrepo.update-vid.rest.headers.mediaType=application/json
 mosip.idrepo.update-vid.rest.timeout=100
 
 ## Credential request generator
-mosip.credential.service.database.hostname=postgres
-mosip.credential.service.database.port=80
+mosip.credential.service.database.hostname=postgres-postgresql.postgres
+mosip.credential.service.database.port=5432
+
 mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.database.hostname}:${mosip.credential.service.database.port}/mosip_credential?currentSchema=credential
 mosip.credential.service.jdbc.user=credentialuser
 mosip.credential.service.jdbc.password=${db.dbuser.password}

From 084a6a5beae679f1c220aaf1106687df4728b9fe Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 11:46:18 +0530
Subject: [PATCH 0571/1358] Websub props corrected.

---
 websub-consolidator.toml | 2 +-
 websub-service.toml      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index f18db075710..dcccde82d82 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -1,6 +1,6 @@
 [consolidatorService.config]
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "kafka.default:9092"
+KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration
diff --git a/websub-service.toml b/websub-service.toml
index 5b62f66431c..be9a68ec110 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -7,7 +7,7 @@ SECURITY_ON = true
 SERVER_ID = "server-1"
 
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "kafka.default:9092"
+KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration
@@ -42,7 +42,8 @@ MESSAGE_DELIVERY_COUNT = 3
 MESSAGE_DELIVERY_TIMEOUT = 10.0
 
 # The base URL of IDP
-MOSIP_AUTH_BASE_URL = "${mosip.api.internal.url}/v1/authmanager"
+MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"
+
 
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"

From bbdb8beaf0691127f2345d2767833f0e762c8ea0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 12:01:13 +0530
Subject: [PATCH 0572/1358] Kafka props corrected.

---
 application-default.properties | 2 ++
 websub-consolidator.toml       | 2 +-
 websub-service.toml            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 3d58128569e..52c6305e026 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -39,6 +39,8 @@ mosip.regproc.workflow.url=http://regproc-workflow.regproc
 mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.websub.url=http://websub.websub
 mosip.ida.internal.url=http://ida-internal.ida
+kafka.profile=kafka.svc.cluster.local
+kafka.port=9092
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index dcccde82d82..1229e93e56c 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -1,6 +1,6 @@
 [consolidatorService.config]
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
+KAFKA_BOOTSTRAP_NODE = "kafka.${kafka.profile}:${kafka.port}"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration
diff --git a/websub-service.toml b/websub-service.toml
index be9a68ec110..1f5f063cec9 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -7,7 +7,7 @@ SECURITY_ON = true
 SERVER_ID = "server-1"
 
 # IP and Port of the Kafka bootstrap node
-KAFKA_BOOTSTRAP_NODE = "kafka.kafka:9092"
+KAFKA_BOOTSTRAP_NODE = "kafka.${kafka.profile}:${kafka.port}"
 
 # Kafka topic which will get notified for websub topic registration/deregistration
 # All the hubs must be pointed to the same Kafka topic to notify websub topic registration/deregistration

From 58bad2a83a5e31edaa873afd00c2be5be9490b52 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 12:41:32 +0530
Subject: [PATCH 0573/1358] DB corrected.

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4860fecb33e..57a1872419f 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -12,8 +12,8 @@ mosip.admin.request-id=ADMIN.REQUEST
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 # If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres
-mosip.kernel.database.port=80
+mosip.kernel.database.hostname=postgres-postgresql.postgres
+mosip.kernel.database.port=5432
 
 ## Account management
 authmanager.base.url=${mosip.kernel.authmanager.url}/v1/authmanager

From a474ef7096cf9ee85e19cad191f604fad1532b0f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 12:47:05 +0530
Subject: [PATCH 0574/1358] Urls fixed.

---
 admin-default.properties       | 4 ++--
 application-default.properties | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 57a1872419f..45cd68ff009 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -165,8 +165,8 @@ mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u
 
 ## UIN activate/deactivate
 mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
-mosip.kernel.packet-status-update-url=${mosip.regproc-registration-transaction-service.url}/v1/registrationtransaction/search
-mosip.kernel.packet-reciever-api-url=${mosip.packet-receiver-service.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+mosip.kernel.packet-status-update-url=${mosip.regproc.transaction.service.url}/v1/registrationtransaction/search
+mosip.kernel.packet-reciever-api-url=${mosip.packet.receiver.url}/registrationprocessor/v1/packetreceiver/registrationpackets
 mosip.kernel.zone-validation-url=${mosip.kernel.masterdata.url}/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
 mosip.kernel.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
diff --git a/application-default.properties b/application-default.properties
index 52c6305e026..a3f5d279d32 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -37,6 +37,8 @@ mosip.datashare.url=http://datashare.datashare
 mosip.mock.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
 mosip.regproc.status.service.url=http://regproc-status.regproc
+mosip.regproc.transaction.service.url=http://regproc-trans.regproc
+mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
 mosip.ida.internal.url=http://ida-internal.ida
 kafka.profile=kafka.svc.cluster.local

From 48d10c4e01085492b0250a22699b0b22d8b9c650 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 16:46:53 +0530
Subject: [PATCH 0575/1358] Keycloak url updated.

---
 admin-default.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 45cd68ff009..fb58fd3ec36 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -174,7 +174,6 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanag
 
 # The base-url below should be an external URL to connect to keycloak
 # keycloak.external.url is Ansible defined 
-mosip.open-id.base-url=${keycloak.external.url}
 mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
@@ -183,8 +182,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.interanl.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client

From f5b3b320d2a058139c6ceb9a5617194374f4588c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 16:50:48 +0530
Subject: [PATCH 0576/1358] Keycloak url corrected.

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index fb58fd3ec36..c7bce025743 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -203,9 +203,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client

From 0f61b3ee4139439541b774b0ef04b69a85db54fa Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 16:53:10 +0530
Subject: [PATCH 0577/1358] Keycloak url experiments.

---
 admin-default.properties | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index c7bce025743..0b1886964b1 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -172,8 +172,6 @@ mosip.kernel.registrationcenterid.length=5
 mosip.kernel.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
-# The base-url below should be an external URL to connect to keycloak
-# keycloak.external.url is Ansible defined 
 mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
@@ -182,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client

From 79aabdfa92d8fbbec0bfbce0ec84a0264726f221 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 7 Jan 2022 21:14:42 +0530
Subject: [PATCH 0578/1358] Keycloak url experiments.

---
 admin-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 0b1886964b1..6871f0a7f20 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.internal.url
+# keycloak.external.url
 # keycloak.external.url
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.regproc.client.secret
@@ -180,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/?pageNumber=0&pageSize=100&orderBy=cr_dtimes&direction=DESC
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt

From 5963e0756b21934e4523ac8b66ba4c59df376a52 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 8 Jan 2022 17:49:41 +0530
Subject: [PATCH 0579/1358] Secrets updated.

---
 id-authentication-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index fda55ab1236..98a8a5eca4f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -26,7 +26,8 @@ ida-auth-partner-id=mpartner-default-auth
 #Note: since the Online verification Partner ID is used as client ID, for a different IDA instance, this needs to be changed accordingly
 #and also to be added to the 'auth.server.admin.allowed.audience' property of all dependency modules.
 mosip.ida.auth.clientId=${ida-auth-partner-id}
-mosip.ida.auth.secretKey=${mosip.mosip.ida.client.secret}
+mosip.ida.auth.secretKey=${mosip.mpartner.default.auth.secret}
+ 
 mosip.ida.auth.appId=ida
 
 ## Database

From f133483bfb7a7b0df493a1e02a317398b09608db Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 8 Jan 2022 18:39:04 +0530
Subject: [PATCH 0580/1358] Synced with develop2-v2.

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 6871f0a7f20..e62f76848b5 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -260,7 +260,7 @@ mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
-MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/?pageNumber=0&pageSize=100&orderBy=cr_dtimes&direction=DESC
+MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt

From c2a04829846039f8b41d36be1a97dbfe56f40bfd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 9 Jan 2022 09:59:37 +0530
Subject: [PATCH 0581/1358] Applicanttype synced with develop2-v2.

---
 applicanttype.mvel | 76 +++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 5ae1fcdcd1f..69da629d5dc 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -96,97 +96,97 @@ def getApplicantType() {
   if( ageCode == 'KER-MSD-151' ) { return "KER-MSD-151"; }
   
   if(itc == null || genderType == null || ageCode == null || isBioExPresent == null ) { 
-      return isUpdateFlow(identity) ? "A000" : "KER-MSD-147";
+      return isUpdateFlow(identity) ? "000" : "KER-MSD-147";
   }
   
   System.out.println(itc + " - " + genderType + " - " + ageCode + " - " + isBioExPresent);
 
   if (itc == NonResident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "A001";
+    return "001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "A002";
+    return "002";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
-    return "A003";
+    return "003";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
-    return "A004";
+    return "004";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "A005";
+    return "005";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "A006";
+    return "006";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
-    return "A007";
+    return "007";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
-    return "A008";
+    return "008";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "A005";
+    return "005";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "A006";
+    return "006";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
-    return "A007";
+    return "007";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
-    return "A008";
+    return "008";
   } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "A009";
+    return "009";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "A010";
+    return "010";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
-    return "A011";
+    return "011";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
-    return "A012";
+    return "012";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "A013";
+    return "013";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && isBioExPresent) {
-    return "A015";
+    return "015";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && isBioExPresent) {
-    return "A016";
+    return "016";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "A013";
+    return "013";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && isBioExPresent) {
-    return "A015";
+    return "015";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && isBioExPresent) {
-    return "A016";
+    return "016";
   } 
     
 	else if (itc == NonResident && genderType == MALE && ageCode == MINOR && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == MALE && ageCode == MINOR && isBioExPresent) {
-    return "A015";
+    return "015";
   }
   
   else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && isBioExPresent) {
-    return "A015";
+    return "015";
   }
   
   else if (itc == NonResident && genderType == Others && ageCode == MINOR && isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == Others && ageCode == MINOR && isBioExPresent) {
-    return "A015";
+    return "015";
   }
   
   else if (itc == NonResident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
-    return "A015";
+    return "015";
   }
   
    else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
-    return "A015";
+    return "015";
   }
   
   else if (itc == NonResident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
-    return "A014";
+    return "014";
   } else if (itc == Resident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
-    return "A015";
+    return "015";
   }
   
   
-  return "A000";
+  return "000";
 }

From 0ff9f337e819713248c362071f83fa47f8befe38 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 9 Jan 2022 10:05:33 +0530
Subject: [PATCH 0582/1358] Synced with develop2-v2.

---
 id-authentication-default.properties | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 98a8a5eca4f..23129d5a5a2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -105,6 +105,12 @@ mosip.date-of-birth.attribute.name=dateOfBirth
 # Used in DOB matching and Child Auth filter
 mosip.date-of-birth.pattern=yyyy/MM/dd
 
+# The separators for composite ID Attribute such as fullAddress. 
+# By default the separator is space.
+# Usage: ida.id.attribute.separator.<id_attribute>=<separator string>
+# For Example, full address attributes are separated with comman (,).
+ida.id.attribute.separator.fullAddress=,
+
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
@@ -566,6 +572,9 @@ ida-zero-knowledge-unencrypted-credential-attributes=
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
+# for Fraud management
+mosip.ida.fraud-analysis-enabled=true
+
 ## Roles
 mosip.role.idauth.postotp=RESIDENT
 mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT

From 6c8dabd9db03c3bcb2be2e6ad88923f84d1e4774 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 9 Jan 2022 20:42:49 +0530
Subject: [PATCH 0583/1358] Keymanager url corrected.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index a3f5d279d32..2f950824c70 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -19,7 +19,7 @@ mosip.recommended.centers.locCode=5
 mosip.api.internal.url=https://${mosip.api.internal.host}
 mosip.kernel.authmanager.url=http://authmanager.kernel
 mosip.kernel.masterdata.url=http://masterdata.kernel
-mosip.kernel.keymanager.url=http://keymanager.kernel
+mosip.kernel.keymanager.url=http://keymanager.keymanager
 mosip.kernel.auditmanager.url=http://auditmanager.kernel
 mosip.kernel.notification.url=http://notifier.kernel
 mosip.kernel.idgenerator.url=http://idgenerator.kernel

From caa6cdad036b10dfa3426c3107a5fc78275134cd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 Jan 2022 12:01:17 +0530
Subject: [PATCH 0584/1358] Props corrected.

---
 kernel-default.properties | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 36d8492fdd4..735ef08c5a1 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -13,8 +13,11 @@
 # email.smtp.host
 # email.smtp.username
 # email.smtp.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
 
 ## Sync data
+mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
 mosip.kernel.syncdata.auth-user-details=/userdetails
 mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
@@ -94,10 +97,6 @@ mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
 mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
 
-## Token id salts
-mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
-mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
-
 ## VID generator service
 mosip.kernel.vid.min-unused-threshold=100000
 mosip.kernel.vid.vids-to-generate=200000

From 45aa1d6a3ca3add28d8ae1ffb085d64bb7bee0a9 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 10 Jan 2022 15:02:44 +0530
Subject: [PATCH 0585/1358] updated issuer uri.

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index e62f76848b5..33c9161aa49 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt

From b8e8e5b6de8d966477b2095571116ec4c77a1f1a Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 10 Jan 2022 15:13:24 +0530
Subject: [PATCH 0586/1358] updated issuer uri.

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 33c9161aa49..8d964416530 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440

From aada3514bc8421c9a0607d2bc10ef2c4bd1fab0f Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 10 Jan 2022 15:30:37 +0530
Subject: [PATCH 0587/1358] updated issuer uri.

---
 admin-default.properties       | 4 ++--
 application-default.properties | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 8d964416530..e62f76848b5 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
diff --git a/application-default.properties b/application-default.properties
index 2f950824c70..767c16b9c20 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -44,6 +44,8 @@ mosip.ida.internal.url=http://ida-internal.ida
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
 
+
+
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 # masterdata field data url

From 006be3f4ff6702fbfe63cb7cb5c08a27ea5ef1fc Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 10 Jan 2022 15:58:02 +0530
Subject: [PATCH 0588/1358] updated issuer uri and URL.

---
 admin-default.properties       | 2 +-
 application-default.properties | 2 +-
 resident-default.properties    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index e62f76848b5..7ec2af05a25 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
diff --git a/application-default.properties b/application-default.properties
index 767c16b9c20..7798eb871aa 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -192,7 +192,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.auth..url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
diff --git a/resident-default.properties b/resident-default.properties
index e1f1fd58551..1ea27ec0b60 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -124,4 +124,4 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/

From 81561d422ef55fc14de70d9e9840416ce9d55df1 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 10 Jan 2022 16:20:07 +0530
Subject: [PATCH 0589/1358] updated issuer uri and URL.

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 7ec2af05a25..e62f76848b5 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440

From d0130facc63f53509ce905bdb150b145f6e64e32 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Mon, 10 Jan 2022 16:28:53 +0530
Subject: [PATCH 0590/1358] Update application-default.properties

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 7798eb871aa..c0bd98a8df2 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -193,8 +193,8 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.auth..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
-mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+auth-token-generator.rest.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 
 ## iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter

From 4e28770d8204b287b22dc6388cb73187ac84ba3a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 Jan 2022 16:49:14 +0530
Subject: [PATCH 0591/1358] Keycloak url made external throughout.

---
 application-default.properties            |  2 +-
 data-share-default.properties             |  4 ++--
 id-repository-default.properties          |  6 +++---
 kernel-default.properties                 |  4 ++--
 partner-management-default.properties     | 14 +++++++-------
 pre-registration-default.properties       |  4 ++--
 print-default.properties                  |  6 +++---
 registration-processor-default.properties |  6 +++---
 resident-default.properties               |  2 +-
 syncdata-default.properties               | 18 +++++++++---------
 10 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index c0bd98a8df2..9cdb48aeb57 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # override below properties for v2 deployment
-#   keycloak.internal.url
+#   keycloak.external.url
 #   s3.accesskey 
 #   s3.region
 #   s3.secretkey
diff --git a/data-share-default.properties b/data-share-default.properties
index ef8c6df6838..c2317ea6dcd 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -1,7 +1,7 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# keycloak.internal.url
+# keycloak.external.url
 # mosip.mosip.datsha.client.secret
 
 mosip.data.share.service.id=mosip.data.share
@@ -24,7 +24,7 @@ data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
-data.share.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+data.share.token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
 mosip.data.share.protocol=http
 mosip.data.share.includeCertificateHash=false
diff --git a/id-repository-default.properties b/id-repository-default.properties
index d9f2bcd49eb..e47b6d23c9c 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -8,7 +8,7 @@
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # idrepo.websub.vid.credential.update.secret
-# keycloak.internal.url
+# keycloak.external.url
 
 management.endpoint.restart.enabled=true
 
@@ -241,7 +241,7 @@ credential.request.token.request.clientId=${mosip.idrepo.credential-req-generato
 credential.request.token.request.secretKey=${mosip.idrepo.credential-req-generator.auth.secret-key}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
-credential.request.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+credential.request.token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 mosip.credential.request.service.id=mosip.credential.request.generator
 mosip.credential.request.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.request.service.version=1.0
@@ -325,7 +325,7 @@ KEYMANAGER_ENCRYPT_PIN=${mosip.kernel.keymanager.url}/v1/keymanager/encryptWithP
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel.keymanager.url}/v1/keymanager/zkEncrypt
 PARTNER_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 PARTNER_EXTRACTION_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
-credential.service.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+credential.service.token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 
 # BioSDK service
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
diff --git a/kernel-default.properties b/kernel-default.properties
index 735ef08c5a1..8f2bd2d401c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.internal.url
+# keycloak.external.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.ida.client.secret
@@ -208,7 +208,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.internal.url}
+mosip.iam.base.url=${keycloak.external.url}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 3c74e36e4fb..966997b9115 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -4,7 +4,7 @@
 ## db.dbuser.password 
 ## mosip.mosip.partner.client.secret
 ## mosip.mosip.pms.client.secret
-## keycloak.internal.url
+## keycloak.external.url
 ## keycloak.admin.password
 ## mosip.api.public.url
 
@@ -135,13 +135,13 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.internal.url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.internal.url}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.external.url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.external.url}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
@@ -155,7 +155,7 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -198,10 +198,10 @@ mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 7ae08f5d987..85f38c6d665 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -6,7 +6,7 @@
 # keycloak.host
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
-# keycloak.internal.url
+# keycloak.external.url
 
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
@@ -287,7 +287,7 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-iam.base.url=${keycloak.internal.url}
+iam.base.url=${keycloak.external.url}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
 validationStatus=success
 context=auth-otp
diff --git a/print-default.properties b/print-default.properties
index c5fa9b94e83..724ff2d6c76 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # mosip.mosip.regproc.client.secret
-# keycloak.internal.url
+# keycloak.external.url
 # print.websub.hub.secret
 
 ## Websub
@@ -27,7 +27,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -112,7 +112,7 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c88d23b0d0b..c4484416ffc 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -4,7 +4,7 @@
 # helm chart:
 # db.dbuser.password 
 # mosip.mosip.regproc.client.secret
-# keycloak.internal.url
+# keycloak.external.url
 # activemq.host
 # activemq.core.port
 
@@ -78,7 +78,7 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -933,7 +933,7 @@ mosip.registration.processor.packet.external.status.version=1.0
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
diff --git a/resident-default.properties b/resident-default.properties
index 1ea27ec0b60..77c1b04b81a 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -3,7 +3,7 @@
 # helm chart:
 # mosip.mosip.resident.client.secret
 # mosip.mosip.regproc.client.secret
-# keycloak.internal.url.
+# keycloak.external.url.
 
 auth.internal.id=mosip.identity.auth.internal
 auth.internal.version=1.0
diff --git a/syncdata-default.properties b/syncdata-default.properties
index d78dd38e673..5ec405528e0 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.internal.url
+# keycloak.external.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
 # mosip.mosip.ida.client.secret
@@ -207,12 +207,12 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.internal.url}
+mosip.iam.base-url=${keycloak.external.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.internal.url}//auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.internal.url}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.internal.url}/admin/
+mosip.iam.open-id-url =${keycloak.external.url}//auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.external.url}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.external.url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -221,7 +221,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -229,14 +229,14 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.internal.url}/auth
+keycloak.auth-server-url=${keycloak.external.url}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 7d1e456d58bcef97e4f7a0f21a01ba9fd1531a09 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 10 Jan 2022 19:13:28 +0530
Subject: [PATCH 0592/1358] updated datashare url

---
 partner-management-default.properties | 2 +-
 print-default.properties              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 966997b9115..15697e143f1 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -126,7 +126,7 @@ mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
-pmp.certificaticate.datashare.rest.uri=http://${mosip.datashare.url}/v1/datashare/create
+pmp.certificaticate.datashare.rest.uri=${mosip.datashare.url}/v1/datashare/create
 # Used for generating the datashare url
 pms.certs.datashare.policyId=mpolicy-default-cert
 pms.certs.datashare.subscriberId=mpartner-default-cert
diff --git a/print-default.properties b/print-default.properties
index 724ff2d6c76..d58067fa2e8 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -104,7 +104,7 @@ registration.processor.unMaskedUin.length=5
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=http://${mosip.datashare.url}/v1/datashare/create
+CREATEDATASHARE=${mosip.datashare.url}/v1/datashare/create
 DECRYPTPINBASSED=${mosip.kernel.keymanager.url}/v1/keymanager/decryptWithPin
 mosip.print.prependThumbprint=true
 

From 09643014ddd6db26f4625dee8f75bc522b67d32f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 Jan 2022 21:02:51 +0530
Subject: [PATCH 0593/1358] Idrepo urls corrected.

---
 application-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 9cdb48aeb57..c8cf0dec82c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -26,13 +26,13 @@ mosip.kernel.idgenerator.url=http://idgenerator.kernel
 mosip.kernel.otpmanager.url=http://otpmanager.kernel
 mosip.kernel.syncdata.url=http://syncdata.kernel
 mosip.kernel.pridgenerator.url=http://pridgenerator.kernel
-mosip.idrepo.identity.url=http://idrepo-identity.idrepo
-mosip.idrepo.vid.url=http://idrepo-vid.idrepo
+mosip.idrepo.identity.url=http://identity.idrepo
+mosip.idrepo.vid.url=http://vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin
 mosip.pms.policymanager.url=http://pms-policy.pms
 mosip.pms.partnermanager.url=http://pms-partner.pms
-mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
-mosip.idrepo.credential.service.url=http://idrepo-credential.idrepo
+mosip.idrepo.credrequest.generator.url=http://credentialrequest.idrepo
+mosip.idrepo.credential.service.url=http://credential.idrepo
 mosip.datashare.url=http://datashare.datashare
 mosip.mock.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc

From 6bd1e136e6548ff3573ae43d431992f2ca1f6ed5 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 11:47:38 +0530
Subject: [PATCH 0594/1358] Updated idrepo url as external url.

---
 id-authentication-default.properties | 4 ++--
 id-repository-default.properties     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 23129d5a5a2..8fa7fc65504 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -167,13 +167,13 @@ sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}?type={type}
+rid-uin.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}
+rid-uin-auth.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index e47b6d23c9c..56b021bca25 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -186,7 +186,7 @@ mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 # the credential request with below partner id to issue credential to new IDA partners.
 idrepo-dummy-online-verification-partner-id=MOVP
 
-mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{uin}
+mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-by-uin.rest.timeout=100

From a10a670e9472967c6b83c86c158ebc38809a784a Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 12:23:30 +0530
Subject: [PATCH 0595/1358] added mpartner for allowed audience.

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 56b021bca25..f232b773c84 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -367,7 +367,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-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-idrepo-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-idrepo-client,mpartner-default-auth
 
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha

From 2ecd1b4fcf14a6be468b2afb84009e7bc6576ed0 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 16:52:33 +0530
Subject: [PATCH 0596/1358] Updated datashare domain url.

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index f232b773c84..0409ca37ed6 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -317,7 +317,7 @@ mosip.credential.service.retry.maxDelay=100
 
 IDREPOGETIDBYID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
-mosip.data.share.internal.domain.name=${mosip.datashare.url}
+mosip.data.share.internal.domain.name=datashare.datashare
 CREATEDATASHARE=/v1/datashare/create
 KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign

From 6ea3e7abc358b065188f19b4c51bf9a54bdb74b3 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 11 Jan 2022 21:00:12 +0530
Subject: [PATCH 0597/1358] added the property
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client

---
 registration-processor-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c4484416ffc..a29ea912e17 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -954,3 +954,5 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 
+
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client

From e7cd3da81858765c4a7cf6ed0e3849566ab46d4c Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 22:01:08 +0530
Subject: [PATCH 0598/1358] Packet manager typo fixed

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a29ea912e17..677b7bd1a71 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -11,7 +11,7 @@
 registration.processor.zone=default
 
 mosip.regproc.notification.url=http://regproc-notifier.regproc
-packetmanager.base.url=http://packetmanager.packetmanger
+packetmanager.base.url=http://packetmanager.packetmanager
 
 ## Health check
 management.endpoint.health.show-details=always

From e1ef274e926f99f3eb50c3610dea14a910d28702 Mon Sep 17 00:00:00 2001
From: Rajul Joshi <rajul@Rajuls-MacBook.local>
Date: Wed, 12 Jan 2022 12:32:44 +0530
Subject: [PATCH 0599/1358] Packetmanager url corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 677b7bd1a71..e380a291732 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -11,7 +11,7 @@
 registration.processor.zone=default
 
 mosip.regproc.notification.url=http://regproc-notifier.regproc
-packetmanager.base.url=http://packetmanager.packetmanager
+packetmanager.base.url=http://packetmanager.packetmanager/commons
 
 ## Health check
 management.endpoint.health.show-details=always

From a4d881c5104677b15dfcfa414bd92a2e55a7bd9d Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 12 Jan 2022 14:02:35 +0530
Subject: [PATCH 0600/1358] Sync with sprint-6 release.

---
 id-authentication-default.properties                        | 2 +-
 registration-processor-camel-routes-lost-default.xml        | 2 +-
 registration-processor-camel-routes-new-default.xml         | 2 +-
 registration-processor-camel-routes-res-reprint-default.xml | 3 +--
 registration-processor-camel-routes-res-update-default.xml  | 3 +--
 registration-processor-camel-routes-update-default.xml      | 3 +--
 websub-service.toml                                         | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 8fa7fc65504..5d4bb97e0e7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -99,7 +99,7 @@ ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
 # The attribute name in the Mapping Json used to fetch Anonymous profile preferred language attribute
 mosip.preferred.language.attribute.name=preferredLanguage
 # The attribute name in the Mapping Json used to fetch Anonymous profile location attributes
-mosip.location.profile.attribute.name=locationProfile
+mosip.location.profile.attribute.name=locationHierarchyForProfiling
 # Used in Child Auth Filter
 mosip.date-of-birth.attribute.name=dateOfBirth
 # Used in DOB matching and Child Auth filter
diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index caac0d18368..3d15e356956 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -502,8 +502,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://anonymous-profile" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 134267ae97c..72a26fed05f 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -543,8 +543,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://anonymous-profile" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index 044226a2cd4..f7d633d8d99 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -76,7 +76,6 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
@@ -100,8 +99,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://anonymous-profile" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index bcd11c32aa7..0874a31a1a9 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -255,7 +255,6 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
@@ -279,8 +278,8 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://anonymous-profile" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index c8683a1c5a6..085b9b78f6b 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -537,7 +537,6 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
@@ -559,8 +558,8 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://anonymous-profile" />
             <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
          </otherwise>
       </choice>
    </route>
diff --git a/websub-service.toml b/websub-service.toml
index 1f5f063cec9..250f3ca1e54 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -39,7 +39,7 @@ MESSAGE_DELIVERY_RETRY_INTERVAL = 3.0
 MESSAGE_DELIVERY_COUNT = 3
 
 # The message delivery timeout
-MESSAGE_DELIVERY_TIMEOUT = 10.0
+MESSAGE_DELIVERY_TIMEOUT = 60.0
 
 # The base URL of IDP
 MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"

From 242b524cd72295f45ef56b01d4353b473aacd9e6 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 12 Jan 2022 19:19:15 +0530
Subject: [PATCH 0601/1358] added tcp to activemq url

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index f531470cbf3..2f0c1476faf 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "${activemq.host}:${activemq.core.port}",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From 62f838e40a51b15d6a502e047f87c58a52e7cc50 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 12 Jan 2022 19:23:20 +0530
Subject: [PATCH 0602/1358] added tcp to activemq url

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e380a291732..306db4fb131 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -271,7 +271,7 @@ registration.processor.updated.subject=UIN Details Updated
 ## Queue
 registration.processor.queue.username=artemis
 registration.processor.queue.password=${activemq.password}
-registration.processor.queue.url=${activemq.host}:${activemq.core.port}
+registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
 
 registration.processor.queue.manualverification.request=mosip-to-mv

From c3f31a57b47e215278e572ce073e7581378f84dd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 15 Jan 2022 22:46:34 +0530
Subject: [PATCH 0603/1358] Regproc prop corrected.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 306db4fb131..07b2d6f1a56 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -97,7 +97,7 @@ MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 MACHINEHISTORY=${MASTER}/machineshistories
 CENTERHISTORY=${MASTER}/registrationcentershistory
 CENTERUSERMACHINEHISTORY=${MASTER}/getregistrationmachineusermappinghistory
-REVERSEDATASYNC=${mosip.prereg-datasync-service.url}/preregistration/v1/sync/consumedPreRegIds
+REVERSEDATASYNC=http://prereg-datasync.prereg/preregistration/v1/sync/consumedPreRegIds
 CENTERDETAILS=${MASTER}/registrationcenters
 MACHINEDETAILS=${MASTER}/machines
 DEVICESHISTORIES=${MASTER}/deviceshistories

From 3f3a9b32844bbfbc53a0d417ffd02ff1df871930 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 17 Jan 2022 09:42:18 +0530
Subject: [PATCH 0604/1358] Synced with develop2-v2

---
 admin-default.properties                  |  2 +-
 application-default.properties            |  4 +--
 hotlist-default.properties                | 31 +++++++++++++++++++++--
 id-authentication-default.properties      |  6 +++++
 id-repository-default.properties          | 11 ++++++--
 packet-manager-default.properties         |  2 +-
 registration-processor-default.properties |  4 +--
 7 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index e62f76848b5..6c877bec8a2 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -165,7 +165,7 @@ mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u
 
 ## UIN activate/deactivate
 mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
-mosip.kernel.packet-status-update-url=${mosip.regproc.transaction.service.url}/v1/registrationtransaction/search
+mosip.kernel.packet-status-update-url=${mosip.regproc.transaction.service.url}/registrationprocessor/v1/registrationtransaction/search
 mosip.kernel.packet-reciever-api-url=${mosip.packet.receiver.url}/registrationprocessor/v1/packetreceiver/registrationpackets
 mosip.kernel.zone-validation-url=${mosip.kernel.masterdata.url}/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
diff --git a/application-default.properties b/application-default.properties
index c8cf0dec82c..e2a065654a6 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -199,8 +199,8 @@ mosip.keycloak.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 ## iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
-mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
-mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
+mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
 
 ## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
diff --git a/hotlist-default.properties b/hotlist-default.properties
index 2761d26d2ff..d71b5e540f2 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -1,7 +1,8 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# db.dbuser.password 
+# db.dbuser.password
+# mosip.mosip.hotlist.client.secret
 spring.application.name=HOTLIST
 
 ## DB
@@ -23,9 +24,20 @@ mosip.hotlist.datasource.password=${mosip.hotlist.db.password}
 mosip.hotlist.datasource.url=jdbc:postgresql://${mosip.hotlist.db.url}:${mosip.hotlist.db.port}/${mosip.hotlist.db.db-name}
 mosip.hotlist.datasource.dialect=${mosip.hotlist.db.dialect}
 
+#Admin hotlist service authentication details
+mosip.admin.hotlist.auth.client-id=mosip-hotlist-client
+mosip.admin.hotlist.auth.secret-key=${mosip.mosip.hotlist.client.secret}
+mosip.admin.hotlist.auth.app-id=hotlist
+
 # Websub
 mosip.hotlist.topic-to-publish=MOSIP_HOTLIST
 
+#Auth Adapter
+mosip.iam.adapter.clientid.HOTLIST=${mosip.admin.hotlist.auth.client-id}
+mosip.iam.adapter.clientsecret.HOTLIST=${mosip.admin.hotlist.auth.secret-key}
+mosip.iam.adapter.appid.HOTLIST=${mosip.admin.hotlist.auth.app-id}
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+
 ## Encryption/decyrption
 mosip.hotlist.crypto.app-id=ADMIN_SERVICES
 mosip.hotlist.crypto.ref-id=hotlist_service
@@ -51,6 +63,22 @@ mosip.hotlist.decryptor.rest.httpMethod=POST
 mosip.hotlist.decryptor.rest.headers.mediaType=application/json
 mosip.hotlist.decryptor.rest.timeout=100
 
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=15
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=15
+#this should be false if you don?t use the self token restTemplate from auth adapter true if you do (needed for websubclient).
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+
+
+# Roles authorized for hotlist APIs
+mosip.role.admin.hotlist.postHotlistBlock=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.hotlist.getHotlistStatus=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION,ID_REPOSITORY
+mosip.role.admin.hotlist.postHotlistUnblock=ZONAL_ADMIN,GLOBAL_ADMIN
+
+auth.server.admin.allowed.audience=mosip-hotlist-client,mosip-regproc-client,mosip-ida-client,mosip-idrepo-client
+
 mosip.hotlist.audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.hotlist.audit.rest.httpMethod=POST
 mosip.hotlist.audit.rest.headers.mediaType=application/json
@@ -70,4 +98,3 @@ kernel.retry.retryable.exceptions=io.mosip.hotlist.exception.HotlistRetryExcepti
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
-auth.server.admin.allowed.audience=mosip-regproc-client
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 5d4bb97e0e7..49bba0a1672 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -575,6 +575,12 @@ springdoc.swagger-ui.operationsSorter=alpha
 # for Fraud management
 mosip.ida.fraud-analysis-enabled=true
 
+mosip.ida.active-async-thread-count=100
+
+# Logging of thread queue done based on below value in ms. Logging is done only if queue value of any one thread group crosses below specified threshold.
+mosip.ida.monitor-thread-queue-in-ms=600000
+mosip.ida.max-thread-queue-threshold=100
+
 ## Roles
 mosip.role.idauth.postotp=RESIDENT
 mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 0409ca37ed6..5d668e455a2 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -43,6 +43,14 @@ mosip.idrepo.crypto.refId.uin-data=identity_data
 mosip.idrepo.crypto.refId.demo-doc-data=demographic_data
 mosip.idrepo.crypto.refId.bio-doc-data=biometric_data
 
+
+# Limit the number of async threads created in IDRepo services. This count is divided into 4 thread groups configured in IdRepoConfig.class
+mosip.idrepo.active-async-thread-count=100
+
+# Logging of thread queue done based on below value in ms. Logging is done only if queue value of any one thread group crosses below specified threshold.
+mosip.idrepo.monitor-thread-queue-in-ms=600000
+mosip.idrepo.max-thread-queue-threshold=100
+
 ## Kernel retry
 # The retry limit excluding the first attempt before attempting for retries. Default is set to 5.
 kernel.retry.attempts.limit=5
@@ -367,8 +375,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-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-idrepo-client,mpartner-default-auth
-
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 0a4be330459..800871d81a1 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -2,7 +2,7 @@
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 
 # Roles
-mosip.role.commons-packet.postcreatepacket=REGISTRATION_PROCESSOR
+mosip.role.commons-packet.putcreatepacket=REGISTRATION_PROCESSOR
 mosip.role.commons-packet.postaddtag=REGISTRATION_PROCESSOR
 mosip.role.commons-packet.postaddorupdatetag=REGISTRATION_PROCESSOR
 mosip.role.commons-packet.postdeletetag=REGISTRATION_PROCESSOR
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 07b2d6f1a56..499cc79bb81 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -139,7 +139,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 
 # Status for matched records in demo dedupe stage.
 # 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
-registration.processor.demodedupe.manual.adjudication.status=REJECTED
+registration.processor.demodedupe.manual.adjudication.status=PENDING
 
 # Validate hostlisted devices
 DEVICEHOTLIST=${mosip.admin.hotlist.url}/v1/hotlist/status
@@ -944,7 +944,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=true
 
 # Roles
-mosip.role.registration.getsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
+mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
 mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
 mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
 mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT

From 03ea836df1d72239b3fb0e2f2be8f382319e40d5 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Mon, 17 Jan 2022 11:23:35 +0530
Subject: [PATCH 0605/1358] Synced with develop2-v2

---
 registration-processor-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 499cc79bb81..e6549277850 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -956,3 +956,5 @@ mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,
 
 
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
+
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
\ No newline at end of file

From 50418ed53069517e3cf1a9bf5791899888218c1e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 17 Jan 2022 11:28:27 +0530
Subject: [PATCH 0606/1358] S3 props moved to individual property files.

---
 application-default.properties            | 12 ------------
 data-share-default.properties             | 11 +++++++++++
 id-repository-default.properties          | 11 +++++++++++
 pre-registration-default.properties       | 12 ++++++++++++
 registration-processor-default.properties | 12 +++++++++++-
 5 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index e2a065654a6..5df10d5cb42 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -3,9 +3,6 @@
 # helm chart:
 # override below properties for v2 deployment
 #   keycloak.external.url
-#   s3.accesskey 
-#   s3.region
-#   s3.secretkey
 #   mosip.api.internal.host
 
 aplication.configuration.level.version=LTS
@@ -351,15 +348,6 @@ default.provider.version=v1.0
 object.store.base.location=/home/mosip
 hazelcast.config=classpath:hazelcast_default.xml
 
-
-## S3 object store adapter. 
-object.store.s3.accesskey=${s3.accesskey}
-object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
-object.store.s3.region=${s3.region}
-object.store.s3.readlimit=10000000
-
 ## Swift
 object.store.swift.username=test
 object.store.swift.password=test
diff --git a/data-share-default.properties b/data-share-default.properties
index c2317ea6dcd..ed29b59dc8a 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -3,6 +3,9 @@
 # helm chart:
 # keycloak.external.url
 # mosip.mosip.datsha.client.secret
+# s3.accesskey 
+# s3.region
+# s3.secretkey
 
 mosip.data.share.service.id=mosip.data.share
 mosip.data.share.service.version=1.0
@@ -36,3 +39,11 @@ mosip.data.share.prependThumbprint=false
 auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client
 
 mosip.auth.filter_disable=false
+
+# Object store
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 5d668e455a2..efb7f42f69f 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -9,6 +9,9 @@
 # mosip.kernel.tokenid.partnercode.salt
 # idrepo.websub.vid.credential.update.secret
 # keycloak.external.url
+# s3.accesskey 
+# s3.region
+# s3.secretkey
 
 management.endpoint.restart.enabled=true
 
@@ -380,6 +383,14 @@ auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosi
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
+# Object store
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
 # Roles
 mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST,ID_REPOSITORY
 mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST,ID_REPOSITORY
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 85f38c6d665..25b96da1543 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -7,6 +7,9 @@
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
 # keycloak.external.url
+# s3.accesskey 
+# s3.region
+# s3.secretkey
 
 ## Database properties
 # Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
@@ -428,6 +431,15 @@ mosip.iam.adapter.appid.pre-registration-datasync-service=registrationclient
 mosip.security.authentication.provider.beans.list.pre-registration-application-service=customJWTAuthProvider
 mosip.security.authentication.provider.beans.list.pre-registration-booking-service=customJWTAuthProvider
 
+# Object store
+
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
 # Roles
 mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.putapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 499cc79bb81..de0fe9028ef 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -1,4 +1,3 @@
-
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
@@ -7,6 +6,9 @@
 # keycloak.external.url
 # activemq.host
 # activemq.core.port
+# s3.accesskey 
+# s3.region
+# s3.secretkey
 
 registration.processor.zone=default
 
@@ -943,6 +945,14 @@ mosip.iam.adapter.renewal-before-expiry-interval=30
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=true
 
+## Object store 
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
 # Roles
 mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
 mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR

From e4e85bc333eb2db3acfd8a158c9cf2d25b097dcf Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 10 Jan 2022 21:02:51 +0530
Subject: [PATCH 0607/1358] Idrepo urls corrected.

---
 application-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 9cdb48aeb57..c8cf0dec82c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -26,13 +26,13 @@ mosip.kernel.idgenerator.url=http://idgenerator.kernel
 mosip.kernel.otpmanager.url=http://otpmanager.kernel
 mosip.kernel.syncdata.url=http://syncdata.kernel
 mosip.kernel.pridgenerator.url=http://pridgenerator.kernel
-mosip.idrepo.identity.url=http://idrepo-identity.idrepo
-mosip.idrepo.vid.url=http://idrepo-vid.idrepo
+mosip.idrepo.identity.url=http://identity.idrepo
+mosip.idrepo.vid.url=http://vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin
 mosip.pms.policymanager.url=http://pms-policy.pms
 mosip.pms.partnermanager.url=http://pms-partner.pms
-mosip.idrepo.credrequest.generator.url=http://idrepo-credentialrequest.idrepo
-mosip.idrepo.credential.service.url=http://idrepo-credential.idrepo
+mosip.idrepo.credrequest.generator.url=http://credentialrequest.idrepo
+mosip.idrepo.credential.service.url=http://credential.idrepo
 mosip.datashare.url=http://datashare.datashare
 mosip.mock.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc

From 35aef3a2874959845cc84c1d8a5f6b7e1f994b8c Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 11:47:38 +0530
Subject: [PATCH 0608/1358] Updated idrepo url as external url.

---
 id-authentication-default.properties | 4 ++--
 id-repository-default.properties     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 23129d5a5a2..8fa7fc65504 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -167,13 +167,13 @@ sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}?type={type}
+rid-uin.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}
+rid-uin-auth.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}
diff --git a/id-repository-default.properties b/id-repository-default.properties
index e47b6d23c9c..56b021bca25 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -186,7 +186,7 @@ mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 # the credential request with below partner id to issue credential to new IDA partners.
 idrepo-dummy-online-verification-partner-id=MOVP
 
-mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{uin}
+mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-by-uin.rest.timeout=100

From 1696e40750a8cd2ba5bbd9c33f776646aa8e40ed Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 12:23:30 +0530
Subject: [PATCH 0609/1358] added mpartner for allowed audience.

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 56b021bca25..f232b773c84 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -367,7 +367,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-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-idrepo-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-resident-client,mosip-ida-client,mosip-admin-client,mosip-crereq-client,mosip-creser-client,mosip-idrepo-client,mpartner-default-auth
 
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha

From 0da462b7bd2ab4775e25e16a316f20f4deeff1e4 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 11 Jan 2022 16:52:33 +0530
Subject: [PATCH 0610/1358] Updated datashare domain url.

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index f232b773c84..0409ca37ed6 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -317,7 +317,7 @@ mosip.credential.service.retry.maxDelay=100
 
 IDREPOGETIDBYID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
-mosip.data.share.internal.domain.name=${mosip.datashare.url}
+mosip.data.share.internal.domain.name=datashare.datashare
 CREATEDATASHARE=/v1/datashare/create
 KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign

From 4be672dc72b09b4f072a32879ce780ecc6ca98a8 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 19 Jan 2022 17:04:57 +0530
Subject: [PATCH 0611/1358] added missing prop.

---
 admin-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 6c877bec8a2..dd05e73e955 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -269,3 +269,6 @@ mosip.admin.packetupload.packetsync.url=${mosip.regproc.status.service.url}/regi
 mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,lastName
 mosip.admin.packetupload.packetsync.email=email
 mosip.admin.packetupload.packetsync.phone=phone
+
+# Mapping identity json to map with the applicant id json
+registration.processor.identityjson=identity-mapping.json
\ No newline at end of file

From 0cd24e72fd50ccb83bb6419c87ff2f5f66f47e01 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 19 Jan 2022 17:46:03 +0530
Subject: [PATCH 0612/1358] added missing prop.

---
 id-authentication-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 49bba0a1672..fe2c3fc31fb 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -328,7 +328,8 @@ ida.demo.address.normalization.regex.eng[21]=9[tT][hH]${ida.norm.sep}9
 ida.demo.address.normalization.regex.eng[22]=0[tT][hH]${ida.norm.sep}0 
 # Note: the common normalization attributes will be replaced at the end.
 # Special characters are removed : . , - * ( ) [ ] ` ' / \ # "
-ida.demo.common.normalization.regex.any[0]=[\\.|,|\\-|\\*|\\(|\\)|\\[|\\]|`|\\'|/|\\|#|\"]
+# Replace spcial char with space.Trailing space is removed from property. As a workaround first replacing with " ." then removing the "."
+ida.demo.common.normalization.regex.any[0]=[\\.|,|\\-|\\*|\\(|\\)|\\[|\\]|`|\\'|/|\\|#|\"]${ida.norm.sep} .
 # Trailing space is removed from property. As a workaround first replacing with " ." then removing the "."
 ida.demo.common.normalization.regex.any[1]=\\s+${ida.norm.sep} .
 ida.demo.common.normalization.regex.any[2]=\\.${ida.norm.sep}

From 448f4325f085fc325fab4239ff167dbd1d076445 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 19 Jan 2022 17:55:58 +0530
Subject: [PATCH 0613/1358] sync with dev

---
 admin-default.properties |  3 ++-
 mosip-cbeff.xsd          | 38 +++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index dd05e73e955..7b4bc4c6d6a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -270,5 +270,6 @@ mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,last
 mosip.admin.packetupload.packetsync.email=email
 mosip.admin.packetupload.packetsync.phone=phone
 
-# Mapping identity json to map with the applicant id json
+mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\W|\w]{1,100}$)
+
 registration.processor.identityjson=identity-mapping.json
\ No newline at end of file
diff --git a/mosip-cbeff.xsd b/mosip-cbeff.xsd
index c39a985c276..b31269eb20b 100644
--- a/mosip-cbeff.xsd
+++ b/mosip-cbeff.xsd
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Permission is hereby granted, free of charge in perpetuity, to any person 
+Permission is hereby granted, free of charge in perpetuity, to any person
 obtaining a copy of the Schema, to use, copy, modify, merge and distribute free
-of charge, copies of the Schema for the purposes of developing, implementing, 
-installing and using software based on the Schema, and to permit persons to 
+of charge, copies of the Schema for the purposes of developing, implementing,
+installing and using software based on the Schema, and to permit persons to
 whom the Schema is furnished to do so, subject to the following conditions:
-THE SCHEMA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+THE SCHEMA IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SCHEMA OR THE USE OR OTHER DEALINGS IN THE
-SCHEMA. 
+SCHEMA.
 -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://standards.iso.org/iso-iec/19785/-3/ed-2/" elementFormDefault="qualified" attributeFormDefault="unqualified">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+		   xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://standards.iso.org/iso-iec/19785/-3/ed-2/" elementFormDefault="qualified" attributeFormDefault="unqualified">
 	<xs:element name="BIR" type="BIRType"/>
 	<xs:complexType name="BIRType">
 		<xs:sequence>
@@ -27,7 +27,7 @@ xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://
 			<xs:element name="BIR" type="BIRType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="BDB" type="xs:base64Binary" minOccurs="0" />
 			<xs:element name="SB" type="xs:base64Binary" minOccurs="0" />
-			<xs:element name="Others" type="Entry" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
+			<xs:element name="others" type="OthersListType" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="VersionType">
@@ -172,11 +172,19 @@ xmlns="http://standards.iso.org/iso-iec/19785/-3/ed-2/" targetNamespace="http://
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:complexType name="Entry">
+	<xs:complexType name="OthersListType">
 		<xs:sequence>
-			<xs:element name="Key" type="xs:string"/>
-			<xs:element name="Value" type="xs:string"/>
+			<xs:element name="entry" type="Entry"
+						nillable="true" maxOccurs="unbounded"
+						minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
-
-</xs:schema>
\ No newline at end of file
+	<xs:complexType name="Entry">
+		<xs:simpleContent>
+			<xs:extension base="xs:string">
+				<xs:attribute name="key" type="xs:string"
+							  use="required"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+</xs:schema>

From f8ec7be017699fb0be818f28ac57c811cd55922b Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Wed, 19 Jan 2022 18:40:49 +0530
Subject: [PATCH 0614/1358] Added missing prop for s3

---
 application-default.properties    |  2 +-
 packet-manager-default.properties | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 5df10d5cb42..ef52dbe9dc5 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -5,6 +5,7 @@
 #   keycloak.external.url
 #   mosip.api.internal.host
 
+
 aplication.configuration.level.version=LTS
 
 ## Idobject validator
@@ -42,7 +43,6 @@ kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
 
 
-
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 
 # masterdata field data url
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 800871d81a1..28b460729fb 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -1,3 +1,7 @@
+# s3.accesskey
+# s3.region
+# s3.secretkey
+
 # Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 
@@ -16,3 +20,11 @@ mosip.role.commons-packet.postdocument=DOCUMENT_READ
 mosip.role.commons-packet.postsearchfields=DATA_READ
 mosip.role.commons-packet.postsearchfield=DATA_READ
 auth.server.admin.allowed.audience=mosip-regproc-client
+
+# Object store
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
\ No newline at end of file

From a8a37d4df55ba13f198978eafd882885ffbb9a92 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Thu, 20 Jan 2022 16:52:25 +0530
Subject: [PATCH 0615/1358] Update kernel-default.properties

---
 kernel-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 8f2bd2d401c..a09358c24df 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -751,3 +751,6 @@ mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATI
 mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+
+
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=200

From f1256ef8401faa757575fa424350c44b90c31c8e Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Thu, 20 Jan 2022 17:00:04 +0530
Subject: [PATCH 0616/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index a09358c24df..26b44a6ec15 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -753,4 +753,4 @@ mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHE
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 
 
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=200
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340

From 3428bc430db3fd3075906c74d9b86edd2c24f958 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 21 Jan 2022 09:57:04 +0530
Subject: [PATCH 0617/1358] Keycloak url changed to internal.

---
 admin-default.properties                  | 16 ++++++++--------
 application-default.properties            |  8 ++++----
 data-share-default.properties             |  4 ++--
 id-repository-default.properties          |  6 +++---
 kernel-default.properties                 |  4 ++--
 partner-management-default.properties     | 14 +++++++-------
 pre-registration-default.properties       |  4 ++--
 print-default.properties                  |  6 +++---
 registration-processor-default.properties |  6 +++---
 resident-default.properties               |  4 ++--
 syncdata-default.properties               | 18 +++++++++---------
 11 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 7b4bc4c6d6a..56a74814ed7 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -2,8 +2,8 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.external.url
-# keycloak.external.url
+# keycloak.internal.url
+# keycloak.internal.url
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.regproc.client.secret
 
@@ -180,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -201,9 +201,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
diff --git a/application-default.properties b/application-default.properties
index ef52dbe9dc5..5df08d332da 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # override below properties for v2 deployment
-#   keycloak.external.url
+#   keycloak.internal.url
 #   mosip.api.internal.host
 
 
@@ -189,9 +189,9 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.auth..url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
-auth-token-generator.rest.issuerUrl=${keycloak.external.url}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 ## iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
diff --git a/data-share-default.properties b/data-share-default.properties
index ed29b59dc8a..159eb260e92 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -1,7 +1,7 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# keycloak.external.url
+# keycloak.internal.url
 # mosip.mosip.datsha.client.secret
 # s3.accesskey 
 # s3.region
@@ -27,7 +27,7 @@ data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
 data.share.token.request.id=io.mosip.datashare
-data.share.token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+data.share.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 spring.servlet.multipart.max-file-size=4MB
 mosip.data.share.protocol=http
 mosip.data.share.includeCertificateHash=false
diff --git a/id-repository-default.properties b/id-repository-default.properties
index efb7f42f69f..d0228bcbe1d 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -8,7 +8,7 @@
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # idrepo.websub.vid.credential.update.secret
-# keycloak.external.url
+# keycloak.internal.url
 # s3.accesskey 
 # s3.region
 # s3.secretkey
@@ -252,7 +252,7 @@ credential.request.token.request.clientId=${mosip.idrepo.credential-req-generato
 credential.request.token.request.secretKey=${mosip.idrepo.credential-req-generator.auth.secret-key}
 credential.request.token.request.version=1.0
 credential.request.token.request.id=io.mosip.credentialrequestgenerator
-credential.request.token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+credential.request.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.credential.request.service.id=mosip.credential.request.generator
 mosip.credential.request.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.credential.request.service.version=1.0
@@ -336,7 +336,7 @@ KEYMANAGER_ENCRYPT_PIN=${mosip.kernel.keymanager.url}/v1/keymanager/encryptWithP
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel.keymanager.url}/v1/keymanager/zkEncrypt
 PARTNER_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 PARTNER_EXTRACTION_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/bioextractors/{policyId}
-credential.service.token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+credential.service.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # BioSDK service
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
diff --git a/kernel-default.properties b/kernel-default.properties
index 26b44a6ec15..a02acb4ff35 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.external.url
+# keycloak.internal.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.ida.client.secret
@@ -208,7 +208,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.external.url}
+mosip.iam.base.url=${keycloak.internal.url}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 15697e143f1..a9d2beb4e5c 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -4,7 +4,7 @@
 ## db.dbuser.password 
 ## mosip.mosip.partner.client.secret
 ## mosip.mosip.pms.client.secret
-## keycloak.external.url
+## keycloak.internal.url
 ## keycloak.admin.password
 ## mosip.api.public.url
 
@@ -135,13 +135,13 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.external.url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.external.url}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.internal.url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.internal.url}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
@@ -155,7 +155,7 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -198,10 +198,10 @@ mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 25b96da1543..5f7ab74934b 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -6,7 +6,7 @@
 # keycloak.host
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
-# keycloak.external.url
+# keycloak.internal.url
 # s3.accesskey 
 # s3.region
 # s3.secretkey
@@ -290,7 +290,7 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-iam.base.url=${keycloak.external.url}
+iam.base.url=${keycloak.internal.url}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
 validationStatus=success
 context=auth-otp
diff --git a/print-default.properties b/print-default.properties
index d58067fa2e8..860bada33ab 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # mosip.mosip.regproc.client.secret
-# keycloak.external.url
+# keycloak.internal.url
 # print.websub.hub.secret
 
 ## Websub
@@ -27,7 +27,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -112,7 +112,7 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d905772c47b..96512b57b23 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -3,7 +3,7 @@
 # helm chart:
 # db.dbuser.password 
 # mosip.mosip.regproc.client.secret
-# keycloak.external.url
+# keycloak.internal.url
 # activemq.host
 # activemq.core.port
 # s3.accesskey 
@@ -80,7 +80,7 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -935,7 +935,7 @@ mosip.registration.processor.packet.external.status.version=1.0
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
diff --git a/resident-default.properties b/resident-default.properties
index 77c1b04b81a..e1f1fd58551 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -3,7 +3,7 @@
 # helm chart:
 # mosip.mosip.resident.client.secret
 # mosip.mosip.regproc.client.secret
-# keycloak.external.url.
+# keycloak.internal.url.
 
 auth.internal.id=mosip.identity.auth.internal
 auth.internal.version=1.0
@@ -124,4 +124,4 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 5ec405528e0..d78dd38e673 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.external.url
+# keycloak.internal.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
 # mosip.mosip.ida.client.secret
@@ -207,12 +207,12 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.external.url}
+mosip.iam.base-url=${keycloak.internal.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.external.url}//auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.external.url}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.external.url}/admin/
+mosip.iam.open-id-url =${keycloak.internal.url}//auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.internal.url}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.internal.url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -221,7 +221,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -229,14 +229,14 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.external.url}/auth
+keycloak.auth-server-url=${keycloak.internal.url}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From c2c180f035f898bd3afdc42c5f05ae366d44d6cc Mon Sep 17 00:00:00 2001
From: Mayura Deshmukh <52281514+mayuradesh@users.noreply.github.com>
Date: Thu, 27 Jan 2022 16:21:12 +0530
Subject: [PATCH 0618/1358] Updated ReadMe.md

---
 README.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/README.md b/README.md
index b80d6e49da9..9f5aa498c98 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,32 @@
 # MOSIP Configuration
 
+## Configuration properties
+
 MOSIP uses Spring CLoud Config Server to read the properties files. So, to use the properties files in this repo, please update the IP addresses, keys and passwords and then point to this repo in spring cloud config in kernel module.
 
+## Config server 
+
+Local Config Server Installation Guide
+
+### Overview
+MOSIP uses Config Server to read the properties files. 
+
+### Download 
+
+1. Download Config server jar [config-server](https://mvnrepository.com/artifact/io.mosip.kernel/kernel-config-server)
+
+2. Clone the Mosip config repo [mosip-config](https://github.com/mosip/mosip-config/tree/develop2-v2)
+
+### Run 
+
+To run config server jar set the following attribute 
+
+```
+-Dspring.cloud.config.server.native.search-locations = point to mosip-config repo location
+```
+
+### Run Config Server Jar
+
+```
+java -jar -Dspring.profiles.active=native  -Dspring.cloud.config.server.native.search-locations=file:C:\mosipcode\mosip-config\sandbox -Dspring.cloud.config.server.accept-empty=true  -Dspring.cloud.config.server.git.force-pull=false -Dspring.cloud.config.server.git.cloneOnStart=false -Dspring.cloud.config.server.git.refreshRate=0 kernel-config-server-1.0.6.jar
+```

From 6cdf8ac9d15a283252df72f01dd207ebc83d5636 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 17:07:01 +0530
Subject: [PATCH 0619/1358] Updated develop3-v3 inline with develop2-v2

---
 admin-default.properties                  | 17 ++++++-----
 application-default.properties            |  9 ++++++
 credential-service-default.properties     | 15 +++++++++-
 hotlist-default.properties                | 20 ++++++-------
 kernel-default.properties                 | 36 +++++------------------
 packet-manager-default.properties         |  8 ++++-
 partner-management-default.properties     | 14 ++++-----
 print-default.properties                  | 15 ++++++----
 registration-default.properties           |  9 +++++-
 registration-processor-default.properties | 22 +++-----------
 resident-default.properties               |  9 ++++--
 syncdata-default.properties               | 18 ++++++------
 12 files changed, 100 insertions(+), 92 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 56a74814ed7..f1d0e540998 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -180,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.external.hostl}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -201,9 +201,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
@@ -270,6 +270,7 @@ mosip.admin.packetupload.packetsync.name=fullName,name,firstName,middleName,last
 mosip.admin.packetupload.packetsync.email=email
 mosip.admin.packetupload.packetsync.phone=phone
 
-mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\W|\w]{1,100}$)
+mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\\W|\\w]{1,100}$)
 
-registration.processor.identityjson=identity-mapping.json
\ No newline at end of file
+# Mapping identity json to map with the applicant id json
+registration.processor.identityjson=identity-mapping.json
diff --git a/application-default.properties b/application-default.properties
index 5df08d332da..bb25226831a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -348,6 +348,15 @@ default.provider.version=v1.0
 object.store.base.location=/home/mosip
 hazelcast.config=classpath:hazelcast_default.xml
 
+
+## S3 object store adapter.
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+object.store.s3.url=${mosip.minio.url}
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
 ## Swift
 object.store.swift.username=test
 object.store.swift.password=test
diff --git a/credential-service-default.properties b/credential-service-default.properties
index 213de396373..4d904547cf2 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -9,4 +9,17 @@ mosip.iam.adapter.clientsecret.credential-service=${mosip.idrepo.credential.auth
 mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id}
 
 
-mosip.auth.filter_disable=false
\ No newline at end of file
+mosip.auth.filter_disable=false
+
+
+mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.api.internal.url}/mosipvc/mosip-context.json" : "mosip-context.json"}
+mosip.credential.service.vercred.context.uri=vccontext.jsonld
+mosip.credential.service.vercred.id.url=${mosip.api.internal.url}/credentials/
+mosip.credential.service.vercred.issuer.url=${mosip.api.internal.url}/mosipvc/controller.json
+mosip.credential.service.vercred.types=VerifiableCredential,MOSIPVerifiableCredential
+mosip.credential.service.vercred.proof.purpose=assertionMethod
+mosip.credential.service.vercred.proof.type=RsaSignature2018
+mosip.credential.service.vercred.proof.verificationmethod=${mosip.api.internal.url}/mosipvc/public-key.json
+
+KEYMANAGER_VERCRED_SIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwsSign
+credentialType.formatter.VERCRED=VerCredProvider
diff --git a/hotlist-default.properties b/hotlist-default.properties
index d71b5e540f2..36f6a2749f9 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -63,6 +63,10 @@ mosip.hotlist.decryptor.rest.httpMethod=POST
 mosip.hotlist.decryptor.rest.headers.mediaType=application/json
 mosip.hotlist.decryptor.rest.timeout=100
 
+mosip.hotlist.audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+mosip.hotlist.audit.rest.httpMethod=POST
+mosip.hotlist.audit.rest.headers.mediaType=application/json
+
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
 # in minutes
@@ -72,16 +76,6 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 
 
-# Roles authorized for hotlist APIs
-mosip.role.admin.hotlist.postHotlistBlock=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.hotlist.getHotlistStatus=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION,ID_REPOSITORY
-mosip.role.admin.hotlist.postHotlistUnblock=ZONAL_ADMIN,GLOBAL_ADMIN
-
-auth.server.admin.allowed.audience=mosip-hotlist-client,mosip-regproc-client,mosip-ida-client,mosip-idrepo-client
-
-mosip.hotlist.audit.rest.uri=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
-mosip.hotlist.audit.rest.httpMethod=POST
-mosip.hotlist.audit.rest.headers.mediaType=application/json
 
 ## Retry configs
 # The retry limit excluding the first attempt before attempting for retries. Default is set to 5.
@@ -98,3 +92,9 @@ kernel.retry.retryable.exceptions=io.mosip.hotlist.exception.HotlistRetryExcepti
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
+# Roles authorized for hotlist APIs
+mosip.role.admin.hotlist.postHotlistBlock=HOTLIST_ADMIN,HOTLIST_ADMIN
+mosip.role.admin.hotlist.getHotlistStatus=HOTLIST_ADMIN,HOTLIST_ADMIN,REGISTRATION_PROCESSOR,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,ID_AUTHENTICATION,ID_REPOSITORY
+mosip.role.admin.hotlist.postHotlistUnblock=HOTLIST_ADMIN,HOTLIST_ADMIN
+
+auth.server.admin.allowed.audience=mosip-hotlist-client,mosip-regproc-client,mosip-ida-client,mosip-idrepo-client
diff --git a/kernel-default.properties b/kernel-default.properties
index a02acb4ff35..5b18abb8f79 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -208,7 +208,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.internal.url}
+mosip.iam.base.url=${keycloak.external.host}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
@@ -227,8 +227,6 @@ keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.iam.authorization_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
@@ -257,14 +255,8 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
-mosip.admin.login_flow.name=authorization_code
-mosip.admin.login_flow.response_type=code
-mosip.admin.login_flow.scope=cls
-mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
-mosip.admin_realm_id=mosip
+mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
+
 
 master.search.maximum.rows=50
 mosip.level=2
@@ -301,14 +293,6 @@ mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
 
-#### Required for admin UI ##############
-## this pattern like --> display column : configKey. 
-## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
-
-## Used to get IAM user details. 
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
-mosip.kernel.masterdata.auth-user-details=/userdetails
 ## Security properties
 mosip.security.csrf-enable=false
 mosip.security.cors-enable=false
@@ -351,7 +335,6 @@ mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,RE
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 
-datastores=db_1_DS,db_2_DS
 
 mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 
@@ -395,10 +378,6 @@ syncdata.websub.resubscription.retry.count=3
 # Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup=120000
 
-# Flag to identify the support of no thumbprint in 1.1.3 version. 
-# Added this for backward compatability. default is false, means support is not required.
-# Make it to true if support is required.
-mosip.kernel.keymanager.113nothumbprint.support=false
 
 # Pause & resume api proeprties
 PACKET_RESUME_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflowaction
@@ -426,16 +405,14 @@ mosip.admin.ui.configs=version:${aplication.configuration.level.version};locatio
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-## Used to get IAM user details. 
+## Used to get IAM user details.
 mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
 
-## identity schema backward compatability ########
-mosip.ui.spec.default.domain=registration-client
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=300
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340
 
 # masterdata swagger openApi
 #openapi.masterdata.servers[0].url=${mosip.kernel.masterdata.url}/v1/masterdata
@@ -751,6 +728,7 @@ mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATI
 mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
 
 
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340
+mosip.kernel.keymanager.jwtsign.validate.json=false
\ No newline at end of file
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 28b460729fb..00580d84e45 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -27,4 +27,10 @@ object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
 object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.region=${s3.region}
-object.store.s3.readlimit=10000000
\ No newline at end of file
+object.store.s3.readlimit=10000000
+
+# IAM adapter
+mosip.iam.adapter.appid=regproc
+mosip.iam.adapter.clientid=mosip-regproc-client
+mosip.iam.adapter.clientsecret=abc123
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
diff --git a/partner-management-default.properties b/partner-management-default.properties
index a9d2beb4e5c..5f53a674104 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -135,13 +135,13 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.internal.url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.internal.url}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.external.host}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.external.host}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
@@ -155,7 +155,7 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -181,7 +181,7 @@ mosip.security.secure-cookie:false
 partner.search.maximum.rows=10
 
 ## Allowed credential types which partner can map against to policy
-pmp.allowed.credential.types=auth,qrcode,euin,reprint
+pmp.allowed.credential.types=auth,qrcode,euin,reprint,vercred 
 
 ## Allowed partner types who can map policies to credential types
 policy.credential.type.mapping.allowed.partner.types=Credential_Partner,Online_Verification_Partner
@@ -198,10 +198,10 @@ mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
diff --git a/print-default.properties b/print-default.properties
index 860bada33ab..378030b9557 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # mosip.mosip.regproc.client.secret
-# keycloak.internal.url
+# keycloak.external.host
 # print.websub.hub.secret
 
 ## Websub
@@ -27,7 +27,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -60,8 +60,6 @@ mosip.print.service.uincard.upperrightx=300
 mosip.print.service.uincard.upperrighty=300
 mosip.print.service.uincard.signature.reason="signing"
 
-# #Audit request id
-mosip.print.audit.id=mosip.applicanttype.getApplicantType
 
 ## Kernel Crypto signature
 registration.processor.signature.isEnabled=true
@@ -110,9 +108,9 @@ mosip.print.prependThumbprint=true
 
 # websub authentication
 mosip.iam.adapter.clientid=mpartner-default-print
-mosip.iam.adapter.clientsecret=3a1a9527-e58b-483d-b4ec-252cd2d805df
+mosip.iam.adapter.clientsecret=${mosip.mpartner.default.print.secret}
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
@@ -127,3 +125,8 @@ mosip.iam.adapter.renewal-before-expiry-interval=1440
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+
+# p12 file
+mosip.print.crypto.p12.filename=partner.p12
+mosip.print.crypto.p12.password={cipher}714cd7ff4c1aa550e7371fabcce089bf6411d69709e6c19aae808eb612c9d31e
+mosip.print.crypto.p12.alias=partner
diff --git a/registration-default.properties b/registration-default.properties
index 9d4b120c091..9f9ab8868c3 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -403,8 +403,15 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':
 # it is comma separated list of field ids
 mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferredLang
 
-## Roles
+
 mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
 mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
 mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
+
+
+## Connection and read timeouts for MDM requests in millis
+mosip.registration.mdm.connection.timeout=10000
+mosip.registration.mdm.RCAPTURE.connection.timeout=40000
+mosip.registration.mdm.MOSIPDINFO.connection.timeout=5000
+mosip.registration.mdm.MOSIPDISC.connection.timeout=5000
\ No newline at end of file
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 96512b57b23..5aa6107f9d0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -3,7 +3,7 @@
 # helm chart:
 # db.dbuser.password 
 # mosip.mosip.regproc.client.secret
-# keycloak.internal.url
+# keycloak.external.host
 # activemq.host
 # activemq.core.port
 # s3.accesskey 
@@ -80,7 +80,7 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -166,7 +166,6 @@ registration.processor.max.retry=10
 mosip.registration.processor.registration.status.id=mosip.registration.status
 mosip.registration.processor.registration.sync.id=mosip.registration.sync
 mosip.registration.processor.registration.transaction.id=mosip.registration.transaction
-mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.registration.status.version=1.0
 mosip.registration.processor.transaction.version=1.0
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
@@ -347,8 +346,6 @@ registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudicatio
 registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
 # Manual verification queue message expiry in seconds, if given 0 then message will never expire
 # Buffer time above the expiry queue to allow reprocessing (in seconds)
-registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
-registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
 registration.processor.manual.adjudication.queue.username=${registration.processor.queue.username}
 registration.processor.manual.adjudication.queue.password=${registration.processor.queue.password}
 registration.processor.manual.adjudication.queue.url=${registration.processor.queue.url}
@@ -363,7 +360,6 @@ mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
 mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
 mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
 mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
-mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
 
 ## Workflow manager
 mosip.regproc.workflow-manager.action.api-id=mosip.registration.processor.workflow.action
@@ -394,14 +390,6 @@ mosip.regproc.workflow-manager.action.job.months=*
 #schedular weeks configuration
 mosip.regproc.workflow-manager.action.job.days_of_week=*
 
-mosip.regproc.workflow.action.job.server.port=8026
-mosip.regproc.workflow.action.job.eventbus.port=5754
-mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/workflowmanager
-
-mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
-mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
-mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
-mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
 
 mosip.regproc.workflow.manager.eventbus.kafka.commit.type=single
 mosip.regproc.workflow.manager.eventbus.kafka.max.poll.records=100
@@ -935,7 +923,7 @@ mosip.registration.processor.packet.external.status.version=1.0
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
@@ -963,8 +951,6 @@ mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,RE
 mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-
-
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-reg-client
 
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
\ No newline at end of file
diff --git a/resident-default.properties b/resident-default.properties
index e1f1fd58551..fc71e26dc7d 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -3,8 +3,9 @@
 # helm chart:
 # mosip.mosip.resident.client.secret
 # mosip.mosip.regproc.client.secret
-# keycloak.internal.url.
+# keycloak.external.host
 
+#--------------ID and Version --------------
 auth.internal.id=mosip.identity.auth.internal
 auth.internal.version=1.0
 mosip.registration.processor.print.id=mosip.registration.print
@@ -124,4 +125,8 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
+
+mosip.service-context=/resident/v1
+mosip.service.end-points=/**/*
+mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
\ No newline at end of file
diff --git a/syncdata-default.properties b/syncdata-default.properties
index d78dd38e673..96c5411a4a5 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.internal.url
+# keycloak.external.host
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
 # mosip.mosip.ida.client.secret
@@ -207,12 +207,12 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.internal.url}
+mosip.iam.base-url=${keycloak.external.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.internal.url}//auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.internal.url}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.internal.url}/admin/
+mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.external.host}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.external.host}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -221,7 +221,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -229,14 +229,14 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.internal.url}/auth
+keycloak.auth-server-url=${keycloak.external.host}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 4225533c1b2defde85d9d4f323017993d399292b Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 19:46:46 +0530
Subject: [PATCH 0620/1358] updated keycloak urls

---
 admin-default.properties                  | 18 ++++++++++--------
 application-default.properties            |  9 ++++++---
 data-share-default.properties             |  3 +++
 kernel-default.properties                 |  5 ++++-
 packet-manager-default.properties         |  4 ++--
 partner-management-default.properties     |  9 ++++++---
 pre-registration-default.properties       |  5 +++--
 registration-processor-default.properties |  7 +++++--
 resident-default.properties               |  5 ++++-
 9 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index f1d0e540998..76d54f80a3e 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -1,9 +1,11 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# db.dbuser.password 
-# keycloak.internal.url
+# db.dbuser.password
 # keycloak.internal.url
+# keycloak.internal.host
+# keycloak.external.host
+# keycloak.external.url
 # mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.mosip.regproc.client.secret
 
@@ -180,8 +182,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.external.hostl}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -201,9 +203,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
@@ -216,7 +218,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +261,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
diff --git a/application-default.properties b/application-default.properties
index bb25226831a..91f267c2e25 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -2,8 +2,11 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # override below properties for v2 deployment
-#   keycloak.internal.url
-#   mosip.api.internal.host
+# keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
+# mosip.api.internal.host
 
 
 aplication.configuration.level.version=LTS
@@ -188,7 +191,7 @@ mosip.kernel.uin.not-start-with=0,1
 mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
-auth.server.validate.url=${mosip.kernel.auth..url}/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
diff --git a/data-share-default.properties b/data-share-default.properties
index 159eb260e92..ef468b9602a 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -1,6 +1,9 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
+# keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
 # keycloak.internal.url
 # mosip.mosip.datsha.client.secret
 # s3.accesskey 
diff --git a/kernel-default.properties b/kernel-default.properties
index 5b18abb8f79..8f99e027864 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -2,6 +2,9 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
+# keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
 # keycloak.internal.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
@@ -208,7 +211,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.external.host}
+mosip.iam.base.url=${keycloak.internal.host}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 00580d84e45..57c5cfd4ed0 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -32,5 +32,5 @@ object.store.s3.readlimit=10000000
 # IAM adapter
 mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret=abc123
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.clientsecret={mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 5f53a674104..10f7e840f83 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -4,6 +4,9 @@
 ## db.dbuser.password 
 ## mosip.mosip.partner.client.secret
 ## mosip.mosip.pms.client.secret
+## keycloak.external.host
+## keycloak.external.url
+## keycloak.internal.host
 ## keycloak.internal.url
 ## keycloak.admin.password
 ## mosip.api.public.url
@@ -135,13 +138,13 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.external.host}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.external.host}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.internal.host}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.internal.host}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 5f7ab74934b..a62ef89fa95 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -3,9 +3,11 @@
 # helm chart:
 # db.dbuser.password 
 # preregistration.mosip.prereg.client.secret
-# keycloak.host
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
+# keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
 # keycloak.internal.url
 # s3.accesskey 
 # s3.region
@@ -306,7 +308,6 @@ mosip.kernel.idobjectvalidator.masterdata.documentcategories.rest.uri=${masterda
 mosip.kernel.idobjectvalidator.masterdata.documenttypes.rest.uri=${masterdata.resource.url}/documenttypes/{documentcategorycode}/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locations.rest.uri=${masterdata.resource.url}/locations/{langcode}
 mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${masterdata.resource.url}/locations/locationhierarchy/{hierarchyname}
-mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode}
 ## Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5aa6107f9d0..f84deb1aa98 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -4,6 +4,9 @@
 # db.dbuser.password 
 # mosip.mosip.regproc.client.secret
 # keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
 # activemq.host
 # activemq.core.port
 # s3.accesskey 
@@ -80,7 +83,7 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -923,7 +926,7 @@ mosip.registration.processor.packet.external.status.version=1.0
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
diff --git a/resident-default.properties b/resident-default.properties
index fc71e26dc7d..e34e7b2f22c 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -4,6 +4,9 @@
 # mosip.mosip.resident.client.secret
 # mosip.mosip.regproc.client.secret
 # keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
 
 #--------------ID and Version --------------
 auth.internal.id=mosip.identity.auth.internal
@@ -125,7 +128,7 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.external.host}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.host}/auth/realms/
 
 mosip.service-context=/resident/v1
 mosip.service.end-points=/**/*

From faaad8b78fb0b85e3376559a81beaa892058402c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 19:59:43 +0530
Subject: [PATCH 0621/1358] updated keycloak urls WIP

---
 partner-management-default.properties |  2 +-
 print-default.properties              |  9 ++++++---
 registration-default.properties       |  2 +-
 syncdata-default.properties           | 17 ++++++++++-------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 10f7e840f83..614df177e44 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -158,7 +158,7 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
diff --git a/print-default.properties b/print-default.properties
index 378030b9557..3d4cc1a59cc 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -2,7 +2,10 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # mosip.mosip.regproc.client.secret
-# keycloak.external.host
+## keycloak.external.host
+## keycloak.external.url
+## keycloak.internal.host
+## keycloak.internal.url
 # print.websub.hub.secret
 
 ## Websub
@@ -27,7 +30,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.external.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -110,7 +113,7 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=${mosip.mpartner.default.print.secret}
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
diff --git a/registration-default.properties b/registration-default.properties
index 9f9ab8868c3..67154c789d8 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -403,7 +403,7 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':
 # it is comma separated list of field ids
 mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferredLang
 
-
+## Roles
 mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
 mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 96c5411a4a5..c5f5e9a77c5 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -3,6 +3,9 @@
 # helm chart:
 # db.dbuser.password 
 # keycloak.external.host
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
 # keycloak.admin.password
 # mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
 # mosip.mosip.ida.client.secret
@@ -207,12 +210,12 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.external.host}
+mosip.iam.base-url=${keycloak.internal.host}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.external.host}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.external.host}/admin/
+mosip.iam.open-id-url =${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.internal.host}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.internal.host}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -221,7 +224,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.external.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -235,8 +238,8 @@ keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 2c7db1eae81273e753a9edd97f71a23fbf41784e Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 20:12:47 +0530
Subject: [PATCH 0622/1358] updated keycloak urls WIP

---
 kernel-default.properties                 |  2 +-
 packet-manager-default.properties         |  2 +-
 partner-management-default.properties     |  8 ++++----
 print-default.properties                  |  4 ++--
 registration-processor-default.properties |  4 ++--
 resident-default.properties               |  2 +-
 syncdata-default.properties               | 16 ++++++++--------
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 8f99e027864..1605e4aeb58 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -211,7 +211,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.internal.host}
+mosip.iam.base.url=${keycloak.internal.url}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 57c5cfd4ed0..5baa31a7d4a 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -33,4 +33,4 @@ object.store.s3.readlimit=10000000
 mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret={mosip.mosip.regproc.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 614df177e44..fa0f5bd7e86 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -138,13 +138,13 @@ pms.certs.datashare.subscriberId=mpartner-default-cert
 # These configurations are used to create user in keycloak and map to a role.
 # Pre-Condition: All partner types should be created as roles in keycloak.
 
-mosip.iam.realm.operations.base-url = ${keycloak.internal.host}/auth/admin/realms/{realmId}
-mosip.iam.admin-url =${keycloak.internal.host}/auth/admin/
+mosip.iam.realm.operations.base-url = ${keycloak.internal.url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url =${keycloak.internal.url}/auth/admin/
 mosip.iam.admin-realm-id =admin
 mosip.iam.roles-extn-url =realms/mosip/roles
 mosip.iam.users-extn-url = realms/mosip/users
 mosip.iam.role-user-mapping-url =/{userId}/role-mappings/realm
-mosip.iam.open-id-url =${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.open-id-url =${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/
 mosip.iam.master.realm-id=master
 mosip.iam.default.realm-id=mosip
 mosip.keycloak.admin.client.id=admin-cli
@@ -158,7 +158,7 @@ auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
-mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
diff --git a/print-default.properties b/print-default.properties
index 3d4cc1a59cc..9d8849b55a5 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -30,7 +30,7 @@ token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGV
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
 token.request.secretKey= ${mosip.mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -113,7 +113,7 @@ mosip.print.prependThumbprint=true
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=${mosip.mpartner.default.print.secret}
 mosip.iam.adapter.appid=print
-mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 # in minutes
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f84deb1aa98..cc824280516 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -83,7 +83,7 @@ token.request.clientId=mosip-regproc-client
 token.request.secretKey=${mosip.mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -926,7 +926,7 @@ mosip.registration.processor.packet.external.status.version=1.0
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
diff --git a/resident-default.properties b/resident-default.properties
index e34e7b2f22c..222063aa167 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -128,7 +128,7 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.host}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
 mosip.service-context=/resident/v1
 mosip.service.end-points=/**/*
diff --git a/syncdata-default.properties b/syncdata-default.properties
index c5f5e9a77c5..f4f18355307 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -210,12 +210,12 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base-url=${keycloak.internal.host}
+mosip.iam.base-url=${keycloak.internal.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url =${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${keycloak.internal.host}/admin/realms/{realmId}
-mosip.iam.admin-url=${keycloak.internal.host}/admin/
+mosip.iam.open-id-url =${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${keycloak.internal.url}/admin/realms/{realmId}
+mosip.iam.admin-url=${keycloak.internal.url}/admin/
 mosip.iam.roles-extn-url=realms/mosip/roles
 mosip.iam.users-extn-url=realms/mosip/users
 mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
@@ -224,7 +224,7 @@ mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 mosip.iam.adapter.clientid=mosip-syncdata-client
 mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
-mosip.iam.adapter.issuerURL=${keycloak.internal.host}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 mosip.iam.adapter.validate-expiry-check-rate=15
 mosip.iam.adapter.renewal-before-expiry-interval=15
@@ -232,14 +232,14 @@ mosip.iam.adapter.self-token-renewal-enable=true
 
 keycloak.realm=registration-client
 keycloak.resource=account
-keycloak.auth-server-url=${keycloak.external.host}/auth
+keycloak.auth-server-url=${keycloak.internal.url}/auth
 keycloak.ssl-required=none
 keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.internal.host}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls

From 82c9e0f620d8f5bf4513abdd9e3183cb7621b82e Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 20:15:00 +0530
Subject: [PATCH 0623/1358] updated keycloak urls WIP

---
 partner-management-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index fa0f5bd7e86..4e8e7949355 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -201,10 +201,10 @@ mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.external.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy

From 93381112d1bd7cef53580ebea9bd170dec9fb937 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 20:35:30 +0530
Subject: [PATCH 0624/1358] removed aws s3 properties from
 application-default.properties as it is not required

---
 application-default.properties | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 91f267c2e25..0a92cd3ac7f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -352,13 +352,6 @@ object.store.base.location=/home/mosip
 hazelcast.config=classpath:hazelcast_default.xml
 
 
-## S3 object store adapter.
-object.store.s3.accesskey=${s3.accesskey}
-object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=${mosip.minio.url}
-object.store.s3.region=${s3.region}
-object.store.s3.readlimit=10000000
 
 ## Swift
 object.store.swift.username=test

From 188b126e5fbbe30a09e8955698b5aaba49ddc7b8 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 31 Jan 2022 20:39:42 +0530
Subject: [PATCH 0625/1358] added roles to mosip.role.keymanager.postpdfsign

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 1605e4aeb58..b3a37f157e8 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -724,7 +724,7 @@ mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_A
 mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
 mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_REQUEST
 mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT

From 77b9fbd59a785ea4b88e217e0ffb61bf0205ba70 Mon Sep 17 00:00:00 2001
From: JyotiPrakashNayak <jyoti.nayak@mindtree.com>
Date: Wed, 2 Feb 2022 12:56:12 +0530
Subject: [PATCH 0626/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d905772c47b..25eeee9af56 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -252,7 +252,7 @@ registration.processor.notification.emails=
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 registration.processor.notification_service_subscriber_callback_url=${mosip.regproc.notification.url}/registrationprocessor/v1/notification/callback/notify
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
-mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_workflow_paused_for_additional_info_event
+mosip.regproc.workflow.pausedforadditionalinfo.topic=REGISTRATION_PROCESSOR_WORKFLOW_PAUSED_FOR_ADDITIONAL_INFO_EVENT
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosip.regproc.notification.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
 
 # Email template code for PauseForAdditionalInfo
@@ -355,7 +355,7 @@ registration.processor.manual.adjudication.queue.url=${registration.processor.qu
 registration.processor.manual.adjudication.queue.typeOfQueue=${registration.processor.queue.typeOfQueue}
 
 #WorkflowAction service  websub topic name
-mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
+mosip.regproc.workflow.complete.topic=REGISTRATION_PROCESSOR_WORKFLOW_COMPLETED_EVENT
 mosip.regproc.workflow.action.job.server.port=8026
 mosip.regproc.workflow.action.job.eventbus.port=5754
 mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/workflowmanager
@@ -363,7 +363,6 @@ mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
 mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
 mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
 mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
-mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
 
 ## Workflow manager
 mosip.regproc.workflow-manager.action.api-id=mosip.registration.processor.workflow.action
@@ -967,4 +966,4 @@ mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,
 
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
 
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
\ No newline at end of file
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face

From 104d9024baea4b065b052d0f8815eb576ed8cea1 Mon Sep 17 00:00:00 2001
From: JyotiPrakashNayak <jyoti.nayak@mindtree.com>
Date: Wed, 2 Feb 2022 13:08:52 +0530
Subject: [PATCH 0627/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index cc824280516..dc699c7517a 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -254,7 +254,7 @@ registration.processor.notification.emails=
 registration.processor.notification_service_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
 registration.processor.notification_service_subscriber_callback_url=${mosip.regproc.notification.url}/registrationprocessor/v1/notification/callback/notify
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_secret={cipher}1b1c1a60abf045c34fff60457976178e5c70c949634ad568f5a5510007bfa438
-mosip.regproc.workflow.pausedforadditionalinfo.topic=registration_processor_workflow_paused_for_additional_info_event
+mosip.regproc.workflow.pausedforadditionalinfo.topic=REGISTRATION_PROCESSOR_WORKFLOW_PAUSED_FOR_ADDITIONAL_INFO_EVENT
 registration.processor.notification_service_pausedforadditonalinfo_subscriber_callback_url=${mosip.regproc.notification.url}/registrationprocessor/v1/notification/callback/notifyPausedForAdditionalInfo
 
 # Email template code for PauseForAdditionalInfo
@@ -355,14 +355,13 @@ registration.processor.manual.adjudication.queue.url=${registration.processor.qu
 registration.processor.manual.adjudication.queue.typeOfQueue=${registration.processor.queue.typeOfQueue}
 
 #WorkflowAction service  websub topic name
-mosip.regproc.workflow.complete.topic=registration_processor_workflow_completed_event
+mosip.regproc.workflow.complete.topic=REGISTRATION_PROCESSOR_WORKFLOW_COMPLETED_EVENT
 mosip.regproc.workflow.action.job.server.port=8026
 mosip.regproc.workflow.action.job.eventbus.port=5754
 mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/workflowmanager
 mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
 mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
 mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
-mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
 
 ## Workflow manager
 mosip.regproc.workflow-manager.action.api-id=mosip.registration.processor.workflow.action
@@ -956,4 +955,4 @@ mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RE
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-reg-client
 
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
\ No newline at end of file
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face

From 0ff4fc18f25f6e75f9201b94f9025500bbd8babb Mon Sep 17 00:00:00 2001
From: JyotiPrakashNayak <jyoti.nayak@mindtree.com>
Date: Wed, 2 Feb 2022 15:46:22 +0530
Subject: [PATCH 0628/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index dc699c7517a..c76a6451cc5 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -362,6 +362,7 @@ mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/
 mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
 mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
 mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
+mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
 
 ## Workflow manager
 mosip.regproc.workflow-manager.action.api-id=mosip.registration.processor.workflow.action

From 036b285c19f0dfd32a9c0686c480fa661e8a1cf6 Mon Sep 17 00:00:00 2001
From: JyotiPrakashNayak <jyoti.nayak@mindtree.com>
Date: Wed, 2 Feb 2022 20:12:17 +0530
Subject: [PATCH 0629/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c76a6451cc5..5425527a324 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -934,7 +934,7 @@ mosip.iam.adapter.validate-expiry-check-rate=30
 mosip.iam.adapter.renewal-before-expiry-interval=30
 #this should be false if you don’t use this restTemplate true if you do
 mosip.iam.adapter.self-token-renewal-enable=true
-mosip.auth.filter_disable=true
+mosip.auth.filter_disable=false
 
 ## Object store 
 object.store.s3.accesskey=${s3.accesskey}

From fa574f4a52a3c542f4e3a4b6d0780376ea05dafd Mon Sep 17 00:00:00 2001
From: JyotiPrakashNayak <jyoti.nayak@mindtree.com>
Date: Wed, 2 Feb 2022 20:15:30 +0530
Subject: [PATCH 0630/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 25eeee9af56..a3c42330154 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -942,7 +942,7 @@ mosip.iam.adapter.validate-expiry-check-rate=30
 mosip.iam.adapter.renewal-before-expiry-interval=30
 #this should be false if you don’t use this restTemplate true if you do
 mosip.iam.adapter.self-token-renewal-enable=true
-mosip.auth.filter_disable=true
+mosip.auth.filter_disable=false
 
 ## Object store 
 object.store.s3.accesskey=${s3.accesskey}

From ac7e9e36e12eea1f0436c49e696092d3d074161f Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 4 Feb 2022 11:27:38 +0530
Subject: [PATCH 0631/1358] Updated authmanager base url

---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index b3a37f157e8..be676b14c3b 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -258,7 +258,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel-auth-service.url}/v1/authmanager
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 
 
 master.search.maximum.rows=50
@@ -734,4 +734,4 @@ mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDU
 mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
 
 
-mosip.kernel.keymanager.jwtsign.validate.json=false
\ No newline at end of file
+mosip.kernel.keymanager.jwtsign.validate.json=false

From 15b1cd538be2ca8889ab57a905884c90816f545f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 8 Feb 2022 06:51:51 +0530
Subject: [PATCH 0632/1358] [MOSIP-18494] Client names updated.

---
 admin-default.properties                  | 17 +++++++--------
 application-default.properties            |  4 ++--
 credential-request-default.properties     |  4 ++--
 credential-service-default.properties     |  8 +++-----
 data-share-default.properties             |  4 ++--
 hotlist-default.properties                |  4 ++--
 id-authentication-default.properties      |  1 -
 id-repository-default.properties          | 10 ++++-----
 kernel-default.properties                 | 25 +++++++++++------------
 mock-abis-default.properties              |  4 ++--
 partner-management-default.properties     | 13 +++++-------
 pre-registration-default.properties       |  2 +-
 print-default.properties                  |  8 ++------
 registration-processor-default.properties | 14 ++++++++-----
 resident-default.properties               | 16 +++++++--------
 syncdata-default.properties               | 24 +++++++++++-----------
 16 files changed, 75 insertions(+), 83 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 76d54f80a3e..b2f9c0e3d0f 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -3,11 +3,9 @@
 # helm chart:
 # db.dbuser.password
 # keycloak.internal.url
-# keycloak.internal.host
-# keycloak.external.host
 # keycloak.external.url
-# mosip.mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
-# mosip.mosip.regproc.client.secret
+# mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.regproc.client.secret
 
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
@@ -178,7 +176,7 @@ mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/audi
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
-mosip.admin-services.open-id.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.admin-services.open-id.clientsecret=${mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
@@ -197,7 +195,7 @@ mosip.security.secure-cookie=false
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-admin-client
-mosip.iam.module.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.module.clientsecret=${mosip.admin.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
@@ -209,7 +207,7 @@ mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/ope
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
-regproc.token.request.secretKey=${mosip.mosip.regproc.client.secret}
+regproc.token.request.secretKey=${mosip.regproc.client.secret}
 regproc.token.request.id=io.mosip.registration.processor
 regproc.token.request.version=1.0
 KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -217,7 +215,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 # IAM adapter
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
@@ -274,5 +272,8 @@ mosip.admin.packetupload.packetsync.phone=phone
 
 mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\\W|\\w]{1,100}$)
 
+<<<<<<< Updated upstream
 # Mapping identity json to map with the applicant id json
+=======
+>>>>>>> Stashed changes
 registration.processor.identityjson=identity-mapping.json
diff --git a/application-default.properties b/application-default.properties
index 0a92cd3ac7f..62a3a6bbf58 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -199,8 +199,8 @@ mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 ## iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
-mosip.kernel.auth.appid-realm-map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
-mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
+mosip.kernel.auth.appid-realm-map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
+mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
 
 ## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
diff --git a/credential-request-default.properties b/credential-request-default.properties
index cc34d671297..886ce20acb4 100644
--- a/credential-request-default.properties
+++ b/credential-request-default.properties
@@ -1,6 +1,6 @@
 #IDRepo credential request generator authentication detalis
 mosip.idrepo.credential-req-generator.auth.client-id=mosip-crereq-client
-mosip.idrepo.credential-req-generator.auth.secret-key=${mosip.mosip.crereq.client.secret}
+mosip.idrepo.credential-req-generator.auth.secret-key=${mosip.crereq.client.secret}
 mosip.idrepo.credential-req-generator.auth.app-id=crereq
 
 #------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
@@ -8,4 +8,4 @@ mosip.iam.adapter.clientid.credential-request=${mosip.idrepo.credential-req-gene
 mosip.iam.adapter.clientsecret.credential-request=${mosip.idrepo.credential-req-generator.auth.secret-key}
 mosip.iam.adapter.appid.credential-request=${mosip.idrepo.credential-req-generator.auth.app-id}
 
-mosip.auth.filter_disable=false
\ No newline at end of file
+mosip.auth.filter_disable=false
diff --git a/credential-service-default.properties b/credential-service-default.properties
index 4d904547cf2..0c19724fe81 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -1,17 +1,15 @@
-#IDRepo credential service authentication detalis
+# IDRepo credential service authentication details
 mosip.idrepo.credential.auth.client-id=mosip-creser-client
-mosip.idrepo.credential.auth.secret-key=${mosip.mosip.creser.client.secret}
+mosip.idrepo.credential.auth.secret-key=${mosip.creser.client.secret}
 mosip.idrepo.credential.auth.app-id=creser
 
-#------------------------- Kernel Auth Adapter self token generator properties ----------------------------#
+##  Kernel Auth Adapter self token generator properties 
 mosip.iam.adapter.clientid.credential-service=${mosip.idrepo.credential.auth.client-id}
 mosip.iam.adapter.clientsecret.credential-service=${mosip.idrepo.credential.auth.secret-key}
 mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id}
 
-
 mosip.auth.filter_disable=false
 
-
 mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.api.internal.url}/mosipvc/mosip-context.json" : "mosip-context.json"}
 mosip.credential.service.vercred.context.uri=vccontext.jsonld
 mosip.credential.service.vercred.id.url=${mosip.api.internal.url}/credentials/
diff --git a/data-share-default.properties b/data-share-default.properties
index ef468b9602a..ed6abbd9c20 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -5,7 +5,7 @@
 # keycloak.external.url
 # keycloak.internal.host
 # keycloak.internal.url
-# mosip.mosip.datsha.client.secret
+# mosip.datsha.client.secret
 # s3.accesskey 
 # s3.region
 # s3.secretkey
@@ -25,7 +25,7 @@ mosip.data.share.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 mosip.data.share.urlshortner=false
 data.share.token.request.appid=datsha
 data.share.token.request.clientId=mosip-datsha-client
-data.share.token.request.secretKey=${mosip.mosip.datsha.client.secret}
+data.share.token.request.secretKey=${mosip.datsha.client.secret}
 data.share.token.request.password=
 data.share.token.request.username=
 data.share.token.request.version=1.0
diff --git a/hotlist-default.properties b/hotlist-default.properties
index 36f6a2749f9..c0ca979c816 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password
-# mosip.mosip.hotlist.client.secret
+# mosip.hotlist.client.secret
 spring.application.name=HOTLIST
 
 ## DB
@@ -26,7 +26,7 @@ mosip.hotlist.datasource.dialect=${mosip.hotlist.db.dialect}
 
 #Admin hotlist service authentication details
 mosip.admin.hotlist.auth.client-id=mosip-hotlist-client
-mosip.admin.hotlist.auth.secret-key=${mosip.mosip.hotlist.client.secret}
+mosip.admin.hotlist.auth.secret-key=${mosip.hotlist.client.secret}
 mosip.admin.hotlist.auth.app-id=hotlist
 
 # Websub
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index fe2c3fc31fb..e1ccf4fdb0a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -2,7 +2,6 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# mosip.mosip.ida.client.secret
 # ida.websub.authtype.callback.secret
 # ida.websub.credential.issue.callback.secret
 # ida.websub.partner.service.callback.secret
diff --git a/id-repository-default.properties b/id-repository-default.properties
index d0228bcbe1d..ce56fb91df5 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -2,9 +2,9 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# mosip.mosip.crereq.client.secret
-# mosip.mosip.creser.client.secret
-# mosip.mosip.regproc.client.secret
+# mosip.crereq.client.secret
+# mosip.creser.client.secret
+# mosip.regproc.client.secret
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # idrepo.websub.vid.credential.update.secret
@@ -31,7 +31,7 @@ mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
 mosip.idrepo.auth.client-id=mosip-idrepo-client
-mosip.idrepo.auth.secret-key=${mosip.mosip.idrepo.client.secret}
+mosip.idrepo.auth.secret-key=${mosip.idrepo.client.secret}
 mosip.idrepo.auth.app-id=idrepo
 
 # For auditing
@@ -298,7 +298,7 @@ WEBSUBSECRET=test
 # Credential service
 credential.service.token.request.appid=${mosip.idrepo.credential.auth.app-id}
 credential.service.token.request.clientId=${mosip.idrepo.credential.auth.client-id}
-credential.service.token.request.secretKey=${mosip.mosip.creser.client.secret}
+credential.service.token.request.secretKey=${mosip.creser.client.secret}
 credential.service.token.request.id=io.mosip.credentialstore
 # Credential formatter properties 
 mosip.credential.vc.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss'Z'
diff --git a/kernel-default.properties b/kernel-default.properties
index be676b14c3b..821c5e00895 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -7,11 +7,11 @@
 # keycloak.internal.host
 # keycloak.internal.url
 # keycloak.admin.password
-# mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
-# mosip.mosip.ida.client.secret
-# mosip.mosip.admin.client.secret
-# mosip.mosip.reg.client.secret
-# preregistration.mosip.prereg.client.secret
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
 # softhsm.kernel.pin
 # email.smtp.host
 # email.smtp.username
@@ -94,11 +94,11 @@ idrepo.api.getuindetails=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key=${mosip.mosip.auth.client.secret}
+mosip.kernel.auth.secret.key=${mosip.auth.client.secret}
 
 mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
+mosip.kernel.ida.secret.key=${mosip.ida.client.secret}
 
 ## VID generator service
 mosip.kernel.vid.min-unused-threshold=100000
@@ -236,7 +236,7 @@ mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
 mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.admin.clientsecret=${mosip.admin.client.secret}
 mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
 mosip.admin_realm_id=mosip
 mosip.iam.master.realm-id=master
@@ -260,7 +260,6 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 
-
 master.search.maximum.rows=50
 mosip.level=2
 mosip.kernel.masterdata.audit-url= ${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -272,9 +271,9 @@ mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/sign
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
-mosip.kernel.prereg.realm-id=preregistration
+mosip.kernel.prereg.realm-id=mosip
 mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
+mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
@@ -354,7 +353,7 @@ mosip.syncdata.tpm.required=false
 mosip.kernel.registrationclient.app.id=registrationclient
 mosip.kernel.registrationclient.client.id=mosip-reg-client
 # env variable
-mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
+mosip.kernel.registrationclient.secret.key=${mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
 mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
@@ -430,7 +429,7 @@ auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosi
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.admin.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
 
 #AdminMaster endpoints to access without authentication
 mosip.service-context=/v1/masterdata
diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index e2463c3688e..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -1,7 +1,7 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-#   mosip.mosip.regproc.client.secret
+# mosip.regproc.client.secret
 spring.cloud.config.name=mock-abis
 spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
@@ -11,5 +11,5 @@ abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string
-secret_url.secretKey=${mosip.mosip.regproc.client.secret}
+secret_url.secretKey=${mosip.regproc.client.secret}
 secret_url.appId=regproc
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4e8e7949355..12e3d11c1b2 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -2,11 +2,8 @@
 ## DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 ## helm chart:
 ## db.dbuser.password 
-## mosip.mosip.partner.client.secret
-## mosip.mosip.pms.client.secret
-## keycloak.external.host
-## keycloak.external.url
-## keycloak.internal.host
+## mosip.partner.client.secret
+## mosip.pms.client.secret
 ## keycloak.internal.url
 ## keycloak.admin.password
 ## mosip.api.public.url
@@ -114,7 +111,7 @@ mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
 mosip.pmp.auth.clientId=mosip-partner-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.mosip.partner.client.secret}
+mosip.pmp.auth.secretKey= ${mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -125,7 +122,7 @@ pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel.keymanager.url}/
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
-mosip.iam.adapter.clientsecret=${mosip.mosip.partner.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.partner.client.secret}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
@@ -197,7 +194,7 @@ policy.auth.allowed.token.types=random,partner,policy
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret=${mosip.mosip.partner.client.secret}
+mosip.iam.module.clientsecret=${mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index a62ef89fa95..af8c1f53ce2 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -425,7 +425,7 @@ mosip.iam.adapter.appid=prereg
 
 # To generate token from keycloak in PreReg Data Sync Service. Used by kernel auth adapter.
 mosip.iam.adapter.clientid.pre-registration-datasync-service=mosip-reg-client
-mosip.iam.adapter.clientsecret.pre-registration-datasync-service=${mosip.mosip.reg.client.secret}
+mosip.iam.adapter.clientsecret.pre-registration-datasync-service=${mosip.reg.client.secret}
 mosip.iam.adapter.appid.pre-registration-datasync-service=registrationclient
 
 #the custom auth provider component names list
diff --git a/print-default.properties b/print-default.properties
index 9d8849b55a5..f0b4d8e7d6b 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -1,11 +1,7 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# mosip.mosip.regproc.client.secret
-## keycloak.external.host
-## keycloak.external.url
-## keycloak.internal.host
-## keycloak.internal.url
+# mosip.regproc.client.secret
 # print.websub.hub.secret
 
 ## Websub
@@ -29,7 +25,7 @@ token.request.username=registrationprocessor
 token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGVnY3M1DIeKGFAeBNfi6jH5qgj1KCUmFONLwSmfcrPx9m6MYXXQMYwyAeq13Msy1fcG1AtZQASKeLbuMCaRwinwdt7C/WYzvVVv47NojD+VmHHVTY3qBXJ4dwZ0/BqmUBPXyYrJPKTcdouxT76bgm5+fXXNcT7lciXgD1aCnWKziL5nDa6Y9dhc+ZPyM0d+I0JfS+emsByt7tWgcZukQkOEx8JWfcCR4eVpERYVa/ps/EAuQRXmxIvnr54GSCc/KKpwnYnjLtKIx/75I6pezBdKU/BBJG1syjQp9VQC9adSI5fdsn3ijkxJjC9TSIFJKDlTHqNCnJaxQXcSBWL4Y=
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
-token.request.secretKey= ${mosip.mosip.regproc.client.secret}
+token.request.secretKey= ${mosip.regproc.client.secret}
 token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # Audit service
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5425527a324..e4340a2a957 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -2,10 +2,8 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# mosip.mosip.regproc.client.secret
-# keycloak.external.host
-# keycloak.external.url
 # keycloak.internal.host
+# mosip.regproc.client.secret
 # keycloak.internal.url
 # activemq.host
 # activemq.core.port
@@ -80,7 +78,7 @@ token.request.id=io.mosip.registration.processor
 token.request.appid=regproc
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
-token.request.secretKey=${mosip.mosip.regproc.client.secret}
+token.request.secretKey=${mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
 token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
@@ -924,7 +922,7 @@ mosip.registration.processor.registration.external.status.version=1.0
 mosip.registration.processor.packet.external.status.version=1.0
 
 mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -956,4 +954,10 @@ mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RE
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-reg-client
 
+<<<<<<< Updated upstream
+=======
+
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
+
+>>>>>>> Stashed changes
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
diff --git a/resident-default.properties b/resident-default.properties
index 222063aa167..07331c979e7 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -1,12 +1,10 @@
 # Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
-# mosip.mosip.resident.client.secret
-# mosip.mosip.regproc.client.secret
-# keycloak.external.host
-# keycloak.external.url
-# keycloak.internal.host
 # keycloak.internal.url
+# mosip.resident.client.secret
+# mosip.regproc.client.secret
+# keycloak.internal.url.
 
 #--------------ID and Version --------------
 auth.internal.id=mosip.identity.auth.internal
@@ -39,7 +37,7 @@ token.request.id=io.mosip.resident
 resident.appid=resident
 token.request.version=1.0
 resident.clientId=mosip-resident-client
-resident.secretKey=${mosip.mosip.resident.client.secret}
+resident.secretKey=${mosip.resident.client.secret}
 # Below is defined in application properties
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
@@ -110,7 +108,7 @@ mosip.registration.processor.registration.sync.id=mosip.registration.sync
 id.repo.vidType=Perpetual
 token.request.appid=resident
 token.request.clientId=mosip-resident-client
-token.request.secretKey=${mosip.mosip.resident.client.secret}
+token.request.secretKey=${mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
 
 #TODO remove reg-client service accunt in production env
@@ -127,9 +125,9 @@ resident.update-uin.machine-zone-code = MOR
 #Auth Adapter rest template authentication configs
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
 mosip.service-context=/resident/v1
 mosip.service.end-points=/**/*
-mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
\ No newline at end of file
+mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
diff --git a/syncdata-default.properties b/syncdata-default.properties
index f4f18355307..dcf79ec8c0d 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -7,12 +7,12 @@
 # keycloak.internal.host
 # keycloak.internal.url
 # keycloak.admin.password
-# mosip.mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
-# mosip.mosip.ida.client.secret
-# mosip.mosip.admin.client.secret
-# mosip.mosip.reg.client.secret
-# preregistration.mosip.prereg.client.secret
-# mosip.mosip.syncdata.client.secret
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
+# mosip.syncdata.client.secret
 # mosip.api.internal.host
 # softhsm.kernel.pin
 
@@ -89,11 +89,11 @@ idrepo.api.getuindetails=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
 
 mosip.kernel.auth.app.id=auth
 mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key=${mosip.mosip.auth.client.secret}
+mosip.kernel.auth.secret.key=${mosip.auth.client.secret}
 
 mosip.kernel.ida.app.id=ida
 mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key=${mosip.mosip.ida.client.secret}
+mosip.kernel.ida.secret.key=${mosip.ida.client.secret}
 
 ## Token id salts
 mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
@@ -222,7 +222,7 @@ mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
 mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
 #Self token resttemplate related to configuration
 mosip.iam.adapter.clientid=mosip-syncdata-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.syncdata.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.syncdata.client.secret}
 mosip.iam.adapter.appid=registrationclient
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
@@ -278,9 +278,9 @@ mosip.kernel.keymanager-service-sign-url=${mosip.kernel.keymanager.url}/v1/keyma
 masterdata.registerdevice.timestamp.validate=+10
 
 ## Prereg
-mosip.kernel.prereg.realm-id=preregistration
+mosip.kernel.prereg.realm-id=mosip
 mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key=${preregistration.mosip.prereg.client.secret}
+mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
@@ -367,7 +367,7 @@ mosip.syncdata.tpm.required=false
 mosip.kernel.registrationclient.app.id=registrationclient
 mosip.kernel.registrationclient.client.id=mosip-reg-client
 # env variable
-mosip.kernel.registrationclient.secret.key=${mosip.mosip.reg.client.secret}
+mosip.kernel.registrationclient.secret.key=${mosip.reg.client.secret}
 
 # API to fetch auth token and refresh token used by syncdata-service
 mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd

From 1dece05ec8121449515296623127c1c12b9c0977 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Tue, 8 Feb 2022 20:12:30 +0530
Subject: [PATCH 0633/1358] [ MOSIP-19884 ] Updated prereg client secrets

---
 pre-registration-default.properties | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index af8c1f53ce2..b84352e529a 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -2,7 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# preregistration.mosip.prereg.client.secret
+# mosip.prereg.client.secret
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
 # keycloak.external.host
@@ -151,7 +151,7 @@ mosip.preregistration.batchjob.service.expired.id=mosip.pre-registration.batchjo
 # Batch Job Service used to fetch token from key cloak
 mosip.batch.token.authmanager.appId=prereg
 mosip.batch.token.authmanager.userName=mosip-prereg-client
-mosip.batch.token.authmanager.password=${preregistration.mosip.prereg.client.secret}
+mosip.batch.token.authmanager.password=${mosip.prereg.client.secret}
 mosip.batch.token.authmanager.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath}/authenticate/clientidsecretkey
 mosip.batch.token.request.id=
 
@@ -240,7 +240,7 @@ preregistration.crypto.PrependThumbprint=false
 ##  KeyCloak 
 ## Both below fields must match with what is there on Keycloak properties 
 clientId=mosip-prereg-client
-secretKey=${preregistration.mosip.prereg.client.secret}
+secretKey=${mosip.prereg.client.secret}
 
 ## Used for Key Creating KeyCloak session
 userIdType=USERID
@@ -418,9 +418,9 @@ preregistration.cookie.contextpath=/
 
 # To generate token from keycloak. Use by kernel auth adapter.
 mosip.iam.adapter.clientid=mosip-prereg-client
-mosip.iam.adapter.clientsecret=${preregistration.mosip.prereg.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.prereg.client.secret}
 
-# preregistration.mosip.prereg.client.secret
+# mosip.prereg.client.secret
 mosip.iam.adapter.appid=prereg
 
 # To generate token from keycloak in PreReg Data Sync Service. Used by kernel auth adapter.
@@ -482,4 +482,3 @@ mosip.role.prereg.putbatchappointmentpreregistrationid=PRE_REGISTRATION_ADMIN,RE
 mosip.role.prereg.deleteappointment=INDIVIDUAL
 mosip.role.prereg.getappointmentpreregistrationidregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getappointmentregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
-

From efee9067494359efc51187278068c014e184ecb0 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Wed, 9 Feb 2022 16:00:26 +0530
Subject: [PATCH 0634/1358] Update kernel-default.properties

---
 kernel-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 821c5e00895..c537225d0d9 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -13,12 +13,15 @@
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
 # softhsm.kernel.pin
+# softhsm-security-pin
 # email.smtp.host
 # email.smtp.username
 # email.smtp.secret
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 
+softhsm.kernel.pin=${softhsm.security.pin}
+
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles

From 109b1df54828ffa40e4037dbf9719c265b65ab9f Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Thu, 10 Feb 2022 10:09:11 +0530
Subject: [PATCH 0635/1358] updated config for mosip-file-server

---
 cred-v1.jsonld     | 237 +++++++++++++++++++++++++++++++++++++++++++++
 mosip-context.json |  24 +++++
 odrl.jsonld        | 200 ++++++++++++++++++++++++++++++++++++++
 vccontext.jsonld   |   9 ++
 4 files changed, 470 insertions(+)
 create mode 100644 cred-v1.jsonld
 create mode 100644 mosip-context.json
 create mode 100644 odrl.jsonld
 create mode 100644 vccontext.jsonld

diff --git a/cred-v1.jsonld b/cred-v1.jsonld
new file mode 100644
index 00000000000..26169278c43
--- /dev/null
+++ b/cred-v1.jsonld
@@ -0,0 +1,237 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+
+    "id": "@id",
+    "type": "@type",
+
+    "VerifiableCredential": {
+      "@id": "https://www.w3.org/2018/credentials#VerifiableCredential",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "cred": "https://www.w3.org/2018/credentials#",
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "credentialSchema": {
+          "@id": "cred:credentialSchema",
+          "@type": "@id",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "cred": "https://www.w3.org/2018/credentials#",
+
+            "JsonSchemaValidator2018": "cred:JsonSchemaValidator2018"
+          }
+        },
+        "credentialStatus": {"@id": "cred:credentialStatus", "@type": "@id"},
+        "credentialSubject": {"@id": "cred:credentialSubject", "@type": "@id"},
+        "evidence": {"@id": "cred:evidence", "@type": "@id"},
+        "expirationDate": {"@id": "cred:expirationDate", "@type": "xsd:dateTime"},
+        "holder": {"@id": "cred:holder", "@type": "@id"},
+        "issued": {"@id": "cred:issued", "@type": "xsd:dateTime"},
+        "issuer": {"@id": "cred:issuer", "@type": "@id"},
+        "issuanceDate": {"@id": "cred:issuanceDate", "@type": "xsd:dateTime"},
+        "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+        "refreshService": {
+          "@id": "cred:refreshService",
+          "@type": "@id",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "cred": "https://www.w3.org/2018/credentials#",
+
+            "ManualRefreshService2018": "cred:ManualRefreshService2018"
+          }
+        },
+        "termsOfUse": {"@id": "cred:termsOfUse", "@type": "@id"},
+        "validFrom": {"@id": "cred:validFrom", "@type": "xsd:dateTime"},
+        "validUntil": {"@id": "cred:validUntil", "@type": "xsd:dateTime"}
+      }
+    },
+
+    "VerifiablePresentation": {
+      "@id": "https://www.w3.org/2018/credentials#VerifiablePresentation",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "cred": "https://www.w3.org/2018/credentials#",
+        "sec": "https://w3id.org/security#",
+
+        "holder": {"@id": "cred:holder", "@type": "@id"},
+        "proof": {"@id": "sec:proof", "@type": "@id", "@container": "@graph"},
+        "verifiableCredential": {"@id": "cred:verifiableCredential", "@type": "@id", "@container": "@graph"}
+      }
+    },
+
+    "EcdsaSecp256k1Signature2019": {
+      "@id": "https://w3id.org/security#EcdsaSecp256k1Signature2019",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "EcdsaSecp256r1Signature2019": {
+      "@id": "https://w3id.org/security#EcdsaSecp256r1Signature2019",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "Ed25519Signature2018": {
+      "@id": "https://w3id.org/security#Ed25519Signature2018",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "id": "@id",
+        "type": "@type",
+
+        "sec": "https://w3id.org/security#",
+        "xsd": "http://www.w3.org/2001/XMLSchema#",
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "RsaSignature2018": {
+      "@id": "https://w3id.org/security#RsaSignature2018",
+      "@context": {
+        "@version": 1.1,
+        "@protected": true,
+
+        "challenge": "sec:challenge",
+        "created": {"@id": "http://purl.org/dc/terms/created", "@type": "xsd:dateTime"},
+        "domain": "sec:domain",
+        "expires": {"@id": "sec:expiration", "@type": "xsd:dateTime"},
+        "jws": "sec:jws",
+        "nonce": "sec:nonce",
+        "proofPurpose": {
+          "@id": "sec:proofPurpose",
+          "@type": "@vocab",
+          "@context": {
+            "@version": 1.1,
+            "@protected": true,
+
+            "id": "@id",
+            "type": "@type",
+
+            "sec": "https://w3id.org/security#",
+
+            "assertionMethod": {"@id": "sec:assertionMethod", "@type": "@id", "@container": "@set"},
+            "authentication": {"@id": "sec:authenticationMethod", "@type": "@id", "@container": "@set"}
+          }
+        },
+        "proofValue": "sec:proofValue",
+        "verificationMethod": {"@id": "sec:verificationMethod", "@type": "@id"}
+      }
+    },
+
+    "proof": {"@id": "https://w3id.org/security#proof", "@type": "@id", "@container": "@graph"}
+  }
+}
\ No newline at end of file
diff --git a/mosip-context.json b/mosip-context.json
new file mode 100644
index 00000000000..340d83a04ed
--- /dev/null
+++ b/mosip-context.json
@@ -0,0 +1,24 @@
+{
+  "@context": [{
+    "@version": 1.1
+  },"https://www.w3.org/ns/odrl.jsonld", {
+    "mosip": "${mosip.api.internal.url}/mosip#",
+    "schema": "http://schema.org/",
+    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "vcVer": "mosip:vcVer",
+    "UIN": "mosip:UIN",
+    "addressLine1": "mosip:addressLine1",
+    "addressLine2": "mosip:addressLine2",
+    "addressLine3": "mosip:addressLine3",
+    "city": "mosip:city",
+    "dateOfBirth": "mosip:dateOfBirth",
+    "email": "mosip:email",
+    "fullName": "mosip:fullName",
+    "gender": "mosip:gender",
+    "phone": "mosip:phone",
+    "postalCode": "mosip:postalCode",
+    "province": "mosip:province",
+    "region": "mosip:region",
+    "biometrics": "mosip:biometrics"
+  }]
+}
\ No newline at end of file
diff --git a/odrl.jsonld b/odrl.jsonld
new file mode 100644
index 00000000000..3ac366acc47
--- /dev/null
+++ b/odrl.jsonld
@@ -0,0 +1,200 @@
+{
+ "@context": {
+    "odrl":    "http://www.w3.org/ns/odrl/2/",
+    "rdf":     "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "rdfs":    "http://www.w3.org/2000/01/rdf-schema#",
+    "owl":     "http://www.w3.org/2002/07/owl#",
+    "skos":    "http://www.w3.org/2004/02/skos/core#",
+    "dct":     "http://purl.org/dc/terms/",
+    "xsd":     "http://www.w3.org/2001/XMLSchema#",
+    "vcard":   "http://www.w3.org/2006/vcard/ns#",
+    "foaf":    "http://xmlns.com/foaf/0.1/",
+    "schema":  "http://schema.org/",
+    "cc":      "http://creativecommons.org/ns#",
+
+    "uid":     "@id",
+    "type":    "@type",
+
+    "Policy":           "odrl:Policy",
+    "Rule":             "odrl:Rule",
+    "profile":          {"@type": "@id", "@id": "odrl:profile"},
+
+    "inheritFrom":      {"@type": "@id", "@id": "odrl:inheritFrom"},
+
+    "ConflictTerm":     "odrl:ConflictTerm",
+    "conflict":         {"@type": "@vocab", "@id": "odrl:conflict"},
+    "perm":             "odrl:perm",
+    "prohibit":         "odrl:prohibit",
+    "invalid":          "odrl:invalid",
+
+    "Agreement":           "odrl:Agreement",
+    "Assertion":           "odrl:Assertion",
+    "Offer":               "odrl:Offer",
+    "Privacy":             "odrl:Privacy",
+    "Request":             "odrl:Request",
+    "Set":                 "odrl:Set",
+    "Ticket":              "odrl:Ticket",
+
+    "Asset":               "odrl:Asset",
+    "AssetCollection":     "odrl:AssetCollection",
+    "relation":            {"@type": "@id", "@id": "odrl:relation"},
+    "hasPolicy":           {"@type": "@id", "@id": "odrl:hasPolicy"},
+
+    "target":             {"@type": "@id", "@id": "odrl:target"},
+    "output":             {"@type": "@id", "@id": "odrl:output"},
+
+    "partOf":            {"@type": "@id", "@id": "odrl:partOf"},
+	"source":            {"@type": "@id", "@id": "odrl:source"},
+
+    "Party":              "odrl:Party",
+    "PartyCollection":    "odrl:PartyCollection",
+    "function":           {"@type": "@vocab", "@id": "odrl:function"},
+    "PartyScope":         "odrl:PartyScope",
+
+    "assignee":             {"@type": "@id", "@id": "odrl:assignee"},
+    "assigner":             {"@type": "@id", "@id": "odrl:assigner"},
+	"assigneeOf":           {"@type": "@id", "@id": "odrl:assigneeOf"},
+    "assignerOf":           {"@type": "@id", "@id": "odrl:assignerOf"},
+    "attributedParty":      {"@type": "@id", "@id": "odrl:attributedParty"},
+	"attributingParty":     {"@type": "@id", "@id": "odrl:attributingParty"},
+    "compensatedParty":     {"@type": "@id", "@id": "odrl:compensatedParty"},
+    "compensatingParty":    {"@type": "@id", "@id": "odrl:compensatingParty"},
+    "consentingParty":      {"@type": "@id", "@id": "odrl:consentingParty"},
+	"consentedParty":       {"@type": "@id", "@id": "odrl:consentedParty"},
+    "informedParty":        {"@type": "@id", "@id": "odrl:informedParty"},
+	"informingParty":       {"@type": "@id", "@id": "odrl:informingParty"},
+    "trackingParty":        {"@type": "@id", "@id": "odrl:trackingParty"},
+	"trackedParty":         {"@type": "@id", "@id": "odrl:trackedParty"},
+	"contractingParty":     {"@type": "@id", "@id": "odrl:contractingParty"},
+	"contractedParty":      {"@type": "@id", "@id": "odrl:contractedParty"},
+
+    "Action":                "odrl:Action",
+    "action":                {"@type": "@vocab", "@id": "odrl:action"},
+    "includedIn":            {"@type": "@id", "@id": "odrl:includedIn"},
+    "implies":               {"@type": "@id", "@id": "odrl:implies"},
+
+    "Permission":            "odrl:Permission",
+    "permission":            {"@type": "@id", "@id": "odrl:permission"},
+
+    "Prohibition":           "odrl:Prohibition",
+    "prohibition":           {"@type": "@id", "@id": "odrl:prohibition"},
+
+    "obligation":            {"@type": "@id", "@id": "odrl:obligation"},
+
+    "use":                   "odrl:use",
+    "grantUse":              "odrl:grantUse",
+    "aggregate":             "odrl:aggregate",
+    "annotate":              "odrl:annotate",
+    "anonymize":             "odrl:anonymize",
+    "archive":               "odrl:archive",
+    "concurrentUse":         "odrl:concurrentUse",
+    "derive":                "odrl:derive",
+    "digitize":              "odrl:digitize",
+    "display":               "odrl:display",
+    "distribute":            "odrl:distribute",
+    "execute":               "odrl:execute",
+    "extract":               "odrl:extract",
+    "give":                  "odrl:give",
+    "index":                 "odrl:index",
+    "install":               "odrl:install",
+    "modify":                "odrl:modify",
+    "move":                  "odrl:move",
+    "play":                  "odrl:play",
+    "present":               "odrl:present",
+    "print":                 "odrl:print",
+    "read":                  "odrl:read",
+    "reproduce":             "odrl:reproduce",
+    "sell":                  "odrl:sell",
+    "stream":                "odrl:stream",
+    "textToSpeech":          "odrl:textToSpeech",
+    "transfer":              "odrl:transfer",
+    "transform":             "odrl:transform",
+    "translate":             "odrl:translate",
+
+    "Duty":                 "odrl:Duty",
+    "duty":                 {"@type": "@id", "@id": "odrl:duty"},
+    "consequence":          {"@type": "@id", "@id": "odrl:consequence"},
+	"remedy":               {"@type": "@id", "@id": "odrl:remedy"},
+
+    "acceptTracking":       "odrl:acceptTracking",
+    "attribute":            "odrl:attribute",
+    "compensate":           "odrl:compensate",
+    "delete":               "odrl:delete",
+    "ensureExclusivity":    "odrl:ensureExclusivity",
+    "include":              "odrl:include",
+    "inform":               "odrl:inform",
+    "nextPolicy":           "odrl:nextPolicy",
+    "obtainConsent":        "odrl:obtainConsent",
+    "reviewPolicy":         "odrl:reviewPolicy",
+    "uninstall":            "odrl:uninstall",
+    "watermark":            "odrl:watermark",
+
+    "Constraint":           "odrl:Constraint",
+	"LogicalConstraint":    "odrl:LogicalConstraint",
+    "constraint":           {"@type": "@id", "@id": "odrl:constraint"},
+	"refinement":           {"@type": "@id", "@id": "odrl:refinement"},
+    "Operator":             "odrl:Operator",
+    "operator":             {"@type": "@vocab", "@id": "odrl:operator"},
+    "RightOperand":         "odrl:RightOperand",
+    "rightOperand":         "odrl:rightOperand",
+    "rightOperandReference":{"@type": "xsd:anyURI", "@id": "odrl:rightOperandReference"},
+    "LeftOperand":          "odrl:LeftOperand",
+    "leftOperand":          {"@type": "@vocab", "@id": "odrl:leftOperand"},
+    "unit":                 "odrl:unit",
+    "dataType":             {"@type": "xsd:anyType", "@id": "odrl:datatype"},
+    "status":               "odrl:status",
+
+    "absolutePosition":        "odrl:absolutePosition",
+    "absoluteSpatialPosition": "odrl:absoluteSpatialPosition",
+    "absoluteTemporalPosition":"odrl:absoluteTemporalPosition",
+    "absoluteSize":            "odrl:absoluteSize",
+    "count":                   "odrl:count",
+    "dateTime":                "odrl:dateTime",
+    "delayPeriod":             "odrl:delayPeriod",
+    "deliveryChannel":         "odrl:deliveryChannel",
+    "elapsedTime":             "odrl:elapsedTime",
+    "event":                   "odrl:event",
+    "fileFormat":              "odrl:fileFormat",
+    "industry":                "odrl:industry:",
+    "language":                "odrl:language",
+    "media":                   "odrl:media",
+    "meteredTime":             "odrl:meteredTime",
+    "payAmount":               "odrl:payAmount",
+    "percentage":              "odrl:percentage",
+    "product":                 "odrl:product",
+    "purpose":                 "odrl:purpose",
+    "recipient":               "odrl:recipient",
+    "relativePosition":        "odrl:relativePosition",
+    "relativeSpatialPosition": "odrl:relativeSpatialPosition",
+    "relativeTemporalPosition":"odrl:relativeTemporalPosition",
+    "relativeSize":            "odrl:relativeSize",
+    "resolution":              "odrl:resolution",
+    "spatial":                 "odrl:spatial",
+    "spatialCoordinates":      "odrl:spatialCoordinates",
+    "systemDevice":            "odrl:systemDevice",
+    "timeInterval":            "odrl:timeInterval",
+    "unitOfCount":             "odrl:unitOfCount",
+    "version":                 "odrl:version",
+    "virtualLocation":         "odrl:virtualLocation",
+
+    "eq":                   "odrl:eq",
+    "gt":                   "odrl:gt",
+    "gteq":                 "odrl:gteq",
+    "lt":                   "odrl:lt",
+    "lteq":                 "odrl:lteq",
+    "neq":                  "odrl:neg",
+    "isA":                  "odrl:isA",
+    "hasPart":              "odrl:hasPart",
+    "isPartOf":             "odrl:isPartOf",
+    "isAllOf":              "odrl:isAllOf",
+    "isAnyOf":              "odrl:isAnyOf",
+    "isNoneOf":             "odrl:isNoneOf",
+    "or":                   "odrl:or",
+    "xone":                 "odrl:xone",
+    "and":                  "odrl:and",
+    "andSequence":          "odrl:andSequence",
+
+    "policyUsage":                "odrl:policyUsage"
+
+    }
+}
\ No newline at end of file
diff --git a/vccontext.jsonld b/vccontext.jsonld
new file mode 100644
index 00000000000..2e0ca6bdfdb
--- /dev/null
+++ b/vccontext.jsonld
@@ -0,0 +1,9 @@
+{
+   "context" : [
+    "https://www.w3.org/2018/credentials/v1",
+    "${mosip.api.internal.url}/mosipvc/mosip-context.json",
+    {
+       "sec": "https://w3id.org/security#"
+    }
+]
+}
\ No newline at end of file

From bd8df7f953f79ebc64899882c912c957c8105966 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com>
Date: Thu, 10 Feb 2022 12:36:15 +0530
Subject: [PATCH 0636/1358] Update admin-default.properties

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index b2f9c0e3d0f..e0b60c709e7 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -201,9 +201,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client

From a3522a22dc982c0114b815743fdb9b4ff73ec25b Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 10 Feb 2022 13:11:22 +0530
Subject: [PATCH 0637/1358] removed wrong commits.

---
 admin-default.properties                  | 5 -----
 registration-processor-default.properties | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index e0b60c709e7..06d61de2d42 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -271,9 +271,4 @@ mosip.admin.packetupload.packetsync.email=email
 mosip.admin.packetupload.packetsync.phone=phone
 
 mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\\W|\\w]{1,100}$)
-
-<<<<<<< Updated upstream
-# Mapping identity json to map with the applicant id json
-=======
->>>>>>> Stashed changes
 registration.processor.identityjson=identity-mapping.json
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index e4340a2a957..2f7979377ce 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -952,12 +952,5 @@ mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,RE
 mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-reg-client
-
-<<<<<<< Updated upstream
-=======
-
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
-
->>>>>>> Stashed changes
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face

From d41e65206d60cc9202de0667817805e35957a6d2 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 10 Feb 2022 13:21:49 +0530
Subject: [PATCH 0638/1358] removed wrong commits.

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2f7979377ce..9e50a94d2f3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -142,7 +142,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 
 # Status for matched records in demo dedupe stage.
 # 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
-registration.processor.demodedupe.manual.adjudication.status=PENDING
+registration.processor.demodedupe.manual.adjudication.status=REJECTED
 
 # Validate hostlisted devices
 DEVICEHOTLIST=${mosip.admin.hotlist.url}/v1/hotlist/status
@@ -167,10 +167,10 @@ registration.processor.max.retry=10
 mosip.registration.processor.registration.status.id=mosip.registration.status
 mosip.registration.processor.registration.sync.id=mosip.registration.sync
 mosip.registration.processor.registration.transaction.id=mosip.registration.transaction
+mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.registration.status.version=1.0
 mosip.registration.processor.transaction.version=1.0
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
-mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.lostrid.version=1.0
 
 mosip.registration.processor.registration.external.status.id=mosip.registration.external.status

From 2920bda3b80b306f1ac1b6e837ae3cf25471deba Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 11 Feb 2022 15:40:12 +0530
Subject: [PATCH 0639/1358] Updated mpartner-default-print secret

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index f0b4d8e7d6b..add74841f4e 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -107,7 +107,7 @@ mosip.print.prependThumbprint=true
 
 # websub authentication
 mosip.iam.adapter.clientid=mpartner-default-print
-mosip.iam.adapter.clientsecret=${mosip.mpartner.default.print.secret}
+mosip.iam.adapter.clientsecret=${mpartner.default.print.secret}
 mosip.iam.adapter.appid=print
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager

From 95e65ff47ec5b2936391991aa9b09c9c3b2c3f2c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Feb 2022 16:24:42 +0530
Subject: [PATCH 0640/1358] Updated keycloak host to external host

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 06d61de2d42..4ee8417538a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt

From 8a8be9c55093c0d9bf4763d3472563355176878c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 11 Feb 2022 16:38:07 +0530
Subject: [PATCH 0641/1358] Revert "Updated keycloak host to external host"

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4ee8417538a..06d61de2d42 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt

From 8aa18ce779809edf3f85b13ab7ce7e4ea5a3f404 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Feb 2022 16:39:54 +0530
Subject: [PATCH 0642/1358] Updated keycloak host to internal host

For testing purpose
---
 admin-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 06d61de2d42..e6f3658f5e9 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -180,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -201,9 +201,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client

From b68acedb0b184dfe4136b596569c2d3a8eaebb0a Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 11 Feb 2022 16:51:08 +0530
Subject: [PATCH 0643/1358] Revert "Updated keycloak host to internal host"

---
 admin-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index e6f3658f5e9..06d61de2d42 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -180,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -201,9 +201,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client

From 1392a1a39f33c89c529f9cd15e8250a9322a2614 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Feb 2022 18:04:55 +0530
Subject: [PATCH 0644/1358] Updated keycloak host to external host

For testing purpose
---
 admin-default.properties  | 4 ++--
 kernel-default.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 06d61de2d42..4ee8417538a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
diff --git a/kernel-default.properties b/kernel-default.properties
index c537225d0d9..c9e97f863f7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -214,7 +214,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.internal.url}
+mosip.iam.base.url=${keycloak.external.url}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip

From 1e888161b3dfe9d8e48563d51980a6922c41d597 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 11 Feb 2022 18:15:56 +0530
Subject: [PATCH 0645/1358] Revert "Updated keycloak host to external host"

---
 admin-default.properties  | 4 ++--
 kernel-default.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4ee8417538a..06d61de2d42 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -216,7 +216,7 @@ KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/cli
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=1440
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
diff --git a/kernel-default.properties b/kernel-default.properties
index c9e97f863f7..c537225d0d9 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -214,7 +214,7 @@ ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:$
 ridgenerator_database_password=${db.dbuser.password}
 
 ## Keycloak properties
-mosip.iam.base.url=${keycloak.external.url}
+mosip.iam.base.url=${keycloak.internal.url}
 mosip.iam.base-url=${mosip.iam.base.url}
 mosip.iam.admin-realm-id=admin
 mosip.iam.default.realm-id=mosip

From 080ef70cf1a824f0aea454596729fdb235ab3289 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 13 Feb 2022 07:16:03 +0530
Subject: [PATCH 0646/1358] Email from address updated.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index c537225d0d9..a24fa16ed08 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -49,7 +49,7 @@ mosip.kernel.sms.sender=sender
 mosip.kernel.sms.unicode=unicode
 
 ## Email notification
-mosip.kernel.notification.email.from=info@mosip.io
+mosip.kernel.notification.email.from=do-not-reply@mosip.io
 spring.mail.host=${email.smtp.host}
 spring.mail.username=${email.smtp.username}
 spring.mail.password=${email.smtp.secret}

From a0017154c078eb07e86c53f539173a43f1a35aa6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 17 Feb 2022 14:28:45 +0530
Subject: [PATCH 0647/1358] Keycloak urls set.

---
 admin-default.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 06d61de2d42..8871d1475ff 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -180,8 +180,8 @@ mosip.admin-services.open-id.clientsecret=${mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-mosip.admin-services.open-id.token_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
 mosip.ui.spec.default.domain=registration-client
@@ -201,9 +201,9 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
@@ -259,7 +259,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt

From 084f251caf8e8dadb3bfb7a20ee2de5b30e9c69b Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 17 Feb 2022 15:00:11 +0530
Subject: [PATCH 0648/1358] updated admin auth url to external.

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 8871d1475ff..093b619334c 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -180,7 +180,7 @@ mosip.admin-services.open-id.clientsecret=${mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 
@@ -201,7 +201,7 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 

From 5593be9d2eb6ba47709efa014a6ba359acab1ef2 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 17 Feb 2022 15:02:42 +0530
Subject: [PATCH 0649/1358] updated admin auth url to external.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index a24fa16ed08..fff94c508b3 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -233,7 +233,7 @@ keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
-mosip.iam.authorization_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code

From 36feec51d90489253d6e460a57c0b3c4c4b07c9f Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 17 Feb 2022 15:11:13 +0530
Subject: [PATCH 0650/1358] reverted open-id.authorization_endpoint url back to
 internal.

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 093b619334c..a80e39606e9 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -180,7 +180,7 @@ mosip.admin-services.open-id.clientsecret=${mosip.admin.client.secret}
 mosip.admin-services.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 mosip.admin-services.open-id.login_flow.scope=email
 mosip.admin-services.open-id.login_flow.response_type=code
-mosip.admin-services.open-id.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+mosip.admin-services.open-id.authorization_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 mosip.admin-services.open-id.token_endpoint=${keycloak.internal.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin-services.cookie.security=true
 

From 2b67d758b28c7059007b6129c43701bd5b9422f0 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 17 Feb 2022 15:40:18 +0530
Subject: [PATCH 0651/1358] updated auth.server.admin.issuer.uri to external
 for admin-ui redirect.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 62a3a6bbf58..dcb1898d1da 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -192,7 +192,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 

From 6b3df6208594e82045a5862ab202d877b1c86cdd Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 17 Feb 2022 16:23:12 +0530
Subject: [PATCH 0652/1358] updated client sercret placeholder

---
 id-authentication-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index e1ccf4fdb0a..f828ca28444 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -8,6 +8,7 @@
 # ida.websub.ca.certificate.callback.secret
 # ida.websub.hotlist.callback.secret
 # mosip.kernel.tokenid.uin.salt
+# mpartner.default.auth.secret
 # mosip.kernel.tokenid.partnercode.salt
 # softhsm.ida.pin
 # ida.websub.masterdata.templates.callback.secret
@@ -25,7 +26,7 @@ ida-auth-partner-id=mpartner-default-auth
 #Note: since the Online verification Partner ID is used as client ID, for a different IDA instance, this needs to be changed accordingly
 #and also to be added to the 'auth.server.admin.allowed.audience' property of all dependency modules.
 mosip.ida.auth.clientId=${ida-auth-partner-id}
-mosip.ida.auth.secretKey=${mosip.mpartner.default.auth.secret}
+mosip.ida.auth.secretKey=${mpartner.default.auth.secret}
  
 mosip.ida.auth.appId=ida
 

From 81ad8fdd5859ff1ed8f9890c343d12b67f509cae Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 17 Feb 2022 16:38:24 +0530
Subject: [PATCH 0653/1358] Updated comments to ui based application redirect
 properties.

---
 admin-default.properties       | 4 +++-
 application-default.properties | 2 ++
 kernel-default.properties      | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index a80e39606e9..dfb893a9fde 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -201,6 +201,8 @@ mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
+
+#This is the endpoint use by ui(browser) based applications to redirect to open-id system. This URL should be reachable through the browser.
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
@@ -259,7 +261,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
diff --git a/application-default.properties b/application-default.properties
index dcb1898d1da..1f2929004e2 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -192,6 +192,8 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
+
+#This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
diff --git a/kernel-default.properties b/kernel-default.properties
index fff94c508b3..cccb6d744cf 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -233,7 +233,9 @@ keycloak.public-client=true
 keycloak.use-resource-role-mappings=true
 keycloak.verify-token-audience=true
 
+#This is the endpoint use by ui(browser) based applications to redirect to open-id system. This URL should be reachable through the browser.
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+
 mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code

From 6da510e59129f62b977974cc561e0bd314417a3d Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 18 Feb 2022 11:58:59 +0530
Subject: [PATCH 0654/1358] Updated ida properties for keycloak token.

---
 id-authentication-default.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f828ca28444..404eea58541 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -547,6 +547,12 @@ ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authenticatio
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
 
+
+auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.issuer.uri=${keycloak.internal.host}/auth/realms/
+auth-token-generator.rest.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
+
 #Fixed delay in which cleanup will be done in Hours
 mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 

From 765d30f55e874f84e15abbeb7a5d6e5012902c76 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 18 Feb 2022 12:03:30 +0530
Subject: [PATCH 0655/1358] updated keycloak url for ida

---
 id-authentication-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 404eea58541..94fc512c819 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -549,9 +549,9 @@ mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normali
 
 
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.internal.host}/auth/realms/
-auth-token-generator.rest.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.internal.host}/auth/realms/mosip
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 #Fixed delay in which cleanup will be done in Hours
 mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24

From 69aea6d37ddbcd22fa95b2911f56a9af32f5932a Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 18 Feb 2022 12:03:44 +0530
Subject: [PATCH 0656/1358] updated keycloak url for ida


From cd741df5790c45875ed31d8e3ffd94646b6d690e Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 18 Feb 2022 13:20:15 +0530
Subject: [PATCH 0657/1358] Updated ida properties for keycloak token issuerurl

---
 id-authentication-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 94fc512c819..fa395615167 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -549,9 +549,8 @@ mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normali
 
 
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.external.url}/auth/realms/mosip
 
 #Fixed delay in which cleanup will be done in Hours
 mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24

From cf05d414be6f60cbdaa91ed491505aeff1cc4869 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 18 Feb 2022 14:08:30 +0530
Subject: [PATCH 0658/1358] Updated ida properties for keycloak token issuerurl

---
 id-authentication-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index fa395615167..d9e4677fc32 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -548,9 +548,10 @@ mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
 
 
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 #Fixed delay in which cleanup will be done in Hours
 mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24

From e95605eac421fdbcaa798e103dc931bafcebb4b3 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 18 Feb 2022 15:53:34 +0530
Subject: [PATCH 0659/1358] updated auth.server.admin.issuer.uri to keyclaok
 external url

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d9e4677fc32..0ff98b69a44 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -548,7 +548,7 @@ mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
 
 
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip

From 27718c96e74d6b5b0eea1797d1e78bc1a59f6ea2 Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Fri, 18 Feb 2022 16:33:36 +0530
Subject: [PATCH 0660/1358] Updated ida properties for keycloak token issuerurl

---
 id-authentication-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 0ff98b69a44..c457bf53ef2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -547,11 +547,12 @@ ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authenticatio
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
 
-
+#This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+
+#This url should be reachable internally to issue token.
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
-mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 #Fixed delay in which cleanup will be done in Hours
 mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24

From 9eee48ec52eaa5518be676df378d90d38a245d2b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 19 Feb 2022 06:20:56 +0530
Subject: [PATCH 0661/1358] Swagger param specified.

---
 kernel-default.properties | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index cccb6d744cf..54dd3e15dd3 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -19,6 +19,7 @@
 # email.smtp.secret
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
+# mosip.api.internal.url
 
 softhsm.kernel.pin=${softhsm.security.pin}
 
@@ -422,10 +423,8 @@ scheduling.job.cron=0 0 2 * * ?
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340
 
 # masterdata swagger openApi
-#openapi.masterdata.servers[0].url=${mosip.kernel.masterdata.url}/v1/masterdata
-#openapi.masterdata.servers[0].description=Admin Masterdata url
-#openapi.service.servers[0].url=https://${mosip.api.internal.host}/${server.servlet.context-path:${server.servlet.path:}}
-#openapi.service.servers[0].description=For Swagger
+openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
+openapi.service.servers[0].description=For Swagger
 
 #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

From 0817c3815d271999e045af6fe42e1c4d26e123a0 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 19 Feb 2022 09:07:00 +0530
Subject: [PATCH 0662/1358] Swagger params updated.

---
 application-default.properties | 4 ++--
 kernel-default.properties      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 1f2929004e2..c208285bf26 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -414,7 +414,7 @@ mosip.notification.timezone=GMT+05:30
 mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}[a-zA-Z0-9]$
 
 ## Swagger
-#openapi.service.servers[0].url=https://${mosip.api.internal.host}${server.servlet.context-path:${server.servlet.pa    th:}}
-#openapi.service.servers[0].description=For Swagger
+openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
+openapi.service.servers[0].description=For Swagger
 
 mosip.auth.filter_disable=false
diff --git a/kernel-default.properties b/kernel-default.properties
index 54dd3e15dd3..c0622be46ea 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -423,8 +423,8 @@ scheduling.job.cron=0 0 2 * * ?
 mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340
 
 # masterdata swagger openApi
-openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
-openapi.service.servers[0].description=For Swagger
+#openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
+#openapi.service.servers[0].description=For Swagger
 
 #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

From 12cf51e3412454925593bfb5491784fe7d0c5d87 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 19 Feb 2022 09:13:10 +0530
Subject: [PATCH 0663/1358] Minor

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index c208285bf26..bb82c07a460 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -414,7 +414,7 @@ mosip.notification.timezone=GMT+05:30
 mosip.centertypecode.validate.regex=^[a-zA-Z0-9]([_-](?![_-])|[a-zA-Z0-9]){0,34}[a-zA-Z0-9]$
 
 ## Swagger
-openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
+openapi.service.servers[0].url=${mosip.api.internal.url}${server.servlet.context-path:${server.servlet.path:}}
 openapi.service.servers[0].description=For Swagger
 
 mosip.auth.filter_disable=false

From 509f12fb07cd9a74a829844781cec26322a52cf2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 21 Feb 2022 18:23:09 +0530
Subject: [PATCH 0664/1358] Allowed audience updated.

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 12e3d11c1b2..6b0ac95fa56 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -151,7 +151,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 

From 411e6fe582f3b566bde320476d4115f6b98c6d46 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <mandeep.kumar@technoforte.co.in>
Date: Tue, 22 Feb 2022 09:38:38 +0530
Subject: [PATCH 0665/1358] Update data-share-default.properties

---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index ed6abbd9c20..3fc18254cda 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -38,7 +38,7 @@ mosip.data.share.includeCertificate=false
 mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=false
-
+mosip.role.durian.postcreatepolicyidsubscriberid=CREATE_SHARE
 auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client
 
 mosip.auth.filter_disable=false

From d88b127f8fd63d2d42699b93a35c4681b0e7ca4e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Feb 2022 15:14:48 +0530
Subject: [PATCH 0666/1358] Clamav updated for testing.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index bb82c07a460..49949e3ab8d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -258,8 +258,8 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav.clamav
-mosip.kernel.virus-scanner.port=80
+mosip.kernel.virus-scanner.host=clamav.clamav2
+mosip.kernel.virus-scanner.port=3310
 
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara

From a237dd4f0292a96cbcb01f902935e1ee326345ea Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Feb 2022 15:21:25 +0530
Subject: [PATCH 0667/1358] Clamav updated for testing

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 9e50a94d2f3..7181421d41a 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -235,8 +235,8 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav
-mosip.kernel.virus-scanner.port=80
+mosip.kernel.virus-scanner.host=clamav.clamav2
+mosip.kernel.virus-scanner.port=3310
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
 mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl

From 98846fccea04e9c595998c131a3a9ab1acf072c8 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Feb 2022 15:39:39 +0530
Subject: [PATCH 0668/1358] [MOSIP-20285] Clamv prop updated based on latest
 method of installation.

---
 application-default.properties            | 2 +-
 registration-processor-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 49949e3ab8d..859823ccc4d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -258,7 +258,7 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav.clamav2
+mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=3310
 
 ## Transliteration
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 7181421d41a..28e6537562d 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -235,7 +235,7 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav.clamav2
+mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=3310
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10

From 63d7ebab76ca0832fb84d125229f8cdc5e0ac26b Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Thu, 24 Feb 2022 13:33:23 +0530
Subject: [PATCH 0669/1358] updated logging level.

---
 application-default.properties | 4 ++--
 print-default.properties       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 859823ccc4d..0bdeb9fe3b1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -374,10 +374,10 @@ mosip.stage.environment=Developer
 
 ## Log level
 
-logging.level.root=WARN
+logging.level.root=DEBUG
 logging.level.io.mosip=DEBUG
 logging.level.io.vertx=DEBUG
-logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
+logging.level.io.mosip.kernel.auth.defaultadapter.filter=DEBUG
 
 ## Tomcat access logs
 server.tomcat.accesslog.enabled=true
diff --git a/print-default.properties b/print-default.properties
index add74841f4e..c67037da64d 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -83,9 +83,9 @@ mosip.kernel.pin.length=6
 mosip.kernel.tokenid.length=36
 
 ## log level
-logging.level.root=WARN
-logging.level.io.mosip=INFO
-logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
+logging.level.root=DEBUG
+logging.level.io.mosip=DEBUG
+logging.level.io.mosip.kernel.auth.defaultadapter.filter=DEBUG
 
 ## tomcat access logs
 server.tomcat.accesslog.enabled=true

From f37ea7e1c565683d152deb26712d6422fd3f81b3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 24 Feb 2022 15:18:46 +0530
Subject: [PATCH 0670/1358] Clamav updated for testing.

---
 application-default.properties            | 2 +-
 registration-processor-default.properties | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 859823ccc4d..49949e3ab8d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -258,7 +258,7 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.host=clamav.clamav2
 mosip.kernel.virus-scanner.port=3310
 
 ## Transliteration
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 28e6537562d..1b29817f1f0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -235,8 +235,6 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav.clamav
-mosip.kernel.virus-scanner.port=3310
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
 mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl

From 20f1b8789d1cc127d0844cff239a5b983494de8f Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 24 Feb 2022 15:26:45 +0530
Subject: [PATCH 0671/1358] Clamav reverted back.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index ea7b25279fc..0bdeb9fe3b1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -258,7 +258,7 @@ mosip.kernel.licensekey.permissions=OTP Trigger,OTP Authentication,Demo Authenti
 
 ## Virus scanner
 # Here we specify the Kubernetes service name if clamav runs inside cluster
-mosip.kernel.virus-scanner.host=clamav.clamav2
+mosip.kernel.virus-scanner.host=clamav.clamav
 mosip.kernel.virus-scanner.port=3310
 
 ## Transliteration

From 9a4645e8b559993c211c2a858b02627f1fa47c16 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 25 Feb 2022 16:51:42 +0530
Subject: [PATCH 0672/1358] Property updated as per
 https://github.com/mosip/mosip-openid-bridge/pull/88

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 0bdeb9fe3b1..8659d4e2843 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -194,6 +194,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
 
 #This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
+auth.server.admin.issuer.internal.uri=${keycloak.internal.url}
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip

From 1eac268fcd064386ebadb33771f15ef0af5e3b8a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 25 Feb 2022 18:19:56 +0530
Subject: [PATCH 0673/1358] Keycloak url corrected.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 8659d4e2843..a8738e7e4a6 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -194,7 +194,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
 
 #This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
-auth.server.admin.issuer.internal.uri=${keycloak.internal.url}
+auth.server.admin.issuer.internal.uri=${keycloak.internal.url}/
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip

From cc54e8e19b262b8d82285cdc8b506586f96c53dc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 25 Feb 2022 18:33:25 +0530
Subject: [PATCH 0674/1358] DEBUG -> INFO.

---
 application-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index a8738e7e4a6..29924f4443b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -375,10 +375,10 @@ mosip.stage.environment=Developer
 
 ## Log level
 
-logging.level.root=DEBUG
-logging.level.io.mosip=DEBUG
-logging.level.io.vertx=DEBUG
-logging.level.io.mosip.kernel.auth.defaultadapter.filter=DEBUG
+logging.level.root=INFO
+logging.level.io.mosip=INFO
+logging.level.io.vertx=INFO
+logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## Tomcat access logs
 server.tomcat.accesslog.enabled=true

From ce94aff10bab7db9b5fe490b8060b553ed051d49 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 25 Feb 2022 18:35:53 +0530
Subject: [PATCH 0675/1358] Keycloak prop corrected.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 29924f4443b..c889114c193 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -194,7 +194,7 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
 
 #This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
-auth.server.admin.issuer.internal.uri=${keycloak.internal.url}/
+auth.server.admin.issuer.internal.uri=${keycloak.internal.url}/auth/realms/
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip

From 87c3a5964f4010ddc655906e977883974d5c0428 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 28 Feb 2022 11:58:17 +0530
Subject: [PATCH 0676/1358] Appid prop of packet manager.

---
 packet-manager-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 5baa31a7d4a..cf9d10e2286 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -30,7 +30,7 @@ object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
 # IAM adapter
-mosip.iam.adapter.appid=regproc
+mosip.iam.adapter.appid.packet-manager=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret={mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip

From 8d999d4537c2c5adf42e91c4f2dd0fb26dba9113 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 28 Feb 2022 12:11:31 +0530
Subject: [PATCH 0677/1358] Reverted previous change.

---
 packet-manager-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index cf9d10e2286..5baa31a7d4a 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -30,7 +30,7 @@ object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
 # IAM adapter
-mosip.iam.adapter.appid.packet-manager=regproc
+mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client
 mosip.iam.adapter.clientsecret={mosip.mosip.regproc.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip

From e8e8db6d9566bc6023fd569dace3e510bd4311fc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 28 Feb 2022 12:25:40 +0530
Subject: [PATCH 0678/1358] Client secret property corrected.

---
 packet-manager-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 5baa31a7d4a..7939858c75a 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -32,5 +32,5 @@ object.store.s3.readlimit=10000000
 # IAM adapter
 mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret={mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.clientsecret={mosip.regproc.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip

From 470f23123ae81b92303236876b2af20d6829e603 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Mon, 28 Feb 2022 12:32:42 +0530
Subject: [PATCH 0679/1358] Secret prop corrected.

---
 packet-manager-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 7939858c75a..59ac07098e9 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -32,5 +32,5 @@ object.store.s3.readlimit=10000000
 # IAM adapter
 mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret={mosip.regproc.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.regproc.client.secret}
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip

From 4435d6344758b4bc1db7dd150396b0ad6abf7085 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 2 Mar 2022 09:23:10 +0530
Subject: [PATCH 0680/1358] MOSIP file server urls corrected.

---
 application-default.properties        |  1 +
 credential-service-default.properties | 14 ++++++++++----
 id-repository-default.properties      |  2 +-
 partner-management-default.properties |  1 -
 vccontext.jsonld                      |  4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index c889114c193..07c922173b1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -41,6 +41,7 @@ mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
+mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
diff --git a/credential-service-default.properties b/credential-service-default.properties
index 0c19724fe81..896a823e804 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -1,3 +1,9 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+#   mosip.creser.client.secret 
+#   
+
 # IDRepo credential service authentication details
 mosip.idrepo.credential.auth.client-id=mosip-creser-client
 mosip.idrepo.credential.auth.secret-key=${mosip.creser.client.secret}
@@ -10,14 +16,14 @@ mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id
 
 mosip.auth.filter_disable=false
 
-mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.api.internal.url}/mosipvc/mosip-context.json" : "mosip-context.json"}
+mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.file.server.url}/mosipvc/mosip-context.json" : "mosip-context.json"}
 mosip.credential.service.vercred.context.uri=vccontext.jsonld
-mosip.credential.service.vercred.id.url=${mosip.api.internal.url}/credentials/
-mosip.credential.service.vercred.issuer.url=${mosip.api.internal.url}/mosipvc/controller.json
+mosip.credential.service.vercred.id.url=${mosip.idrepo.credential.service.url}/credentials/
+mosip.credential.service.vercred.issuer.url=${mosip.file.server.url}/mosipvc/controller.json
 mosip.credential.service.vercred.types=VerifiableCredential,MOSIPVerifiableCredential
 mosip.credential.service.vercred.proof.purpose=assertionMethod
 mosip.credential.service.vercred.proof.type=RsaSignature2018
-mosip.credential.service.vercred.proof.verificationmethod=${mosip.api.internal.url}/mosipvc/public-key.json
+mosip.credential.service.vercred.proof.verificationmethod=${mosip.file.server.url}/mosipvc/public-key.json
 
 KEYMANAGER_VERCRED_SIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwsSign
 credentialType.formatter.VERCRED=VerCredProvider
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ce56fb91df5..16b7aa871f3 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -197,7 +197,7 @@ mosip.idrepo.credential-status-update-job.fixed-delay-in-ms=10000
 # the credential request with below partner id to issue credential to new IDA partners.
 idrepo-dummy-online-verification-partner-id=MOVP
 
-mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{uin}
+mosip.idrepo.retrieve-by-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{uin}
 mosip.idrepo.retrieve-by-uin.rest.httpMethod=GET
 mosip.idrepo.retrieve-by-uin.rest.headers.mediaType=application/json
 mosip.idrepo.retrieve-by-uin.rest.timeout=100
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 6b0ac95fa56..6fbca0f5b48 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -16,7 +16,6 @@ mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
 
-
 ## Auth device
 mosip.authdevice.database.hostname=postgres
 mosip.authdevice.database.port=80
diff --git a/vccontext.jsonld b/vccontext.jsonld
index 2e0ca6bdfdb..ff878ef02df 100644
--- a/vccontext.jsonld
+++ b/vccontext.jsonld
@@ -1,9 +1,9 @@
 {
    "context" : [
     "https://www.w3.org/2018/credentials/v1",
-    "${mosip.api.internal.url}/mosipvc/mosip-context.json",
+    "${mosip.file.server.url}/mosipvc/mosip-context.json",
     {
        "sec": "https://w3id.org/security#"
     }
 ]
-}
\ No newline at end of file
+}

From 3c77742021c59444ca42d879408ed0566cfff213 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 2 Mar 2022 09:26:42 +0530
Subject: [PATCH 0681/1358] Idrepo urls corrected.

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index c457bf53ef2..528d1ea8e4a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -167,13 +167,13 @@ sms-notification.rest.headers.mediaType=${mosip.ida.request.mediaType}
 sms-notification.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (with type specified as query param) - Used in Internal Auth based on User ID
-rid-uin.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{rid}?type={type}
+rid-uin.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}?type={type}
 rid-uin.rest.httpMethod=GET
 rid-uin.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin.rest.timeout=${mosip.ida.request.timeout.secs}
 
 ## Get Identity Data for RID (without type specified) - Used in Internal Auth based on User ID
-rid-uin-auth.rest.uri=${mosip.api.internal.url}/idrepository/v1/identity/idvid/{rid}
+rid-uin-auth.rest.uri=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{rid}
 rid-uin-auth.rest.httpMethod=GET
 rid-uin-auth.rest.headers.mediaType=${mosip.ida.request.mediaType}
 rid-uin-auth.rest.timeout=${mosip.ida.request.timeout.secs}

From 105722592fb6f012a28e232ce088d07ae2b82507 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 2 Mar 2022 13:37:37 +0530
Subject: [PATCH 0682/1358] uncommented
 mosip.kernel.keymanager.keystore.keyreference.enable.cache to false

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index c457bf53ef2..9d0427b156e 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -499,7 +499,7 @@ zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
 ## TODO: For testing. Revert in production
-#mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 ## Admin
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country

From a12df5479fc4295f04913f6acd60979ca13bae6d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 2 Mar 2022 13:46:44 +0530
Subject: [PATCH 0683/1358] Unused property removed.

---
 syncdata-default.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index dcf79ec8c0d..f7c4abcb431 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -346,9 +346,6 @@ datastores=ldap_1_DS,db_1_DS,db_2_DS
 ## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
-## List of keys to auto generate.
-mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS
-
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 

From 63d4a983b65f32bf2f299f3b005a42d28176bfc1 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 2 Mar 2022 19:24:52 +0530
Subject: [PATCH 0684/1358] Callback urls corrected in IDA.

---
 id-authentication-external-default.properties | 6 +++---
 id-authentication-internal-default.properties | 6 +++---
 id-authentication-otp-default.properties      | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index 1f6672a5c35..086a58a97c9 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=http://ida-auth.ida/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=http://ida-auth.ida/${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=http://ida-auth.ida/${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 4ea87b06ce2..961e46cda8a 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=http://ida-internal.ida/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=http://ida-internal.ida/${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=http://ida-internal.ida/${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index 11256a5d2bc..b35e261ec1a 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=http://ida-otp.ida/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=${mosip.api.internal.url}/${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=http://ida-otp.ida/${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=${mosip.api.internal.url}/${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=http://ida-otp.ida/${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}

From a2a4e449334847e1bd00baf3ef90132b18a954fc Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 3 Mar 2022 05:47:10 +0530
Subject: [PATCH 0685/1358] Print callback URL updated.

---
 print-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index c67037da64d..932cec0df12 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -9,7 +9,8 @@ mosip.event.hubURL=${mosip.websub.url}/hub/
 mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
-mosip.event.callBackUrl=${mosip.api.internal.url}/${server.servlet.context-path}/print/callback/notifyPrint
+## This callback is called by Websub to notify print
+mosip.event.callBackUrl=http://print-service.print/${server.servlet.context-path}/print/callback/notifyPrint
 
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
 mosip.event.secret=${print.websub.hub.secret}

From e2337989033a4a1ef78880f6bd3d8ff2af87e5ba Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 3 Mar 2022 13:38:32 +0530
Subject: [PATCH 0686/1358] In-cluster API link specified in Syncdata.

---
 syncdata-default.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index f7c4abcb431..22fdd76cb01 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -13,7 +13,6 @@
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
 # mosip.syncdata.client.secret
-# mosip.api.internal.host
 # softhsm.kernel.pin
 
 ## Sync data
@@ -385,7 +384,7 @@ syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
 syncdata.websub.callback.secret.ca-cert=secret
 # Callback url for partner CA certificate CRUD event
 syncdata.websub.callback.url.path.ca-cert=/websub/callback/cacert
-syncdata.websub.callback.url.ca-cert=${mosip.api.internal.url}/${server.servlet.context-path}/websub/callback/cacert
+syncdata.websub.callback.url.ca-cert=${mosip.kernel.syncdata.url}/${server.servlet.context-path}/websub/callback/cacert
 # Number of retires on subscription failure
 syncdata.websub.resubscription.retry.count=3
 # The time interval in seconds to schedule subscription of topics which is done as a
@@ -403,7 +402,7 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel.masterdata.ur
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.internal.url}/v1/syncdata/scripts/applicanttype.mvel
+mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.kernel.syncdata.url}/v1/syncdata/scripts/applicanttype.mvel
 mosip.sync.entity.auth-required.APPLICANTTYPE.MVEL=true
 mosip.sync.entity.auth-token.APPLICANTTYPE.MVEL=Authorization:OAUTH
 mosip.sync.entity.encrypted.APPLICANTTYPE.MVEL=false

From 31a815eb5fdeedb087d01a01259e727dcff2a2f6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Thu, 3 Mar 2022 17:12:45 +0530
Subject: [PATCH 0687/1358] Callback urls corrected.

---
 id-authentication-default.properties          | 13 +------------
 id-authentication-internal-default.properties | 12 ++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f8883cc93a1..a827d8cca64 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -216,26 +216,15 @@ ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
-ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
-## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
-ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
-ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
-ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
-ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
-ida-websub-partner-service-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
+ida-websub-partner-service-callback-url=${mosip.pms.partnermanager.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
 ida-websub-partner-service-apikey-approved-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/apikey_approved
 ida-websub-partner-service-partner-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_updated
 ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/policy_updated
 ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
 ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
-## Callback url for hotlist event
-ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=${mosip.api.internal.url}/${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 961e46cda8a..bf608668899 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -2,6 +2,18 @@ ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-p
 ida-websub-masterdata-templates-callback-url=http://ida-internal.ida/${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
 ida-websub-masterdata-titles-callback-url=http://ida-internal.ida/${ida-websub-masterdata-titles-callback-relative-url}
+## Callback url for hotlist event
+ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
+ida-websub-hotlist-callback-url=http://ida-internal.ida/${ida-websub-hotlist-callback-relative-url}
+
+ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
+ida-websub-auth-type-callback-url=http://ida-internal.ida/${ida-websub-auth-type-callback-relative-url}
+## Callback url for credential issueance event notification, including id remove/deactivate/activate events
+ida-websub-idchage-callback-url=http://ida-internal.ida/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
+ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
+ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
+ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate

From daddcecdccf3c34616d1cd6538fe60b789c5204e Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 11:18:28 +0530
Subject: [PATCH 0688/1358] Minor cleanup.

---
 application-default.properties                |  2 ++
 id-authentication-external-default.properties |  6 +++---
 id-authentication-internal-default.properties | 12 ++++++------
 id-authentication-otp-default.properties      |  6 +++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 07c922173b1..9417f3d19a9 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -43,6 +43,8 @@ mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
+mosip.ida.auth.url=http://ida-auth.ida
+mosip.ida.otp.url=http://ida-otp.ida
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
 
diff --git a/id-authentication-external-default.properties b/id-authentication-external-default.properties
index 086a58a97c9..651d4dbb2a5 100644
--- a/id-authentication-external-default.properties
+++ b/id-authentication-external-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=http://ida-auth.ida/${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.ida.auth.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=http://ida-auth.ida/${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.ida.auth.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=http://ida-auth.ida/${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.ida.auth.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index bf608668899..ebd980db8d4 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -1,15 +1,15 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=http://ida-internal.ida/${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.ida.internal.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=http://ida-internal.ida/${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.ida.internal.url}${ida-websub-masterdata-titles-callback-relative-url}
 ## Callback url for hotlist event
 ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=http://ida-internal.ida/${ida-websub-hotlist-callback-relative-url}
+ida-websub-hotlist-callback-url=${mosip.ida.internal.url}${ida-websub-hotlist-callback-relative-url}
 
 ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=http://ida-internal.ida/${ida-websub-auth-type-callback-relative-url}
+ida-websub-auth-type-callback-url=${mosip.ida.internal.url}${ida-websub-auth-type-callback-relative-url}
 ## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=http://ida-internal.ida/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchage-callback-url=${mosip.ida.internal.url}${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
 ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
 ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
 ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
@@ -17,7 +17,7 @@ ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-p
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=http://ida-internal.ida/${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.ida.internal.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}
diff --git a/id-authentication-otp-default.properties b/id-authentication-otp-default.properties
index b35e261ec1a..97e243469f4 100644
--- a/id-authentication-otp-default.properties
+++ b/id-authentication-otp-default.properties
@@ -1,11 +1,11 @@
 ida-websub-masterdata-templates-callback-relative-url=${server.servlet.context-path}/callback/masterdata/templates
-ida-websub-masterdata-templates-callback-url=http://ida-otp.ida/${ida-websub-masterdata-templates-callback-relative-url}
+ida-websub-masterdata-templates-callback-url=${mosip.ida.otp.url}${ida-websub-masterdata-templates-callback-relative-url}
 ida-websub-masterdata-titles-callback-relative-url=${server.servlet.context-path}/callback/masterdata/titles
-ida-websub-masterdata-titles-callback-url=http://ida-otp.ida/${ida-websub-masterdata-titles-callback-relative-url}
+ida-websub-masterdata-titles-callback-url=${mosip.ida.otp.url}${ida-websub-masterdata-titles-callback-relative-url}
 
 # Callback url for partner CA certification upload event
 ida-websub-ca-cert-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/ca_certificate
-ida-websub-ca-cert-callback-url=http://ida-otp.ida/${ida-websub-ca-cert-callback-relative-url}
+ida-websub-ca-cert-callback-url=${mosip.ida.otp.url}${ida-websub-ca-cert-callback-relative-url}
 
 # Secret for partner CA certification upload callback
 ida-websub-ca-certificate-callback-secret=${ida.websub.ca.certificate.callback.secret}

From 7d740b7fd1b6286f9aa94d217860d543d59647af Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 18:23:53 +0530
Subject: [PATCH 0689/1358] VC property added in print.

---
 print-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/print-default.properties b/print-default.properties
index 932cec0df12..31ef2fb1659 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -130,3 +130,6 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.print.crypto.p12.filename=partner.p12
 mosip.print.crypto.p12.password={cipher}714cd7ff4c1aa550e7371fabcce089bf6411d69709e6c19aae808eb612c9d31e
 mosip.print.crypto.p12.alias=partner
+
+# verifiable credential
+mosip.print.verify.credentials.flag=false

From 18bd7cfda34fff43b91cb582341b53aaa0cd1742 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 18:31:17 +0530
Subject: [PATCH 0690/1358] App id corrected.

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index 31ef2fb1659..68db4d23eff 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -109,7 +109,7 @@ mosip.print.prependThumbprint=true
 # websub authentication
 mosip.iam.adapter.clientid=mpartner-default-print
 mosip.iam.adapter.clientsecret=${mpartner.default.print.secret}
-mosip.iam.adapter.appid=print
+mosip.iam.adapter.appid=admin
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey

From 70b48d2c9de396048f1577bacd0756ae931a800d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 18:32:12 +0530
Subject: [PATCH 0691/1358] Log level changed to INFO.

---
 print-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/print-default.properties b/print-default.properties
index 68db4d23eff..8e4f9658a30 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -84,9 +84,9 @@ mosip.kernel.pin.length=6
 mosip.kernel.tokenid.length=36
 
 ## log level
-logging.level.root=DEBUG
-logging.level.io.mosip=DEBUG
-logging.level.io.mosip.kernel.auth.defaultadapter.filter=DEBUG
+logging.level.root=INFO
+logging.level.io.mosip=INFO
+logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## tomcat access logs
 server.tomcat.accesslog.enabled=true

From a5ee779ecb8b157896e29a5fcb84efad1442aeb2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 18:40:03 +0530
Subject: [PATCH 0692/1358] Pwd updated.

---
 print-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index 8e4f9658a30..c9ff24e6a4f 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -128,7 +128,8 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # p12 file
 mosip.print.crypto.p12.filename=partner.p12
-mosip.print.crypto.p12.password={cipher}714cd7ff4c1aa550e7371fabcce089bf6411d69709e6c19aae808eb612c9d31e
+## password hardcoded in print service. TODO: Make it configurable.
+mosip.print.crypto.p12.password=password@123
 mosip.print.crypto.p12.alias=partner
 
 # verifiable credential

From 9626bb6f68931e8255db2d6f22c9744efdc80395 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 19:00:36 +0530
Subject: [PATCH 0693/1358] Allowed audience updated.

---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 3fc18254cda..90c842de45b 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -39,7 +39,7 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=false
 mosip.role.durian.postcreatepolicyidsubscriberid=CREATE_SHARE
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client,mpartner-default-print,mosip-resident-client
 
 mosip.auth.filter_disable=false
 

From 0585d6bd3c64e7da7cb1f16db02ca76ed821aa07 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 4 Mar 2022 19:28:40 +0530
Subject: [PATCH 0694/1358] Opencrvs props added.

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 9417f3d19a9..6880259e260 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -345,8 +345,10 @@ packetmanager.packet.signature.disable-verification=true
 mosip.commons.packetnames=id,evidence,optional
 provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
 provider.packetreader.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketReaderImpl
+provider.packetreader.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketReaderImpl
 provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
+provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true

From aa758a811e0479313ca8cfd3bdae87878bb0d330 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 5 Mar 2022 10:17:03 +0530
Subject: [PATCH 0695/1358] Log level changed to INFO.

---
 pre-registration-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index b84352e529a..6e10f257b21 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -29,8 +29,7 @@ hibernate.show_sql=false
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 
-## Hickari Logs for Database
-logging.level.com.zaxxer.hikari=DEBUG
+logging.level.com.zaxxer.hikari=INFO
 
 ## Project Version for the API response 
 version=1.0

From 967174555c517f19a6f383b763539621339097bf Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 7 Mar 2022 13:39:31 +0530
Subject: [PATCH 0696/1358] added mosip public url

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 6880259e260..0751b3794cd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -17,6 +17,7 @@ aplication.configuration.level.version=LTS
 mosip.recommended.centers.locCode=5
 
 ## Common properties used across different modules
+mosipbox.public.url=${mosip.api.internal.url}
 mosip.api.internal.url=https://${mosip.api.internal.host}
 mosip.kernel.authmanager.url=http://authmanager.kernel
 mosip.kernel.masterdata.url=http://masterdata.kernel

From 31be5ed8cb07d49420166bf47eb1bb5bc146ae6b Mon Sep 17 00:00:00 2001
From: mandeepdhiman123 <mandeep.kumar@technoforte.co.in>
Date: Tue, 8 Mar 2022 10:21:55 +0530
Subject: [PATCH 0697/1358] updated reprocess time.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1b29817f1f0..2941f9d432c 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -288,7 +288,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=4800
+registration.processor.reprocess.elapse.time=180
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From 9e155889ce175725d72646eade11c26ee111869a Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 8 Mar 2022 13:27:53 +0530
Subject: [PATCH 0698/1358] [ MOSIP-20475 ] Added new properties

---
 admin-default.properties | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index dfb893a9fde..ed974d2e2ac 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -240,6 +240,12 @@ mosip.role.admin.getbulkuploadtranscationtranscationid=GLOBAL_ADMIN
 mosip.role.admin.getbulkuploadgetalltransactions=GLOBAL_ADMIN
 mosip.role.admin.postauditmanagerlog=GLOBAL_ADMIN,ZONAL_ADMIN
 
+
+mosip.role.admin.getgeneratecsrcertificateapplicationidreferenceid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.postuploadcertificate=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.postgeneratecsr=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.postuploadotherdomaincertificate=GLOBAL_ADMIN,ZONAL_ADMIN
+
 # packet-manager
 mosip.commons.packetnames=id,evidence,optional
 provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl
@@ -274,3 +280,9 @@ mosip.admin.packetupload.packetsync.phone=phone
 
 mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\\W|\\w]{1,100}$)
 registration.processor.identityjson=identity-mapping.json
+
+###Key manager url's used by KeyManagerDelegation api from admin-service to delegate request
+mosip.kernel.keymanager.generatecsr=${mosip.kernel-keymanager-service.url}/v1/keymanager/generateCSR
+mosip.kernel.keymanager.getcertificate=${mosip.kernel-keymanager-service.url}/v1/keymanager/getCertificate?
+mosip.kernel.keymanager.uploadcertificate=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadCertificate
+mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadOtherDomainCertificate

From ecb5b39bfe18d8fc882eadc3c272fa8f8bedabcb Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 8 Mar 2022 13:37:47 +0530
Subject: [PATCH 0699/1358] [ MOSIP-20475 ] updated keymanager properties in
 admin-default.properties

---
 admin-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index ed974d2e2ac..1e1f3ea1c55 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -282,7 +282,7 @@ mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\\W|\\w]{1,100
 registration.processor.identityjson=identity-mapping.json
 
 ###Key manager url's used by KeyManagerDelegation api from admin-service to delegate request
-mosip.kernel.keymanager.generatecsr=${mosip.kernel-keymanager-service.url}/v1/keymanager/generateCSR
-mosip.kernel.keymanager.getcertificate=${mosip.kernel-keymanager-service.url}/v1/keymanager/getCertificate?
-mosip.kernel.keymanager.uploadcertificate=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadCertificate
-mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel-keymanager-service.url}/v1/keymanager/uploadOtherDomainCertificate
+mosip.kernel.keymanager.generatecsr=${mosip.kernel.keymanager.url}/v1/keymanager/generateCSR
+mosip.kernel.keymanager.getcertificate=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate?
+mosip.kernel.keymanager.uploadcertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadCertificate
+mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadOtherDomainCertificate

From 8e6540530af896fd6f2b340e06fa3a6b3f4b5af2 Mon Sep 17 00:00:00 2001
From: Mayura Deshmukh <mayura.deshmukh@gmail.com>
Date: Thu, 10 Mar 2022 11:22:36 +0530
Subject: [PATCH 0700/1358] Latest from develop-v2

---
 kernel-default.properties           | 4 ++--
 pre-registration-default.properties | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index c0622be46ea..7ca701994bc 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -694,8 +694,8 @@ mosip.role.admin.masterdata.postdynamicfieldsfiltervalues=ZONAL_ADMIN,GLOBAL_ADM
 mosip.role.admin.masterdata.putlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
 mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postotpgenerate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.getotpvalidate=INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.postotpgenerate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getotpvalidate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
 mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN,ID_REPOSITORY
 mosip.role.keymanager.postcssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 6e10f257b21..c40a2bdc609 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -199,6 +199,7 @@ email.acknowledgement.template=Email-Acknowledgement
 email.acknowledgement.subject.template=Acknowledgement-email-subject
 sms.acknowledgement.template=SMS-Acknowledgement
 cancel.appoinment.template=cancel-appointment
+cancel.appointment.email.subject=cancel-appointment-email-subject
 
 ## Notification service
 notification.service.version=v1
@@ -476,8 +477,8 @@ mosip.role.prereg.getappointmentavailability=INDIVIDUAL
 mosip.role.prereg.postappointmentpreregistrationid=INDIVIDUAL
 mosip.role.prereg.postappointment=INDIVIDUAL
 mosip.role.prereg.getappointmentpreregistrationid=REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN,PRE_REGISTRATION_ADMIN,INDIVIDUAL
-mosip.role.prereg.putappointmentpreregistrationid=INDIVIDUAL
+mosip.role.prereg.putappointmentpreregistrationid=INDIVIDUAL,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.putbatchappointmentpreregistrationid=PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR
-mosip.role.prereg.deleteappointment=INDIVIDUAL
+mosip.role.prereg.deleteappointment=INDIVIDUAL,PRE_REGISTRATION_ADMIN
 mosip.role.prereg.getappointmentpreregistrationidregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN
 mosip.role.prereg.getappointmentregistrationcenterid=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN

From 930017fc2f18db87f0e261bfb4ebd9150276611d Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Mar 2022 19:11:01 +0530
Subject: [PATCH 0701/1358] [ MOSIP-20594 ] added
 resident-app-default.properties for resident-app service

---
 resident-app-default.properties | 177 ++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 resident-app-default.properties

diff --git a/resident-app-default.properties b/resident-app-default.properties
new file mode 100644
index 00000000000..a52f20c39e4
--- /dev/null
+++ b/resident-app-default.properties
@@ -0,0 +1,177 @@
+
+# MOSIP
+mosipbox.public.url=${mosipbox.public.url}
+public.url=${mosipbox.public.url}/residentmobileapp
+mosip.resident.base.url=${mosip.resident-service.url}/resident/v1
+
+
+RESIDENT_OTP=${mosip.resident.base.url}/req/otp
+RESIDENT_CREDENTIAL_REQUEST=${mosip.resident.base.url}/req/credential
+RESIDENT_CREDENTIAL_REQUEST_STATUS=${RESIDENT_CREDENTIAL_REQUEST}/status
+RESIDENT_VID=${mosip.resident.base.url}/vid
+RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
+RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
+
+
+# Resident App
+credential.template=template.json
+credential.sample=sample_credential.json
+credential.data.path=data
+safetynet.api.key=
+safetynet.api.url=https://www.googleapis.com/androidcheck/v1/attestations/verify?key=${safetynet.api.key}
+
+registration.processor.print.textfile=registration-processor-print-text-file.json
+
+# Websub
+mosip.event.hubUrl=${mosipbox.public.url}/hub/
+mosip.event.hub.subUrl=${mosip.event.hubUrl}
+mosip.event.hub.pubUrl=${mosip.event.hubUrl}
+
+
+# MOSIP partner
+mosip.partner.id=mpartner-default-mobile
+mosip.event.callBackUrl=${public.url}/credentialshare/callback/notify
+mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
+mosip.event.secret=Kslk30SNF2AChs2
+
+
+mosip.partner.crypto.p12.filename=keystore.p12
+mosip.partner.crypto.p12.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.crypto.p12.alias=partner
+mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.prependThumbprint=true
+
+
+mosip.datashare.partner.id=mpartner-default-resident
+mosip.datashare.policy.id=mpolicy-default-resident
+
+
+csrf.disabled=true
+# Delayed websub subscription. Default is 5 seconds in ms.
+mosip.event.delay-millisecs=5000
+# Websub re-subscription workaround for losing subscribed topic when MOSIP websub update or restart. Default is 5 minutes in ms.
+websub-resubscription-delay-millisecs=300000
+
+#-------------TOKEN GENERATION----------------
+#Token generation request id
+token.request.id=io.mosip.registration.processor
+#Token generation app id
+token.request.appid=regproc
+#Token generation username
+token.request.username=registrationprocessor
+#Token generation password
+token.request.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+#Token generation version
+token.request.version=1.0
+#Token generation Client Id
+token.request.clientId=mosip-regproc-client
+#Token generation secret key
+token.request.secretKey={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+#Token generation issuer url
+token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+
+#Audit Service
+AUDIT=${mosipbox.public.url}/v1/auditmanager/audits
+AUDIT_URL=${mosipbox.public.url}/v1/auditmanager/audits
+KEYBASEDTOKENAPI=${mosipbox.public.url}/v1/authmanager/authenticate/clientidsecretkey
+
+#Master Data Services
+# MASTER=http://kernel-masterdata-service/v1/masterdata
+MASTER=${mosipbox.public.url}/v1/masterdata
+TEMPLATES=${MASTER}/templates
+
+#Packet receiver application version
+mosip.print.application.version=1.0
+#Request Date Time format
+mosip.print.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+
+
+#-------------Printing Service--------------------
+mosip.print.service.id=mosip.print
+
+#Audit request id
+mosip.print.audit.id=mosip.applicanttype.getApplicantType
+mosip.country.code=MOR
+
+#Kernel Crypto signature
+registration.processor.signature.isEnabled=true
+
+# Language Supported By Platform - ISO
+mosip.supported-languages=eng,ara,fra
+
+mosip.template-language=eng
+mosip.optional-languages=fra,ara
+mosip.mandatory-languages=eng
+
+# mosip.primary-language=eng
+# mosip.secondary-language=ara
+
+#----------------------- CBEFF Util--------------------------------------------------
+# Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
+mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/print/${spring.profiles.active}/${spring.cloud.config.label}/
+# Cbeff XSD file name in config server
+mosip.kernel.xsdfile=mosip-cbeff.xsd
+
+#----------------------------- Applicant Type --------------------------------------------------
+mosip.kernel.applicant.type.age.limit = 5
+
+#----------------------------- Static PIN --------------------------------------------------
+mosip.kernel.pin.length=6
+
+#-----------------------------TOKEN-ID Properties---------------------------------
+#length of the token id
+mosip.kernel.tokenid.length=36
+
+# log level
+logging.level.root=WARN
+logging.level.io.mosip=INFO
+# logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
+logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
+logging.level.org.springframework.http.client=DEBUG
+logging.level.io.mosip.residentapp=INFO
+logging.level.reactor.netty.http.client=INFO
+# tomcat access logs
+server.tomcat.accesslog.enabled=true
+server.tomcat.accesslog.directory=/dev
+server.tomcat.accesslog.prefix=stdout
+server.tomcat.accesslog.buffered=false
+server.tomcat.accesslog.suffix=
+server.tomcat.accesslog.file-date-format=
+server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}"}
+server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
+registration.processor.unMaskedUin.length=5
+
+IDSchema.Version=1.0
+registration.processor.identityjson=identity-mapping.json
+registration.processor.demographic.identity=identity
+CREATEDATASHARE=${mosipbox.public.url}/v1/datashare/create
+DECRYPTPINBASSED=${mosipbox.public.url}/v1/keymanager/decryptWithPin
+
+config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profiles.active}/${spring.cloud.config.label}/
+
+
+#Auth Adapter rest template authentication configs
+mosip.iam.adapter.appid=partner
+mosip.iam.adapter.clientid=mpartner-default-mobile
+mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
+auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
+
+mosip.iam.adapter.issuerURL=${mosipbox.public.url}/keycloak/auth/realms/mosip
+mosip.authmanager.base-url=${mosipbox.public.url}/v1/authmanager
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
+auth.server.admin.validate.url=${mosip.authmanager.base-url}/v1/authmanager/authorize/admin/validateToken
+
+
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=1440
+
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=1440
+
+#this should be false if you don?t use this restTemplate true if you do
+
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
+

From 2fdcde6e3b5701bcfa06b2d8b9d39ae27b74068c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Mar 2022 19:13:35 +0530
Subject: [PATCH 0702/1358] [ MOSIP-20594 ] added resident service secret

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index a52f20c39e4..1aaea19b4f1 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -153,7 +153,7 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 #Auth Adapter rest template authentication configs
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
-mosip.iam.adapter.clientsecret=${mosip.mosip.resident.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
 
 mosip.iam.adapter.issuerURL=${mosipbox.public.url}/keycloak/auth/realms/mosip

From ee6fac5d5a8b3b2489272f7eb05666154ae6e902 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Mar 2022 19:23:22 +0530
Subject: [PATCH 0703/1358] [ MOSIP-20594 ] updated
 resident-app-default.properties

---
 resident-app-default.properties | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index 1aaea19b4f1..4f64588f850 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -1,7 +1,6 @@
 
 # MOSIP
-mosipbox.public.url=${mosipbox.public.url}
-public.url=${mosipbox.public.url}/residentmobileapp
+public.url=$https://{mosip.api.internal.host}/residentmobileapp
 mosip.resident.base.url=${mosip.resident-service.url}/resident/v1
 
 
@@ -23,7 +22,7 @@ safetynet.api.url=https://www.googleapis.com/androidcheck/v1/attestations/verify
 registration.processor.print.textfile=registration-processor-print-text-file.json
 
 # Websub
-mosip.event.hubUrl=${mosipbox.public.url}/hub/
+mosip.event.hubUrl=$https://{mosip.api.internal.host}/hub/
 mosip.event.hub.subUrl=${mosip.event.hubUrl}
 mosip.event.hub.pubUrl=${mosip.event.hubUrl}
 
@@ -68,16 +67,16 @@ token.request.clientId=mosip-regproc-client
 #Token generation secret key
 token.request.secretKey={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 #Token generation issuer url
-token.request.issuerUrl=${mosipbox.public.url}/keycloak/auth/realms/mosip
+token.request.issuerUrl=$https://{mosip.api.internal.host}/keycloak/auth/realms/mosip
 
 #Audit Service
-AUDIT=${mosipbox.public.url}/v1/auditmanager/audits
-AUDIT_URL=${mosipbox.public.url}/v1/auditmanager/audits
-KEYBASEDTOKENAPI=${mosipbox.public.url}/v1/authmanager/authenticate/clientidsecretkey
+AUDIT=$https://{mosip.api.internal.host}/v1/auditmanager/audits
+AUDIT_URL=$https://{mosip.api.internal.host}/v1/auditmanager/audits
+KEYBASEDTOKENAPI=$https://{mosip.api.internal.host}/v1/authmanager/authenticate/clientidsecretkey
 
 #Master Data Services
 # MASTER=http://kernel-masterdata-service/v1/masterdata
-MASTER=${mosipbox.public.url}/v1/masterdata
+MASTER=$https://{mosip.api.internal.host}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 
 #Packet receiver application version
@@ -144,8 +143,8 @@ registration.processor.unMaskedUin.length=5
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=${mosipbox.public.url}/v1/datashare/create
-DECRYPTPINBASSED=${mosipbox.public.url}/v1/keymanager/decryptWithPin
+CREATEDATASHARE=$https://{mosip.api.internal.host}/v1/datashare/create
+DECRYPTPINBASSED=$https://{mosip.api.internal.host}/v1/keymanager/decryptWithPin
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profiles.active}/${spring.cloud.config.label}/
 
@@ -156,8 +155,8 @@ mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
 
-mosip.iam.adapter.issuerURL=${mosipbox.public.url}/keycloak/auth/realms/mosip
-mosip.authmanager.base-url=${mosipbox.public.url}/v1/authmanager
+mosip.iam.adapter.issuerURL=$https://{mosip.api.internal.host}/keycloak/auth/realms/mosip
+mosip.authmanager.base-url=$https://{mosip.api.internal.host}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 auth.server.admin.validate.url=${mosip.authmanager.base-url}/v1/authmanager/authorize/admin/validateToken
 

From 4353d74f8bf046130e810972bc81aa5e92d1159b Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Mar 2022 19:25:50 +0530
Subject: [PATCH 0704/1358] [ MOSIP-20594 ] updated
 resident-app-default.properties

---
 resident-app-default.properties | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index 4f64588f850..a95fb8cbb7f 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -1,6 +1,6 @@
 
 # MOSIP
-public.url=$https://{mosip.api.internal.host}/residentmobileapp
+public.url=https://${mosip.api.internal.host}/residentmobileapp
 mosip.resident.base.url=${mosip.resident-service.url}/resident/v1
 
 
@@ -22,7 +22,7 @@ safetynet.api.url=https://www.googleapis.com/androidcheck/v1/attestations/verify
 registration.processor.print.textfile=registration-processor-print-text-file.json
 
 # Websub
-mosip.event.hubUrl=$https://{mosip.api.internal.host}/hub/
+mosip.event.hubUrl=https://${mosip.api.internal.host}/hub/
 mosip.event.hub.subUrl=${mosip.event.hubUrl}
 mosip.event.hub.pubUrl=${mosip.event.hubUrl}
 
@@ -67,16 +67,16 @@ token.request.clientId=mosip-regproc-client
 #Token generation secret key
 token.request.secretKey={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 #Token generation issuer url
-token.request.issuerUrl=$https://{mosip.api.internal.host}/keycloak/auth/realms/mosip
+token.request.issuerUrl=https://${mosip.api.internal.host}/keycloak/auth/realms/mosip
 
 #Audit Service
-AUDIT=$https://{mosip.api.internal.host}/v1/auditmanager/audits
-AUDIT_URL=$https://{mosip.api.internal.host}/v1/auditmanager/audits
-KEYBASEDTOKENAPI=$https://{mosip.api.internal.host}/v1/authmanager/authenticate/clientidsecretkey
+AUDIT=https://${mosip.api.internal.host}/v1/auditmanager/audits
+AUDIT_URL=https://${mosip.api.internal.host}/v1/auditmanager/audits
+KEYBASEDTOKENAPI=https://${mosip.api.internal.host}/v1/authmanager/authenticate/clientidsecretkey
 
 #Master Data Services
 # MASTER=http://kernel-masterdata-service/v1/masterdata
-MASTER=$https://{mosip.api.internal.host}/v1/masterdata
+MASTER=https://${mosip.api.internal.host}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 
 #Packet receiver application version
@@ -143,8 +143,8 @@ registration.processor.unMaskedUin.length=5
 IDSchema.Version=1.0
 registration.processor.identityjson=identity-mapping.json
 registration.processor.demographic.identity=identity
-CREATEDATASHARE=$https://{mosip.api.internal.host}/v1/datashare/create
-DECRYPTPINBASSED=$https://{mosip.api.internal.host}/v1/keymanager/decryptWithPin
+CREATEDATASHARE=https://${mosip.api.internal.host}/v1/datashare/create
+DECRYPTPINBASSED=https://${mosip.api.internal.host}/v1/keymanager/decryptWithPin
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profiles.active}/${spring.cloud.config.label}/
 
@@ -155,8 +155,8 @@ mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
 
-mosip.iam.adapter.issuerURL=$https://{mosip.api.internal.host}/keycloak/auth/realms/mosip
-mosip.authmanager.base-url=$https://{mosip.api.internal.host}/v1/authmanager
+mosip.iam.adapter.issuerURL=https://${mosip.api.internal.host}/keycloak/auth/realms/mosip
+mosip.authmanager.base-url=https://${mosip.api.internal.host}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 auth.server.admin.validate.url=${mosip.authmanager.base-url}/v1/authmanager/authorize/admin/validateToken
 

From f0a205c11a2a761b3da002bb5e09736bef6dee35 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Mar 2022 20:13:31 +0530
Subject: [PATCH 0705/1358] [ MOSIP-20594 ] updated resident app keycloak urls

---
 resident-app-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index a95fb8cbb7f..c940c0d0e04 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -67,7 +67,7 @@ token.request.clientId=mosip-regproc-client
 #Token generation secret key
 token.request.secretKey={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 #Token generation issuer url
-token.request.issuerUrl=https://${mosip.api.internal.host}/keycloak/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 #Audit Service
 AUDIT=https://${mosip.api.internal.host}/v1/auditmanager/audits
@@ -153,9 +153,9 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${mosip.api.internal.url}/keycloak/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
-mosip.iam.adapter.issuerURL=https://${mosip.api.internal.host}/keycloak/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=https://${mosip.api.internal.host}/v1/authmanager
 mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 auth.server.admin.validate.url=${mosip.authmanager.base-url}/v1/authmanager/authorize/admin/validateToken

From 96b2d448bb13d489c770cccfbb418207dd3b1a08 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 11 Mar 2022 20:16:16 +0530
Subject: [PATCH 0706/1358] [ MOSIP-20594 ] updated resident app keycloak urls

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index c940c0d0e04..f06c429615f 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -153,7 +153,7 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/mosip
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=https://${mosip.api.internal.host}/v1/authmanager

From e574286f37261e36ba8041b00be6934ec92f5fa6 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Fri, 11 Mar 2022 20:22:33 +0530
Subject: [PATCH 0707/1358] Revert "[ MOSIP-20594 ] updated resident app
 keycloak urls"

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index f06c429615f..c940c0d0e04 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -153,7 +153,7 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/mosip
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=https://${mosip.api.internal.host}/v1/authmanager

From 14ed152ba6a92838e0a54fca482cef50b9468e42 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 12 Mar 2022 11:10:06 +0530
Subject: [PATCH 0708/1358] CORS enabled for testing. Reset it later.

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 7ca701994bc..de6bc13d70d 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -302,10 +302,10 @@ mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 mosip.ui.spec.default.domain=registration-client
 
 ## Security properties
-mosip.security.csrf-enable=false
-mosip.security.cors-enable=false
+mosip.security.csrf-enable=true
+mosip.security.cors-enable=true
 mosip.security.origins=localhost:8080
-mosip.security.secure-cookie=false
+mosip.security.secure-cookie=true
 
 ## ROOT key identifier
 mosip.root.key.applicationid=ROOT

From dfe55fc3752a7917eb60e616c84bb7870d3cc1b2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 12 Mar 2022 11:14:54 +0530
Subject: [PATCH 0709/1358] Reverted back previous change.

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index de6bc13d70d..7ca701994bc 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -302,10 +302,10 @@ mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 mosip.ui.spec.default.domain=registration-client
 
 ## Security properties
-mosip.security.csrf-enable=true
-mosip.security.cors-enable=true
+mosip.security.csrf-enable=false
+mosip.security.cors-enable=false
 mosip.security.origins=localhost:8080
-mosip.security.secure-cookie=true
+mosip.security.secure-cookie=false
 
 ## ROOT key identifier
 mosip.root.key.applicationid=ROOT

From 5517a716fc55dcacd58709ccc3cafe8f749cc56b Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 12 Mar 2022 11:17:58 +0530
Subject: [PATCH 0710/1358] CORS setting changed for testing.

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 1e1f3ea1c55..ed796e59ec7 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -187,8 +187,8 @@ mosip.admin-services.cookie.security=true
 mosip.ui.spec.default.domain=registration-client
 
 ## Security
-mosip.security.csrf-enable=false
-mosip.security.cors-enable=false
+mosip.security.csrf-enable=true
+mosip.security.cors-enable=true
 mosip.security.origins=localhost:8080
 mosip.security.secure-cookie=false
 

From 026c427d46832dd8c8bafc68a564af0e3504ebdd Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 15 Mar 2022 10:34:28 +0530
Subject: [PATCH 0711/1358] Redundant comments removed.

---
 registration-processor-camel-routes-new-default.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 72a26fed05f..1a2ad6c899a 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -33,7 +33,6 @@
          </otherwise>
       </choice>
    </route>
-   <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader new route">
       <from uri="eventbus://securezone-notification-new-bus-out" />
       <log message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
@@ -55,7 +54,6 @@
          </otherwise>
       </choice>
    </route>
-   <!-- packet-uploader to packet-validator Route -->
    <route id="packet-uploader-->packet-validator new route">
       <from uri="eventbus://packet-uploader-new-bus-out" />
       <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
@@ -77,7 +75,6 @@
          </otherwise>
       </choice>
    </route>
-   <!-- Packet Validator to Packet classifier Route -->
    <route id="packet-validator-->packet-classifier new route">
       <from uri="eventbus://packet-validator-new-bus-out" />
       <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
@@ -101,7 +98,6 @@
          </otherwise>
       </choice>
    </route>
-   <!-- Packet Classifier to Quality Classifier Route -->
    <route id="packet-classifier-->cmd-validator new route">
       <from uri="eventbus://packet-classifier-new-bus-out" />
       <log message="packet-classifier-->quality-classifier new route ${bodyAs(String)}" />
@@ -450,7 +446,6 @@
          </otherwise>
       </choice>
    </route>
-   <!-- UIN Generator to biometric-extraction Route -->
    <route id="uin-generation route-->biometric-extraction-stage new route">
       <from uri="eventbus://uin-generator-new-bus-out" />
       <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
@@ -475,7 +470,6 @@
          </otherwise>
       </choice>
    </route>
- <!-- biometric-extraction to finalization Route -->
    <route id="biometric-extraction route-->finalization-stage new route">
       <from uri="eventbus://biometric-extraction-new-bus-out" />
       <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
@@ -499,7 +493,6 @@
          </otherwise>
       </choice>
    </route>
-	 <!-- finalization to Printing Route -->
    <route id="finalization route-->printing-stage new route">
       <from uri="eventbus://finalization-new-bus-out" />
       <log message="finalization-->printing-stage route ${bodyAs(String)}" />

From 8120fbde52e4d3a4da18a9552c602e165fdffe53 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Tue, 15 Mar 2022 11:11:54 +0530
Subject: [PATCH 0712/1358] [MOSIP-8576] Added camel route for opencrvs

---
 ...ssor-camel-routes-opencrvs-new-default.xml | 250 ++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 registration-processor-camel-routes-opencrvs-new-default.xml

diff --git a/registration-processor-camel-routes-opencrvs-new-default.xml b/registration-processor-camel-routes-opencrvs-new-default.xml
new file mode 100644
index 00000000000..cf14151eb24
--- /dev/null
+++ b/registration-processor-camel-routes-opencrvs-new-default.xml
@@ -0,0 +1,250 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <route id="packet-receiver-->securezone-notification new route">
+      <from uri="eventbus://packet-receiver-new-bus-out" />
+      <log message="packet-receiver-->securezone-notification new ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="securezone-notification-->packet-uploader new route">
+      <from uri="eventbus://securezone-notification-new-bus-out" />
+      <log message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-uploader-->packet-validator new route">
+      <from uri="eventbus://packet-uploader-new-bus-out" />
+      <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-validator-->packet-classifier new route">
+      <from uri="eventbus://packet-validator-new-bus-out" />
+      <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-classifier-->demo-dedupe new route">
+      <from uri="eventbus://packet-classifier-new-bus-out" />
+      <log message="packet-classifier-->demo-dedupe new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="demo-dedupe-->uin-generator new route">
+      <from uri="eventbus://demo-dedupe-new-bus-out" />
+      <log message="demo-dedupe-->uin-generator new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+<!--         <when>-->
+<!--            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>-->
+<!--            <to uri="eventbus://abis-handler-bus-in" />-->
+<!--         </when>-->
+<!--         <when>-->
+<!--            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>-->
+<!--            <to uri="eventbus://manual-adjudication-bus-in" />-->
+<!--         </when>-->
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="uin-generation route-->finalization-stage new route">
+      <from uri="eventbus://uin-generator-new-bus-out" />
+      <log message="uin-generation-->finalization-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="finalization route-->printing-stage new route">
+      <from uri="eventbus://finalization-new-bus-out" />
+      <log message="finalization-->printing-stage route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage--> opencrvs-stage new route">
+      <from uri="eventbus://printing-new-bus-out" />
+      <log message="printing-stage--> opencrvs-stage new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://opencrvs-new-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="opencrvs-stage route --> new route">
+      <from uri="eventbus://opencrvs-new-bus-out" />
+      <log message="opencrvs-stage route--> route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>

From 48425ab28d8e4cb60f765dc545ff585c40129557 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 15 Mar 2022 14:05:34 +0530
Subject: [PATCH 0713/1358] [ DSD-841 ]  develop3-v3 inline with develop2-v2 &
 1.2.0.1

---
 id-authentication-default.properties      |  2 +-
 kernel-default.properties                 | 15 +++++++--------
 pre-registration-default.properties       |  2 +-
 registration-processor-default.properties |  3 +--
 resident-default.properties               |  2 ++
 syncdata-default.properties               |  2 +-
 websub-service.toml                       |  8 ++++++++
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index a827d8cca64..89a1fb9dadb 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -408,7 +408,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 ## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 ## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.authentication.core.exception.IdAuthRetryException,io.mosip.authentication.core.exception.IdAuthenticationBaseException
+kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
 ## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
diff --git a/kernel-default.properties b/kernel-default.properties
index 7ca701994bc..e666b4f0bdf 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -406,7 +406,7 @@ syncdata.websub.resubscription.delay.millis=48000000
 ## Admin UI
 ## this pattern like --> display column : configKey. 
 ## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code}
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns}
 
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
@@ -420,7 +420,7 @@ mosip.kernel.masterdata.auth-user-details=/userdetails
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=0
 
 # masterdata swagger openApi
 #openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
@@ -429,8 +429,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=340
 #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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
-
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
@@ -636,7 +635,7 @@ mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMI
 mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRINT_PARTNER
 mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -697,15 +696,15 @@ mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESI
 mosip.role.kernel.postotpgenerate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getotpvalidate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
 mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN,ID_REPOSITORY
+mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN,ID_REPOSITORY,HOTLIST_ADMIN
 mosip.role.keymanager.postcssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postcsverifysign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmsigningpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.posttpmencryptionpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST
-mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST,HOTLIST_ADMIN
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST,HOTLIST_ADMIN
 mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index c40a2bdc609..9db0611fc40 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -293,7 +293,7 @@ mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.inva
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
 iam.base.url=${keycloak.internal.url}
-auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/preregistration
+auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/mosip
 validationStatus=success
 context=auth-otp
 prereg.auth.jwt.secret=Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E=
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2941f9d432c..d73c556976b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -504,8 +504,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
-
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": "packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
diff --git a/resident-default.properties b/resident-default.properties
index 07331c979e7..54b026cc8fd 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -131,3 +131,5 @@ auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 mosip.service-context=/resident/v1
 mosip.service.end-points=/**/*
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
+
+mosip.ida.env=Production
\ No newline at end of file
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 22fdd76cb01..33c0c8bd2e2 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -414,7 +414,7 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 syncdata.cache.evict.delta-sync.cron=0 0/15 * * * *
 syncdata.cache.snapshot.cron=0 0 23 * * * 
 
-mosip.kernel.keymanager-service-publickey-url=${mosip.kernel.keymanager.url}/v1/keymanager/publickey/{applicationId}
+mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/getCertificate?applicationId={applicationId}
 
 mosip.kernel.keymanager.unique.identifier.autoupdate=false
 
diff --git a/websub-service.toml b/websub-service.toml
index 250f3ca1e54..0185dd7f704 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -47,3 +47,11 @@ MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"
 
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"
+
+[ballerina.http.accessLogConfig]
+# Enable printing access logs in console
+console = true              # Default is false
+
+[ballerina.http.traceLogAdvancedConfig]
+# Enable printing trace logs in console
+console = true              # Default is false

From 70cd6a2e4753ad14439fc143a5265355411fdcf2 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 15 Mar 2022 16:23:34 +0530
Subject: [PATCH 0714/1358] [ DSD-841 ]  fix keymanager url

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 33c0c8bd2e2..3f789c6d8b1 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -414,7 +414,7 @@ spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 syncdata.cache.evict.delta-sync.cron=0 0/15 * * * *
 syncdata.cache.snapshot.cron=0 0 23 * * * 
 
-mosip.kernel.keymanager-service-publickey-url=${mosip.kernel-keymanager-service.url}/v1/keymanager/getCertificate?applicationId={applicationId}
+mosip.kernel.keymanager-service-publickey-url=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate?applicationId={applicationId}
 
 mosip.kernel.keymanager.unique.identifier.autoupdate=false
 

From b904aeb43463f5890bbf968de50b43c883fc6f68 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 15 Mar 2022 18:49:05 +0530
Subject: [PATCH 0715/1358] [ DSD-841 ]  updated keycloak url

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 0751b3794cd..6639b240aba 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -198,8 +198,8 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
 
 #This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
-auth.server.admin.issuer.internal.uri=${keycloak.internal.url}/auth/realms/
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.internal.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 

From 0256ccc9fc208c8751fe2b6ca61a53aa656fb78e Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Tue, 15 Mar 2022 18:54:39 +0530
Subject: [PATCH 0716/1358] Revert "[ DSD-841 ]  updated keycloak url"

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 6639b240aba..0751b3794cd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -198,8 +198,8 @@ mosip.kernel.uin.length.conjugative-even-digits-limit=3
 auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
 
 #This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
-auth.server.admin.issuer.internal.uri=${keycloak.external.url}/auth/realms/
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.internal.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth-token-generator.rest.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 

From fac6511821f647bc3be3bbebe4b18cc1ea6087dc Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 15 Mar 2022 21:17:44 +0530
Subject: [PATCH 0717/1358] [ DSD-841 ]  added new admin properties

---
 admin-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index ed796e59ec7..6e2c97c7346 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -286,3 +286,8 @@ mosip.kernel.keymanager.generatecsr=${mosip.kernel.keymanager.url}/v1/keymanager
 mosip.kernel.keymanager.getcertificate=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate?
 mosip.kernel.keymanager.uploadcertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadCertificate
 mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadOtherDomainCertificate
+
+# this property are used in AdminProxyService to get base url and version
+mosip.admin.masterdata.service.version=v1
+mosip.admin.keymanager.service.version=v1
+mosip.admin.base.url=https://${mosip.api.internal.host}/
\ No newline at end of file

From 5c7abf5d9e56b568c1d4a8ebaceab4f451cef4b5 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Wed, 16 Mar 2022 12:56:35 +0530
Subject: [PATCH 0718/1358] [MOSIP-8576] Edited camel route for opencrvs with
 proper process name

---
 ...ssor-camel-routes-opencrvs-new-default.xml | 250 -----------
 ...ssor-camel-routes-opencrvs_new-default.xml | 406 ++++++++++++++++++
 2 files changed, 406 insertions(+), 250 deletions(-)
 delete mode 100644 registration-processor-camel-routes-opencrvs-new-default.xml
 create mode 100644 registration-processor-camel-routes-opencrvs_new-default.xml

diff --git a/registration-processor-camel-routes-opencrvs-new-default.xml b/registration-processor-camel-routes-opencrvs-new-default.xml
deleted file mode 100644
index cf14151eb24..00000000000
--- a/registration-processor-camel-routes-opencrvs-new-default.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-   <route id="packet-receiver-->securezone-notification new route">
-      <from uri="eventbus://packet-receiver-new-bus-out" />
-      <log message="packet-receiver-->securezone-notification new ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="securezone-notification-->packet-uploader new route">
-      <from uri="eventbus://securezone-notification-new-bus-out" />
-      <log message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://packet-uploader-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="packet-uploader-->packet-validator new route">
-      <from uri="eventbus://packet-uploader-new-bus-out" />
-      <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://packet-validator-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="packet-validator-->packet-classifier new route">
-      <from uri="eventbus://packet-validator-new-bus-out" />
-      <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://packet-classifier-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="packet-classifier-->demo-dedupe new route">
-      <from uri="eventbus://packet-classifier-new-bus-out" />
-      <log message="packet-classifier-->demo-dedupe new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://demo-dedupe-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="demo-dedupe-->uin-generator new route">
-      <from uri="eventbus://demo-dedupe-new-bus-out" />
-      <log message="demo-dedupe-->uin-generator new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-rejected" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-<!--         <when>-->
-<!--            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>-->
-<!--            <to uri="eventbus://abis-handler-bus-in" />-->
-<!--         </when>-->
-<!--         <when>-->
-<!--            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>-->
-<!--            <to uri="eventbus://manual-adjudication-bus-in" />-->
-<!--         </when>-->
-         <otherwise>
-            <to uri="eventbus://uin-generator-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="uin-generation route-->finalization-stage new route">
-      <from uri="eventbus://uin-generator-new-bus-out" />
-      <log message="uin-generation-->finalization-stage route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://finalization-bus-in" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="finalization route-->printing-stage new route">
-      <from uri="eventbus://finalization-new-bus-out" />
-      <log message="finalization-->printing-stage route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
-            <to uri="eventbus://printing-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="printing-stage--> opencrvs-stage new route">
-      <from uri="eventbus://printing-new-bus-out" />
-      <log message="printing-stage--> opencrvs-stage new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://opencrvs-new-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="opencrvs-stage route --> new route">
-      <from uri="eventbus://opencrvs-new-bus-out" />
-      <log message="opencrvs-stage route--> route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </otherwise>
-      </choice>
-   </route>
-</routes>
diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
new file mode 100644
index 00000000000..1a8dfdd2149
--- /dev/null
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -0,0 +1,406 @@
+<routes xmlns="http://camel.apache.org/schema/spring">
+   <route id="packet-receiver-->securezone-notification opencrvs_new route">
+      <from uri="eventbus://packet-receiver-opencrvs_new-bus-out" />
+      <log message="packet-receiver-->securezone-notification opencrvs_new ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <process ref="tokenGenerationProcessor" />
+            <setHeader headerName="CamelHttpMethod">
+               <constant>POST</constant>
+            </setHeader>
+            <setHeader headerName="Content-Type">
+               <constant>application/json</constant>
+            </setHeader>
+            <setHeader headerName="Cookie">
+               <simple>${header.Cookie}</simple>
+            </setHeader>
+            <setBody>
+               <simple>${bodyAs(String)}</simple>
+            </setBody>
+            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="securezone-notification-->packet-uploader opencrvs_new route">
+      <from uri="eventbus://securezone-notification-opencrvs_new-bus-out" />
+      <log message="securezone-notification-->packet-uploader opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-uploader-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-uploader-->packet-validator opencrvs_new route">
+      <from uri="eventbus://packet-uploader-opencrvs_new-bus-out" />
+      <log message="packet-uploader-->packet-validator opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-validator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-validator-->packet-classifier opencrvs_new route">
+      <from uri="eventbus://packet-validator-opencrvs_new-bus-out" />
+      <log message="packet-validator-->packet-classifier opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://packet-classifier-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="packet-classifier-->demo-dedupe opencrvs_new route">
+      <from uri="eventbus://packet-classifier-opencrvs_new-bus-out" />
+      <log message="packet-classifier-->introducer-validator/demo-dedupe opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?((@['tags']['AGE_GROUP'] == 'INFANT' || @['tags']['AGE_GROUP'] == 'MINOR') &amp;&amp; @['tags']['INTRODUCER_AVAILABILITY'] == 'true')]</jsonpath>
+            <to uri="eventbus://introducer-validator-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="introducer-validator-->demo-dedupe opencrvs_new route">
+      <from uri="eventbus://introducer-validator-opencrvs_new-bus-out" />
+      <log message="introducer-validator-->demo-dedupe opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="demo-dedupe-->bio-dedupe opencrvs_new route">
+      <from uri="eventbus://demo-dedupe-opencrvs_new-bus-out" />
+      <log message="demo-dedupe-->bio-dedupe opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-handler-->abis-middleware opencrvs_new route">
+      <from uri="eventbus://abis-handler-opencrvs_new-bus-out" />
+      <log message="abis-handler-->abis-middleware opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-middle-ware-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'demo-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://demo-dedupe-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'bio-dedupe-bus-in')]</jsonpath>
+            <to uri="eventbus://bio-dedupe-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="bio-dedupe-->uin-generator opencrvs_new route">
+      <from uri="eventbus://bio-dedupe-opencrvs_new-bus-out" />
+      <log message="bio-dedupe-->uin-generator opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'verification-bus-in')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="verification-->uin-generator opencrvs_new route">
+      <from uri="eventbus://verification-opencrvs_new-bus-out" />
+      <log message="verification-->uin-generator opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="abis-middleware-->abis-handler opencrvs_new route">
+      <from uri="eventbus://abis-middle-ware-opencrvs_new-bus-out" />
+      <log message="abis-middleware route-->abis-handler opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://abis-handler-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="manual-adjudication-->uin-generator opencrvs_new route">
+      <from uri="eventbus://manual-adjudication-opencrvs_new-bus-out" />
+      <log message="manual-adjudication-->uin-generator opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://uin-generator-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="uin-generator-->finalization opencrvs_new route">
+      <from uri="eventbus://uin-generator-opencrvs_new-bus-out" />
+      <log message="uin-generator-->finalization opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://finalization-bus-in" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="finalization-->printing-stage opencrvs_new route">
+      <from uri="eventbus://finalization-opencrvs_new-bus-out" />
+      <log message="finalization-->printing-stage opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://printing-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="printing-stage-->opencrvs-stage opencrvs_new route">
+      <from uri="eventbus://printing-opencrvs_new-bus-out" />
+      <log message="printing-stage-->opencrvs-stage opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-failed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+         <otherwise>
+            <to uri="eventbus://opencrvs-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="opencrvs-stage--> opencrvs_new route">
+      <from uri="eventbus://opencrvs-opencrvs_new-bus-out" />
+      <log message="opencrvs-stage--> opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
+         <otherwise>
+            <to uri="workflow-cmd://complete-as-processed" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </otherwise>
+      </choice>
+   </route>
+</routes>

From 707b97af5e2eea96558ba5511270a4ddf1aebc98 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 16 Mar 2022 13:22:08 +0530
Subject: [PATCH 0719/1358] [ DSD-841 ]  disabled property
 mosip.kernel.keymanager.keystore.keyreference.enable.cache

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index e666b4f0bdf..f2e5d9edc28 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -347,7 +347,7 @@ zkcrypto.random.key.generate.count=10000
 mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
 
 # Keymanager service keystore cache properties
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=true
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 # API to get machine based on machine id
 mosip.kernel.syncdata-service-machine-url=${mosip.kernel.masterdata.url}/v1/masterdata/machines/%s/eng

From 4cbc18d08a1146a08ac110a9f71bf2ae29b633b4 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 16 Mar 2022 13:59:11 +0530
Subject: [PATCH 0720/1358] [ DSD-841 ]  updated object store url

---
 data-share-default.properties             | 2 +-
 id-repository-default.properties          | 2 +-
 packet-manager-default.properties         | 2 +-
 pre-registration-default.properties       | 2 +-
 registration-processor-default.properties | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 90c842de45b..3b2d73c9821 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -47,6 +47,6 @@ mosip.auth.filter_disable=false
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 16b7aa871f3..84ae5bed5a4 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -387,7 +387,7 @@ springdoc.swagger-ui.operationsSorter=alpha
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 59ac07098e9..bff47db960f 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -25,7 +25,7 @@ auth.server.admin.allowed.audience=mosip-regproc-client
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 9db0611fc40..94aea318127 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -437,7 +437,7 @@ mosip.security.authentication.provider.beans.list.pre-registration-booking-servi
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index d73c556976b..21d4d90f030 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -935,7 +935,7 @@ mosip.auth.filter_disable=false
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
 ## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 

From e156be383dea24f5633c97b05e0f9190677aaaa6 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 16 Mar 2022 18:22:24 +0530
Subject: [PATCH 0721/1358] [ DSD-841 ] updated
 mosip.sync.entity.url.APPLICANTTYPE.MVEL

---
 syncdata-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 3f789c6d8b1..9a29894c198 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -402,7 +402,7 @@ mosip.kernel.masterdata.locationhierarchylevels.uri=${mosip.kernel.masterdata.ur
 # Make it to true if support is required.
 mosip.kernel.keymanager.113nothumbprint.support=false
 
-mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.kernel.syncdata.url}/v1/syncdata/scripts/applicanttype.mvel
+mosip.sync.entity.url.APPLICANTTYPE.MVEL=${mosip.api.internal.url}/v1/syncdata/scripts/applicanttype.mvel
 mosip.sync.entity.auth-required.APPLICANTTYPE.MVEL=true
 mosip.sync.entity.auth-token.APPLICANTTYPE.MVEL=Authorization:OAUTH
 mosip.sync.entity.encrypted.APPLICANTTYPE.MVEL=false

From 5ca9fb94e1800d781e9c8cff1297ba24d74f16e3 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 18 Mar 2022 10:52:23 +0530
Subject: [PATCH 0722/1358] [MOSIP-8576] Added opencrvs.properties

---
 opencrvs-default.properties | 68 +++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 opencrvs-default.properties

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
new file mode 100644
index 00000000000..89454631360
--- /dev/null
+++ b/opencrvs-default.properties
@@ -0,0 +1,68 @@
+mediator.core.pool.size=2
+mediator.max.pool.size=2
+mediator.queue.capacity=500
+
+opencrvs.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+
+opencrvs.center.id=45451
+opencrvs.machine.id=45452
+opencrvs.appid=opencrvs
+opencrvs.appName=OPENCRVS
+opencrvs.audit.app.id=${opencrvs.appid}
+opencrvs.audit.app.name=${opencrvs.appName}
+opencrvs.data.gender.default.lang.code=eng
+opencrvs.data.lang.code.mapping=eng:eng|english|en,fra:french|fr|fra|fre
+opencrvs.data.dummy.address.line1="[{\"language\":\"eng\",\"value\":\"1234, block 1, road no1\"}]"
+opencrvs.data.dummy.address.line2="[{\"language\":\"eng\",\"value\":\"Street 1, place1\"}]"
+opencrvs.data.dummy.address.line3="[{\"language\":\"eng\",\"value\":\"behind place2\"}]"
+opencrvs.data.dummy.region="[{\"language\":\"eng\",\"value\":\"Rabat Sale Kenitra\"}]"
+opencrvs.data.dummy.province="[{\"language\":\"eng\",\"value\":\"Kenitra\"}]"
+opencrvs.data.dummy.city="[{\"language\":\"eng\",\"value\":\"Kenitra\"}]"
+opencrvs.data.dummy.zone="[{\"language\":\"eng\",\"value\":\"Ben Mansour\"}]"
+opencrvs.data.dummy.postal.code="[{\"language\":\"eng\",\"value\":\"14022\"}]"
+# opencrvs.subscribe.startup=false
+# opecnrvs.auth.url=
+# opencrvs.callback.url=
+# opencrvs.webhooks.url=
+# opencrvs.client.id=mosip-opencrvs-client
+# opencrvs.client.id=mosip-regproc-client
+# opencrvs.client.secret.key=abc123
+# opencrvs.client.sha.secret=abc123
+# mosip.opencrvs.client.id=mosip-regproc-client
+# mosip.opencrvs.client.secret.key=
+
+mosip.iam.token_endpoint=http://${keycloak.internal.host}/auth/realms/mosip/protocol/openid-connect/token
+
+config.server.file.storage.uri=http://config-server.config-server/config/*/default/release-1.2.0/
+registration.processor.identityjson=identity-mapping.json
+
+mosip.registration.processor.registration.sync.id=mosip.registration.sync
+mosip.registration.processor.application.version=1.0
+
+MIDSCHEMAURL=${mosip.kernel.syncdata-service-idschema-url}
+SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=${mosip.packet.receiver.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+RIDGENERATION=http://ridgenerator.kernel/v1/ridgenerator/generate/rid
+
+IDSchema.Version=0.1
+id.repo.update=mosip.id.update
+objectstore.crypto.name=OnlinePacketCryptoServiceImpl
+
+objectstore.adapter.name=PosixAdapter
+object.store.base.location=./packets/mosip-opencrvs/
+
+mosip.opencrvs.db.datasource.jdbc-url=jdbc:postgresql://postgres-postgresql.postgres:5432/mosip_opencrvs
+mosip.opencrvs.db.datasource.username=opencrvsuser
+# mosip.opencrvs.db.datasource.password=
+mosip.opencrvs.db.datasource.birth.transaction.table=opencrvs.birth_transactions
+mosip.opencrvs.db.datasource.cr.by=system
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+mosip.opencrvs.kafka.bootstrap.server=kafka.kafka:9092
+mosip.opencrvs.kafka.topic=OPENCRVS_BIRTH_RECORDS
+mosip.opencrvs.kafka.admin.request.timeout.ms=2000
+mosip.opencrvs.kafka.consumer.group.id=mediatorReceiver
+mosip.opencrvs.kafka.consumer.poll.interval.ms=1000
+mosip.opencrvs.kafka.consumer.auto.offset.reset=latest
+mosip.opencrvs.kafka.consumer.enable.auto.commit=true
+mosip.opencrvs.kafka.consumer.auto.commit.interval.ms=500
\ No newline at end of file

From 228bc501ee757bbb46e524f79f928991f1ee5a10 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 18 Mar 2022 12:33:38 +0530
Subject: [PATCH 0723/1358] [MOSIP-8576] Update opencrvs-default.properties

---
 opencrvs-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 89454631360..e79ddac2d8c 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -22,7 +22,7 @@ opencrvs.data.dummy.zone="[{\"language\":\"eng\",\"value\":\"Ben Mansour\"}]"
 opencrvs.data.dummy.postal.code="[{\"language\":\"eng\",\"value\":\"14022\"}]"
 # opencrvs.subscribe.startup=false
 # opecnrvs.auth.url=
-# opencrvs.callback.url=
+# opencrvs.birth.callback.url=
 # opencrvs.webhooks.url=
 # opencrvs.client.id=mosip-opencrvs-client
 # opencrvs.client.id=mosip-regproc-client
@@ -65,4 +65,4 @@ mosip.opencrvs.kafka.consumer.group.id=mediatorReceiver
 mosip.opencrvs.kafka.consumer.poll.interval.ms=1000
 mosip.opencrvs.kafka.consumer.auto.offset.reset=latest
 mosip.opencrvs.kafka.consumer.enable.auto.commit=true
-mosip.opencrvs.kafka.consumer.auto.commit.interval.ms=500
\ No newline at end of file
+mosip.opencrvs.kafka.consumer.auto.commit.interval.ms=500

From 03584ce16aad4e5b739c04a1242405d4bef856d0 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 18 Mar 2022 14:12:23 +0530
Subject: [PATCH 0724/1358] [MOSIP-8576] Added Startup delay for subscribe

---
 opencrvs-default.properties | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index e79ddac2d8c..431cf293b6c 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -1,6 +1,6 @@
-mediator.core.pool.size=2
-mediator.max.pool.size=2
-mediator.queue.capacity=500
+mediator.core.pool.size=20
+mediator.max.pool.size=200
+mediator.queue.capacity=50
 
 opencrvs.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 
@@ -21,6 +21,7 @@ opencrvs.data.dummy.city="[{\"language\":\"eng\",\"value\":\"Kenitra\"}]"
 opencrvs.data.dummy.zone="[{\"language\":\"eng\",\"value\":\"Ben Mansour\"}]"
 opencrvs.data.dummy.postal.code="[{\"language\":\"eng\",\"value\":\"14022\"}]"
 # opencrvs.subscribe.startup=false
+# opencrvs.subscribe.startup.delay.ms=
 # opecnrvs.auth.url=
 # opencrvs.birth.callback.url=
 # opencrvs.webhooks.url=

From 84fd84f3177d1ad2497ad3fc03479e1d11e91943 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 18 Mar 2022 16:02:18 +0530
Subject: [PATCH 0725/1358] Keycloak host->url.

---
 opencrvs-default.properties | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 89454631360..91d8a56f973 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -1,3 +1,8 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+#  keycloak.internal.url
+
 mediator.core.pool.size=2
 mediator.max.pool.size=2
 mediator.queue.capacity=500
@@ -31,7 +36,7 @@ opencrvs.data.dummy.postal.code="[{\"language\":\"eng\",\"value\":\"14022\"}]"
 # mosip.opencrvs.client.id=mosip-regproc-client
 # mosip.opencrvs.client.secret.key=
 
-mosip.iam.token_endpoint=http://${keycloak.internal.host}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 config.server.file.storage.uri=http://config-server.config-server/config/*/default/release-1.2.0/
 registration.processor.identityjson=identity-mapping.json
@@ -65,4 +70,4 @@ mosip.opencrvs.kafka.consumer.group.id=mediatorReceiver
 mosip.opencrvs.kafka.consumer.poll.interval.ms=1000
 mosip.opencrvs.kafka.consumer.auto.offset.reset=latest
 mosip.opencrvs.kafka.consumer.enable.auto.commit=true
-mosip.opencrvs.kafka.consumer.auto.commit.interval.ms=500
\ No newline at end of file
+mosip.opencrvs.kafka.consumer.auto.commit.interval.ms=500

From 9018baaeb9ed78d2e8cb22e0e0650cc1043d5fdf Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 18 Mar 2022 18:47:16 +0530
Subject: [PATCH 0726/1358] [MOSIP-8576] Edited opencrvs props

---
 opencrvs-default.properties | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 564a4639ced..359eb01e3ad 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -1,8 +1,24 @@
-# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# Following properites have their values assigned via 'overrides' environment variables of config server docker.
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 #  keycloak.internal.url
 
+# Following properties get their values from environment variables of mediator helm chart.
+# DO NOT define the following properties in this file.
+ 
+# opencrvs.subscribe.startup=false
+# opencrvs.subscribe.startup.delay.ms=
+# opecnrvs.auth.url=
+# opencrvs.birth.callback.url=
+# opencrvs.webhooks.url=
+# opencrvs.client.id=mosip-opencrvs-client
+# opencrvs.client.id=mosip-regproc-client
+# opencrvs.client.secret.key=abc123
+# opencrvs.client.sha.secret=abc123
+# mosip.opencrvs.client.id=mosip-regproc-client
+# mosip.opencrvs.client.secret.key=
+# mosip.opencrvs.db.datasource.password=
+
 mediator.core.pool.size=20
 mediator.max.pool.size=200
 mediator.queue.capacity=50
@@ -17,14 +33,14 @@ opencrvs.audit.app.id=${opencrvs.appid}
 opencrvs.audit.app.name=${opencrvs.appName}
 opencrvs.data.gender.default.lang.code=eng
 opencrvs.data.lang.code.mapping=eng:eng|english|en,fra:french|fr|fra|fre
-opencrvs.data.dummy.address.line1="[{\"language\":\"eng\",\"value\":\"1234, block 1, road no1\"}]"
-opencrvs.data.dummy.address.line2="[{\"language\":\"eng\",\"value\":\"Street 1, place1\"}]"
-opencrvs.data.dummy.address.line3="[{\"language\":\"eng\",\"value\":\"behind place2\"}]"
-opencrvs.data.dummy.region="[{\"language\":\"eng\",\"value\":\"Rabat Sale Kenitra\"}]"
-opencrvs.data.dummy.province="[{\"language\":\"eng\",\"value\":\"Kenitra\"}]"
-opencrvs.data.dummy.city="[{\"language\":\"eng\",\"value\":\"Kenitra\"}]"
-opencrvs.data.dummy.zone="[{\"language\":\"eng\",\"value\":\"Ben Mansour\"}]"
-opencrvs.data.dummy.postal.code="[{\"language\":\"eng\",\"value\":\"14022\"}]"
+opencrvs.data.dummy.address.line1=[{"language":"eng","value":"1234, block 1, road no1"}]
+opencrvs.data.dummy.address.line2=[{"language":"eng","value":"Street 1, place1"}]
+opencrvs.data.dummy.address.line3=[{"language":"eng","value":"behind place2"}]
+opencrvs.data.dummy.region=[{"language":"eng","value":"Rabat Sale Kenitra"}]
+opencrvs.data.dummy.province=[{"language":"eng","value":"Kenitra"}]
+opencrvs.data.dummy.city=[{"language":"eng","value":"Kenitra"}]
+opencrvs.data.dummy.zone=[{"language":"eng","value":"Ben Mansour"}]
+opencrvs.data.dummy.postal.code=[{"language":"eng","value":"14022"}]
 # opencrvs.subscribe.startup=false
 # opencrvs.subscribe.startup.delay.ms=
 # opecnrvs.auth.url=

From c189586c24b6a16a55edb84ac9a6f487d4fe37c6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 18 Mar 2022 22:30:36 +0530
Subject: [PATCH 0727/1358] Comments added.

---
 data-share-default.properties             | 3 ++-
 id-repository-default.properties          | 3 ++-
 packet-manager-default.properties         | 3 ++-
 pre-registration-default.properties       | 3 ++-
 registration-processor-default.properties | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 3b2d73c9821..3be30655e2d 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -46,7 +46,8 @@ mosip.auth.filter_disable=false
 # Object store
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 84ae5bed5a4..ca5ca033644 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -386,7 +386,8 @@ springdoc.swagger-ui.operationsSorter=alpha
 # Object store
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index bff47db960f..85f29c401f3 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -24,7 +24,8 @@ auth.server.admin.allowed.audience=mosip-regproc-client
 # Object store
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 94aea318127..3ddd062e75e 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -436,7 +436,8 @@ mosip.security.authentication.provider.beans.list.pre-registration-booking-servi
 
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 21d4d90f030..b6fcc1c507f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -934,7 +934,8 @@ mosip.auth.filter_disable=false
 ## Object store 
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
 object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000

From 8084822741a5664472413f546c1c048f46e6d89a Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Fri, 18 Mar 2022 22:56:00 +0530
Subject: [PATCH 0728/1358] Opencrvs added as source.

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 0751b3794cd..bcd3d26c6ae 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -338,10 +338,10 @@ mosip.registration.gps_device_enable_flag=n
 ## Packet manager
 ## if source is not passed, packetmanager supports below default strategy -
 ## 1. 'exception' : it will throw exception.
-## 2.  'defaultPriority' : use default priority packetmanager.default.priority.
+## 2. 'defaultPriority' : use default priority packetmanager.default.priority.
 packetmanager.default.read.strategy=defaultPriority
 packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
-packetmanager.name.source={default:'REGISTRATION_CLIENT',resident:'RESIDENT'}
+packetmanager.name.source={default:'REGISTRATION_CLIENT',resident:'RESIDENT',opencrvs:'OPENCRVS'}
 packetmanager.packet.signature.disable-verification=true
 mosip.commons.packetnames=id,evidence,optional
 provider.packetreader.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|BIOMETRIC_CORRECTION,classname:io.mosip.commons.packet.impl.PacketReaderImpl

From d2ae9225c6ac3a898ca922a1d3f2395be918b866 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Sat, 19 Mar 2022 15:55:39 +0530
Subject: [PATCH 0729/1358] [MOSIP-8576] Added birth process type

---
 opencrvs-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 359eb01e3ad..52601297ab5 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -53,6 +53,9 @@ opencrvs.data.dummy.postal.code=[{"language":"eng","value":"14022"}]
 # mosip.opencrvs.client.id=mosip-regproc-client
 # mosip.opencrvs.client.secret.key=
 
+# The following process.type should the same one present in provider.packetwriter.opencrvs and provider.packetreader.opencrvs, in application-default.properties
+opencrvs.birth.process.type=OPENCRVS_NEW
+
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 config.server.file.storage.uri=http://config-server.config-server/config/*/default/release-1.2.0/

From 8eb02e5d4bf0da47f146196c977504ed80eae05d Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 19 Mar 2022 17:49:50 +0530
Subject: [PATCH 0730/1358] Opencrvs process added.

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b6fcc1c507f..674e1c5cd88 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -69,7 +69,7 @@ worker.pool.size=10
 camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
 
 # main processor used in stages
-registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE
+registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE,OPENCRVS_NEW
 # sub processor used in stages
 registration.processor.sub-processes=BIOMETRIC_CORRECTION
 
@@ -741,7 +741,7 @@ packetmanager.name.source.resident=RESIDENT
 packetmanager.name.source.default=REGISTRATION_CLIENT
 object.store.s3.use.account.as.bucketname=true
 
-# default priority for correction packets
+# Default priority for correction packets.
 # To define priority use below stage names. For example, field 'gender' has priority in uin-generator-stage. The key for uin-generator-stage is 'uingenerator'. So the key would be 'packetmanager.provider.uingenerator.gender'
 # packetreceiver,packetuploader,packetvalidator,qualitychecker,osivalidator,demodedupe,classification,biodedupe,bioauth,manualverification,uingenerator,messagesender
 packetmanager.provider.uingenerator.lastName=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT

From 1735ad3ffe651f10986cfabff83336b4508097aa Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Sat, 19 Mar 2022 17:54:32 +0530
Subject: [PATCH 0731/1358] [MOSIP-8576] Added prop to disable reproduce
 opencrvs

---
 opencrvs-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 52601297ab5..6d99a5ebb1d 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -56,6 +56,10 @@ opencrvs.data.dummy.postal.code=[{"language":"eng","value":"14022"}]
 # The following process.type should the same one present in provider.packetwriter.opencrvs and provider.packetreader.opencrvs, in application-default.properties
 opencrvs.birth.process.type=OPENCRVS_NEW
 
+# Incase the mediator encounters error creating and uploading the packet, it will reproduce the same if this is true.
+opencrvs.reproduce.on.error=false
+opencrvs.reproduce.on.error.delay.ms=10000
+
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 config.server.file.storage.uri=http://config-server.config-server/config/*/default/release-1.2.0/

From bcd92e5e4b0a9fe938e3ce49ad524c0cb1491ad9 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sat, 19 Mar 2022 18:43:48 +0530
Subject: [PATCH 0732/1358] Camel flow file for opencrvs added in
 configuration.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 674e1c5cd88..70c2773ae58 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -66,7 +66,7 @@ cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
-camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
+camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml,registration-processor-camel-routes-opencrvs_new-default.xml
 
 # main processor used in stages
 registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE,OPENCRVS_NEW

From 5ae1bd5c83d10906a9ce09e839fec16bab55b197 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Mon, 21 Mar 2022 10:04:35 +0530
Subject: [PATCH 0733/1358] reduced the
 registration.processor.reprocess.elapse.time to 300

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1b29817f1f0..2b06e5fd297 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -288,7 +288,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=4800
+registration.processor.reprocess.elapse.time=300
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From 1fe60fa4fc6822ac14f0e89e632b71ffec761967 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 21 Mar 2022 11:58:43 +0530
Subject: [PATCH 0734/1358] [ DSD-841 ] updated resident url in
 resident-app-default.properties

---
 application-default.properties  | 3 ++-
 resident-app-default.properties | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index bcd3d26c6ae..28b7593fd98 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -12,7 +12,7 @@
 aplication.configuration.level.version=LTS
 
 ## Idobject validator
-# This config is used for loading recommended centers based on the value of the config. 
+# This config is used for loading recommended centers based on the value of the config.
 # The value depicts the location hierarchy code of the hierarchy based on which the recommended centers is loaded
 mosip.recommended.centers.locCode=5
 
@@ -46,6 +46,7 @@ mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
 mosip.ida.auth.url=http://ida-auth.ida
 mosip.ida.otp.url=http://ida-otp.ida
+mosip.resident.url=http://resident.resident
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
 
diff --git a/resident-app-default.properties b/resident-app-default.properties
index c940c0d0e04..ed88cffe46a 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -1,7 +1,7 @@
 
 # MOSIP
 public.url=https://${mosip.api.internal.host}/residentmobileapp
-mosip.resident.base.url=${mosip.resident-service.url}/resident/v1
+mosip.resident.base.url=${mosip.resident.url}/resident/v1
 
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp

From f54334f7428376f4a1191e906a8ea12e089720c0 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 21 Mar 2022 17:16:42 +0530
Subject: [PATCH 0735/1358] [ DSD-841 ] updated audit manager url in
 admin-default.properties

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 6e2c97c7346..fb8d02b8419 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -172,7 +172,7 @@ mosip.kernel.registrationcenterid.length=5
 mosip.kernel.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
-mosip.admin-services.audit.manager.api=${mosip.auditmanager-service.url}/v1/auditmanager/audits
+mosip.admin-services.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client

From b3d5bbc65be156a74cc5683d54a851de326587b3 Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Tue, 22 Mar 2022 11:43:03 +0530
Subject: [PATCH 0736/1358] enable debug logging

---
 admin-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index fb8d02b8419..99b369cd75b 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -231,7 +231,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.lostrid.version=1.0
 LOST_RID_API=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/lostridsearch
-#logging.level.org.springframework.web.client.RestTemplate=DEBUG
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
 
 # Roles
 mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -290,4 +290,4 @@ mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.u
 # this property are used in AdminProxyService to get base url and version
 mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
-mosip.admin.base.url=https://${mosip.api.internal.host}/
\ No newline at end of file
+mosip.admin.base.url=https://${mosip.api.internal.host}/

From cb4ef3c60cf9afda837a25b29111b06660d87be3 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Mar 2022 12:32:49 +0530
Subject: [PATCH 0737/1358] Opencrvs property added.

---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index bcd3d26c6ae..360d43056cf 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -340,7 +340,8 @@ mosip.registration.gps_device_enable_flag=n
 ## 1. 'exception' : it will throw exception.
 ## 2. 'defaultPriority' : use default priority packetmanager.default.priority.
 packetmanager.default.read.strategy=defaultPriority
-packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+#packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
+packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT,source:OPENCRVS\/process:OPENCRVS_NEW
 packetmanager.name.source={default:'REGISTRATION_CLIENT',resident:'RESIDENT',opencrvs:'OPENCRVS'}
 packetmanager.packet.signature.disable-verification=true
 mosip.commons.packetnames=id,evidence,optional

From 0b30b3fe1a951c5d22b2e775db449aa1e9037584 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Mar 2022 12:42:25 +0530
Subject: [PATCH 0738/1358] Minor cleanup.

---
 application-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 138762972c3..c9e99c52b79 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -341,7 +341,6 @@ mosip.registration.gps_device_enable_flag=n
 ## 1. 'exception' : it will throw exception.
 ## 2. 'defaultPriority' : use default priority packetmanager.default.priority.
 packetmanager.default.read.strategy=defaultPriority
-#packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
 packetmanager.default.priority=source:REGISTRATION_CLIENT\/process:BIOMETRIC_CORRECTION|NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT,source:OPENCRVS\/process:OPENCRVS_NEW
 packetmanager.name.source={default:'REGISTRATION_CLIENT',resident:'RESIDENT',opencrvs:'OPENCRVS'}
 packetmanager.packet.signature.disable-verification=true

From b223abced8846bed8c5b1a25208961c9fc10ba46 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Mar 2022 13:25:17 +0530
Subject: [PATCH 0739/1358] Mandatory fields for opencrvs added.

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index c9e99c52b79..01ada94cccb 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -73,6 +73,7 @@ mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registra
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.other=IDSchemaVersion,UIN
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.lost=IDSchemaVersion
 mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.biometric_correction=IDSchemaVersion
+mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.opencrvs_new=IDSchemaVersion
 # Value used in IdObjectReferenceValidator when value is not available
 mosip.kernel.idobjectvalidator.masterdata.value-not-available=NA
 

From 774ef047f593beb7a805899d975990a9bd74f243 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Tue, 22 Mar 2022 14:21:51 +0530
Subject: [PATCH 0740/1358] [MOSIP-8576] Changing identity fields

---
 opencrvs-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 6d99a5ebb1d..0fee5d03530 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -40,7 +40,8 @@ opencrvs.data.dummy.region=[{"language":"eng","value":"Rabat Sale Kenitra"}]
 opencrvs.data.dummy.province=[{"language":"eng","value":"Kenitra"}]
 opencrvs.data.dummy.city=[{"language":"eng","value":"Kenitra"}]
 opencrvs.data.dummy.zone=[{"language":"eng","value":"Ben Mansour"}]
-opencrvs.data.dummy.postal.code=[{"language":"eng","value":"14022"}]
+opencrvs.data.dummy.postal.code="14022"
+opencrvs.data.dummy.phone="9898989898"
 # opencrvs.subscribe.startup=false
 # opencrvs.subscribe.startup.delay.ms=
 # opecnrvs.auth.url=

From a93e14d90e37ec274181e1c5c0cf7e7bbce8557e Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Tue, 22 Mar 2022 16:32:50 +0530
Subject: [PATCH 0741/1358] Added mosip.service.end-points property

---
 admin-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-default.properties b/admin-default.properties
index 99b369cd75b..64dcb7fea4d 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -291,3 +291,4 @@ mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.u
 mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://${mosip.api.internal.host}/
+mosip.service.end-points=/**/masterdata/**,/**/keymanager/**

From a38bc6b6c1432929e4596ecbd49aecb4b8b63515 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Mar 2022 21:17:18 +0530
Subject: [PATCH 0742/1358] Dedupe for infant enabled.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 0783898a9b6..f4fcd39c378 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -408,7 +408,7 @@ mosip.registration.processor.sms.id=mosip.sms.send
 registration.processor.signature.isEnabled=true
 
 ## Enable this flag only if infant biometrics are captured, and dedup is desired.
-registration.processor.infant.dedupe=N
+registration.processor.infant.dedupe=Y
 
 # ID Authentication 
 IDAUTHENCRYPTION=${IDAINTERNAL}/idauthentication/v1/internal/encrypt

From c20de21233f5e5281cdb86f4651ac2c051b10462 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Mar 2022 21:36:09 +0530
Subject: [PATCH 0743/1358] Reverted previous change.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f4fcd39c378..0783898a9b6 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -408,7 +408,7 @@ mosip.registration.processor.sms.id=mosip.sms.send
 registration.processor.signature.isEnabled=true
 
 ## Enable this flag only if infant biometrics are captured, and dedup is desired.
-registration.processor.infant.dedupe=Y
+registration.processor.infant.dedupe=N
 
 # ID Authentication 
 IDAUTHENCRYPTION=${IDAINTERNAL}/idauthentication/v1/internal/encrypt

From 6fe8cbcff1c415f833bffe5d2ca4198c7cb0bbc2 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Tue, 22 Mar 2022 21:51:16 +0530
Subject: [PATCH 0744/1358] Biodedupe stage removed.

---
 ...ssor-camel-routes-opencrvs_new-default.xml | 152 +-----------------
 1 file changed, 2 insertions(+), 150 deletions(-)

diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
index 1a8dfdd2149..ec4fbf3b448 100644
--- a/registration-processor-camel-routes-opencrvs_new-default.xml
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -148,157 +148,9 @@
          </otherwise>
       </choice>
    </route>
-   <route id="demo-dedupe-->bio-dedupe opencrvs_new route">
+   <route id="demo-dedupe-->uin-generator opencrvs_new route">
       <from uri="eventbus://demo-dedupe-opencrvs_new-bus-out" />
-      <log message="demo-dedupe-->bio-dedupe opencrvs_new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-rejected" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
-            <to uri="eventbus://abis-handler-bus-in" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
-            <to uri="eventbus://manual-adjudication-bus-in" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://bio-dedupe-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="abis-handler-->abis-middleware opencrvs_new route">
-      <from uri="eventbus://abis-handler-opencrvs_new-bus-out" />
-      <log message="abis-handler-->abis-middleware opencrvs_new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-middle-ware-bus-in')]</jsonpath>
-            <to uri="eventbus://abis-middle-ware-bus-in" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'demo-dedupe-bus-in')]</jsonpath>
-            <to uri="eventbus://demo-dedupe-bus-in" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'bio-dedupe-bus-in')]</jsonpath>
-            <to uri="eventbus://bio-dedupe-bus-in" />
-         </when>
-         <otherwise>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="bio-dedupe-->uin-generator opencrvs_new route">
-      <from uri="eventbus://bio-dedupe-opencrvs_new-bus-out" />
-      <log message="bio-dedupe-->uin-generator opencrvs_new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-rejected" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'verification-bus-in')]</jsonpath>
-            <to uri="eventbus://verification-bus-in" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
-            <to uri="eventbus://abis-handler-bus-in" />
-         </when>
-         <when>
-            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
-            <to uri="eventbus://manual-adjudication-bus-in" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://uin-generator-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="verification-->uin-generator opencrvs_new route">
-      <from uri="eventbus://verification-opencrvs_new-bus-out" />
-      <log message="verification-->uin-generator opencrvs_new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://uin-generator-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="abis-middleware-->abis-handler opencrvs_new route">
-      <from uri="eventbus://abis-middle-ware-opencrvs_new-bus-out" />
-      <log message="abis-middleware route-->abis-handler opencrvs_new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
-            <to uri="workflow-cmd://complete-as-failed" />
-            <to uri="workflow-cmd://anonymous-profile" />
-         </when>
-         <otherwise>
-            <to uri="eventbus://abis-handler-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="manual-adjudication-->uin-generator opencrvs_new route">
-      <from uri="eventbus://manual-adjudication-opencrvs_new-bus-out" />
-      <log message="manual-adjudication-->uin-generator opencrvs_new route ${bodyAs(String)}" />
+      <log message="demo-dedupe-->uin-generator opencrvs_new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>

From f4e1383d75675ba55423128f46b256c91729a5d5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 23 Mar 2022 06:31:48 +0530
Subject: [PATCH 0745/1358] Minor change in print property.

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index c9ff24e6a4f..6a0a4c9fd38 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -10,7 +10,7 @@ mosip.partner.id=mpartner-default-print
 mosip.datashare.partner.id=mpartner-default-resident
 mosip.datashare.policy.id=mpolicy-default-resident
 ## This callback is called by Websub to notify print
-mosip.event.callBackUrl=http://print-service.print/${server.servlet.context-path}/print/callback/notifyPrint
+mosip.event.callBackUrl=http://print-service.print${server.servlet.context-path}/print/callback/notifyPrint
 
 mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
 mosip.event.secret=${print.websub.hub.secret}

From dcd0f1196397873a2b465b865b21620796a5238e Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Thu, 24 Mar 2022 11:17:37 +0530
Subject: [PATCH 0746/1358] [MOSIP-20858] Regproc Opencrvs stage added

---
 ...ssor-camel-routes-opencrvs_new-default.xml | 21 ++++---------------
 registration-processor-default.properties     | 10 +++++++++
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
index ec4fbf3b448..455d206d304 100644
--- a/registration-processor-camel-routes-opencrvs_new-default.xml
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -214,13 +214,13 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://printing-bus-in" />
+            <to uri="eventbus://opencrvs-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="printing-stage-->opencrvs-stage opencrvs_new route">
-      <from uri="eventbus://printing-opencrvs_new-bus-out" />
-      <log message="printing-stage-->opencrvs-stage opencrvs_new route ${bodyAs(String)}" />
+   <route id="opencrvs-stage--> opencrvs_new route">
+      <from uri="eventbus://opencrvs-opencrvs_new-bus-out" />
+      <log message="opencrvs-stage--> opencrvs_new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -236,19 +236,6 @@
             <to uri="workflow-cmd://complete-as-failed" />
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
-         <otherwise>
-            <to uri="eventbus://opencrvs-bus-in" />
-         </otherwise>
-      </choice>
-   </route>
-   <route id="opencrvs-stage--> opencrvs_new route">
-      <from uri="eventbus://opencrvs-opencrvs_new-bus-out" />
-      <log message="opencrvs-stage--> opencrvs_new route ${bodyAs(String)}" />
-      <choice>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
             <to uri="workflow-cmd://anonymous-profile" />
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 0783898a9b6..6f128404fcc 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -737,6 +737,16 @@ mosip.regproc.printing.server.port=8099
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 
+#opencrvs-stage
+mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
+mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
+mosip.regproc.opencrvs.eventbus.kafka.poll.frequency=100
+mosip.regproc.opencrvs.eventbus.kafka.group.id=opencrvs-stage
+mosip.regproc.opencrvs.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.opencrvs.server.port=8045
+mosip.regproc.opencrvs.server.servlet.path=/registrationprocessor/v1/opencrvs-stage
+mosip.regproc.opencrvs.eventbus.port=5745
+
 packetmanager.name.source.resident=RESIDENT
 packetmanager.name.source.default=REGISTRATION_CLIENT
 object.store.s3.use.account.as.bucketname=true

From 735bb466cab92d279c5dfadd1820be25cca6f5ba Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Thu, 24 Mar 2022 16:05:57 +0530
Subject: [PATCH 0747/1358] [MOSIP-20858] Regproc Opencrvs stage edited

---
 registration-processor-camel-routes-opencrvs_new-default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
index 455d206d304..40fd34e8e87 100644
--- a/registration-processor-camel-routes-opencrvs_new-default.xml
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -195,9 +195,9 @@
          </otherwise>
       </choice>
    </route>
-   <route id="finalization-->printing-stage opencrvs_new route">
+   <route id="finalization-->opencrvs-stage opencrvs_new route">
       <from uri="eventbus://finalization-opencrvs_new-bus-out" />
-      <log message="finalization-->printing-stage opencrvs_new route ${bodyAs(String)}" />
+      <log message="finalization-->opencrvs-stage opencrvs_new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>

From bf7b77444256712a69d861cae4f9ff556660734a Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 25 Mar 2022 16:25:31 +0530
Subject: [PATCH 0748/1358] [MOSIP-20858] Added issuer and credentialtype for
 opencrvs partner

---
 partner-management-default.properties     | 2 +-
 registration-processor-default.properties | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 6fbca0f5b48..ff381272d19 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -180,7 +180,7 @@ mosip.security.secure-cookie:false
 partner.search.maximum.rows=10
 
 ## Allowed credential types which partner can map against to policy
-pmp.allowed.credential.types=auth,qrcode,euin,reprint,vercred 
+pmp.allowed.credential.types=auth,qrcode,euin,reprint,vercred,opencrvs
 
 ## Allowed partner types who can map policies to credential types
 policy.credential.type.mapping.allowed.partner.types=Credential_Partner,Online_Verification_Partner
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 6f128404fcc..5c75b070772 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -746,6 +746,8 @@ mosip.regproc.opencrvs.message.expiry-time-limit=${mosip.regproc.common.stage.me
 mosip.regproc.opencrvs.server.port=8045
 mosip.regproc.opencrvs.server.servlet.path=/registrationprocessor/v1/opencrvs-stage
 mosip.regproc.opencrvs.eventbus.port=5745
+mosip.regproc.opencrvs.credentialtype=opencrvs
+mosip.regproc.opencrvs.issuer=opencrvs-partner
 
 packetmanager.name.source.resident=RESIDENT
 packetmanager.name.source.default=REGISTRATION_CLIENT

From f99f8b833911f0a94646ee83047a5b7fa1d31072 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 25 Mar 2022 18:12:11 +0530
Subject: [PATCH 0749/1358] [MOSIP-20858] Revereted the camel opencrvs stage

---
 ...ssor-camel-routes-opencrvs_new-default.xml | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
index 40fd34e8e87..ec4fbf3b448 100644
--- a/registration-processor-camel-routes-opencrvs_new-default.xml
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -195,9 +195,9 @@
          </otherwise>
       </choice>
    </route>
-   <route id="finalization-->opencrvs-stage opencrvs_new route">
+   <route id="finalization-->printing-stage opencrvs_new route">
       <from uri="eventbus://finalization-opencrvs_new-bus-out" />
-      <log message="finalization-->opencrvs-stage opencrvs_new route ${bodyAs(String)}" />
+      <log message="finalization-->printing-stage opencrvs_new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -214,13 +214,13 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="eventbus://opencrvs-bus-in" />
+            <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
    </route>
-   <route id="opencrvs-stage--> opencrvs_new route">
-      <from uri="eventbus://opencrvs-opencrvs_new-bus-out" />
-      <log message="opencrvs-stage--> opencrvs_new route ${bodyAs(String)}" />
+   <route id="printing-stage-->opencrvs-stage opencrvs_new route">
+      <from uri="eventbus://printing-opencrvs_new-bus-out" />
+      <log message="printing-stage-->opencrvs-stage opencrvs_new route ${bodyAs(String)}" />
       <choice>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == true)]</jsonpath>
@@ -236,6 +236,19 @@
             <to uri="workflow-cmd://complete-as-failed" />
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
+         <otherwise>
+            <to uri="eventbus://opencrvs-bus-in" />
+         </otherwise>
+      </choice>
+   </route>
+   <route id="opencrvs-stage--> opencrvs_new route">
+      <from uri="eventbus://opencrvs-opencrvs_new-bus-out" />
+      <log message="opencrvs-stage--> opencrvs_new route ${bodyAs(String)}" />
+      <choice>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
+            <to uri="workflow-cmd://mark-as-reprocess" />
+         </when>
          <otherwise>
             <to uri="workflow-cmd://complete-as-processed" />
             <to uri="workflow-cmd://anonymous-profile" />

From d2138f317036b4c613dc28c715da42add280a25d Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Mon, 28 Mar 2022 12:57:38 +0530
Subject: [PATCH 0750/1358] [MOSIP-8576] Added allowed audience

---
 data-share-default.properties    | 2 +-
 id-repository-default.properties | 2 +-
 kernel-default.properties        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 3be30655e2d..6be511ea086 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -39,7 +39,7 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=false
 mosip.role.durian.postcreatepolicyidsubscriberid=CREATE_SHARE
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client,mpartner-default-print,mosip-resident-client
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client,mpartner-default-print,mosip-resident-client,opencrvs-partner
 
 mosip.auth.filter_disable=false
 
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ca5ca033644..88fceca6f48 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -378,7 +378,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-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
diff --git a/kernel-default.properties b/kernel-default.properties
index f2e5d9edc28..ae709711646 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -429,7 +429,7 @@ mosip.kernel.partner.issuer.certificate.allowed.grace.duration=0
 #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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}

From 1fb6b8f3a41b7395d7982695e00f163203c5d8ee Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Mon, 28 Mar 2022 13:12:00 +0530
Subject: [PATCH 0751/1358] Added auth.allowed.urls in develop3-v3

---
 admin-default.properties  | 1 +
 kernel-default.properties | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 64dcb7fea4d..6cf80f60a72 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -292,3 +292,4 @@ mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://${mosip.api.internal.host}/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
+auth.allowed.urls=${mosip.api.internal.url}/admin-ui/
diff --git a/kernel-default.properties b/kernel-default.properties
index ae709711646..adeee4bde3b 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -735,5 +735,8 @@ mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHE
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
 
-
+mosip.kernel.masterdata.template_idauthentication_event=MASTERDATA_IDAUTHENTICATION_TEMPLATES
+mosip.kernel.masterdata.title_event=MASTERDATA_TITLES
 mosip.kernel.keymanager.jwtsign.validate.json=false
+
+auth.allowed.urls=http://localhost:5000/

From 0595a6fe71efda23954c3040ebff8a7790003fed Mon Sep 17 00:00:00 2001
From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Date: Mon, 28 Mar 2022 14:51:14 +0530
Subject: [PATCH 0752/1358] Removed grace.period property.

---
 kernel-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index f2e5d9edc28..ad5b76e5ac5 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -420,7 +420,6 @@ mosip.kernel.masterdata.auth-user-details=/userdetails
 
 ## scheduler do it's job at 2am
 scheduling.job.cron=0 0 2 * * ?
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=0
 
 # masterdata swagger openApi
 #openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}

From c319dd42041d1f58b51cfeadfb619538bd0f91ce Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <mandeep.kumar@technoforte.co.in>
Date: Tue, 29 Mar 2022 18:47:53 +0530
Subject: [PATCH 0753/1358] Update admin-default.properties

---
 admin-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-default.properties b/admin-default.properties
index 6cf80f60a72..3cd2558756c 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -7,6 +7,7 @@
 # mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.regproc.client.secret
 
+logging.level.org.springframework.security=DEBUG
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
 ## Database properties

From c408372bdabcce5044e10b2580f60c0518473fc9 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <mandeep.kumar@technoforte.co.in>
Date: Tue, 29 Mar 2022 18:59:03 +0530
Subject: [PATCH 0754/1358] Update admin-default.properties

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 3cd2558756c..bd4b34f5166 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -188,7 +188,7 @@ mosip.admin-services.cookie.security=true
 mosip.ui.spec.default.domain=registration-client
 
 ## Security
-mosip.security.csrf-enable=true
+mosip.security.csrf-enable=false
 mosip.security.cors-enable=true
 mosip.security.origins=localhost:8080
 mosip.security.secure-cookie=false

From 582984df685686cf8284ddf2f27fc3e351403f7a Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Tue, 29 Mar 2022 19:12:40 +0530
Subject: [PATCH 0755/1358] modified allowed url for admin

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index bd4b34f5166..0368b408369 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -293,4 +293,4 @@ mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://${mosip.api.internal.host}/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
-auth.allowed.urls=${mosip.api.internal.url}/admin-ui/
+auth.allowed.urls=https://admin.dev3.mosip.net/

From 69597735dbf3840521fc3b4d8e64ad2ab1c6ecbd Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <mandeep.kumar@technoforte.co.in>
Date: Tue, 29 Mar 2022 20:00:42 +0530
Subject: [PATCH 0756/1358] Revert "modified allowed url for admin"

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 0368b408369..bd4b34f5166 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -293,4 +293,4 @@ mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://${mosip.api.internal.host}/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
-auth.allowed.urls=https://admin.dev3.mosip.net/
+auth.allowed.urls=${mosip.api.internal.url}/admin-ui/

From bbb1df5d48a47d88fe82acc9bf798ff58dd42b6b Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Tue, 29 Mar 2022 20:13:01 +0530
Subject: [PATCH 0757/1358] modified allowed url for admin

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index bd4b34f5166..0368b408369 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -293,4 +293,4 @@ mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://${mosip.api.internal.host}/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
-auth.allowed.urls=${mosip.api.internal.url}/admin-ui/
+auth.allowed.urls=https://admin.dev3.mosip.net/

From 8220799974793aa5377457e6fc2a4432e64347d8 Mon Sep 17 00:00:00 2001
From: Mandeep Dhiman <mandeep.kumar@technoforte.co.in>
Date: Wed, 30 Mar 2022 09:32:20 +0530
Subject: [PATCH 0758/1358] Update admin-default.properties

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 0368b408369..eaab1dd8e89 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -7,7 +7,7 @@
 # mosip.admin.client.secret   (convention: <realm>.<keycloak client name>.secret)
 # mosip.regproc.client.secret
 
-logging.level.org.springframework.security=DEBUG
+
 mosip.admin.version-id=v1.0
 mosip.admin.request-id=ADMIN.REQUEST
 ## Database properties

From f352bef613bf6e52acb28e1a1a8181a8b661c6f4 Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Wed, 30 Mar 2022 11:56:55 +0530
Subject: [PATCH 0759/1358] disable cors for admin

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index eaab1dd8e89..e9139c7ae5c 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -189,7 +189,7 @@ mosip.ui.spec.default.domain=registration-client
 
 ## Security
 mosip.security.csrf-enable=false
-mosip.security.cors-enable=true
+mosip.security.cors-enable=false
 mosip.security.origins=localhost:8080
 mosip.security.secure-cookie=false
 

From 5626c5a81a0f461bb4ff56e630448c93dbf6a9b7 Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Wed, 30 Mar 2022 17:15:02 +0530
Subject: [PATCH 0760/1358] enable csrf for admin

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index e9139c7ae5c..4409809376d 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -188,7 +188,7 @@ mosip.admin-services.cookie.security=true
 mosip.ui.spec.default.domain=registration-client
 
 ## Security
-mosip.security.csrf-enable=false
+mosip.security.csrf-enable=true
 mosip.security.cors-enable=false
 mosip.security.origins=localhost:8080
 mosip.security.secure-cookie=false

From 31e990ca66b1f98776331c739fce53cc9f985d2c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 30 Mar 2022 18:44:33 +0530
Subject: [PATCH 0761/1358] [ MOSIP-20973 ] added property for
 auth.allowed.urls

---
 partner-management-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index ff381272d19..3afa1665b6a 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -67,6 +67,9 @@ hibernate.cache.use_structured_entries=false
 hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
+## This property is used by kernel-authcodeflowproxy-api to check request is coming from allowed urls not.
+auth.allowed.urls=${mosip.api.internal.url}/pmp-ui/
+
 ## Application ID of PMP. Used to upload other domain certs
 application.id=PARTNER
 application.name=partner

From b4f8d0c207be70a46c48342d38f2e14c16f568ae Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 31 Mar 2022 16:06:54 +0530
Subject: [PATCH 0762/1358] [ DSD-897 ] updated
 ida-websub-partner-service-callback-url

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 89a1fb9dadb..d73939deb8a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -218,7 +218,7 @@ ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.template
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
-ida-websub-partner-service-callback-url=${mosip.pms.partnermanager.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
+ida-websub-partner-service-callback-url=${mosip.ida.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
 ida-websub-partner-service-apikey-approved-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/apikey_approved
 ida-websub-partner-service-partner-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_updated
 ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/policy_updated

From b966912d2d6545cad416e9ff68878589e4c70eb2 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 1 Apr 2022 11:07:20 +0530
Subject: [PATCH 0763/1358] [ MOSIP-20594 ] added secret for keycloak client
 "mpartner-default-mobile"

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index ed88cffe46a..81c1ec364b4 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -152,7 +152,7 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 #Auth Adapter rest template authentication configs
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
-mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
+mosip.iam.adapter.clientsecret=${mpartner.default.mobile.secret}
 auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip

From f295a82e226889835e34cc7ca8a72abfb636b576 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 1 Apr 2022 18:07:16 +0530
Subject: [PATCH 0764/1358] [MOSIP-8576] Edited with latest Changes in
 mosip-side mediator with websub subscription

---
 opencrvs-default.properties | 45 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index 0fee5d03530..a34180e9c22 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -5,19 +5,21 @@
 
 # Following properties get their values from environment variables of mediator helm chart.
 # DO NOT define the following properties in this file.
- 
-# opencrvs.subscribe.startup=false
-# opencrvs.subscribe.startup.delay.ms=
-# opecnrvs.auth.url=
-# opencrvs.birth.callback.url=
-# opencrvs.webhooks.url=
-# opencrvs.client.id=mosip-opencrvs-client
-# opencrvs.client.id=mosip-regproc-client
-# opencrvs.client.secret.key=abc123
-# opencrvs.client.sha.secret=abc123
-# mosip.opencrvs.client.id=mosip-regproc-client
+
+# opencrvs.receive.credential.url=
+# mosip.receive.credential.url= 
+# opencrvs.auth.url=
+# opencrvs.client.id=
+# opencrvs.client.id=
+# opencrvs.client.secret.key=
+# opencrvs.client.sha.secret=
+# mosip.opencrvs.client.id=mosip-opencrvs-client
 # mosip.opencrvs.client.secret.key=
 # mosip.opencrvs.db.datasource.password=
+# mosip.opencrvs.partner.client.id=opencrvs-partner
+# mosip.opencrvs.partner.client.sha.secret=
+# mosip.opencrvs.partner.username=opencrvs-partner
+# mosip.opencrvs.partner.password=
 
 mediator.core.pool.size=20
 mediator.max.pool.size=200
@@ -42,17 +44,6 @@ opencrvs.data.dummy.city=[{"language":"eng","value":"Kenitra"}]
 opencrvs.data.dummy.zone=[{"language":"eng","value":"Ben Mansour"}]
 opencrvs.data.dummy.postal.code="14022"
 opencrvs.data.dummy.phone="9898989898"
-# opencrvs.subscribe.startup=false
-# opencrvs.subscribe.startup.delay.ms=
-# opecnrvs.auth.url=
-# opencrvs.birth.callback.url=
-# opencrvs.webhooks.url=
-# opencrvs.client.id=mosip-opencrvs-client
-# opencrvs.client.id=mosip-regproc-client
-# opencrvs.client.secret.key=abc123
-# opencrvs.client.sha.secret=abc123
-# mosip.opencrvs.client.id=mosip-regproc-client
-# mosip.opencrvs.client.secret.key=
 
 # The following process.type should the same one present in provider.packetwriter.opencrvs and provider.packetreader.opencrvs, in application-default.properties
 opencrvs.birth.process.type=OPENCRVS_NEW
@@ -61,7 +52,17 @@ opencrvs.birth.process.type=OPENCRVS_NEW
 opencrvs.reproduce.on.error=false
 opencrvs.reproduce.on.error.delay.ms=10000
 
+mosip.opencrvs.websub.resubscribe=true
+mosip.opencrvs.websub.resubscribe.init.delay.ms=20000
+mosip.opencrvs.websub.resubscribe.delay.ms=21600000
+ 
+mosip.opencrvs.decrypt.privkey.path="/certs/mnt/mosip-priv.key"
+mosip.opencrvs.signverify.pubkey.path="/certs/mnt/opencrvs-pub.key"
+ 
+kernel.auth.adapter.available=false
+
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.validate_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/userinfo
 
 config.server.file.storage.uri=http://config-server.config-server/config/*/default/release-1.2.0/
 registration.processor.identityjson=identity-mapping.json

From 8980c09f5f7b9af84fd7c778e594d4c0b3b1a263 Mon Sep 17 00:00:00 2001
From: Lalith Kota <kotalalith@gmail.com>
Date: Fri, 1 Apr 2022 18:48:23 +0530
Subject: [PATCH 0765/1358] [MOSIP-8576] Certs Path

---
 opencrvs-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opencrvs-default.properties b/opencrvs-default.properties
index a34180e9c22..3a3268ca33d 100644
--- a/opencrvs-default.properties
+++ b/opencrvs-default.properties
@@ -56,8 +56,8 @@ mosip.opencrvs.websub.resubscribe=true
 mosip.opencrvs.websub.resubscribe.init.delay.ms=20000
 mosip.opencrvs.websub.resubscribe.delay.ms=21600000
  
-mosip.opencrvs.decrypt.privkey.path="/certs/mnt/mosip-priv.key"
-mosip.opencrvs.signverify.pubkey.path="/certs/mnt/opencrvs-pub.key"
+mosip.opencrvs.decrypt.privkey.path=/certs/mnt/mosip-priv.key
+mosip.opencrvs.signverify.pubkey.path=/certs/mnt/opencrvs-pub.key
  
 kernel.auth.adapter.available=false
 

From 0bc0a8e3680a0806e879ed9ac6544a6158de0df6 Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Mon, 4 Apr 2022 09:47:33 +0530
Subject: [PATCH 0766/1358] disable csrf for admin

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4409809376d..e9139c7ae5c 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -188,7 +188,7 @@ mosip.admin-services.cookie.security=true
 mosip.ui.spec.default.domain=registration-client
 
 ## Security
-mosip.security.csrf-enable=true
+mosip.security.csrf-enable=false
 mosip.security.cors-enable=false
 mosip.security.origins=localhost:8080
 mosip.security.secure-cookie=false

From 5c66321802bedacd2880cb6dac87ee165db5dd8e Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 4 Apr 2022 11:28:08 +0530
Subject: [PATCH 0767/1358] [ MOSIP-20594 ] Added mimoto-default.properties
 file for resident-app service

---
 mimoto-default.properties | 175 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 mimoto-default.properties

diff --git a/mimoto-default.properties b/mimoto-default.properties
new file mode 100644
index 00000000000..e51a9b15686
--- /dev/null
+++ b/mimoto-default.properties
@@ -0,0 +1,175 @@
+# MOSIP
+
+public.url=${mosip.api.internal.url}/residentmobileapp
+mosip.resident.base.url=${mosip.resident.url}/resident/v1
+
+
+RESIDENT_OTP=${mosip.resident.base.url}/req/otp
+RESIDENT_CREDENTIAL_REQUEST=${mosip.resident.base.url}/req/credential
+RESIDENT_CREDENTIAL_REQUEST_STATUS=${RESIDENT_CREDENTIAL_REQUEST}/status
+RESIDENT_VID=${mosip.resident.base.url}/vid
+RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
+RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
+
+
+# Resident App
+credential.template=template.json
+credential.sample=sample_credential.json
+credential.data.path=data
+safetynet.api.key=
+safetynet.api.url=https://www.googleapis.com/androidcheck/v1/attestations/verify?key=${safetynet.api.key}
+
+registration.processor.print.textfile=registration-processor-print-text-file.json
+
+# Websub
+mosip.event.hubUrl=${mosip.websub.url}/hub/
+mosip.event.hub.subUrl=${mosip.event.hubUrl}
+mosip.event.hub.pubUrl=${mosip.event.hubUrl}
+
+
+# MOSIP partner
+mosip.partner.id=mpartner-default-mobile
+mosip.event.callBackUrl=${public.url}/credentialshare/callback/notify
+mosip.event.topic=${mosip.partner.id}/CREDENTIAL_ISSUED
+mosip.event.secret=Kslk30SNF2AChs2
+
+
+mosip.partner.crypto.p12.filename=keystore.p12
+mosip.partner.crypto.p12.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.crypto.p12.alias=partner
+mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.prependThumbprint=true
+
+
+mosip.datashare.partner.id=mpartner-default-resident
+mosip.datashare.policy.id=mpolicy-default-resident
+
+
+csrf.disabled=true
+# Delayed websub subscription. Default is 5 seconds in ms.
+mosip.event.delay-millisecs=5000
+# Websub re-subscription workaround for losing subscribed topic when MOSIP websub update or restart. Default is 5 minutes in ms.
+websub-resubscription-delay-millisecs=300000
+
+#-------------TOKEN GENERATION----------------
+#Token generation request id
+token.request.id=io.mosip.registration.processor
+#Token generation app id
+token.request.appid=regproc
+#Token generation username
+token.request.username=registrationprocessor
+#Token generation password
+token.request.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+#Token generation version
+token.request.version=1.0
+#Token generation Client Id
+token.request.clientId=mosip-regproc-client
+#Token generation secret key
+token.request.secretKey={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+#Token generation issuer url
+token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+
+#Audit Service
+AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+AUDIT_URL=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+
+#Master Data Services
+# MASTER=http://kernel-masterdata-service/v1/masterdata
+MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
+TEMPLATES=${MASTER}/templates
+
+#Packet receiver application version
+mosip.print.application.version=1.0
+#Request Date Time format
+mosip.print.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+
+
+#-------------Printing Service--------------------
+mosip.print.service.id=mosip.print
+
+#Audit request id
+mosip.print.audit.id=mosip.applicanttype.getApplicantType
+mosip.country.code=MOR
+
+#Kernel Crypto signature
+registration.processor.signature.isEnabled=true
+
+# Language Supported By Platform - ISO
+mosip.supported-languages=eng,ara,fra
+
+mosip.template-language=eng
+mosip.optional-languages=fra,ara
+mosip.mandatory-languages=eng
+
+# mosip.primary-language=eng
+# mosip.secondary-language=ara
+
+#----------------------- CBEFF Util--------------------------------------------------
+# Cbeff URL where the files will be stored in git, change it accordingly in case of change of storage location.
+mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/print/${spring.profiles.active}/${spring.cloud.config.label}/
+# Cbeff XSD file name in config server
+mosip.kernel.xsdfile=mosip-cbeff.xsd
+
+#----------------------------- Applicant Type --------------------------------------------------
+mosip.kernel.applicant.type.age.limit = 5
+
+#----------------------------- Static PIN --------------------------------------------------
+mosip.kernel.pin.length=6
+
+#-----------------------------TOKEN-ID Properties---------------------------------
+#length of the token id
+mosip.kernel.tokenid.length=36
+
+# log level
+logging.level.root=WARN
+logging.level.io.mosip=INFO
+# logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
+logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
+logging.level.org.springframework.http.client=DEBUG
+logging.level.io.mosip.residentapp=INFO
+logging.level.reactor.netty.http.client=INFO
+# tomcat access logs
+server.tomcat.accesslog.enabled=true
+server.tomcat.accesslog.directory=/dev
+server.tomcat.accesslog.prefix=stdout
+server.tomcat.accesslog.buffered=false
+server.tomcat.accesslog.suffix=
+server.tomcat.accesslog.file-date-format=
+server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}"}
+server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
+registration.processor.unMaskedUin.length=5
+
+IDSchema.Version=1.0
+registration.processor.identityjson=identity-mapping.json
+registration.processor.demographic.identity=identity
+CREATEDATASHARE=${mosip.datashare.url}/v1/datashare/create
+DECRYPTPINBASSED=${mosip.kernel.keymanager.url}/v1/keymanager/decryptWithPin
+
+config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profiles.active}/${spring.cloud.config.label}/
+
+
+#Auth Adapter rest template authentication configs
+mosip.iam.adapter.appid=partner
+mosip.iam.adapter.clientid=mpartner-default-mobile
+mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/authenticate/clientidsecretkey
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+
+
+# in minutes
+mosip.iam.adapter.validate-expiry-check-rate=1440
+
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=1440
+
+#this should be false if you don?t use this restTemplate true if you do
+
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}

From 44241e996d421bcad4149de587053a41f33289f2 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 4 Apr 2022 12:17:41 +0530
Subject: [PATCH 0768/1358] [ MOSIP-20594 ] updated internal keycloak url &
 updated authmanager url

---
 mimoto-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index e51a9b15686..5aa64eca104 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -67,7 +67,7 @@ token.request.clientId=mosip-regproc-client
 #Token generation secret key
 token.request.secretKey={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 #Token generation issuer url
-token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 #Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -153,11 +153,11 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
-mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/authenticate/clientidsecretkey
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 
 

From b037b586500a47879bd1bfc753dddfcf724ed63a Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 4 Apr 2022 15:27:44 +0530
Subject: [PATCH 0769/1358] [ MOSIP-20594 ] update auth.server.admin.issuer.uri
 to keycloak external

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 5aa64eca104..5a9e5d435bf 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -153,7 +153,7 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager

From a4a20329964f6107b00bbc0bd026ecf07f3dd73a Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 4 Apr 2022 17:46:54 +0530
Subject: [PATCH 0770/1358] [ MOSIP-20594 ] updated keycloak client secret and
 auth issuer.url

---
 mimoto-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 5a9e5d435bf..37f7e7750ab 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -152,8 +152,8 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 #Auth Adapter rest template authentication configs
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
-mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+mosip.iam.adapter.clientsecret=${mpartner.default.mobile.secret}
+auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager

From ef20287987d6d7d04aa948cfeca77ba29e133716 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 5 Apr 2022 11:05:00 +0530
Subject: [PATCH 0771/1358] [ MOSIP-20594 ] updated keycloak client secret and
 auth issuer.url

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 37f7e7750ab..8cc3323c4c7 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -153,7 +153,7 @@ config.server.file.storage.uri=${spring.cloud.config.uri}/print/${spring.profile
 mosip.iam.adapter.appid=partner
 mosip.iam.adapter.clientid=mpartner-default-mobile
 mosip.iam.adapter.clientsecret=${mpartner.default.mobile.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 
 mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager

From fc9dcdb2b41362c9874ca3c4fa87f159c93100a5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 6 Apr 2022 20:50:07 +0530
Subject: [PATCH 0772/1358] Minor cleanup.

---
 pre-registration-default.properties | 2 --
 syncdata-default.properties         | 2 --
 2 files changed, 4 deletions(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 3ddd062e75e..d200225b120 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -5,8 +5,6 @@
 # mosip.prereg.client.secret
 # prereg.captcha.site.key
 # prereg.captcha.secret.key
-# keycloak.external.host
-# keycloak.external.url
 # keycloak.internal.host
 # keycloak.internal.url
 # s3.accesskey 
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 9a29894c198..0631b6e8354 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -2,8 +2,6 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.external.host
-# keycloak.external.url
 # keycloak.internal.host
 # keycloak.internal.url
 # keycloak.admin.password

From c8cce35088fcf85b3435d63ea5cf4b7579a05da6 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 6 Apr 2022 20:51:24 +0530
Subject: [PATCH 0773/1358] Minor cleanup.

---
 kernel-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 878af0ac7f9..0d37243c386 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -2,7 +2,6 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# keycloak.external.host
 # keycloak.external.url
 # keycloak.internal.host
 # keycloak.internal.url

From 326a42d66779a333035595467ccc89784a9e375c Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Wed, 6 Apr 2022 20:55:01 +0530
Subject: [PATCH 0774/1358] Minor cleanup.

---
 application-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 01ada94cccb..ba54a482f87 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -2,9 +2,7 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # override below properties for v2 deployment
-# keycloak.external.host
 # keycloak.external.url
-# keycloak.internal.host
 # keycloak.internal.url
 # mosip.api.internal.host
 

From 380a28c6df73d8ea1087e8703c89a3a4ec9eb4e0 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 8 Apr 2022 14:25:14 +0530
Subject: [PATCH 0775/1358] Disabled captcha

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index d200225b120..947813721e8 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -381,7 +381,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=true
+mosip.preregistration.captcha.enable=false
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}

From 50262ad56ada2dc746662848a1bd8a025732a0f5 Mon Sep 17 00:00:00 2001
From: Puneet Joshi <puneet@mosip.io>
Date: Sun, 10 Apr 2022 22:12:43 +0530
Subject: [PATCH 0776/1358] Client added in allowed audience.

---
 id-authentication-internal-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index ebd980db8d4..30aafc10c60 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,4 +32,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client

From 0964b766a9a31bfa525eb3df8bc2c0e766adc1b3 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 12 Apr 2022 13:50:21 +0530
Subject: [PATCH 0777/1358] [ DSD-930 ] updated 1.2.0.1-v3 branch with latest

---
 admin-default.properties                      |  5 +-
 application-default.properties                | 18 ++++--
 credential-service-default.properties         |  2 +-
 hotlist-default.properties                    |  2 +-
 id-authentication-default.properties          | 21 +++++--
 id-repository-default.properties              |  6 +-
 kernel-default.properties                     |  6 +-
 mosip-cbeff.xsd                               |  1 +
 mosip-context.json                            | 42 ++++++++++---
 partner-management-default.properties         |  6 +-
 print-default.properties                      |  2 +-
 registration-default.properties               | 59 ++++++++++++++++++-
 ...on-processor-camel-routes-lost-default.xml |  1 -
 ...ion-processor-camel-routes-new-default.xml | 17 ++++--
 registration-processor-default.properties     |  8 ++-
 resident-default.properties                   |  2 +-
 syncdata-default.properties                   |  3 +
 17 files changed, 156 insertions(+), 45 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index e9139c7ae5c..e5cf5fbd04c 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -174,6 +174,7 @@ mosip.kernel.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 mosip.admin-services.audit.manager.api=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+mosip.open-id.base-url=${keycloak.internal.url}
 mosip.admin-services.open-id.realmid=mosip
 mosip.admin-services.open-id.login_flow.name=authorization_code
 mosip.admin-services.open-id.clientid=mosip-admin-client
@@ -268,7 +269,7 @@ mosip.kernel.jsonvalidator.property-source = LOCAL
 mosip.kernel.jsonvalidator.file-storage-uri=LOCAL
 
 mosip.kernel.machineid.length=5
-
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 MACHINE_GET_API=${mosip.kernel.masterdata.url}/v1/masterdata/machines/mappedmachines/
 CRYPTOMANAGERDECRYPT_API=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
@@ -293,4 +294,4 @@ mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=https://${mosip.api.internal.host}/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
-auth.allowed.urls=https://admin.dev3.mosip.net/
+auth.allowed.urls=https://${mosip.admin.host}/
diff --git a/application-default.properties b/application-default.properties
index ba54a482f87..7a48cef4153 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -29,12 +29,17 @@ mosip.kernel.pridgenerator.url=http://pridgenerator.kernel
 mosip.idrepo.identity.url=http://identity.idrepo
 mosip.idrepo.vid.url=http://vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin
+mosip.admin.service.url=http://admin-service.admin
+mosip.admin.ui.url=http://admin-ui.admin
 mosip.pms.policymanager.url=http://pms-policy.pms
 mosip.pms.partnermanager.url=http://pms-partner.pms
+mosip.pms.ui.url=http://pms-ui.pms
 mosip.idrepo.credrequest.generator.url=http://credentialrequest.idrepo
 mosip.idrepo.credential.service.url=http://credential.idrepo
 mosip.datashare.url=http://datashare.datashare
-mosip.mock.biosdk.url=http://biosdk-service.biosdk
+mosip.ida.biosdk.url=http://biosdk-service.biosdk
+mosip.regproc.biosdk.url=http://biosdk-service.biosdk
+mosip.idrepo.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
 mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.regproc.transaction.service.url=http://regproc-trans.regproc
@@ -45,6 +50,7 @@ mosip.ida.internal.url=http://ida-internal.ida
 mosip.ida.auth.url=http://ida-auth.ida
 mosip.ida.otp.url=http://ida-otp.ida
 mosip.resident.url=http://resident.resident
+mosip.artifactory.url=http://artifactory.artifactory
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
 
@@ -84,8 +90,8 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,fra
-mosip.right_to_left_orientation=
+mosip.supported-languages=eng,fra,ara
+mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng,fra
 
 ## Application IDs
@@ -402,12 +408,12 @@ websub.publish.url=${mosip.websub.url}/hub/
 
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=fra
+mosip.optional-languages=fra,ara
 mosip.min-languages.count=2
-mosip.max-languages.count=2
+mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,fra
+mosip.default.template-languages=eng,fra,ara
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/credential-service-default.properties b/credential-service-default.properties
index 896a823e804..9dbf0acfd9e 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -16,7 +16,7 @@ mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id
 
 mosip.auth.filter_disable=false
 
-mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.file.server.url}/mosipvc/mosip-context.json" : "mosip-context.json"}
+mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.file.server.url}/.well-known/mosip-context.json" : "mosip-context.json"}
 mosip.credential.service.vercred.context.uri=vccontext.jsonld
 mosip.credential.service.vercred.id.url=${mosip.idrepo.credential.service.url}/credentials/
 mosip.credential.service.vercred.issuer.url=${mosip.file.server.url}/mosipvc/controller.json
diff --git a/hotlist-default.properties b/hotlist-default.properties
index c0ca979c816..cbf0d64c517 100644
--- a/hotlist-default.properties
+++ b/hotlist-default.properties
@@ -15,7 +15,7 @@ mosip.hotlist.db.driverClassName=org.postgresql.Driver
 mosip.hotlist.db.dialect=org.hibernate.dialect.PostgreSQL92Dialect
 
 ## Data validation
-mosip.hotlist.allowedIdTypes=UIN,VID,MACHINE_ID,PARTNER_ID,OPERATOR_ID,CENTER_ID,DEVICE,DEVICE_MODEL,FTM_PUBLIC_KEY
+mosip.hotlist.allowedIdTypes=UIN,VID,MACHINE_ID,PARTNER_ID,OPERATOR_ID,CENTER_ID,DEVICE,DEVICE_MODEL,FTM_PUBLIC_KEY,DEVICE_PROVIDER
 
 ## Data source
 mosip.hotlist.datasource.driverClassName=${mosip.hotlist.db.driverClassName}
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d73939deb8a..1c372bf88ea 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -113,7 +113,9 @@ ida.id.attribute.separator.fullAddress=,
 
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
-mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.ida.biosdk.url}/biosdk-service
+## For real biosdk
+# mosip.biosdk.default.service.url=${mosip.ida.biosdk-service.url}/api
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -216,6 +218,14 @@ ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
+ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
+ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
+## Callback url for credential issueance event notification, including id remove/deactivate/activate events
+ida-websub-idchage-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
+ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
+ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
+ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.ida.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
@@ -225,6 +235,9 @@ ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet
 ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
 ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
+## Callback url for hotlist event
+ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
+ida-websub-hotlist-callback-url=${mosip.api.internal.url}/${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
@@ -408,7 +421,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 ## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 ## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
+kernel.retry.retryable.exceptions=io.mosip.authentication.core.exception.IdAuthRetryException,io.mosip.authentication.core.exception.IdAuthenticationBaseException
 ## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -488,7 +501,7 @@ zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
 ## TODO: For testing. Revert in production
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+#mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 ## Admin
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
@@ -556,7 +569,7 @@ mosip.ida.allowed.domain.uris=${mosip.api.internal.url}
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
 #The list of attributes in identity that are to be decrypted by default 
-ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
 
 #------ Un-encrypted Credential Attributes list -----------
 #The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 88fceca6f48..aefca740c9a 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -65,7 +65,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 # Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 #Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException
+kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -163,7 +163,7 @@ mosip.iam.adapter.renewal-before-expiry-interval=15
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 
-mosip.idrepo.bio-extractor-service.rest.uri=${mosip.mock.biosdk.url}/biosdk-service/{extractionFormat}/extracttemplates
+mosip.idrepo.bio-extractor-service.rest.uri=${mosip.idrepo.biosdk.url}/biosdk-service/{extractionFormat}/extracttemplates
 mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
 mosip.idrepo.bio-extractor-service.rest.timeout=100
@@ -339,7 +339,7 @@ PARTNER_EXTRACTION_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/part
 credential.service.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # BioSDK service
-mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.idrepo.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
diff --git a/kernel-default.properties b/kernel-default.properties
index 0d37243c386..78a63323993 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -237,6 +237,7 @@ keycloak.verify-token-audience=true
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 
 mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -263,7 +264,6 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 
 master.search.maximum.rows=50
 mosip.level=2
@@ -405,7 +405,7 @@ syncdata.websub.resubscription.delay.millis=48000000
 ## Admin UI
 ## this pattern like --> display column : configKey. 
 ## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns}
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns};filterValueMaxCount:{"default":${mosip.kernel.filtervalue.max_columns},"registrationcenters":50,"locations":100}
 
 # Flag to identify the support of no thumbprint in 1.1.3 version. 
 # Added this for backward compatability. default is false, means support is not required.
@@ -733,8 +733,6 @@ mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHE
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
 
-mosip.kernel.masterdata.template_idauthentication_event=MASTERDATA_IDAUTHENTICATION_TEMPLATES
-mosip.kernel.masterdata.title_event=MASTERDATA_TITLES
 mosip.kernel.keymanager.jwtsign.validate.json=false
 
 auth.allowed.urls=http://localhost:5000/
diff --git a/mosip-cbeff.xsd b/mosip-cbeff.xsd
index b31269eb20b..edfa430a93d 100644
--- a/mosip-cbeff.xsd
+++ b/mosip-cbeff.xsd
@@ -113,6 +113,7 @@ SCHEMA.
 			<xs:enumeration value="Palm"/>
 			<xs:enumeration value="BackOfHand"/>
 			<xs:enumeration value="Wrist"/>
+			<xs:enumeration value="ExceptionPhoto"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="MultipleTypesType">
diff --git a/mosip-context.json b/mosip-context.json
index 340d83a04ed..e01a8d4b883 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -2,23 +2,47 @@
   "@context": [{
     "@version": 1.1
   },"https://www.w3.org/ns/odrl.jsonld", {
-    "mosip": "${mosip.api.internal.url}/mosip#",
+    "mosip": "${mosipbox.public.url}/mosip#",
     "schema": "http://schema.org/",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "vcVer": "mosip:vcVer",
     "UIN": "mosip:UIN",
-    "addressLine1": "mosip:addressLine1",
-    "addressLine2": "mosip:addressLine2",
-    "addressLine3": "mosip:addressLine3",
-    "city": "mosip:city",
+    "addressLine1": {
+      "@id": "${mosip.api.internal.url}/mosip#addressLine1",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "addressLine2": {
+      "@id": "${mosip.api.internal.url}/mosip#addressLine2",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "addressLine3": {
+      "@id": "${mosip.api.internal.url}/mosip#addressLine3",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "city": {
+      "@id": "${mosip.api.internal.url}/mosip#city",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
     "dateOfBirth": "mosip:dateOfBirth",
     "email": "mosip:email",
-    "fullName": "mosip:fullName",
-    "gender": "mosip:gender",
+    "fullName": {
+      "@id": "${mosip.api.internal.url}/mosip#fullName",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "gender": {
+      "@id": "${mosip.api.internal.url}/mosip#gender",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
     "phone": "mosip:phone",
     "postalCode": "mosip:postalCode",
-    "province": "mosip:province",
-    "region": "mosip:region",
+    "province": {
+      "@id": "${mosip.api.internal.url}/mosip#province",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "region": {
+      "@id": "${mosip.api.internal.url}/mosip#region",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
     "biometrics": "mosip:biometrics"
   }]
 }
\ No newline at end of file
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 3afa1665b6a..ee71539b67d 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -58,8 +58,8 @@ mosip.datasource.regdevice.hibernate.dialect=org.hibernate.dialect.PostgreSQL95D
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.hbm2ddl.auto=none
-hibernate.show_sql=true
-hibernate.format_sql=true
+hibernate.show_sql=false
+hibernate.format_sql=false
 hibernate.connection.charSet=utf8
 hibernate.cache.use_second_level_cache=false
 hibernate.cache.use_query_cache=false
@@ -68,7 +68,7 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 ## This property is used by kernel-authcodeflowproxy-api to check request is coming from allowed urls not.
-auth.allowed.urls=${mosip.api.internal.url}/pmp-ui/
+auth.allowed.urls=${mosip.pms.host}/pmp-ui/#/pmp/home
 
 ## Application ID of PMP. Used to upload other domain certs
 application.id=PARTNER
diff --git a/print-default.properties b/print-default.properties
index 6a0a4c9fd38..f06af5dc362 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -66,7 +66,7 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,fra
+mosip.supported-languages=eng,fra,ara
 mosip.template-language=eng
 mosip.optional-languages=fra,ara
 mosip.mandatory-languages=eng
diff --git a/registration-default.properties b/registration-default.properties
index 67154c789d8..c48829578d3 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -414,4 +414,61 @@ mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRAT
 mosip.registration.mdm.connection.timeout=10000
 mosip.registration.mdm.RCAPTURE.connection.timeout=40000
 mosip.registration.mdm.MOSIPDINFO.connection.timeout=5000
-mosip.registration.mdm.MOSIPDISC.connection.timeout=5000
\ No newline at end of file
+mosip.registration.mdm.MOSIPDISC.connection.timeout=5000
+
+mosip.registration.HTTP_API_READ_TIMEOUT=60000
+mosip.registration.HTTP_API_WRITE_TIMEOUT=60000
+
+## Global properties
+mosip.right_to_left_orientation=${mosip.right_to_left_orientation}
+mosip.left_to_right_orientation=${mosip.left_to_right_orientation}
+mosip.mandatory-languages=${mosip.mandatory-languages}
+mosip.optional-languages=${mosip.optional-languages}
+mosip.min-languages.count=${mosip.min-languages.count}
+mosip.max-languages.count=${mosip.max-languages.count}
+mosip.kernel.keygenerator.symmetric-key-length=${mosip.kernel.keygenerator.symmetric-key-length}
+mosip.kernel.keygenerator.asymmetric-key-length=${mosip.kernel.keygenerator.asymmetric-key-length}
+mosip.kernel.keygenerator.asymmetric-algorithm-name=${mosip.kernel.keygenerator.asymmetric-algorithm-name}
+mosip.kernel.keygenerator.symmetric-algorithm-name=${mosip.kernel.keygenerator.symmetric-algorithm-name}
+mosip.kernel.crypto.symmetric-algorithm-name=${mosip.kernel.crypto.symmetric-algorithm-name}
+mosip.kernel.crypto.asymmetric-algorithm-name=${mosip.kernel.crypto.asymmetric-algorithm-name}
+mosip.kernel.crypto.gcm-tag-length=${mosip.kernel.crypto.gcm-tag-length}
+mosip.kernel.crypto.hash-symmetric-key-length=${mosip.kernel.crypto.hash-symmetric-key-length}
+mosip.kernel.crypto.hash-algorithm-name=${mosip.kernel.crypto.hash-algorithm-name}
+mosip.kernel.crypto.sign-algorithm-name=${mosip.kernel.crypto.sign-algorithm-name}
+mosip.kernel.crypto.hash-iteration=${mosip.kernel.crypto.hash-iteration}
+mosip.kernel.data-key-splitter=${mosip.kernel.data-key-splitter}
+mosip.kernel.signature.signature-request-id=${mosip.kernel.signature.signature-request-id}
+mosip.kernel.signature.signature-version-id=${mosip.kernel.signature.signature-version-id}
+mosip.kernel.prid.restricted-numbers=${mosip.kernel.prid.restricted-numbers}
+mosip.kernel.prid.length=${mosip.kernel.prid.length}
+mosip.kernel.prid.sequence-limit=${mosip.kernel.prid.sequence-limit}
+mosip.kernel.prid.repeating-block-limit=${mosip.kernel.prid.repeating-block-limit}
+mosip.kernel.prid.repeating-limit=${mosip.kernel.prid.repeating-limit}
+mosip.kernel.prid.not-start-with=${mosip.kernel.prid.not-start-with}
+mosip.kernel.uin.length=${mosip.kernel.uin.length}
+mosip.kernel.uin.restricted-numbers=${mosip.kernel.uin.restricted-numbers}
+mosip.kernel.uin.length.repeating-block-limit=${mosip.kernel.uin.length.repeating-block-limit}
+mosip.kernel.uin.length.sequence-limit=${mosip.kernel.uin.length.sequence-limit}
+mosip.kernel.uin.length.repeating-limit=${mosip.kernel.uin.length.repeating-limit}
+mosip.kernel.uin.length.conjugative-even-digits-limit=${mosip.kernel.uin.length.conjugative-even-digits-limit}
+mosip.kernel.uin.length.reverse-digits-limit=${mosip.kernel.uin.length.reverse-digits-limit}
+mosip.kernel.uin.length.digits-limit=${mosip.kernel.uin.length.digits-limit}
+mosip.kernel.vid.restricted-numbers=${mosip.kernel.vid.restricted-numbers}
+mosip.kernel.vid.not-start-with=${mosip.kernel.vid.not-start-with}
+mosip.kernel.vid.length.repeating-limit=${mosip.kernel.vid.length.repeating-limit}
+mosip.kernel.vid.length.repeating-block-limit=${mosip.kernel.vid.length.repeating-block-limit}
+mosip.kernel.vid.length.sequence-limit=${mosip.kernel.vid.length.sequence-limit}
+mosip.kernel.vid.length=${mosip.kernel.vid.length}
+mosip.kernel.registrationcenterid.length=${mosip.kernel.registrationcenterid.length}
+mosip.kernel.machineid.length=${mosip.kernel.machineid.length}
+## RID
+mosip.kernel.rid.length=${mosip.kernel.rid.length}
+mosip.kernel.rid.timestamp-length=${mosip.kernel.rid.timestamp-length}
+mosip.kernel.rid.sequence-length=${mosip.kernel.rid.sequence-length}
+## Virus scanner
+# Here we specify the Kubernetes service name if clamav runs inside cluster
+mosip.kernel.virus-scanner.host=${mosip.kernel.virus-scanner.host}
+mosip.kernel.virus-scanner.port=${mosip.kernel.virus-scanner.port}
+mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
+## end of global properties
diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index 3d15e356956..686bd0d8437 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -478,7 +478,6 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 1a2ad6c899a..16d8c55baea 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -33,6 +33,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- securezone-notification to packet-uploader Route -->
    <route id="securezone-notification-->packet-uploader new route">
       <from uri="eventbus://securezone-notification-new-bus-out" />
       <log message="securezone-notification-->packet-uploader new route ${bodyAs(String)}" />
@@ -54,6 +55,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- packet-uploader to packet-validator Route -->
    <route id="packet-uploader-->packet-validator new route">
       <from uri="eventbus://packet-uploader-new-bus-out" />
       <log message="packet-uploader-->packet-validator new route ${bodyAs(String)}" />
@@ -75,6 +77,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- Packet Validator to Packet classifier Route -->
    <route id="packet-validator-->packet-classifier new route">
       <from uri="eventbus://packet-validator-new-bus-out" />
       <log message="packet-validator-->packet-classifier new route ${bodyAs(String)}" />
@@ -98,6 +101,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- Packet Classifier to Quality Classifier Route -->
    <route id="packet-classifier-->cmd-validator new route">
       <from uri="eventbus://packet-classifier-new-bus-out" />
       <log message="packet-classifier-->quality-classifier new route ${bodyAs(String)}" />
@@ -284,10 +288,6 @@
             <to uri="workflow-cmd://complete-as-failed" />
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
-         <when>
-            <jsonpath>$.[?(@['isValid'] == true &amp;&amp; @['internalError'] == true)]</jsonpath>
-            <to uri="workflow-cmd://mark-as-reprocess" />
-         </when>
          <when>
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
@@ -301,6 +301,11 @@
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
             <to uri="eventbus://manual-adjudication-bus-in" />
          </when>
+         <when>
+            <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
+            <to uri="workflow-cmd://complete-as-rejected" />
+            <to uri="workflow-cmd://anonymous-profile" />
+         </when>
          <otherwise>
             <to uri="eventbus://bio-dedupe-bus-in" />
          </otherwise>
@@ -446,6 +451,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- UIN Generator to biometric-extraction Route -->
    <route id="uin-generation route-->biometric-extraction-stage new route">
       <from uri="eventbus://uin-generator-new-bus-out" />
       <log message="uin-generation-->biometric-extraction-stage route ${bodyAs(String)}" />
@@ -470,6 +476,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- biometric-extraction to finalization Route -->
    <route id="biometric-extraction route-->finalization-stage new route">
       <from uri="eventbus://biometric-extraction-new-bus-out" />
       <log message="biometric-extraction-->finalization-stage route ${bodyAs(String)}" />
@@ -493,6 +500,7 @@
          </otherwise>
       </choice>
    </route>
+   <!-- finalization to Printing Route -->
    <route id="finalization route-->printing-stage new route">
       <from uri="eventbus://finalization-new-bus-out" />
       <log message="finalization-->printing-stage route ${bodyAs(String)}" />
@@ -512,7 +520,6 @@
             <to uri="workflow-cmd://anonymous-profile" />
          </when>
          <otherwise>
-            <to uri="workflow-cmd://complete-as-processed" />
             <to uri="eventbus://printing-bus-in" />
          </otherwise>
       </choice>
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5c75b070772..b7c9473db1b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -235,6 +235,8 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
+mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.port=3310
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
 mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl
@@ -443,8 +445,8 @@ mosip.regproc.data.share.protocol=http
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
-#mosip.biosdk.default.host=${mosip.mock.biosdk.url}
-mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
+#mosip.biosdk.default.host=${mosip.regproc.biosdk.url}
+mosip.biosdk.default.service.url=${mosip.regproc.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -504,7 +506,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": "packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
diff --git a/resident-default.properties b/resident-default.properties
index 54b026cc8fd..bb0e31c101c 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -119,7 +119,7 @@ registration.processor.identityjson=identity-mapping.json
 
 #machine creation and search configs
 resident.update-uin.machine-name-prefix = resident_machine_
-resident.update-uin.machine-spec-id = 1001
+resident.update-uin.machine-spec-id = RESIDENT-1
 resident.update-uin.machine-zone-code = MOR
 
 #Auth Adapter rest template authentication configs
diff --git a/syncdata-default.properties b/syncdata-default.properties
index 0631b6e8354..e15c4ddd7a0 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -343,6 +343,9 @@ datastores=ldap_1_DS,db_1_DS,db_2_DS
 ## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
+## List of keys to auto generate.
+mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS
+
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 

From 6637d566c8930c3e7451d92314807814c7b5e45e Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Tue, 12 Apr 2022 18:03:44 +0530
Subject: [PATCH 0778/1358] Update partner-management-default.properties

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index ee71539b67d..14b87b165e0 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -68,7 +68,7 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 ## This property is used by kernel-authcodeflowproxy-api to check request is coming from allowed urls not.
-auth.allowed.urls=${mosip.pms.host}/pmp-ui/#/pmp/home
+auth.allowed.urls=${mosip.pmp.host}/pmp-ui/#/pmp/home
 
 ## Application ID of PMP. Used to upload other domain certs
 application.id=PARTNER

From a966f3eae3146d8d69c8d214fae99f5d9c9886f1 Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Mon, 25 Apr 2022 13:34:24 +0530
Subject: [PATCH 0779/1358] MOSIP-21477

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index e5cf5fbd04c..088185b5398 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -292,6 +292,6 @@ mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.u
 # this property are used in AdminProxyService to get base url and version
 mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
-mosip.admin.base.url=https://${mosip.api.internal.host}/
+mosip.admin.base.url=http://admin-proxy
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/

From c75cf34db25475c03135888a8217dc0429e79720 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 28 Apr 2022 11:42:07 +0530
Subject: [PATCH 0780/1358] MOSIP-21337 : updated admin-default.properties

---
 admin-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 088185b5398..da637c561b3 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -295,3 +295,7 @@ mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=http://admin-proxy
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/
+
+##This property is used for validation in kernel-masterdata-service
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
+mosip.kernel.masterdata.name.validate.regex=[^a-z]
\ No newline at end of file

From c798e3c0713918530d528148db2b7ee769990ea2 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Mon, 2 May 2022 18:07:59 +0530
Subject: [PATCH 0781/1358] Revert "MOSIP-21337 : updated
 admin-default.properties"

---
 admin-default.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index da637c561b3..088185b5398 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -295,7 +295,3 @@ mosip.admin.keymanager.service.version=v1
 mosip.admin.base.url=http://admin-proxy
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/
-
-##This property is used for validation in kernel-masterdata-service
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
-mosip.kernel.masterdata.name.validate.regex=[^a-z]
\ No newline at end of file

From 9022335de8ad1a638ea23a40b62ab2d2c3f60571 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 5 May 2022 18:43:56 +0530
Subject: [PATCH 0782/1358] [ DSD-952 ] set language to eng & ara

---
 application-default.properties  | 13 ++++++-------
 mimoto-default.properties       |  4 ++--
 print-default.properties        |  4 ++--
 registration-default.properties |  1 -
 resident-app-default.properties |  4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 7a48cef4153..09ef8a21745 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -90,9 +90,9 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,fra,ara
+mosip.supported-languages=eng,ara
 mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng,fra
+mosip.left_to_right_orientation=eng
 
 ## Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
@@ -274,7 +274,6 @@ mosip.kernel.virus-scanner.port=3310
 
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
-mosip.kernel.transliteration.franch-language-code=fra
 mosip.kernel.transliteration.english-language-code=eng
 
 ## DOB
@@ -408,12 +407,12 @@ websub.publish.url=${mosip.websub.url}/hub/
 
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=fra,ara
-mosip.min-languages.count=2
-mosip.max-languages.count=3
+mosip.optional-languages=ara
+mosip.min-languages.count=1
+mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,fra,ara
+mosip.default.template-languages=eng,ara
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 8cc3323c4c7..ce8fde91263 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
-mosip.optional-languages=fra,ara
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
diff --git a/print-default.properties b/print-default.properties
index f06af5dc362..26c9f8055ef 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -66,9 +66,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,fra,ara
+mosip.supported-languages=eng,ara
 mosip.template-language=eng
-mosip.optional-languages=fra,ara
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 ## CBEFF util
diff --git a/registration-default.properties b/registration-default.properties
index c48829578d3..980f1d7ce47 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -322,7 +322,6 @@ mosip.kernel.idobjectvalidator.property-source=LOCAL
 mosip.kernel.transliteration.arabic-language-code=ara
 
 #Language Code for French Language. Should not be modified
-mosip.kernel.transliteration.franch-language-code=fra
 
 #Language Code for English Language. Should not be modified
 mosip.kernel.transliteration.english-language-code=eng
diff --git a/resident-app-default.properties b/resident-app-default.properties
index 81c1ec364b4..dcf8f091b70 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
-mosip.optional-languages=fra,ara
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 4a9803cb7c8be0f185998b20ab36ed6010206009 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 5 May 2022 18:45:38 +0530
Subject: [PATCH 0783/1358] [ DSD-952 ] set language to eng & ara

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 088185b5398..7a7594c75cc 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -71,7 +71,7 @@ mosip.admin.security.policy.userrole-auth-url=${mosip.kernel.authmanager.url}/v1
 
 ## Masterdata cards
 
-mosip.admin.masterdata.lang-code=eng,ara,fra
+mosip.admin.masterdata.lang-code=eng,ara
 mosip.admin-services.required.roles=GLOBAL_ADMIN
 
 #masterdata machine

From ca01114ef7bb3c87be6fd2ea5a332c1973e573e6 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 6 May 2022 16:31:15 +0530
Subject: [PATCH 0784/1358] [MOSIP-21369]  added mosip-deployment-client to
 allowed.audience

---
 admin-default.properties                      | 2 +-
 application-default.properties                | 1 +
 id-authentication-internal-default.properties | 2 +-
 kernel-default.properties                     | 2 +-
 partner-management-default.properties         | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 7a7594c75cc..51df696f088 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -166,7 +166,7 @@ mosip.admin.masterdata.card.valid-document-ara=\u0648\u062B\u0627\u0626\u0642 \u
 
 ## UIN activate/deactivate
 mosip.admin.uinmgmt.uin-detail-search=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
-mosip.kernel.packet-status-update-url=${mosip.regproc.transaction.service.url}/registrationprocessor/v1/registrationtransaction/search
+mosip.kernel.packet-status-update-url=${mosip.regproc.transaction.service.url}/registrationprocessor/v1/registrationtransaction/search/
 mosip.kernel.packet-reciever-api-url=${mosip.packet.receiver.url}/registrationprocessor/v1/packetreceiver/registrationpackets
 mosip.kernel.zone-validation-url=${mosip.kernel.masterdata.url}/v1/masterdata/zones/authorize
 mosip.kernel.registrationcenterid.length=5 
diff --git a/application-default.properties b/application-default.properties
index 09ef8a21745..ab593bc9b17 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -26,6 +26,7 @@ mosip.kernel.idgenerator.url=http://idgenerator.kernel
 mosip.kernel.otpmanager.url=http://otpmanager.kernel
 mosip.kernel.syncdata.url=http://syncdata.kernel
 mosip.kernel.pridgenerator.url=http://pridgenerator.kernel
+mosip.kernel.ridgenerator.url=http://ridgenerator.kernel
 mosip.idrepo.identity.url=http://identity.idrepo
 mosip.idrepo.vid.url=http://vid.idrepo
 mosip.admin.hotlist.url=http://admin-hotlist.admin
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 30aafc10c60..4b05ca5f01b 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,4 +32,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client,mosip-deployment-client
diff --git a/kernel-default.properties b/kernel-default.properties
index 78a63323993..271183709f8 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -427,7 +427,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 14b87b165e0..4afa500ea73 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -153,7 +153,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client,mosip-deployment-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 

From cc65baeba92720dc2dfa35ecf2a8a804a17548c6 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 6 May 2022 18:03:38 +0530
Subject: [PATCH 0785/1358] [MOSIP-21369]  added mosip-deployment-client to
 allowed.audience

---
 id-authentication-internal-default.properties | 2 +-
 kernel-default.properties                     | 2 +-
 partner-management-default.properties         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 30aafc10c60..4b05ca5f01b 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,4 +32,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client,mosip-deployment-client
diff --git a/kernel-default.properties b/kernel-default.properties
index 78a63323993..271183709f8 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -427,7 +427,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 14b87b165e0..4afa500ea73 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -153,7 +153,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client,mosip-deployment-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 

From 642ee96857488dd452522ebad725886a78e270fb Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 6 May 2022 18:05:57 +0530
Subject: [PATCH 0786/1358] [MOSIP-21369]  added mosip-deployment-client to
 allowed.audience

---
 id-authentication-internal-default.properties | 2 +-
 kernel-default.properties                     | 2 +-
 partner-management-default.properties         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 30aafc10c60..4b05ca5f01b 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,4 +32,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client,mosip-deployment-client
diff --git a/kernel-default.properties b/kernel-default.properties
index 78a63323993..271183709f8 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -427,7 +427,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 14b87b165e0..4afa500ea73 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -153,7 +153,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client,mosip-deployment-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 

From 867657bde676279094785fb00d4e49ac7deb26d2 Mon Sep 17 00:00:00 2001
From: gaganama <anjinkumars@gmail.com>
Date: Wed, 18 May 2022 20:27:55 +0530
Subject: [PATCH 0787/1358] [ DSD -1026 ] updating
 partner-management-default.properties for pmp-ui

---
 partner-management-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4afa500ea73..4734d634a58 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -68,7 +68,7 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 ## This property is used by kernel-authcodeflowproxy-api to check request is coming from allowed urls not.
-auth.allowed.urls=${mosip.pmp.host}/pmp-ui/#/pmp/home
+auth.allowed.urls=https://${mosip.pmp.host}/
 
 ## Application ID of PMP. Used to upload other domain certs
 application.id=PARTNER
@@ -198,9 +198,9 @@ mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
 mosip.iam.module.clientsecret=${mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
-mosip.iam.module.login_flow.scope=cls
+mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token

From 75fce06c88a919b3762d3843ec672f4e1abbfa89 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Thu, 19 May 2022 14:58:32 +0530
Subject: [PATCH 0788/1358] [DSD-1026] updated the prop

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 14b87b165e0..4947e9974b7 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -200,7 +200,7 @@ mosip.iam.module.clientsecret=${mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token

From 13b9ac0f05f4d76a0be625431e54b44c0707adf4 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Thu, 19 May 2022 15:09:22 +0530
Subject: [PATCH 0789/1358] [DSD-1026] updated the prop

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4947e9974b7..ef65495d9fb 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -203,7 +203,7 @@ mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy

From 2b7baa9d765e232616c93046c9aeb896109547dd Mon Sep 17 00:00:00 2001
From: Nagarjuna K <nagarjunabtechece@gmail.com>
Date: Mon, 23 May 2022 11:38:06 +0530
Subject: [PATCH 0790/1358] Revert "[DSD-1026] updated the prop"

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index e5bc04cf50f..4734d634a58 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -203,7 +203,7 @@ mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy

From f65a4a91a6941d31acedd3f9a164b132c6f44f79 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Mon, 23 May 2022 11:49:51 +0530
Subject: [PATCH 0791/1358] Update id-authentication-default.properties

updated ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 1c372bf88ea..eaaf6337229 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -543,7 +543,7 @@ ida.fetch.failed.websub.messages.chunk.size=10
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
-ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
+ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl
 
 ## Demo SDK integration
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0

From 49f11cc37c9215c28414cacf8e7ceb38b2898202 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte
 <72004356+syed-salman-technoforte@users.noreply.github.com>
Date: Mon, 23 May 2022 11:59:55 +0530
Subject: [PATCH 0792/1358] [  DSD-1026 ] updated mosip-pmp-client secrets

---
 partner-management-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4734d634a58..09b4781fee4 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -196,7 +196,7 @@ policy.auth.allowed.token.types=random,partner,policy
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
 mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret=${mosip.partner.client.secret}
+mosip.iam.module.clientsecret=${mosip.pms.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code

From 1afbbcd33d5d2b0a6fb681a89bbe4a1b133e5238 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 23 May 2022 12:17:27 +0530
Subject: [PATCH 0793/1358] [ MOSIP-22128 ] updated clients to
 mosip-partner-client

---
 partner-management-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 09b4781fee4..81c66583310 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -195,8 +195,8 @@ policy.auth.allowed.token.types=random,partner,policy
 
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
-mosip.iam.module.clientID=mosip-pms-client
-mosip.iam.module.clientsecret=${mosip.pms.client.secret}
+mosip.iam.module.clientID=mosip-partner-client
+mosip.iam.module.clientsecret=${mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code

From 9b59e5da91696710964e54f3d263a162042205a6 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 23 May 2022 15:59:55 +0530
Subject: [PATCH 0794/1358] [ MOSIP-22128 ] updated client details

---
 kernel-default.properties             |  2 +-
 partner-management-default.properties | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 271183709f8..600cb4016fb 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -427,7 +427,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4afa500ea73..3165190814b 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -68,7 +68,7 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 ## This property is used by kernel-authcodeflowproxy-api to check request is coming from allowed urls not.
-auth.allowed.urls=${mosip.pmp.host}/pmp-ui/#/pmp/home
+auth.allowed.urls=https://${mosip.pmp.host}/
 
 ## Application ID of PMP. Used to upload other domain certs
 application.id=PARTNER
@@ -109,11 +109,11 @@ mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 # ApplicationId for partner
-mosip.pmp.auth.appId =partner
+mosip.pmp.auth.appId=partner
 # Kernel auth client ID for partner management services
 mosip.pmp.auth.clientId=mosip-partner-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey= ${mosip.partner.client.secret}
+mosip.pmp.auth.secretKey=${mosip.partner.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -124,7 +124,7 @@ pmp-keymanager.upload.other.domain.cert.rest.uri=${mosip.kernel.keymanager.url}/
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pmp.auth.clientId}
-mosip.iam.adapter.clientsecret=${mosip.partner.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.pmp.auth.secretKey}
 mosip.iam.adapter.appid=${mosip.pmp.auth.appId}
 
 # Used to get data share url to publish to websub
@@ -195,12 +195,12 @@ policy.auth.allowed.token.types=random,partner,policy
 
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
-mosip.iam.module.clientID=mosip-pms-client
+mosip.iam.module.clientID=mosip-partner-client
 mosip.iam.module.clientsecret=${mosip.partner.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
-mosip.iam.module.login_flow.scope=cls
+mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
-mosip.iam.authorization_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token

From 304d602fd4d9cc85f551ba099b1413ccf01595c9 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Mon, 23 May 2022 17:32:18 +0530
Subject: [PATCH 0795/1358] Update id-authentication-default.properties

Added Preferred lang to zero knowledge properties
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index eaaf6337229..4dee61c5367 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -576,7 +576,7 @@ ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferre
 #These attributes will not be decrypted when fetching the records from IDA DB for Authentication/EKYC/OTP requests.
 #By default all attributes are assumed to be Zero Knowledge encrypted.
 #Specify the attributes here only if they are not encrypted as per the datashare policy.
-ida-zero-knowledge-unencrypted-credential-attributes=
+ida-zero-knowledge-unencrypted-credential-attributes=preferredLang
 
 #openapi properties to sort tags and operations in Id Authentication
 springdoc.swagger-ui.tagsSorter=alpha

From d4787cc8d7c26c4889482fffb2bb51670db71289 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Mon, 23 May 2022 19:33:00 +0530
Subject: [PATCH 0796/1358] Update auth-policy-schema.json

Added kyc attributes
---
 auth-policy-schema.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/auth-policy-schema.json b/auth-policy-schema.json
index ef345a8cbdf..b5173828fcd 100644
--- a/auth-policy-schema.json
+++ b/auth-policy-schema.json
@@ -50,6 +50,12 @@
       "enum":["random","partner","policy"]
     }
   },
+  "kycLanguages": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
   "required":[
     "authTokenType",
     "allowedAuthTypes",

From 930e35a044479aa06c9abdcd9cfa66e20babf7f3 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 10:25:21 +0530
Subject: [PATCH 0797/1358] Changed abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 28c1736461096ab892cc31dab01678cd0bce22b9 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 11:50:08 +0530
Subject: [PATCH 0798/1358] Update mandatory.modalities with Exception Photo

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b7c9473db1b..bee18fc4b78 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -506,7 +506,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+#mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
@@ -965,4 +965,4 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face,EXCEPTION_PHOTO

From 596606d43dc8e49ef7312634c94ad0370199b615 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 12:09:38 +0530
Subject: [PATCH 0799/1358] Reverted return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 7f6aaabb91a9c9a75ce12cf9289402ad24990a95 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 12:41:24 +0530
Subject: [PATCH 0800/1358] Reverted mandatory.modalities

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index bee18fc4b78..df3a4ba51ae 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -965,4 +965,4 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face,EXCEPTION_PHOTO
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face

From d6505d2c27faeb944e3f89bbc458ce95661d4f94 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 13:33:32 +0530
Subject: [PATCH 0801/1358] Updated pause-settings

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index df3a4ba51ae..b7c9473db1b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -506,7 +506,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-#mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100

From 1e387568d1f346b71aebcc6d4f76964f01a3ea33 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 14:19:35 +0530
Subject: [PATCH 0802/1358] Update mandatory.modalities with Exception photo

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b7c9473db1b..296a618b587 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -965,4 +965,4 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face,EXCEPTION_PHOTO

From 1e51ba8fe6e63cefaf44346ed84507c1d40ac174 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Tue, 24 May 2022 15:16:06 +0530
Subject: [PATCH 0803/1358] Update auth-policy-schema.json

Updated kyc languages
---
 auth-policy-schema.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/auth-policy-schema.json b/auth-policy-schema.json
index b5173828fcd..d8ddb7f7e4d 100644
--- a/auth-policy-schema.json
+++ b/auth-policy-schema.json
@@ -48,14 +48,15 @@
     "authTokenType":{
       "type":"string",
       "enum":["random","partner","policy"]
-    }
-  },
-  "kycLanguages": {
+    },
+	  "kycLanguages": {
 			"type": "array",
 			"items": {
 				"type": "string"
 			}
-		},
+		}
+  },
+  
   "required":[
     "authTokenType",
     "allowedAuthTypes",

From 793c4d24ee2583c6958cbc627a012ebb2c69e266 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 24 May 2022 18:19:25 +0530
Subject: [PATCH 0804/1358] Update return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From a1c1e363439baf61bb211db3487c40fd741d5b5b Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Wed, 25 May 2022 17:20:03 +0530
Subject: [PATCH 0805/1358] Changed defaultResumeAction to "STOP_PROCESSING"

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 296a618b587..4323bfad5fd 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -506,7 +506,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "STOP_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100

From dc5565f3899a73dd99b2a4af91efc8917051f23b Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Thu, 26 May 2022 15:02:06 +0530
Subject: [PATCH 0806/1358] Fix for revoke VID url

---
 resident-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index bb0e31c101c..d10dd077e0e 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -48,7 +48,7 @@ INTERNALAUTH=${mosip.ida.internal.url}/idauthentication/v1/internal/auth
 INTERNALAUTHTRANSACTIONS=${mosip.ida.internal.url}/idauthentication/v1/internal/authTransactions
 KERNELENCRYPTIONSERVICE=${mosip.ida.internal.url}/idauthentication/v1/internal/getCertificate
 IDAUTHCREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
-IDAUTHREVOKEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid/deactivate
+IDAUTHREVOKEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 ## Notification service
 IDREPOGETIDBYUIN=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 IDREPOGETIDBYRID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
@@ -132,4 +132,4 @@ mosip.service-context=/resident/v1
 mosip.service.end-points=/**/*
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
-mosip.ida.env=Production
\ No newline at end of file
+mosip.ida.env=Production

From 14b1bae9d1c8871ef329f270e0739aae2e5e4a28 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 26 May 2022 16:18:58 +0530
Subject: [PATCH 0807/1358] Reverted return.duplicat to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From e0c37fb4d3f039e0f4603cf8e3e55b1884022423 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 31 May 2022 14:07:50 +0530
Subject: [PATCH 0808/1358] Updated return.duplicate=true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 1b0a06e3b9021130025022c3e9f5bd1ed7edb084 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 31 May 2022 14:19:53 +0530
Subject: [PATCH 0809/1358] Update return duplicates to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 7e08fe8aebaf29ecb8d649f98613fe2358e2075d Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Wed, 1 Jun 2022 09:26:49 +0530
Subject: [PATCH 0810/1358] Updated abis.return.duplicate=true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 5d973b60cf01705108f2d2ef038348a093cc0a40 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 1 Jun 2022 20:08:47 +0530
Subject: [PATCH 0811/1358] [ DSD-1078 ] updated mosip-context.json

---
 mosip-context.json | 51 +++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/mosip-context.json b/mosip-context.json
index e01a8d4b883..ba37660726b 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -1,48 +1,53 @@
 {
   "@context": [{
-    "@version": 1.1
-  },"https://www.w3.org/ns/odrl.jsonld", {
-    "mosip": "${mosipbox.public.url}/mosip#",
+       "@version": 1.1
+    },"https://www.w3.org/ns/odrl.jsonld", {
+    "mosip": "https://${mosip.api.host}/mosip#",
     "schema": "http://schema.org/",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "vcVer": "mosip:vcVer",
     "UIN": "mosip:UIN",
     "addressLine1": {
-      "@id": "${mosip.api.internal.url}/mosip#addressLine1",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#addressLine1",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine2": {
-      "@id": "${mosip.api.internal.url}/mosip#addressLine2",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#addressLine2",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine3": {
-      "@id": "${mosip.api.internal.url}/mosip#addressLine3",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#addressLine3",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "city": {
-      "@id": "${mosip.api.internal.url}/mosip#city",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#city",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
+     "gender": {
+        "@id": "https://${mosip.api.host}/mosip#gender",
+        "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+     "residenceStatus": {
+        "@id": "https://${mosip.api.host}/mosip#residenceStatus",
+        "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    
     "dateOfBirth": "mosip:dateOfBirth",
     "email": "mosip:email",
     "fullName": {
-      "@id": "${mosip.api.internal.url}/mosip#fullName",
-      "@context": {"value": "rdf:value", "lang": "@language"}
-    },
-    "gender": {
-      "@id": "${mosip.api.internal.url}/mosip#gender",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#fullName",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
-    "phone": "mosip:phone",
+  "phone": "mosip:phone",
     "postalCode": "mosip:postalCode",
     "province": {
-      "@id": "${mosip.api.internal.url}/mosip#province",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#province",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "region": {
-      "@id": "${mosip.api.internal.url}/mosip#region",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#region",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "biometrics": "mosip:biometrics"
   }]
-}
\ No newline at end of file
+}

From 5f6c026f43220997b708c9c948f4e6775f62e796 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 1 Jun 2022 20:08:47 +0530
Subject: [PATCH 0812/1358] [ DSD-1078 ] updated mosip-context.json

---
 mosip-context.json | 51 +++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/mosip-context.json b/mosip-context.json
index e01a8d4b883..ba37660726b 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -1,48 +1,53 @@
 {
   "@context": [{
-    "@version": 1.1
-  },"https://www.w3.org/ns/odrl.jsonld", {
-    "mosip": "${mosipbox.public.url}/mosip#",
+       "@version": 1.1
+    },"https://www.w3.org/ns/odrl.jsonld", {
+    "mosip": "https://${mosip.api.host}/mosip#",
     "schema": "http://schema.org/",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "vcVer": "mosip:vcVer",
     "UIN": "mosip:UIN",
     "addressLine1": {
-      "@id": "${mosip.api.internal.url}/mosip#addressLine1",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#addressLine1",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine2": {
-      "@id": "${mosip.api.internal.url}/mosip#addressLine2",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#addressLine2",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine3": {
-      "@id": "${mosip.api.internal.url}/mosip#addressLine3",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#addressLine3",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "city": {
-      "@id": "${mosip.api.internal.url}/mosip#city",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#city",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
+     "gender": {
+        "@id": "https://${mosip.api.host}/mosip#gender",
+        "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+     "residenceStatus": {
+        "@id": "https://${mosip.api.host}/mosip#residenceStatus",
+        "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    
     "dateOfBirth": "mosip:dateOfBirth",
     "email": "mosip:email",
     "fullName": {
-      "@id": "${mosip.api.internal.url}/mosip#fullName",
-      "@context": {"value": "rdf:value", "lang": "@language"}
-    },
-    "gender": {
-      "@id": "${mosip.api.internal.url}/mosip#gender",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#fullName",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
-    "phone": "mosip:phone",
+  "phone": "mosip:phone",
     "postalCode": "mosip:postalCode",
     "province": {
-      "@id": "${mosip.api.internal.url}/mosip#province",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#province",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "region": {
-      "@id": "${mosip.api.internal.url}/mosip#region",
-      "@context": {"value": "rdf:value", "lang": "@language"}
+        "@id": "https://${mosip.api.host}/mosip#region",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "biometrics": "mosip:biometrics"
   }]
-}
\ No newline at end of file
+}

From 29eb1382b57b5d56d238141560a111432ea9a36e Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 2 Jun 2022 13:06:30 +0530
Subject: [PATCH 0813/1358] Update return duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 07292cd9fe478f60f9fab0d2151528f2065b2090 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 2 Jun 2022 14:48:24 +0530
Subject: [PATCH 0814/1358] Update return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 067910e733036133424de0c318dbd517ed9de699 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 2 Jun 2022 15:04:18 +0530
Subject: [PATCH 0815/1358] Changed return.duplicate=false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 2a45257ac1cb0f5ed7c29fcc4e49c6c1704df36c Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Thu, 2 Jun 2022 15:20:45 +0530
Subject: [PATCH 0816/1358] [MOSIP-22166] updated the props

---
 application-default.properties       | 2 +-
 id-authentication-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index ab593bc9b17..a9975e89f06 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -38,7 +38,7 @@ mosip.pms.ui.url=http://pms-ui.pms
 mosip.idrepo.credrequest.generator.url=http://credentialrequest.idrepo
 mosip.idrepo.credential.service.url=http://credential.idrepo
 mosip.datashare.url=http://datashare.datashare
-mosip.ida.biosdk.url=http://biosdk-service.biosdk
+mosip.mock.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.biosdk.url=http://biosdk-service.biosdk
 mosip.idrepo.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4dee61c5367..f31b81d12bd 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -113,7 +113,7 @@ ida.id.attribute.separator.fullAddress=,
 
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
-mosip.biosdk.default.service.url=${mosip.ida.biosdk.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 ## For real biosdk
 # mosip.biosdk.default.service.url=${mosip.ida.biosdk-service.url}/api
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 

From 8e6f9a2d157246559be05d040e89aa85899b7045 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Thu, 2 Jun 2022 15:34:52 +0530
Subject: [PATCH 0817/1358] [DSD-1080] added the latest cbeff.xsd

---
 mosip-cbeff.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mosip-cbeff.xsd b/mosip-cbeff.xsd
index edfa430a93d..1bede505788 100644
--- a/mosip-cbeff.xsd
+++ b/mosip-cbeff.xsd
@@ -188,4 +188,4 @@ SCHEMA.
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file

From cfa95c9b422149ccb29c9530bd05dbe917daa096 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <loganathan.sekar@mindtree.com>
Date: Thu, 2 Jun 2022 16:13:24 +0530
Subject: [PATCH 0818/1358] Fixed config issues in qa5

---
 application-default.properties | 2 +-
 resident-default.properties    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index a9975e89f06..c95e996008c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -202,7 +202,7 @@ mosip.kernel.uin.not-start-with=0,1
 mosip.kernel.uin.length.conjugative-even-digits-limit=3
 
 ## Auth adapter
-auth.server.validate.url=${mosip.kernel.auth.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 
 #This is the frontend url configured in the open-id system. This url should match the issuer attribute in JWT.
 auth.server.admin.issuer.internal.uri=${keycloak.internal.url}/auth/realms/
diff --git a/resident-default.properties b/resident-default.properties
index d10dd077e0e..5ce9c8a47d6 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -62,7 +62,7 @@ MACHINEDETAILS=${MASTER}/machines
 MACHINESEARCH=${MASTER}/machines/search
 MACHINECREATE=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
-RIDGENERATION=${mosip.kernel-ridgenerator-service.url}/v1/ridgenerator/generate/rid
+RIDGENERATION=${mosip.kernel.ridgenerator.url}/v1/ridgenerator/generate/rid
 CREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 IDREPOSITORY=${mosip.idrepo.identity.url}/idrepository/v1/identity/
 ENCRYPTURL=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt

From d6abf671f856d23e92f69205c918e24374b2ded9 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:29:07 +0530
Subject: [PATCH 0819/1358] Corrected syncdata url

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 5ce9c8a47d6..928835ae5e3 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -67,7 +67,7 @@ CREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 IDREPOSITORY=${mosip.idrepo.identity.url}/idrepository/v1/identity/
 ENCRYPTURL=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 PACKETSIGNPUBLICKEY=${mosip.kernel.keymanager.url}/v1/keymanager/tpmsigning/publickey
-MIDSCHEMAURL=${mosip.kernel.keymanager.url}/v1/syncdata/latestidschema
+MIDSCHEMAURL=${mosip.kernel.syncdata.url}/v1/syncdata/latestidschema
 
 # DMZ service call
 SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync

From 3d165a63916b90a86538dea56fe259d6f4742a4e Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 2 Jun 2022 17:14:43 +0530
Subject: [PATCH 0820/1358] MOSIP-21337 : Updated kernel-default properties

---
 kernel-default.properties | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 600cb4016fb..75cbf373aaa 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -736,3 +736,10 @@ mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENT
 mosip.kernel.keymanager.jwtsign.validate.json=false
 
 auth.allowed.urls=http://localhost:5000/
+
+##These properties are used for validation in kernel-masterdata-service
+#For example, Arabic needs to be added along with english
+#the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
+#the final value in this case might look like [^a-z\u0600-\u06FF]
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
+mosip.kernel.masterdata.name.validate.regex=[^A-Za-z]
\ No newline at end of file

From 542d2ae6d0c258ffce15fdecaca68f6c897c5f4d Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 3 Jun 2022 14:10:51 +0530
Subject: [PATCH 0821/1358] updated the prop

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 947813721e8..2015866dbc8 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -290,7 +290,7 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-iam.base.url=${keycloak.internal.url}
+iam.base.url=${keycloak.external.url}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/mosip
 validationStatus=success
 context=auth-otp

From 7a0eb87082ff44ce2224da6b818f4eafd1bf193b Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 3 Jun 2022 14:18:28 +0530
Subject: [PATCH 0822/1358] Update pre-registration-default.properties

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 2015866dbc8..947813721e8 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -290,7 +290,7 @@ mosip.preregistration.login.id.validateotp=mosip.pre-registration.login.useridot
 mosip.preregistration.login.id.invalidatetoken=mosip.pre-registration.login.invalidate
 mosip.preregistration.login.id.config=mosip.pre-registration.login.config
 
-iam.base.url=${keycloak.external.url}
+iam.base.url=${keycloak.internal.url}
 auth-token-generator.rest.issuerUrl=${iam.base.url}/auth/realms/mosip
 validationStatus=success
 context=auth-otp

From 1a05c6957e236fdee1c0a30345117d3e0062d14c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 6 Jun 2022 13:27:48 +0530
Subject: [PATCH 0823/1358] [ MOSIP-22358 ] updated mosip.admin.base.url

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 51df696f088..3d5028a87b0 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -292,6 +292,6 @@ mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.u
 # this property are used in AdminProxyService to get base url and version
 mosip.admin.masterdata.service.version=v1
 mosip.admin.keymanager.service.version=v1
-mosip.admin.base.url=http://admin-proxy
+mosip.admin.base.url=http://admin-proxy.admin
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/

From 293630a9a8a7d67490297c7c345dfab65fa60f19 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 6 Jun 2022 14:04:57 +0530
Subject: [PATCH 0824/1358] [ MOSIP-22358 ] updated mosip.admin.base.url,
 masterdata and keymanager

---
 admin-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 3d5028a87b0..1e9945118cc 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -290,8 +290,8 @@ mosip.kernel.keymanager.uploadcertificate=${mosip.kernel.keymanager.url}/v1/keym
 mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadOtherDomainCertificate
 
 # this property are used in AdminProxyService to get base url and version
-mosip.admin.masterdata.service.version=v1
-mosip.admin.keymanager.service.version=v1
-mosip.admin.base.url=http://admin-proxy.admin
+mosip.admin.masterdata.service.version=masterdata.kernel/v1
+mosip.admin.keymanager.service.version=keymanager.keymanager/v1
+mosip.admin.base.url=http:/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/

From 4235ae49130e5a0f8e994c0fbc2254a2306a86d1 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 6 Jun 2022 15:08:22 +0530
Subject: [PATCH 0825/1358] update reset_password_url

---
 registration-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/registration-default.properties b/registration-default.properties
index 980f1d7ce47..4781be63054 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -363,7 +363,8 @@ mosip.registration.quality_check_with_sdk=N
 mosip.registration.replace_sdk_quality_score=N
 
 #URL for reset password
-mosip.registration.reset_password_url=${mosip.api.internal.url}/keycloak/auth/realms/mosip/account/
+#mosip.registration.reset_password_url=${mosip.api.internal.url}/keycloak/auth/realms/mosip/account/
+mosip.registration.reset_password_url=${keycloak.external.url}/auth/realms/mosip/account
 #Flag to check / bypass device cert validation
 
 mosip.registration.onboard_yourself_url=https://docs.mosip.io/platform/modules/registration-client/first-user-registration-and-onboarding

From b85501e99b0992777059e1153f415b52e712c296 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 6 Jun 2022 17:14:04 +0530
Subject: [PATCH 0826/1358] [ MOSIP-22358 ] updated mosip.admin.base.url,
 masterdata and keymanager

---
 admin-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 088185b5398..68ba069da95 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -290,8 +290,8 @@ mosip.kernel.keymanager.uploadcertificate=${mosip.kernel.keymanager.url}/v1/keym
 mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadOtherDomainCertificate
 
 # this property are used in AdminProxyService to get base url and version
-mosip.admin.masterdata.service.version=v1
-mosip.admin.keymanager.service.version=v1
-mosip.admin.base.url=http://admin-proxy
+mosip.admin.masterdata.service.version=masterdata.kernel/v1
+mosip.admin.keymanager.service.version=keymanager.keymanager/v1
+mosip.admin.base.url=http:/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/

From cbbf5071b008fc8168a26a1617017c8961a05802 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 6 Jun 2022 17:15:49 +0530
Subject: [PATCH 0827/1358] [ MOSIP-21337 ] updated kernel masterdata code and
 name validator

---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 75cbf373aaa..8a8a142fa72 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -741,5 +741,5 @@ auth.allowed.urls=http://localhost:5000/
 #For example, Arabic needs to be added along with english
 #the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
 #the final value in this case might look like [^a-z\u0600-\u06FF]
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
-mosip.kernel.masterdata.name.validate.regex=[^A-Za-z]
\ No newline at end of file
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
\ No newline at end of file

From bf4fd408bd27e31096a1f32b3a4759354395da5f Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Mon, 6 Jun 2022 17:25:54 +0530
Subject: [PATCH 0828/1358] [ DSD-1078 ] updated fileserver to external domain

---
 credential-service-default.properties |  6 +++---
 mosip-context.json                    | 20 ++++++++++----------
 vccontext.jsonld                      |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/credential-service-default.properties b/credential-service-default.properties
index 9dbf0acfd9e..02b710a497a 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -16,14 +16,14 @@ mosip.iam.adapter.appid.credential-service=${mosip.idrepo.credential.auth.app-id
 
 mosip.auth.filter_disable=false
 
-mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "${mosip.file.server.url}/.well-known/mosip-context.json" : "mosip-context.json"}
+mosip.credential.service.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "https://${mosip.api.public.host}/.well-known/mosip-context.json" : "mosip-context.json"}
 mosip.credential.service.vercred.context.uri=vccontext.jsonld
 mosip.credential.service.vercred.id.url=${mosip.idrepo.credential.service.url}/credentials/
-mosip.credential.service.vercred.issuer.url=${mosip.file.server.url}/mosipvc/controller.json
+mosip.credential.service.vercred.issuer.url=https://${mosip.api.public.host}/.well-known/controller.json
 mosip.credential.service.vercred.types=VerifiableCredential,MOSIPVerifiableCredential
 mosip.credential.service.vercred.proof.purpose=assertionMethod
 mosip.credential.service.vercred.proof.type=RsaSignature2018
-mosip.credential.service.vercred.proof.verificationmethod=${mosip.file.server.url}/mosipvc/public-key.json
+mosip.credential.service.vercred.proof.verificationmethod=https://${mosip.api.public.host}/.well-known/public-key.json
 
 KEYMANAGER_VERCRED_SIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwsSign
 credentialType.formatter.VERCRED=VerCredProvider
diff --git a/mosip-context.json b/mosip-context.json
index ba37660726b..e7d79e94181 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -2,50 +2,50 @@
   "@context": [{
        "@version": 1.1
     },"https://www.w3.org/ns/odrl.jsonld", {
-    "mosip": "https://${mosip.api.host}/mosip#",
+    "mosip": "https://${mosip.api.public.host}/mosip#",
     "schema": "http://schema.org/",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "vcVer": "mosip:vcVer",
     "UIN": "mosip:UIN",
     "addressLine1": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine1",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine1",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine2": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine2",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine2",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine3": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine3",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine3",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "city": {
-        "@id": "https://${mosip.api.host}/mosip#city",
+        "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "gender": {
-        "@id": "https://${mosip.api.host}/mosip#gender",
+        "@id": "https://${mosip.api.public.host}/mosip#gender",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
-        "@id": "https://${mosip.api.host}/mosip#residenceStatus",
+        "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     
     "dateOfBirth": "mosip:dateOfBirth",
     "email": "mosip:email",
     "fullName": {
-        "@id": "https://${mosip.api.host}/mosip#fullName",
+        "@id": "https://${mosip.api.public.host}/mosip#fullName",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
   "phone": "mosip:phone",
     "postalCode": "mosip:postalCode",
     "province": {
-        "@id": "https://${mosip.api.host}/mosip#province",
+        "@id": "https://${mosip.api.public.host}/mosip#province",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "region": {
-        "@id": "https://${mosip.api.host}/mosip#region",
+        "@id": "https://${mosip.api.public.host}/mosip#region",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "biometrics": "mosip:biometrics"
diff --git a/vccontext.jsonld b/vccontext.jsonld
index ff878ef02df..f9ceeb9f6bd 100644
--- a/vccontext.jsonld
+++ b/vccontext.jsonld
@@ -1,7 +1,7 @@
 {
    "context" : [
     "https://www.w3.org/2018/credentials/v1",
-    "${mosip.file.server.url}/mosipvc/mosip-context.json",
+    "https://${mosip.api.public.host}/.well-known/mosip-context.json",
     {
        "sec": "https://w3id.org/security#"
     }

From 544bcb5e1f06832b38a935ddad7b866a3fa83d37 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:15:49 +0530
Subject: [PATCH 0829/1358] Updated admin-default properties and
 partner-management default properties

---
 admin-default.properties              | 5 +++++
 partner-management-default.properties | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 68ba069da95..57fd3ccd991 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -295,3 +295,8 @@ mosip.admin.keymanager.service.version=keymanager.keymanager/v1
 mosip.admin.base.url=http:/
 mosip.service.end-points=/**/masterdata/**,/**/keymanager/**
 auth.allowed.urls=https://${mosip.admin.host}/
+
+# query param usd to refer url to redirect after logout
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
+# end session endpoint in OIDC
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout 
\ No newline at end of file
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 3165190814b..a6282ae7aeb 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -307,3 +307,8 @@ mosip.role.pms.postmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.putmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmispsmispidlicensekey=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
+
+# query param usd to refer url to redirect after logout
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
+# end session endpoint in OIDC
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout 
\ No newline at end of file

From 72550c9d5b66529c477c7421f22e25731db17256 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:25:01 +0530
Subject: [PATCH 0830/1358] Updated Admin-default properties and
 partner-management default properties

---
 admin-default.properties              | 7 ++++++-
 partner-management-default.properties | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 7b4bc4c6d6a..d95c8244c14 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -272,4 +272,9 @@ mosip.admin.packetupload.packetsync.phone=phone
 
 mosip.admin.audit.manager.eventName.pattern=^(Click|Page View): ([\W|\w]{1,100}$)
 
-registration.processor.identityjson=identity-mapping.json
\ No newline at end of file
+registration.processor.identityjson=identity-mapping.json
+
+# query param usd to refer url to redirect after logout
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
+# end session endpoint in OIDC
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout 
\ No newline at end of file
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 15697e143f1..f2113d818dd 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -305,3 +305,8 @@ mosip.role.pms.postmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.putmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
 mosip.role.pms.getmispsmispidlicensekey=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
+
+# query param usd to refer url to redirect after logout
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
+# end session endpoint in OIDC
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout 
\ No newline at end of file

From ed2b8aa4f2c177dbddb377d0973bfa2526db3cac Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:30:04 +0530
Subject: [PATCH 0831/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a3c42330154..8bce31547a9 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -966,4 +966,4 @@ mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,
 
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
 
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
\ No newline at end of file

From c73194786083a145c75acf40028680ff9957e432 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:34:49 +0530
Subject: [PATCH 0832/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 67 +++++++++++------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8bce31547a9..4323bfad5fd 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -2,8 +2,9 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # db.dbuser.password 
-# mosip.mosip.regproc.client.secret
-# keycloak.external.url
+# keycloak.internal.host
+# mosip.regproc.client.secret
+# keycloak.internal.url
 # activemq.host
 # activemq.core.port
 # s3.accesskey 
@@ -65,10 +66,10 @@ cluster.manager.file.name=hazelcast_default.xml
 # Workel pool size to process multiple requests parallely 
 worker.pool.size=10
 # Route files corresponding to the secure flow
-camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml
+camel.secure.active.flows.file.names=registration-processor-camel-routes-new-default.xml,registration-processor-camel-routes-update-default.xml,registration-processor-camel-routes-activate-default.xml,registration-processor-camel-routes-res-update-default.xml,registration-processor-camel-routes-deactivate-default.xml,registration-processor-camel-routes-lost-default.xml,registration-processor-camel-routes-res-reprint-default.xml,registration-processor-camel-routes-biometric-correction-default.xml,registration-processor-camel-routes-opencrvs_new-default.xml
 
 # main processor used in stages
-registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE
+registration.processor.main-processes=NEW,UPDATE,LOST,RES_UPDATE,ACTIVATE,DEACTIVATE,OPENCRVS_NEW
 # sub processor used in stages
 registration.processor.sub-processes=BIOMETRIC_CORRECTION
 
@@ -77,10 +78,10 @@ token.request.id=io.mosip.registration.processor
 token.request.appid=regproc
 token.request.version=1.0
 token.request.clientId=mosip-regproc-client
-token.request.secretKey=${mosip.mosip.regproc.client.secret}
+token.request.secretKey=${mosip.regproc.client.secret}
 # Token generation issuer url. NOTE: The url here must match the one mentioned in keycloak auth token, otherwise
 # performance of system will be severly affected.
-token.request.issuerUrl=${keycloak.external.url}/auth/realms/mosip
+token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 ## Audit Service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
@@ -141,7 +142,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 
 # Status for matched records in demo dedupe stage.
 # 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
-registration.processor.demodedupe.manual.adjudication.status=PENDING
+registration.processor.demodedupe.manual.adjudication.status=REJECTED
 
 # Validate hostlisted devices
 DEVICEHOTLIST=${mosip.admin.hotlist.url}/v1/hotlist/status
@@ -170,7 +171,6 @@ mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.registration.status.version=1.0
 mosip.registration.processor.transaction.version=1.0
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
-mosip.registration.processor.sync.version=1.0
 mosip.registration.processor.lostrid.version=1.0
 
 mosip.registration.processor.registration.external.status.id=mosip.registration.external.status
@@ -235,8 +235,8 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav
-mosip.kernel.virus-scanner.port=80
+mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.port=3310
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
 mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl
@@ -290,7 +290,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=4800
+registration.processor.reprocess.elapse.time=300
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron
@@ -347,8 +347,6 @@ registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudicatio
 registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
 # Manual verification queue message expiry in seconds, if given 0 then message will never expire
 # Buffer time above the expiry queue to allow reprocessing (in seconds)
-registration.processor.manual.adjudication.policy.id=mpolicy-default-adjudication
-registration.processor.manual.adjudication.subscriber.id=mpartner-default-adjudication
 registration.processor.manual.adjudication.queue.username=${registration.processor.queue.username}
 registration.processor.manual.adjudication.queue.password=${registration.processor.queue.password}
 registration.processor.manual.adjudication.queue.url=${registration.processor.queue.url}
@@ -393,14 +391,6 @@ mosip.regproc.workflow-manager.action.job.months=*
 #schedular weeks configuration
 mosip.regproc.workflow-manager.action.job.days_of_week=*
 
-mosip.regproc.workflow.action.job.server.port=8026
-mosip.regproc.workflow.action.job.eventbus.port=5754
-mosip.regproc.workflow.action.job.server.servlet.path=/registrationprocessor/v1/workflowmanager
-
-mosip.regproc.workflow.action.job.eventbus.kafka.commit.type=single
-mosip.regproc.workflow.action.job.eventbus.kafka.max.poll.records=100
-mosip.regproc.workflow.action.job.eventbus.kafka.poll.frequency=100
-mosip.regproc.workflow.action.job.eventbus.kafka.group.id=workflow-manager-service
 
 mosip.regproc.workflow.manager.eventbus.kafka.commit.type=single
 mosip.regproc.workflow.manager.eventbus.kafka.max.poll.records=100
@@ -455,8 +445,8 @@ mosip.regproc.data.share.protocol=http
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
-#mosip.biosdk.default.host=${mosip.mock.biosdk.url}
-mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
+#mosip.biosdk.default.host=${mosip.regproc.biosdk.url}
+mosip.biosdk.default.service.url=${mosip.regproc.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -516,8 +506,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
-
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "STOP_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
@@ -750,11 +739,23 @@ mosip.regproc.printing.server.port=8099
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 
+#opencrvs-stage
+mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
+mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
+mosip.regproc.opencrvs.eventbus.kafka.poll.frequency=100
+mosip.regproc.opencrvs.eventbus.kafka.group.id=opencrvs-stage
+mosip.regproc.opencrvs.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.opencrvs.server.port=8045
+mosip.regproc.opencrvs.server.servlet.path=/registrationprocessor/v1/opencrvs-stage
+mosip.regproc.opencrvs.eventbus.port=5745
+mosip.regproc.opencrvs.credentialtype=opencrvs
+mosip.regproc.opencrvs.issuer=opencrvs-partner
+
 packetmanager.name.source.resident=RESIDENT
 packetmanager.name.source.default=REGISTRATION_CLIENT
 object.store.s3.use.account.as.bucketname=true
 
-# default priority for correction packets
+# Default priority for correction packets.
 # To define priority use below stage names. For example, field 'gender' has priority in uin-generator-stage. The key for uin-generator-stage is 'uingenerator'. So the key would be 'packetmanager.provider.uingenerator.gender'
 # packetreceiver,packetuploader,packetvalidator,qualitychecker,osivalidator,demodedupe,classification,biodedupe,bioauth,manualverification,uingenerator,messagesender
 packetmanager.provider.uingenerator.lastName=source:REGISTRATION_CLIENT\/process:NEW|UPDATE|LOST,source:RESIDENT\/process:ACTIVATED|DEACTIVATED|RES_UPDATE|RES_REPRINT
@@ -932,9 +933,9 @@ mosip.registration.processor.registration.external.status.version=1.0
 mosip.registration.processor.packet.external.status.version=1.0
 
 mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret=${mosip.mosip.regproc.client.secret}
+mosip.iam.adapter.clientsecret=${mosip.regproc.client.secret}
 mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=30
@@ -947,8 +948,9 @@ mosip.auth.filter_disable=false
 ## Object store 
 object.store.s3.accesskey=${s3.accesskey}
 object.store.s3.secretkey=${s3.secretkey}
-## If minio, and running inside cluster URL will be something like http://minio.minio:9000.
-object.store.s3.url=s3.${s3.region}.amazonaws.com
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
@@ -962,8 +964,5 @@ mosip.role.registration.getPostsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,RE
 mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
-
-
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
-
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face
\ No newline at end of file
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face,EXCEPTION_PHOTO

From 6d3c893a04060a228e4fda5f556ac4f84d53a97c Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:37:52 +0530
Subject: [PATCH 0833/1358] Update registration-processor-default.properties


From 0d0367ea2f88a852d0e7ef1defe2e324a327eb2c Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 6 Jun 2022 20:38:47 +0530
Subject: [PATCH 0834/1358] Update registration-processor-default.properties


From 7f89128813b4dbd3eda1e275ca945f333ab29f2e Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 9 Jun 2022 18:19:36 +0530
Subject: [PATCH 0835/1358] Added Threshold quality for Iris and Face BioAuth

---
 registration-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/registration-default.properties b/registration-default.properties
index 4781be63054..881cf38b274 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -231,6 +231,11 @@ mosip.registration.mds.deduplication.enable.flag=N
 #Threshold quality for Fingerprint biometric authentication
 mosip.fingerprint_authentication.quality_score=30
 
+#Threshold quality for Iris biometric authentication
+mosip.iris_authentication.quality_score=30
+
+#Threshold quality for Face biometric authentication
+mosip.face_authentication.quality_score=30
 
 
 #Jobs

From 15ae94058ffeb8ae9205e13fba632d52cd4cd834 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 9 Jun 2022 18:57:17 +0530
Subject: [PATCH 0836/1358] [ MOSIP-22406 ] disabled kernel notification health
 check

---
 kernel-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 271183709f8..a25b8fb01c0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -61,6 +61,7 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.debug=false
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=5MB
+management.health.mail.enabled=false   ## set this property to "false" disable kernel notification health check
 
 ## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE

From 4eb8b4c5c9c4506a4cdb790e3520c5ccfd5112f1 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Thu, 9 Jun 2022 18:59:49 +0530
Subject: [PATCH 0837/1358] [ MOSIP-22406 ] disabled kernel notification health
 check

---
 kernel-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index a25b8fb01c0..7719cf3fa8f 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -61,7 +61,9 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.debug=false
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=5MB
-management.health.mail.enabled=false   ## set this property to "false" disable kernel notification health check
+
+## set this property to "false" to disable kernel notification health check
+management.health.mail.enabled=false
 
 ## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE

From 9bb907b7c7d58df7b013a94d300a3ffbffbf0182 Mon Sep 17 00:00:00 2001
From: Yashavant1629 <102220960+Yashavant1629@users.noreply.github.com>
Date: Mon, 13 Jun 2022 17:56:30 +0530
Subject: [PATCH 0838/1358] Added the below properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

##This property is used for validation in kernel-masterdata-service
mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\0600–06FF]
mosip.kernel.masterdata.name.validate.regex=[^a-z\0600–06FF]
---
 kernel-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 7719cf3fa8f..fc8f5543dac 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -739,3 +739,7 @@ mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENT
 mosip.kernel.keymanager.jwtsign.validate.json=false
 
 auth.allowed.urls=http://localhost:5000/
+
+##This property is used for validation in kernel-masterdata-service
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\0600–06FF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\0600–06FF]

From 68bd72d62feed023e3025e0c561da728170725fb Mon Sep 17 00:00:00 2001
From: Yashavant1629 <102220960+Yashavant1629@users.noreply.github.com>
Date: Mon, 13 Jun 2022 18:07:32 +0530
Subject: [PATCH 0839/1358] Update kernel-default.properties

updated regex property
---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index fc8f5543dac..21e0a37453e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -741,5 +741,5 @@ mosip.kernel.keymanager.jwtsign.validate.json=false
 auth.allowed.urls=http://localhost:5000/
 
 ##This property is used for validation in kernel-masterdata-service
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\0600–06FF]
-mosip.kernel.masterdata.name.validate.regex=[^a-z\0600–06FF]
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\0600–\06FF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\0600–\06FF]

From bcd9bc2ca0c9d1039b62ac6f135d4655f94a025a Mon Sep 17 00:00:00 2001
From: Yashavant1629 <102220960+Yashavant1629@users.noreply.github.com>
Date: Mon, 13 Jun 2022 18:13:06 +0530
Subject: [PATCH 0840/1358] Update kernel-default.properties

updated regex property
---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 21e0a37453e..ab9e7676f2e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -741,5 +741,5 @@ mosip.kernel.keymanager.jwtsign.validate.json=false
 auth.allowed.urls=http://localhost:5000/
 
 ##This property is used for validation in kernel-masterdata-service
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\0600–\06FF]
-mosip.kernel.masterdata.name.validate.regex=[^a-z\0600–\06FF]
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600–\u06FF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600–\u06FF]

From 2c43d98d01e882a3d586fe3c2bb423cc4a24d0ed Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Mon, 13 Jun 2022 18:49:51 +0530
Subject: [PATCH 0841/1358] MOSIP-21337 : Updated kernel default properties

---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ab9e7676f2e..e39dae653e0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -741,5 +741,5 @@ mosip.kernel.keymanager.jwtsign.validate.json=false
 auth.allowed.urls=http://localhost:5000/
 
 ##This property is used for validation in kernel-masterdata-service
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600–\u06FF]
-mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600–\u06FF]
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF]

From 744427794fd3ade3e21c0d546bd98829de997228 Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Tue, 14 Jun 2022 13:00:55 +0530
Subject: [PATCH 0842/1358] [ DSD-1119 ] removed management.health.mail.enabled

## set this property to "false" to disable kernel notification health check
management.health.mail.enabled=false
---
 kernel-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index e39dae653e0..90d1011a596 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -62,8 +62,6 @@ spring.mail.debug=false
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=5MB
 
-## set this property to "false" to disable kernel notification health check
-management.health.mail.enabled=false
 
 ## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE

From f70283a7b276fd0fa6c43e6689931767de14315f Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Mon, 20 Jun 2022 12:10:03 +0530
Subject: [PATCH 0843/1358] Updated properties file

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 7a48cef4153..65358ff55cd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -285,7 +285,7 @@ mosip.login.mode= email,mobile
 ## Notification
 mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
-mosip.kernel.sms.proxy-sms=true
+mosip.kernel.sms.proxy-sms=false
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true
 ## Notification lanugage types: either PRIMARY or BOTH 

From 67c904834f01d0deafebef6d30370a8205219146 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Mon, 20 Jun 2022 13:31:29 +0530
Subject: [PATCH 0844/1358] Added temporary workaround for kernel-notifier

---
 kernel-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 8a8a142fa72..d174f71715b 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -742,4 +742,5 @@ auth.allowed.urls=http://localhost:5000/
 #the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
 #the final value in this case might look like [^a-z\u0600-\u06FF]
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
-mosip.kernel.masterdata.name.validate.regex=[^a-z\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
\ No newline at end of file
+mosip.kernel.masterdata.name.validate.regex=[^a-z\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
+management.health.mail.enabled=false

From 78f7ed3d77dd4337d7c6bafbaeff30c39576a31d Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 20 Jun 2022 14:07:37 +0530
Subject: [PATCH 0845/1358] enabled PrependThumbprint

---
 data-share-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 6be511ea086..52537547358 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -37,7 +37,7 @@ mosip.data.share.includeCertificateHash=false
 mosip.data.share.includeCertificate=false
 mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
-mosip.data.share.prependThumbprint=false
+mosip.data.share.prependThumbprint=true
 mosip.role.durian.postcreatepolicyidsubscriberid=CREATE_SHARE
 auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client,mpartner-default-print,mosip-resident-client,opencrvs-partner
 

From 61ac8ed6f97d8665fe2cbf4629e9aa932eb1dfbd Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 20 Jun 2022 18:19:02 +0530
Subject: [PATCH 0846/1358] enabled debug for reg-status-service

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index c95e996008c..fd22c70b23e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -390,6 +390,7 @@ mosip.stage.environment=Developer
 logging.level.root=INFO
 logging.level.io.mosip=INFO
 logging.level.io.vertx=INFO
+logging.level.io.mosip.registration.processor.status=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## Tomcat access logs

From 1cf63af0ddbe40b6051c76b58ef432392981528e Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 21 Jun 2022 13:10:10 +0530
Subject: [PATCH 0847/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index d174f71715b..7e84d20fcff 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -743,4 +743,4 @@ auth.allowed.urls=http://localhost:5000/
 #the final value in this case might look like [^a-z\u0600-\u06FF]
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0C80-\u0CFF\u0900-\u097F\u0B80-\u0BFF]
-management.health.mail.enabled=false
+management.health.mail.enabled=true

From 6fb4b9101b3901bb530226c4e763dc41794b4155 Mon Sep 17 00:00:00 2001
From: NishantKumar4559 <100404536+NishantKumar4559@users.noreply.github.com>
Date: Tue, 5 Jul 2022 12:46:15 +0530
Subject: [PATCH 0848/1358] Update registration-processor-default.properties

removed face from mosip.regproc.cbeff-validation.mandatory.modalities
---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 4323bfad5fd..16071995b31 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -965,4 +965,4 @@ mosip.role.registration.getPostlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFF
 mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
-mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,Face,EXCEPTION_PHOTO
+mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO

From c2f094b0545ceac3ba59ffb5a8093a908f598cc5 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Mon, 11 Jul 2022 15:25:23 +0530
Subject: [PATCH 0849/1358] [DSD-1211] added the properties..

---
 registration-processor-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 16071995b31..4652f386e97 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -966,3 +966,6 @@ mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RE
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
+
+registration.processor.lostrid.max.registrationid=5
+mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
\ No newline at end of file

From 4f55fbfe9249e2a43a2dfe0605bae134c1a19e70 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 19 Jul 2022 17:25:31 +0530
Subject: [PATCH 0850/1358] Updated abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From ed6c19330caae4dfb9495c9b298d5e1f0af39a58 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 19 Jul 2022 17:46:17 +0530
Subject: [PATCH 0851/1358] Reverted abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From b3708f068c0a459403e5e60a52a2038dc9b4f90c Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:35:32 +0530
Subject: [PATCH 0852/1358] Added missing configs

---
 registration-processor-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b7c9473db1b..ee6f4a02ce4 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -316,6 +316,7 @@ registration.processor.verification.queue.password=${registration.processor.queu
 registration.processor.verification.queue.url=${registration.processor.queue.url}
 registration.processor.verification.queue.typeOfQueue=${registration.processor.queue.typeOfQueue}
 registration.processor.verification.queue.response=verification-to-mosip
+registration.processor.queue.verification.request=mosip-to-verification
 registration.processor.verification.policy.id=mpolicy-default-adjudication
 registration.processor.verification.subscriber.id=mpartner-default-adjudication
 registration.processor.queue.verification.request.messageTTL=5400
@@ -338,6 +339,8 @@ mosip.registration.processor.manual.adjudication.decision.id=mosip.manual.adjudi
 mosip.registration.processor.manual.adjudication.biometric.id=mosip.manual.adjudication.biometric
 mosip.registration.processor.manual.adjudication.demographic.id=mosip.manual.adjudication.demographic
 mosip.registration.processor.manual.adjudication.packetinfo.id=mosip.manual.adjudication.packetinfo
+registration.processor.queue.manual.adjudication.request=mosip-to-adjudication
+registration.processor.manual.adjudication.queue.response=adjudication-to-mosip
 
 #Manual verification queue message expiry in seconds, if given 0 then message will never expire
 registration.processor.queue.manual.adjudication.request.messageTTL=5400
@@ -527,6 +530,7 @@ mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.s
 mosip.regproc.packet.uploader.server.port=8087
 mosip.regproc.packet.uploader.server.servlet.path=/registrationprocessor/v1/uploader
 mosip.regproc.packet.uploader.eventbus.port=5714
+packet.manager.iteration.addition.enabled=true
 
 packet.uploader.stage=registration-processor-packet-uploader-stage
 

From 1fa3464cc1eb16f48596f21b1f06e1b48ecca81a Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:36:52 +0530
Subject: [PATCH 0853/1358] MOSIP-23101 : additional field search configuration

---
 packet-manager-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 85f29c401f3..ff436cc381e 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -4,6 +4,8 @@
 
 # Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
+# The additional fields to be searched apart from demograpgics 
+packetmanager.additional.fields.search.from.metainfo=officerBiometricFileName,supervisorBiometricFileName
 
 # Roles
 mosip.role.commons-packet.putcreatepacket=REGISTRATION_PROCESSOR

From 2d4007b52d05264fd3de22e3ad369053095dc744 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:38:41 +0530
Subject: [PATCH 0854/1358] MOSIP-23101 : additional field search configuration

---
 packet-manager-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 85f29c401f3..ff436cc381e 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -4,6 +4,8 @@
 
 # Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
+# The additional fields to be searched apart from demograpgics 
+packetmanager.additional.fields.search.from.metainfo=officerBiometricFileName,supervisorBiometricFileName
 
 # Roles
 mosip.role.commons-packet.putcreatepacket=REGISTRATION_PROCESSOR

From d5e5fb3a03ad13cde7bdd96179b60f9f30167bdf Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:03:42 +0530
Subject: [PATCH 0855/1358] Changed return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 944e17d1f2f8d22b19a71e8db43652b1b9d71707 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 22 Jul 2022 16:53:19 +0530
Subject: [PATCH 0856/1358] Updated mock.mv.decision to REJECTED

---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 4652f386e97..ece19278e08 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -843,7 +843,7 @@ mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-
 
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
-mock.mv.decision=APPROVED 
+mock.mv.decision=REJECTED 
 
 # salt generation properties
 mosip.regproc.db.url=${javax.persistence.jdbc.url}
@@ -968,4 +968,4 @@ auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
 
 registration.processor.lostrid.max.registrationid=5
-mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
\ No newline at end of file
+mosip.registration.processor.lostrid.max-registration-date-filter-interval=30

From d807dc52354a987d4b611392dff1ee4fd833a2a5 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 25 Jul 2022 11:08:24 +0530
Subject: [PATCH 0857/1358] Updated abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 40fd5e6f94bbdb21c6690ea98a09441540e50fc8 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 29 Jul 2022 11:53:05 +0530
Subject: [PATCH 0858/1358] [DSD-1273] config changes cherry-pick

---
 registration-default.properties | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 881cf38b274..633c0504c59 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -324,12 +324,13 @@ mosip.kernel.idobjectvalidator.property-source=LOCAL
 #----For Transliteration Component----
 
 #Language Code for Arabic Language. Should not be modified
-mosip.kernel.transliteration.arabic-language-code=ara
+mosip.kernel.transliteration.arabic-language-code=${mosip.kernel.transliteration.arabic-language-code}
 
 #Language Code for French Language. Should not be modified
+mosip.kernel.transliteration.franch-language-code=${mosip.kernel.transliteration.franch-language-code}
 
 #Language Code for English Language. Should not be modified
-mosip.kernel.transliteration.english-language-code=eng
+mosip.kernel.transliteration.english-language-code=${mosip.kernel.transliteration.english-language-code}
 
 #----For CBEFF Component----
 
@@ -408,12 +409,6 @@ mosip.regproc.packet.classifier.tagging.agegroup.ranges={'INFANT':'0-5','MINOR':
 # it is comma separated list of field ids
 mosip.registration.fields.to.retain.post.prid.fetch=consent,consentText,preferredLang
 
-## Roles
-mosip.role.registration.postlostridsearch=REGISTRATION_ADMIN,REGISTRATION_OFFICER,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.registration.postsync=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.postsyncv2=REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,RESIDENT
-mosip.role.registration.getsearchrid=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
-
 
 ## Connection and read timeouts for MDM requests in millis
 mosip.registration.mdm.connection.timeout=10000
@@ -477,3 +472,14 @@ mosip.kernel.virus-scanner.host=${mosip.kernel.virus-scanner.host}
 mosip.kernel.virus-scanner.port=${mosip.kernel.virus-scanner.port}
 mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
 ## end of global properties
+
+## backward compatibility fields	
+mosip.registration.uin.update.configured.fields=test	
+#mosip.primary-language=eng	
+#mosip.secondary-language=fra,ara	
+mosip.primary-language=${mosip.primary-language}	
+mosip.secondary-language=${mosip.secondary-language}	
+mosip.registration.ideal_time=900	
+mosip.kernel.applicant.type.age.limit=0	
+mosip.registration.max_age=200
+

From 9091ec153d7fb4615c71ebe06d2432366b180e50 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 29 Jul 2022 13:02:51 +0530
Subject: [PATCH 0859/1358] Disable printing trace logs in console

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 0185dd7f704..2f5516a32ed 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -54,4 +54,4 @@ console = true              # Default is false
 
 [ballerina.http.traceLogAdvancedConfig]
 # Enable printing trace logs in console
-console = true              # Default is false
+console = false              # Default is false

From 274e44763fb9e84d20b9675eb0732769577cc1cc Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 29 Jul 2022 13:40:22 +0530
Subject: [PATCH 0860/1358] [DSD-1273] added language changes

---
 admin-default.properties        | 2 +-
 application-default.properties  | 9 +++++----
 mimoto-default.properties       | 4 ++--
 print-default.properties        | 4 ++--
 resident-app-default.properties | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 060e1902f95..4174179c65a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -71,7 +71,7 @@ mosip.admin.security.policy.userrole-auth-url=${mosip.kernel.authmanager.url}/v1
 
 ## Masterdata cards
 
-mosip.admin.masterdata.lang-code=eng,ara
+mosip.admin.masterdata.lang-code=eng,ara,fra
 mosip.admin-services.required.roles=GLOBAL_ADMIN
 
 #masterdata machine
diff --git a/application-default.properties b/application-default.properties
index e352bdc561c..76ab83f588d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -91,7 +91,7 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng
 
@@ -276,6 +276,7 @@ mosip.kernel.virus-scanner.port=3310
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
 mosip.kernel.transliteration.english-language-code=eng
+mosip.kernel.transliteration.french-language-code=fra
 
 ## DOB
 mosip.default.dob.month=01
@@ -410,11 +411,11 @@ websub.publish.url=${mosip.websub.url}/hub/
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
 mosip.optional-languages=ara
-mosip.min-languages.count=1
-mosip.max-languages.count=2
+mosip.min-languages.count=2
+mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara
+mosip.default.template-languages=eng,ara,fra
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/mimoto-default.properties b/mimoto-default.properties
index ce8fde91263..77cf8701915 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
diff --git a/print-default.properties b/print-default.properties
index 26c9f8055ef..0ec39bec316 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -66,9 +66,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 mosip.template-language=eng
-mosip.optional-languages=ara
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 ## CBEFF util
diff --git a/resident-app-default.properties b/resident-app-default.properties
index dcf8f091b70..91cb59ec474 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,7 +96,7 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
 mosip.optional-languages=ara

From 8fa914f29eda5d0ca8b233eec4d8baa5f809122c Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 29 Jul 2022 13:43:20 +0530
Subject: [PATCH 0861/1358] [DSD-1273] added fra lang in
 resident-app-default.properties

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index 91cb59ec474..8c45381053b 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -99,7 +99,7 @@ registration.processor.signature.isEnabled=true
 mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 2c965b7289cf1efc1dcba8e84d690eeb69319bb8 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Fri, 29 Jul 2022 14:50:14 +0530
Subject: [PATCH 0862/1358] Using same object bucket name

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index aefca740c9a..ba9965e36a0 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepository
+mosip.idrepo.objectstore.bucket-name=idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details

From 1c453bb1265afdbc446466841f9ed6a223d9f0ec Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 3 Aug 2022 18:09:55 +0530
Subject: [PATCH 0863/1358] Update registration-default.properties

---
 registration-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 633c0504c59..0742631e7c4 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -475,8 +475,6 @@ mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
 
 ## backward compatibility fields	
 mosip.registration.uin.update.configured.fields=test	
-#mosip.primary-language=eng	
-#mosip.secondary-language=fra,ara	
 mosip.primary-language=${mosip.primary-language}	
 mosip.secondary-language=${mosip.secondary-language}	
 mosip.registration.ideal_time=900	

From 60e742c64fa61ce1ccb361859204f7f346d6d7f5 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:27:08 +0530
Subject: [PATCH 0864/1358] [ MOSIP-23405 ] Enabled the sms proxy property.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index e352bdc561c..fd22c70b23e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -285,7 +285,7 @@ mosip.login.mode= email,mobile
 ## Notification
 mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
-mosip.kernel.sms.proxy-sms=false
+mosip.kernel.sms.proxy-sms=true
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true
 ## Notification lanugage types: either PRIMARY or BOTH 

From d2fd0a0fee1747cbcc944abba0355e6d1b3af0ff Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 9 Aug 2022 10:03:09 +0530
Subject: [PATCH 0865/1358] [ MOSIP-23405 ] Enabled the sms proxy property.

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 76ab83f588d..6deb0de935f 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -286,7 +286,7 @@ mosip.login.mode= email,mobile
 ## Notification
 mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
-mosip.kernel.sms.proxy-sms=false
+mosip.kernel.sms.proxy-sms=true
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true
 ## Notification lanugage types: either PRIMARY or BOTH 

From eefd0cd896d9b3e8cf56e1cf452d39d7bdea8435 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 9 Aug 2022 12:23:12 +0530
Subject: [PATCH 0866/1358] made api's to public..

---
 mosip-context.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mosip-context.json b/mosip-context.json
index c2b5e493449..4da43560e8f 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -2,33 +2,33 @@
   "@context": [{
        "@version": 1.1
     },"https://www.w3.org/ns/odrl.jsonld", {
-    "mosip": "https://${mosip.api.host}/mosip#",
+    "mosip": "https://${mosip.api.public.host}/mosip#",
     "schema": "http://schema.org/",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "vcVer": "mosip:vcVer",
     "UIN": "mosip:UIN",
     "addressLine1": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine1",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine1",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine2": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine2",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine2",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine3": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine3",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine3",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "city": {
-        "@id": "https://${mosip.api.host}/mosip#city",
+        "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "gender": {
-        "@id": "https://${mosip.api.host}/mosip#gender",
+        "@id": "https://${mosip.api.public.host}/mosip#gender",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
-        "@id": "https://${mosip.api.host}/mosip#residenceStatus",
+        "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     
@@ -36,7 +36,7 @@
     "email": "mosip:email",
     "fullName": {
 
-        "@id": "https://${mosip.api.host}/mosip#fullName",
+        "@id": "https://${mosip.api.public.host}/mosip#fullName",
 
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
@@ -44,11 +44,11 @@
     "postalCode": "mosip:postalCode",
     "province": {
 
-        "@id": "https://${mosip.api.host}/mosip#province",
+        "@id": "https://${mosip.api.public.host}/mosip#province",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "region": {
-        "@id": "https://${mosip.api.host}/mosip#region",
+        "@id": "https://${mosip.api.public.host}/mosip#region",
 
         "@context": {"value": "rdf:value", "lang": "@language"}
     },

From e77c6bd4ce2d66f4b17608db9b5080024a008890 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 9 Aug 2022 12:53:26 +0530
Subject: [PATCH 0867/1358] [DSD-1312] updated the context url's..

---
 mosip-context.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/mosip-context.json b/mosip-context.json
index c2b5e493449..4da43560e8f 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -2,33 +2,33 @@
   "@context": [{
        "@version": 1.1
     },"https://www.w3.org/ns/odrl.jsonld", {
-    "mosip": "https://${mosip.api.host}/mosip#",
+    "mosip": "https://${mosip.api.public.host}/mosip#",
     "schema": "http://schema.org/",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "vcVer": "mosip:vcVer",
     "UIN": "mosip:UIN",
     "addressLine1": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine1",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine1",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine2": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine2",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine2",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "addressLine3": {
-        "@id": "https://${mosip.api.host}/mosip#addressLine3",
+        "@id": "https://${mosip.api.public.host}/mosip#addressLine3",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "city": {
-        "@id": "https://${mosip.api.host}/mosip#city",
+        "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "gender": {
-        "@id": "https://${mosip.api.host}/mosip#gender",
+        "@id": "https://${mosip.api.public.host}/mosip#gender",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
-        "@id": "https://${mosip.api.host}/mosip#residenceStatus",
+        "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     
@@ -36,7 +36,7 @@
     "email": "mosip:email",
     "fullName": {
 
-        "@id": "https://${mosip.api.host}/mosip#fullName",
+        "@id": "https://${mosip.api.public.host}/mosip#fullName",
 
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
@@ -44,11 +44,11 @@
     "postalCode": "mosip:postalCode",
     "province": {
 
-        "@id": "https://${mosip.api.host}/mosip#province",
+        "@id": "https://${mosip.api.public.host}/mosip#province",
         "@context": {"value": "rdf:value", "lang": "@language"}
     },
     "region": {
-        "@id": "https://${mosip.api.host}/mosip#region",
+        "@id": "https://${mosip.api.public.host}/mosip#region",
 
         "@context": {"value": "rdf:value", "lang": "@language"}
     },

From ca7118674649996540bed38f596853f16e6c6dd9 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Wed, 10 Aug 2022 16:03:20 +0530
Subject: [PATCH 0868/1358] Updated abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From a8801cdb6b60cf1e9ba766f6f36b1417479e9b40 Mon Sep 17 00:00:00 2001
From: nagarjunakuchi <nagarjunabtechece@gmail.com>
Date: Thu, 11 Aug 2022 15:02:16 +0530
Subject: [PATCH 0869/1358] Removed roles configurations

---
 partner-management-default.properties | 85 +--------------------------
 1 file changed, 2 insertions(+), 83 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index a6282ae7aeb..bc07324353b 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -74,10 +74,7 @@ auth.allowed.urls=https://${mosip.pmp.host}/
 application.id=PARTNER
 application.name=partner
 
-## To configure starting value or initial value of mispId.
-## ex: if value = 3 ==> mispId starts from  100
-## if value = 4 ==> mispId starts from 1000
-mosip.kernel.mispid.length = 3
+## To configure the length of the misp license key
 mosip.kernel.idgenerator.misp.license-key-length = 50
 ## To configure the partner types for which extractors are required. It should be "," separated.
 pmp.bioextractors.required.partner.types = Credential_Partner,Online_Verification_Partner
@@ -100,9 +97,6 @@ pmp.partner.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)
 pmp.partner.partnerId.max.length=36
 pmp.partner.mobileNumbe.max.length=16
 
-## Time difference between request creation and request processing
-masterdata.registerdevice.timestamp.validate=+5
-
 ## Keymanager
 mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 ## Kernel services
@@ -233,82 +227,7 @@ pms.notifications-schedule.fixed-rate=24
 
 partner.register.as.user.in.iam.enable=false
 
-## Roles
-mosip.role.pms.postpoliciesgroupnew=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.putpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.postpolicies=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.postpoliciespolicyidgrouppublish=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.putpoliciespolicyid=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.patchpoliciespolicyidgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpolicies=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpoliciespolicyid=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpoliciesapikey=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpoliciespolicyidpartnerpartnerid=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpoliciesgroupall=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.postpoliciesgroupsearch=PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.postpoliciessearch=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.getpoliciesconfigkey=PARTNER_ADMIN,POLICYMANAGER
-mosip.role.pms.postpoliciesgroupfiltervalues=PARTNER_ADMIN,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
-mosip.role.pms.postpoliciesfiltervalues=PARTNER_ADMIN,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
-mosip.role.pms.getactivegroupgroupname=AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,ABIS_PARTNER,MANUAL_ADJUDICATION,POLICYMANAGER
-mosip.role.pms.postdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
-mosip.role.pms.putdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
-mosip.role.pms.patchdevicedetail=PARTNER_ADMIN
-mosip.role.pms.postdevicedetailsearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
-mosip.role.pms.postdevicedetaildevicetypesearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
-mosip.role.pms.postdevicedetailfiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
-mosip.role.pms.postdevicedetaildevicetypefiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
-mosip.role.pms.postdevicedetaildevicesubtypefiltervalues=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
-mosip.role.pms.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.pms.postftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
-mosip.role.pms.putftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
-mosip.role.pms.patchftpchipdetail=PARTNER_ADMIN
-mosip.role.pms.postftpchipdetailuploadcertificate=PARTNER_ADMIN,FTM_PROVIDER
-mosip.role.pms.getftpchipdetailgetpartnercertificate=PARTNER_ADMIN,FTM_PROVIDER
-mosip.role.pms.postftpchipdetailsearch=PARTNER_ADMIN,FTM_PROVIDER
-mosip.role.pms.postregistereddevices=PARTNER_ADMIN,FTM_PROVIDER,ZONAL_ADMIN
-mosip.role.pms.postregistereddevicesderegister=PARTNER_ADMIN,FTM_PROVIDER,ZONAL_ADMIN
-mosip.role.pms.postregistereddevicessearch=PARTNER,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION
-mosip.role.pms.postsecurebiometricinterface=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
-mosip.role.pms.putsecurebiometricinterface=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
-mosip.role.pms.patchsecurebiometricinterface=PARTNER_ADMIN
-mosip.role.pms.postsecurebiometricinterfacesearch=PARTNER_ADMIN,FTM_PROVIDER,DEVICE_PROVIDER
-mosip.role.pms.postpartners=PARTNER,PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER
-mosip.role.pms.patchpartnerspartneridapikeyrequest=PARTNER_ADMIN,AUTH_PARTNER,PARTNER,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_PARTNER
-mosip.role.pms.postpartnerspartneridbioextractorspolicyid=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
-mosip.role.pms.getpartnerspartneridbioextractorspolicyid=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
-mosip.role.pms.postpartnerspartneridcredentialtypepolicyid=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
-mosip.role.pms.getpartnerspartneridcredentialtypepolicies=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
-mosip.role.pms.postpartnerspartneridcontactadd=CREATE_SHARE,PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
-mosip.role.pms.putpartnerspartnerid=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER
-mosip.role.pms.getpartnerspartnerid=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER,RESIDENT
-mosip.role.pms.getpartnerspartneridapikeyrequest=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER
-mosip.role.pms.getpartnerspartneridapikeyapikeyreqid=PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,CREDENTIAL_ISSUANCE,AUTH_PARTNER
-mosip.role.pms.postpartnerscertificatecaupload=PARTNER_ADMIN,FTM_PROVIDER,AUTH_PARTNER,PMS_USER,ONLINE_VERIFICATION_PARTNER,PARTNERMANAGER
-mosip.role.pms.postpartnerscertificateupload=PARTNER_ADMIN,PARTNER_ADMIN,FTM_PROVIDER,AUTH_PARTNER,PMS_USER,ONLINE_VERIFICATION_PARTNER,PARTNERMANAGER,ID_AUTHENTICATION,CREDENTIAL_ISSUANCE,CREDENTIAL_PARTNER
-mosip.role.pms.getpartnerspartneridcertificate=PARTNER_ADMIN,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,ONLINE_VERIFICATION_PARTNER
-mosip.role.pms.postpartnerssearch=PARTNER_ADMIN,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,ONLINE_VERIFICATION_PARTNER
-mosip.role.pms.postpartnerspartnertypesearch=PARTNER_ADMIN,FTM_PROVIDER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,ONLINE_VERIFICATION_PARTNER
-mosip.role.pms.postpartnersfiltervalues=PARTNER_ADMIN,PARTNER,ONLINE_VERIFICATION_PARTNER
-mosip.role.pms.postpartnersapikeyrequestfiltervalues=PARTNER_ADMIN,FTM_PROVIDER,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER
-mosip.role.pms.postpartnersapikeyrequestsearch=PARTNER_ADMIN,FTM_PROVIDER,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,DEVICE_PROVIDER,PMS_USER,ONLINE_VERIFICATION_PARTNER
-mosip.role.pms.postpartnersapikeysearch=PARTNER_ADMIN,FTM_PROVIDER,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,DEVICE_PROVIDER,ONLINE_VERIFICATION_PARTNER,PMS_USER
-mosip.role.pms.putpartnerspartneridapikeypolicies=PARTNERMANAGER,PARTNER_ADMIN
-mosip.role.pms.patchpartnerspartnerid=PARTNERMANAGER,PARTNER_ADMIN
-mosip.role.pms.patchpartnerspartneridapikey=PARTNERMANAGER,PARTNER_ADMIN
-mosip.role.pms.getpartnerspartneridapikeymisplicensekey=PARTNERMANAGER,PARTNER_ADMIN,ID_AUTHENTICATION,CREDENTIAL_ISSUANCE
-mosip.role.pms.patchpartnersapikey=PARTNERMANAGER,PARTNER_ADMIN
-mosip.role.pms.getpartners=REGISTRATION_PROCESSOR,RESIDENT,PARTNER_ADMIN,ID_AUTHENTICATION,CREDENTIAL_ISSUANCE,PARTNERMANAGER
-mosip.role.pms.getpartnerspartneridapikey=PARTNERMANAGER,PARTNER_ADMIN
-mosip.role.pms.getpartnersapikey=PARTNERMANAGER,PARTNER_ADMIN
-mosip.role.pms.getpartnersapikeykey=PARTNER_ADMIN,PARTNERMANAGER
-mosip.role.pms.postmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
-mosip.role.pms.putmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
-mosip.role.pms.getmisps=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
-mosip.role.pms.getmispsmispidlicensekey=PARTNER_ADMIN,MISP_PARTNER,MISP,PARTNERMANAGER
-
 # query param usd to refer url to redirect after logout
 mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
 # end session endpoint in OIDC
-mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout 
\ No newline at end of file
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
\ No newline at end of file

From 057c6f5baa45bf2e2b4ab3acafdda7694d3d16ae Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:07:26 +0530
Subject: [PATCH 0870/1358] Updated abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From ecee54c3a0a100188e466159bee075efc6f5350d Mon Sep 17 00:00:00 2001
From: ckm007 <chandrakeshavmishra@gmail.com>
Date: Mon, 15 Aug 2022 19:02:01 +0530
Subject: [PATCH 0871/1358] [MOSIP-23519] Config changes after diff preparation
 for upgrade

---
 kernel-default.properties       |  5 -----
 print-default.properties        | 11 ---------
 registration-default.properties | 40 +++++++++++++++++++++++++++++++++
 resident-default.properties     |  3 +++
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0f5a268be71..c3d71ccdefb 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -408,11 +408,6 @@ syncdata.websub.resubscription.delay.millis=48000000
 ## We can provide multiple values with ";" separated 
 mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns};filterValueMaxCount:{"default":${mosip.kernel.filtervalue.max_columns},"registrationcenters":50,"locations":100}
 
-# Flag to identify the support of no thumbprint in 1.1.3 version. 
-# Added this for backward compatability. default is false, means support is not required.
-# Make it to true if support is required.
-mosip.kernel.keymanager.113nothumbprint.support=false
-
 ## Used to get IAM user details.
 mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.masterdata.auth-user-details=/userdetails
diff --git a/print-default.properties b/print-default.properties
index 0ec39bec316..c40bcd4c3a2 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -19,16 +19,6 @@ mosip.event.delay-millisecs=120000
 print-websub-resubscription-delay-millisecs=21600000
 registration.processor.print.textfile=registration-processor-print-text-file.json
 
-## Token
-token.request.id=io.mosip.registration.processor
-token.request.appid=regproc
-token.request.username=registrationprocessor
-token.request.password={cipher}AQABt4aBjlC2OxQNy04L3OtJm8KaTDwSJhV3lEpUh6xBM2xGVnY3M1DIeKGFAeBNfi6jH5qgj1KCUmFONLwSmfcrPx9m6MYXXQMYwyAeq13Msy1fcG1AtZQASKeLbuMCaRwinwdt7C/WYzvVVv47NojD+VmHHVTY3qBXJ4dwZ0/BqmUBPXyYrJPKTcdouxT76bgm5+fXXNcT7lciXgD1aCnWKziL5nDa6Y9dhc+ZPyM0d+I0JfS+emsByt7tWgcZukQkOEx8JWfcCR4eVpERYVa/ps/EAuQRXmxIvnr54GSCc/KKpwnYnjLtKIx/75I6pezBdKU/BBJG1syjQp9VQC9adSI5fdsn3ijkxJjC9TSIFJKDlTHqNCnJaxQXcSBWL4Y=
-token.request.version=1.0
-token.request.clientId=mosip-regproc-client
-token.request.secretKey= ${mosip.regproc.client.secret}
-token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
-
 # Audit service
 AUDIT=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.kernel.pdf_owner_password=123456
@@ -40,7 +30,6 @@ KEYBASEDTOKENAPI=${authmanager.base.url}/v1/authmanager/authenticate/clientidsec
 ## Master data services
 MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
-mosip.print.audit.id=mosip.applicanttype.getApplicantType
 
 mosip.print.application.version=1.0
 mosip.print.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
diff --git a/registration-default.properties b/registration-default.properties
index 0742631e7c4..7be2b150fda 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -481,3 +481,43 @@ mosip.registration.ideal_time=900
 mosip.kernel.applicant.type.age.limit=0	
 mosip.registration.max_age=200
 
+# Parameters required for Backward Compatibility
+# These parameters needed for supporting previous versions of registration clients in case of upgraded env.
+
+mosip.registration.mdm.hostProtocol=http
+mosip.mdm.enabled=TRUE
+mosip.registration.ui_sync_data=y
+mosip.registration.Login_Credentials_Sync.frequency=190
+mosip.registration.consent_fra="Je comprends que les données recueillies à mon sujet lors de la enregistrement par ladite autorité comprennent mon -  <br> &#x2022 nom <br>&#x2022 Date de naissance <br>&#x2022 genre <br>&#x2022 adresse <br>&#x2022 coordonnées <br>&#x2022 Documents <br>Je comprends également que ces informations seront stockées et traitées dans le but de vérifier mon identité afin d'accéder à divers services, ou de se conformer à une obligation légale. Je donne mon consentement pour la collecte de ces données à cette fin."
+mosip.camera.resolution.width=2592
+mosip.registration.eod_process_config_flag=Y
+mosip.id.validation.identity.CNIENumber=^([0-9]{10,30})$
+mosip.registration.important_guidelines_eng=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
+mosip.registration.mds.iris.dedup.enable.flag=N
+mosip.registration.mds.face.dedup.enable.flag=N
+mosip.registration.consent_eng=I understand that the data collected about me during registration by the said authority includes my -<br>&#x2022 Name <br> &#x2022 Date of birth <br> &#x2022 Gender <br> &#x2022 Address <br> &#x2022 Contact details <br> &#x2022 Documents <br> I also understand that this information will be stored and processed for the purpose of verifying my identity in order to access various services, or to comply with a legal obligation. I give my consent for the collection of this data for this purpose. 
+mosip.registration.cbeff_only_unique_tags=Y
+current_mdm_spec=0.9.2
+mosip.registration.re_capture_time=10
+mosip.registration.fingerprint_enable_flag=Y
+mosip.registration.mds.fingerprint.dedup.enable.flag=N
+mosip.registration.important_guidelines_ara=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
+mosip.registration.webcam_name=logitech
+mosip.registration.User_Role_Setup_Sync.frequency=190
+mosip.registration.face_recapture_time=5
+mosip.registration.key_policy_sync_threshold_value=1
+mosip.registration.send_notification_disable_flag=y
+mosip.registration.mdm.contextPath=
+mosip.registration.face_enable_flag=Y
+mosip.registration.important_guidelines_fra=COUNTRY TO DEFINE THE TEXT OF GUIDELINES
+mosip.id.validation.identity.referenceIdentityNumber=^([0-9]{10,30})$
+mosip.camera.resolution.height=1944
+mosip.registration.consent_ara=" أدرك أن البيانات التي تم جمعها عني أثناء التسجيل من قِبل السلطة المذكورة تتضمن بياناتي  -  <br> &#x2022 الاسم <br>&#x2022 تاريخ الميلاد <br>&#x2022 نوع الجنس <br>&#x2022 العنوان <br>&#x2022 تفاصيل الاتصال <br>&#x2022  الوثائق <br> كما أفهم أنه سيتم تخزين هذه المعلومات ومعالجتها بغرض التحقق من هويتي من أجل الوصول إلى خدمات مختلفة، أو الامتثال لالتزام قانوني. وأوافق على جمع هذه البيانات لهذا الغرض. "
+mosip.registration.iris_enable_flag=Y
+mosip.registration.user_on_board_threshold_limit=1
+mosip.registration.quality_score=60
+mosip.registration.webcam_library_name=sarxos
+mosip.registration.DOCUMENT_SCANNER_DEPTH=100
+mosip.registration.document_scanner_dpi=75
+mosip.registration.document_scanner_brightness=10
+
diff --git a/resident-default.properties b/resident-default.properties
index 928835ae5e3..579f6d44daa 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -133,3 +133,6 @@ mosip.service.end-points=/**/*
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
+
+object.store.base.location=/home/mosip
+

From 572dd1581d70bee4c02b5d51e3b96db134e8f17e Mon Sep 17 00:00:00 2001
From: urviljoshi <urvvil08@gmail.com>
Date: Tue, 16 Aug 2022 13:09:40 +0530
Subject: [PATCH 0872/1358] props added for healthcheck and init task

---
 websub-consolidator.toml | 11 +++++++++++
 websub-service.toml      | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index 1229e93e56c..b68677bd964 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -21,3 +21,14 @@ POLLING_INTERVAL = 10.0
 
 # The period in which Kafka close method waits to complete
 GRACEFUL_CLOSE_PERIOD = 5.0
+
+CURRENT_WORKING_DIR = "user.dir";
+
+# The disk space threshold for healthcheck
+DISK_SPACE_THRESHOLD = 10485760;
+
+# The port that is used to start the consolidator
+CONSOLIDATOR_PORT = 9192;
+
+# consolidator health endpoint
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
\ No newline at end of file
diff --git a/websub-service.toml b/websub-service.toml
index 2f5516a32ed..aa2c61f64be 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -55,3 +55,43 @@ console = true              # Default is false
 [ballerina.http.traceLogAdvancedConfig]
 # Enable printing trace logs in console
 console = false              # Default is false
+
+
+# The token validation URL of IDP
+DISK_SPACE_THRESHOLD = 10485760;
+
+# The token validation URL of IDP
+PARTNER_USER_ID_PREFIX = "service-account-";
+
+
+CURRENT_WORKING_DIR = "user.dir";
+
+# The period between retry requests
+INTENT_VERIFICATION_RETRY_INTERVAL = 3;
+
+# The maximum retry count
+INTENT_VERIFICATION_COUNT = 3;
+
+# The period between retry requests
+INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0;
+
+# The maximum retry count
+INTENT_VERIFICATION_MAX_INTERVAL = 20;
+
+# The maximum retry count
+KAFKA_CONSUMER_MAX_POLL_RECORDS = 50;
+
+# The maximum retry count
+KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728;
+
+# The maximum retry count
+KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288;
+
+# Kafka topic which is stores consolidated websub subscribers for this server
+META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
+
+# consolidator base url
+CONSOLIDATOR_BASE_URL = "http://websub-consolidator";
+
+# consolidator health endpoint
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
\ No newline at end of file

From cbd6c27f446323db4c81f0c28c7899039524679b Mon Sep 17 00:00:00 2001
From: ckm007 <chandrakeshavmishra@gmail.com>
Date: Tue, 16 Aug 2022 13:12:22 +0530
Subject: [PATCH 0873/1358] [MOSIP-23519] licencekeymanager properties removed

---
 kernel-default.properties | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index c3d71ccdefb..11dd745cdca 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -205,11 +205,6 @@ syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosi
 syncdata_database_username=masteruser
 syncdata_database_password=${db.dbuser.password}
 
-licensekeymanager.persistence.jdbc.driver=org.postgresql.Driver
-licensekeymanager_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-licensekeymanager_database_username=masteruser
-licensekeymanager_database_password=${db.dbuser.password}
-
 ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
 ridgenerator_database_password=${db.dbuser.password}

From 633029f0f45c1c7fbd2082ac9c026b4923836676 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 16 Aug 2022 16:01:27 +0530
Subject: [PATCH 0874/1358] Update print-default.properties

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index 26c9f8055ef..46e9259bf7a 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -133,4 +133,4 @@ mosip.print.crypto.p12.password=password@123
 mosip.print.crypto.p12.alias=partner
 
 # verifiable credential
-mosip.print.verify.credentials.flag=false
+mosip.print.verify.credentials.flag=true

From 60144588629ca1565acbd96e4e768ed41977e4ee Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 17 Aug 2022 16:21:08 +0530
Subject: [PATCH 0875/1358] logging.level.io.mosip

changed above property value from INFO to DEBUG
---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index 46e9259bf7a..b84850e82e7 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -85,7 +85,7 @@ mosip.kernel.tokenid.length=36
 
 ## log level
 logging.level.root=INFO
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## tomcat access logs

From c78bf5340a19aa55f09042720e023ada95c72739 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 19 Aug 2022 18:44:40 +0530
Subject: [PATCH 0876/1358] updated the websub prop

---
 websub-service.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/websub-service.toml b/websub-service.toml
index aa2c61f64be..bab9fb02372 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -91,7 +91,7 @@ KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288;
 META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
 
 # consolidator base url
-CONSOLIDATOR_BASE_URL = "http://websub-consolidator";
+CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}";
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
\ No newline at end of file
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";

From b7c16ddf968e090c4ff496cf7bef971113c1635c Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 19 Aug 2022 18:47:19 +0530
Subject: [PATCH 0877/1358] added the websub prop

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 6deb0de935f..8d86b3815f6 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -46,6 +46,7 @@ mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
+mosip.consolidator.url=http://consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
 mosip.ida.auth.url=http://ida-auth.ida

From 58bd6a900c3198025b90d525dcf1ee85fe57af40 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 19 Aug 2022 19:09:48 +0530
Subject: [PATCH 0878/1358] [DSD-1352] updated the languages

---
 admin-default.properties        | 2 +-
 application-default.properties  | 9 ++++-----
 mimoto-default.properties       | 4 ++--
 print-default.properties        | 4 ++--
 resident-app-default.properties | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4174179c65a..060e1902f95 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -71,7 +71,7 @@ mosip.admin.security.policy.userrole-auth-url=${mosip.kernel.authmanager.url}/v1
 
 ## Masterdata cards
 
-mosip.admin.masterdata.lang-code=eng,ara,fra
+mosip.admin.masterdata.lang-code=eng,ara
 mosip.admin-services.required.roles=GLOBAL_ADMIN
 
 #masterdata machine
diff --git a/application-default.properties b/application-default.properties
index 8d86b3815f6..5816ba192ff 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -92,7 +92,7 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng
 
@@ -277,7 +277,6 @@ mosip.kernel.virus-scanner.port=3310
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
 mosip.kernel.transliteration.english-language-code=eng
-mosip.kernel.transliteration.french-language-code=fra
 
 ## DOB
 mosip.default.dob.month=01
@@ -412,11 +411,11 @@ websub.publish.url=${mosip.websub.url}/hub/
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
 mosip.optional-languages=ara
-mosip.min-languages.count=2
-mosip.max-languages.count=3
+mosip.min-languages.count=1
+mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara,fra
+mosip.default.template-languages=eng,ara
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 77cf8701915..ce8fde91263 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
diff --git a/print-default.properties b/print-default.properties
index bbe922cf1f6..d993652f9d7 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -55,9 +55,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 ## CBEFF util
diff --git a/resident-app-default.properties b/resident-app-default.properties
index 8c45381053b..6052fac3a49 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,7 +96,7 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
 mosip.optional-languages=ara,fra

From 332ebdb213ad45f39e74420cca75d78178bc5c66 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 19 Aug 2022 19:11:28 +0530
Subject: [PATCH 0879/1358] [DSD-1352] removed fra lang

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index 6052fac3a49..dcf8f091b70 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -99,7 +99,7 @@ registration.processor.signature.isEnabled=true
 mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 92fdeef2eaa23cd3e2b9852bde12140cd2e1c8dd Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 19 Aug 2022 21:47:37 +0530
Subject: [PATCH 0880/1358] [DSD-1352] removed semi colon from prop file

---
 websub-consolidator.toml |  8 ++++----
 websub-service.toml      | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index b68677bd964..0e0216d5e94 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -22,13 +22,13 @@ POLLING_INTERVAL = 10.0
 # The period in which Kafka close method waits to complete
 GRACEFUL_CLOSE_PERIOD = 5.0
 
-CURRENT_WORKING_DIR = "user.dir";
+CURRENT_WORKING_DIR = "user.dir"
 
 # The disk space threshold for healthcheck
-DISK_SPACE_THRESHOLD = 10485760;
+DISK_SPACE_THRESHOLD = 10485760
 
 # The port that is used to start the consolidator
-CONSOLIDATOR_PORT = 9192;
+CONSOLIDATOR_PORT = 9192
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
\ No newline at end of file
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
\ No newline at end of file
diff --git a/websub-service.toml b/websub-service.toml
index bab9fb02372..835254b2a5a 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -58,40 +58,40 @@ console = false              # Default is false
 
 
 # The token validation URL of IDP
-DISK_SPACE_THRESHOLD = 10485760;
+DISK_SPACE_THRESHOLD = 10485760
 
 # The token validation URL of IDP
-PARTNER_USER_ID_PREFIX = "service-account-";
+PARTNER_USER_ID_PREFIX = "service-account-"
 
 
-CURRENT_WORKING_DIR = "user.dir";
+CURRENT_WORKING_DIR = "user.dir"
 
 # The period between retry requests
-INTENT_VERIFICATION_RETRY_INTERVAL = 3;
+INTENT_VERIFICATION_RETRY_INTERVAL = 3
 
 # The maximum retry count
-INTENT_VERIFICATION_COUNT = 3;
+INTENT_VERIFICATION_COUNT = 3
 
 # The period between retry requests
-INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0;
+INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
 
 # The maximum retry count
-INTENT_VERIFICATION_MAX_INTERVAL = 20;
+INTENT_VERIFICATION_MAX_INTERVAL = 20
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_POLL_RECORDS = 50;
+KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
 
 # The maximum retry count
-KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728;
+KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288;
+KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
 
 # Kafka topic which is stores consolidated websub subscribers for this server
 META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
 
 # consolidator base url
-CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}";
+CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"

From eff6dffb5a1665d1f21e3b102df9d22e00357c61 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Sun, 21 Aug 2022 23:36:38 +0530
Subject: [PATCH 0881/1358] Update websub-service.toml

---
 websub-service.toml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/websub-service.toml b/websub-service.toml
index 835254b2a5a..0bb36b37fc5 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -58,40 +58,40 @@ console = false              # Default is false
 
 
 # The token validation URL of IDP
-DISK_SPACE_THRESHOLD = 10485760
+#DISK_SPACE_THRESHOLD = 10485760
 
 # The token validation URL of IDP
-PARTNER_USER_ID_PREFIX = "service-account-"
+#PARTNER_USER_ID_PREFIX = "service-account-"
 
 
-CURRENT_WORKING_DIR = "user.dir"
+#CURRENT_WORKING_DIR = "user.dir"
 
 # The period between retry requests
-INTENT_VERIFICATION_RETRY_INTERVAL = 3
+#INTENT_VERIFICATION_RETRY_INTERVAL = 3
 
 # The maximum retry count
-INTENT_VERIFICATION_COUNT = 3
+#INTENT_VERIFICATION_COUNT = 3
 
 # The period between retry requests
-INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
+#INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
 
 # The maximum retry count
-INTENT_VERIFICATION_MAX_INTERVAL = 20
+#INTENT_VERIFICATION_MAX_INTERVAL = 20
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
+#KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
 
 # The maximum retry count
-KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
+#KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
+#KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
 
 # Kafka topic which is stores consolidated websub subscribers for this server
-META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
+#META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
 
 # consolidator base url
-CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
+#CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+#CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"

From 562433645e173c1eac55ef3323053b35199a5e46 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Sun, 21 Aug 2022 23:38:18 +0530
Subject: [PATCH 0882/1358] Update websub-consolidator.toml

---
 websub-consolidator.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index 0e0216d5e94..fac58b9c7a2 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -31,4 +31,4 @@ DISK_SPACE_THRESHOLD = 10485760
 CONSOLIDATOR_PORT = 9192
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
\ No newline at end of file
+#CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"

From a96a14d95581657e8735f424153d61afa099a523 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Sun, 21 Aug 2022 23:41:14 +0530
Subject: [PATCH 0883/1358] Update websub-consolidator.toml

---
 websub-consolidator.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index fac58b9c7a2..7c264876a19 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -31,4 +31,4 @@ DISK_SPACE_THRESHOLD = 10485760
 CONSOLIDATOR_PORT = 9192
 
 # consolidator health endpoint
-#CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+# CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"

From e80a1af1e5ac429aad264a675eefcb85a7c8c7c8 Mon Sep 17 00:00:00 2001
From: urviljoshi <urvvil08@gmail.com>
Date: Mon, 22 Aug 2022 00:33:38 +0530
Subject: [PATCH 0884/1358] removed working dir as it has to be same

---
 websub-consolidator.toml |  3 +--
 websub-service.toml      | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index 7c264876a19..1076b3907f5 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -22,7 +22,6 @@ POLLING_INTERVAL = 10.0
 # The period in which Kafka close method waits to complete
 GRACEFUL_CLOSE_PERIOD = 5.0
 
-CURRENT_WORKING_DIR = "user.dir"
 
 # The disk space threshold for healthcheck
 DISK_SPACE_THRESHOLD = 10485760
@@ -31,4 +30,4 @@ DISK_SPACE_THRESHOLD = 10485760
 CONSOLIDATOR_PORT = 9192
 
 # consolidator health endpoint
-# CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
diff --git a/websub-service.toml b/websub-service.toml
index 0bb36b37fc5..7b84b7b1df4 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -58,40 +58,38 @@ console = false              # Default is false
 
 
 # The token validation URL of IDP
-#DISK_SPACE_THRESHOLD = 10485760
+DISK_SPACE_THRESHOLD = 10485760
 
 # The token validation URL of IDP
-#PARTNER_USER_ID_PREFIX = "service-account-"
+PARTNER_USER_ID_PREFIX = "service-account-"
 
 
-#CURRENT_WORKING_DIR = "user.dir"
-
 # The period between retry requests
-#INTENT_VERIFICATION_RETRY_INTERVAL = 3
+INTENT_VERIFICATION_RETRY_INTERVAL = 3
 
 # The maximum retry count
-#INTENT_VERIFICATION_COUNT = 3
+INTENT_VERIFICATION_COUNT = 3
 
 # The period between retry requests
-#INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
+INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
 
 # The maximum retry count
-#INTENT_VERIFICATION_MAX_INTERVAL = 20
+INTENT_VERIFICATION_MAX_INTERVAL = 20
 
 # The maximum retry count
-#KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
+KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
 
 # The maximum retry count
-#KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
+KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
 
 # The maximum retry count
-#KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
+KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
 
 # Kafka topic which is stores consolidated websub subscribers for this server
-#META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
+META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
 
 # consolidator base url
-#CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
+CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
-#CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"

From 4e27aa0998fea3ddfc265ef89ecd35eb9c511139 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Mon, 22 Aug 2022 09:12:50 +0530
Subject: [PATCH 0885/1358] Update websub-service.toml

---
 websub-service.toml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/websub-service.toml b/websub-service.toml
index 7b84b7b1df4..660ff7aee0f 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -48,15 +48,6 @@ MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"
 
-[ballerina.http.accessLogConfig]
-# Enable printing access logs in console
-console = true              # Default is false
-
-[ballerina.http.traceLogAdvancedConfig]
-# Enable printing trace logs in console
-console = false              # Default is false
-
-
 # The token validation URL of IDP
 DISK_SPACE_THRESHOLD = 10485760
 
@@ -93,3 +84,11 @@ CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
 CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+
+[ballerina.http.accessLogConfig]
+# Enable printing access logs in console
+console = true              # Default is false
+
+[ballerina.http.traceLogAdvancedConfig]
+# Enable printing trace logs in console
+console = false              # Default is false

From 99892a56f690c680b8b83ed31b2bbd6f9adf85f6 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Mon, 22 Aug 2022 09:49:51 +0530
Subject: [PATCH 0886/1358] Update websub-service.toml

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 660ff7aee0f..f1da8960087 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -77,7 +77,7 @@ KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
 KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
 
 # Kafka topic which is stores consolidated websub subscribers for this server
-META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
+META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers"
 
 # consolidator base url
 CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"

From 297f8004aad8654a7a126d9f9950e898d07a82be Mon Sep 17 00:00:00 2001
From: urviljoshi <urvvil08@gmail.com>
Date: Mon, 22 Aug 2022 09:57:24 +0530
Subject: [PATCH 0887/1358] int changed to decimal

---
 websub-service.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/websub-service.toml b/websub-service.toml
index f1da8960087..13741f43fd2 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -56,7 +56,7 @@ PARTNER_USER_ID_PREFIX = "service-account-"
 
 
 # The period between retry requests
-INTENT_VERIFICATION_RETRY_INTERVAL = 3
+INTENT_VERIFICATION_RETRY_INTERVAL = 3.0
 
 # The maximum retry count
 INTENT_VERIFICATION_COUNT = 3
@@ -65,7 +65,7 @@ INTENT_VERIFICATION_COUNT = 3
 INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
 
 # The maximum retry count
-INTENT_VERIFICATION_MAX_INTERVAL = 20
+INTENT_VERIFICATION_MAX_INTERVAL = 20.0
 
 # The maximum retry count
 KAFKA_CONSUMER_MAX_POLL_RECORDS = 50

From 505490fca480420ce6a5dfaa5906b438241d8c4a Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Mon, 22 Aug 2022 11:20:46 +0530
Subject: [PATCH 0888/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 5816ba192ff..605caf4484a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -46,7 +46,7 @@ mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
-mosip.consolidator.url=http://consolidator.websub
+mosip.consolidator.url=http://websub-consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
 mosip.ida.auth.url=http://ida-auth.ida

From 669fd39a93e94e030740d3b6a2dde8b02c6ae985 Mon Sep 17 00:00:00 2001
From: urviljoshi <urvvil08@gmail.com>
Date: Tue, 23 Aug 2022 18:51:28 +0530
Subject: [PATCH 0889/1358] merging changes done in qa5 issue to 1.2.0.1

---
 websub-consolidator.toml |  7 +++----
 websub-service.toml      | 43 +++++++++++++++++++---------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index b68677bd964..cb3258ff7c4 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -22,13 +22,12 @@ POLLING_INTERVAL = 10.0
 # The period in which Kafka close method waits to complete
 GRACEFUL_CLOSE_PERIOD = 5.0
 
-CURRENT_WORKING_DIR = "user.dir";
 
 # The disk space threshold for healthcheck
-DISK_SPACE_THRESHOLD = 10485760;
+DISK_SPACE_THRESHOLD = 10485760
 
 # The port that is used to start the consolidator
-CONSOLIDATOR_PORT = 9192;
+CONSOLIDATOR_PORT = 9192
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
\ No newline at end of file
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
\ No newline at end of file
diff --git a/websub-service.toml b/websub-service.toml
index bab9fb02372..3d4a1aab78c 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -48,50 +48,47 @@ MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"
 
-[ballerina.http.accessLogConfig]
-# Enable printing access logs in console
-console = true              # Default is false
-
-[ballerina.http.traceLogAdvancedConfig]
-# Enable printing trace logs in console
-console = false              # Default is false
-
-
 # The token validation URL of IDP
-DISK_SPACE_THRESHOLD = 10485760;
+DISK_SPACE_THRESHOLD = 10485760
 
 # The token validation URL of IDP
-PARTNER_USER_ID_PREFIX = "service-account-";
+PARTNER_USER_ID_PREFIX = "service-account-"
 
 
-CURRENT_WORKING_DIR = "user.dir";
-
 # The period between retry requests
-INTENT_VERIFICATION_RETRY_INTERVAL = 3;
+INTENT_VERIFICATION_RETRY_INTERVAL = 3.0
 
 # The maximum retry count
-INTENT_VERIFICATION_COUNT = 3;
+INTENT_VERIFICATION_COUNT = 3
 
 # The period between retry requests
-INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0;
+INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
 
 # The maximum retry count
-INTENT_VERIFICATION_MAX_INTERVAL = 20;
+INTENT_VERIFICATION_MAX_INTERVAL = 20.0
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_POLL_RECORDS = 50;
+KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
 
 # The maximum retry count
-KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728;
+KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288;
+KAFKA_CONSUMER_MAX_PARTITION_FETCH_BYTES = 524288
 
 # Kafka topic which is stores consolidated websub subscribers for this server
-META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers";
+META_TOPICS = "registered-websub-topics,consolidated-websub-topics,registered-websub-subscribers,consolidated-websub-subscribers"
 
 # consolidator base url
-CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}";
+CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health";
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+
+[ballerina.http.accessLogConfig]
+# Enable printing access logs in console
+console = true              # Default is false
+
+[ballerina.http.traceLogAdvancedConfig]
+# Enable printing trace logs in console
+console = false              # Default is false
\ No newline at end of file

From 80827e4c6984a2bac06054dda75b4bb358de986a Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Wed, 24 Aug 2022 19:07:34 +0530
Subject: [PATCH 0890/1358] cipher password doesnot work | workaround

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index ce8fde91263..76329816669 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -35,7 +35,7 @@ mosip.event.secret=Kslk30SNF2AChs2
 
 
 mosip.partner.crypto.p12.filename=keystore.p12
-mosip.partner.crypto.p12.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.crypto.p12.password=abc123
 mosip.partner.crypto.p12.alias=partner
 mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 mosip.partner.prependThumbprint=true

From cb4b9e67423b9ac64d30b4691a2bade0d11b94c9 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 25 Aug 2022 15:44:46 +0530
Subject: [PATCH 0891/1358] Updated abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 2d1e01d14f4cebd029725be871705d893b24f058 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 26 Aug 2022 11:56:26 +0530
Subject: [PATCH 0892/1358] Update manual.adjudication, MV, Pause setting

Upadted manual.adjudication.status to PENDING, mock.mv.decision to APPROVED and pause-settings to RESUME_PROCESSING
---
 registration-processor-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 27115e5eb4e..454f3c5bd1b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -142,7 +142,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 
 # Status for matched records in demo dedupe stage.
 # 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
-registration.processor.demodedupe.manual.adjudication.status=REJECTED
+registration.processor.demodedupe.manual.adjudication.status=PENDING
 
 # Validate hostlisted devices
 DEVICEHOTLIST=${mosip.admin.hotlist.url}/v1/hotlist/status
@@ -509,7 +509,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "STOP_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
@@ -847,7 +847,7 @@ mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-
 
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
-mock.mv.decision=REJECTED 
+mock.mv.decision=APPROVED 
 
 # salt generation properties
 mosip.regproc.db.url=${javax.persistence.jdbc.url}

From 26d4ef49e51bf75bf6ec73feed8bc1a9a6e5567f Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:27:15 +0530
Subject: [PATCH 0893/1358] Reverted abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 71aad9b5f04b716789988b2182ec5a0316084def Mon Sep 17 00:00:00 2001
From: santhoshsunder <102220709+santhoshsunder@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:21:43 +0530
Subject: [PATCH 0894/1358] testing

deleted
---
 mosip-context.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mosip-context.json b/mosip-context.json
index 4da43560e8f..6d7a162b625 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -22,10 +22,6 @@
     "city": {
         "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
-    },
-     "gender": {
-        "@id": "https://${mosip.api.public.host}/mosip#gender",
-        "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
         "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",

From 8f65984df38e918a1d7a427cf32040f7b80f6525 Mon Sep 17 00:00:00 2001
From: santhoshsunder <102220709+santhoshsunder@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:49:57 +0530
Subject: [PATCH 0895/1358] reverting back the changes

---
 mosip-context.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mosip-context.json b/mosip-context.json
index 6d7a162b625..4da43560e8f 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -22,6 +22,10 @@
     "city": {
         "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+     "gender": {
+        "@id": "https://${mosip.api.public.host}/mosip#gender",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
         "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",

From 7a7465933527eb847e33b75d6624a3f015560872 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 30 Aug 2022 12:17:37 +0530
Subject: [PATCH 0896/1358] [ MOSIP-23768 ] added controller.json for
 mosip-file-server

---
 controller.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 controller.json

diff --git a/controller.json b/controller.json
new file mode 100644
index 00000000000..85301676af4
--- /dev/null
+++ b/controller.json
@@ -0,0 +1,7 @@
+{
+    "@context": "https://w3id.org/security/v2",
+    "id": "${mosipbox.public.url}/.well-known/controller.json",
+    "assertionMethod": [
+        "${mosipbox.public.url}/.well-known/public-key.json"
+    ]
+}
\ No newline at end of file

From 4191241b14e20b71a282da8cd8c490e56d44f76b Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Mon, 5 Sep 2022 11:30:47 +0530
Subject: [PATCH 0897/1358] [DSD-1394]Added controller.json file

---
 controller.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 controller.json

diff --git a/controller.json b/controller.json
new file mode 100644
index 00000000000..ed238229ab5
--- /dev/null
+++ b/controller.json
@@ -0,0 +1,7 @@
+{
+  "@context": "https://w3id.org/security/v2",
+  "id": "https://${mosip.api.public.host}/.well-known/controller.json",
+  "assertionMethod": [
+    "https://${mosip.api.public.host}/.well-known/public-key.json"
+  ]
+}
\ No newline at end of file

From b0eaf254bbeac65c21fa859b8f00ce96f9ee822e Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Mon, 5 Sep 2022 11:30:47 +0530
Subject: [PATCH 0898/1358] Added controller.json file and updated the conf as
 per qa5-v3

---
 application-default.properties            |  2 +-
 controller.json                           | 10 +++++-----
 print-default.properties                  |  4 ++--
 registration-processor-default.properties |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 8d86b3815f6..efaa89ce00a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -46,7 +46,7 @@ mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
-mosip.consolidator.url=http://consolidator.websub
+mosip.consolidator.url=http://websub-consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
 mosip.ida.auth.url=http://ida-auth.ida
diff --git a/controller.json b/controller.json
index 85301676af4..ed238229ab5 100644
--- a/controller.json
+++ b/controller.json
@@ -1,7 +1,7 @@
 {
-    "@context": "https://w3id.org/security/v2",
-    "id": "${mosipbox.public.url}/.well-known/controller.json",
-    "assertionMethod": [
-        "${mosipbox.public.url}/.well-known/public-key.json"
-    ]
+  "@context": "https://w3id.org/security/v2",
+  "id": "https://${mosip.api.public.host}/.well-known/controller.json",
+  "assertionMethod": [
+    "https://${mosip.api.public.host}/.well-known/public-key.json"
+  ]
 }
\ No newline at end of file
diff --git a/print-default.properties b/print-default.properties
index c40bcd4c3a2..bbe922cf1f6 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -74,7 +74,7 @@ mosip.kernel.tokenid.length=36
 
 ## log level
 logging.level.root=INFO
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## tomcat access logs
@@ -122,4 +122,4 @@ mosip.print.crypto.p12.password=password@123
 mosip.print.crypto.p12.alias=partner
 
 # verifiable credential
-mosip.print.verify.credentials.flag=false
+mosip.print.verify.credentials.flag=true
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 27115e5eb4e..454f3c5bd1b 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -142,7 +142,7 @@ mosip.registration.processor.digital.signature.id=io.mosip.registration.processo
 
 # Status for matched records in demo dedupe stage.
 # 'REJECTED' will automatically reject packets failed in demo dedupe. It will not be sent for manual verification.
-registration.processor.demodedupe.manual.adjudication.status=REJECTED
+registration.processor.demodedupe.manual.adjudication.status=PENDING
 
 # Validate hostlisted devices
 DEVICEHOTLIST=${mosip.admin.hotlist.url}/v1/hotlist/status
@@ -509,7 +509,7 @@ mosip.regproc.camel.bridge.eventbus.kafka.poll.frequency=100
 #MosipVerticleAPIManager
 mosip.regproc.camel.bridge.eventbus.kafka.group.id=camel-bridge
 mosip.regproc.camelbridge.endpoint-prefix=eventbus://
-mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "STOP_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
+mosip.regproc.camelbridge.pause-settings=[{"ruleId" :"PAUSE","matchExpression": "$.tags[?(@['AGE_GROUP'] == 'ADULT'&& @['ID_OBJECT-residenceStatus'] == 'Foreigner')]","pauseFor": 180,"defaultResumeAction": "RESUME_PROCESSING","fromAddress": "eventbus://packet-classifier-new-bus-out","ruleDescription" : "Non resident adult applicant packet"}],[{"ruleId" :"HOTLISTED_OPERATOR","matchExpression": "$.tags[?(@['HOTLISTED'] == 'operator')]","pauseFor": 432000,"defaultResumeAction": "STOP_PROCESSING","fromAddress": ".*","ruleDescription" : "Packet created by hotlisted operator"}]
 ## Securzone stage (NOTE:  not used in V3, but need this for service to start)
 mosip.regproc.securezone.notification.eventbus.kafka.commit.type=single
 mosip.regproc.securezone.notification.eventbus.kafka.max.poll.records=100
@@ -847,7 +847,7 @@ mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-
 
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
-mock.mv.decision=REJECTED 
+mock.mv.decision=APPROVED 
 
 # salt generation properties
 mosip.regproc.db.url=${javax.persistence.jdbc.url}

From b6108a8a0c51bd2540e1285440add4ced379165a Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Mon, 5 Sep 2022 12:13:45 +0530
Subject: [PATCH 0899/1358] reverted changes in print-default.properties

---
 print-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/print-default.properties b/print-default.properties
index bbe922cf1f6..c40bcd4c3a2 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -74,7 +74,7 @@ mosip.kernel.tokenid.length=36
 
 ## log level
 logging.level.root=INFO
-logging.level.io.mosip=DEBUG
+logging.level.io.mosip=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## tomcat access logs
@@ -122,4 +122,4 @@ mosip.print.crypto.p12.password=password@123
 mosip.print.crypto.p12.alias=partner
 
 # verifiable credential
-mosip.print.verify.credentials.flag=true
+mosip.print.verify.credentials.flag=false

From 35fdec67c0e1ce6c618e9e062af0a0963043a7b1 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 5 Sep 2022 14:40:16 +0530
Subject: [PATCH 0900/1358] MOSIP-23584 : changed printing stage port to 8097

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 454f3c5bd1b..2c28e99206f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -739,7 +739,7 @@ mosip.regproc.printing.eventbus.kafka.max.poll.records=100
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
 mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-mosip.regproc.printing.server.port=8099
+mosip.regproc.printing.server.port=8097
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 

From 58928c52df8efe11f03e06907cc2430402149a48 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 5 Sep 2022 14:41:25 +0530
Subject: [PATCH 0901/1358] MOSIP-23584 : changed printing stage port to 8097

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 454f3c5bd1b..2c28e99206f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -739,7 +739,7 @@ mosip.regproc.printing.eventbus.kafka.max.poll.records=100
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
 mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-mosip.regproc.printing.server.port=8099
+mosip.regproc.printing.server.port=8097
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 

From 5d687ddb55597c9d22d863aeddbdf4d08e96b782 Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:42:19 +0530
Subject: [PATCH 0902/1358] mosip.kernel.mail.content.html.enable=true

Added above property for getting correct email format
---
 kernel-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 11dd745cdca..755c755d2ae 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -738,3 +738,7 @@ mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF]
 
 management.health.mail.enabled=true
+
+
+# html content for email notification
+mosip.kernel.mail.content.html.enable=true

From 92acbefb4ce34d8cd4f7bb59ae822d7bdf494a5a Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:53:10 +0530
Subject: [PATCH 0903/1358] Updated mosip.default.template-languages=eng

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 605caf4484a..eea97ab0815 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -415,7 +415,7 @@ mosip.min-languages.count=1
 mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara
+mosip.default.template-languages=eng
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang

From 5bca170be70664091050077505c6dcac45a3b6a2 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:28:24 +0530
Subject: [PATCH 0904/1358] Reverted back the changes to
 mosip.default.template-languages=eng, ara

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index eea97ab0815..605caf4484a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -415,7 +415,7 @@ mosip.min-languages.count=1
 mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng
+mosip.default.template-languages=eng,ara
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang

From 847aaf690747d72d1d6d8c236f49a3e72e06125a Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:41:26 +0530
Subject: [PATCH 0905/1358] Updating abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 4d1491c84a52b75306f170c2580a8c53b9178b48 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 16 Sep 2022 11:30:45 +0530
Subject: [PATCH 0906/1358] updated abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From abcae5b0c77332a1a4122d3ec205dcf8ebc50a01 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 16 Sep 2022 14:08:53 +0530
Subject: [PATCH 0907/1358] Changing reprocess elapse time and MockMV decision

Changing reprocess elapse time to 3600 and mock mv decision to REJECTED
---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2c28e99206f..83fcd924d08 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -290,7 +290,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=300
+registration.processor.reprocess.elapse.time=3600
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron
@@ -847,7 +847,7 @@ mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-
 
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
-mock.mv.decision=APPROVED 
+mock.mv.decision=REJECTED 
 
 # salt generation properties
 mosip.regproc.db.url=${javax.persistence.jdbc.url}

From 00b6dea113d7082b2a5cc7526283054110cd7379 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Mon, 19 Sep 2022 15:01:02 +0530
Subject: [PATCH 0908/1358] Space is added

---
 admin-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/admin-default.properties b/admin-default.properties
index 4174179c65a..ae6f3134041 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -16,6 +16,9 @@ mosip.admin.request-id=ADMIN.REQUEST
 mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
+#test
+
+
 ## Account management
 authmanager.base.url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager

From 39352a950d405b9757839237f1e61bfadf068a60 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:38:39 +0530
Subject: [PATCH 0909/1358] MOSIP-23025 : added failure listener configurable
 period

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 2f0c1476faf..b9f17c63f1d 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?clientFailureCheckPeriod=30000",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From 70fd4731890e00552af31e39757811fb4d22e826 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 19 Sep 2022 18:43:18 +0530
Subject: [PATCH 0910/1358] MOSIP-23025 : added failure listener configurable
 period

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 2f0c1476faf..b9f17c63f1d 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?clientFailureCheckPeriod=30000",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From 0c9dedc0b181347dd95216cef00abd54a3970e4f Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 19 Sep 2022 19:04:07 +0530
Subject: [PATCH 0911/1358] Revert "MOSIP-23025 : added failure listener
 configurable period"

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index b9f17c63f1d..2f0c1476faf 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?clientFailureCheckPeriod=30000",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From c0443973c698931b72c510132815eafbdde33046 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 19 Sep 2022 19:04:15 +0530
Subject: [PATCH 0912/1358] Revert "MOSIP-23025 : added failure listener
 configurable period"

---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index b9f17c63f1d..2f0c1476faf 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?clientFailureCheckPeriod=30000",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From df615e1118f5904d29788fb9bdcee4b0121a8fe1 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 11:06:50 +0530
Subject: [PATCH 0913/1358] Performance fix Added

---
 kernel-default.properties                 |  6 ++-
 registration-processor-default.properties | 62 +++++++++++++++--------
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 11dd745cdca..d9c9ec1ecd0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -279,8 +279,10 @@ mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
-kernel.uin.transfer-scheduler-minutes=48
-kernel.uin.transfer-scheduler-hours=17
+#kernel.uin.transfer-scheduler-minutes=48
+#kernel.uin.transfer-scheduler-hours=17
+kernel.uin.transfer-scheduler-minutes=0
+kernel.uin.transfer-scheduler-hours=*
 kernel.uin.transfer-scheduler-days_of_month=*
 kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2c28e99206f..2cf7b0d7b22 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -523,8 +523,10 @@ mosip.regproc.securezone.notification.message.tag.loading.disable=true
 
 #packet-uploader-stage
 mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
-mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
-mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
+#mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
+mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=5
+#mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
+mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.uploader.eventbus.kafka.group.id=packet-uploader-stage
 mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.packet.uploader.server.port=8087
@@ -535,9 +537,12 @@ packet.manager.iteration.addition.enabled=true
 packet.uploader.stage=registration-processor-packet-uploader-stage
 
 #packet-validator-stage
-mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
-mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
-mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
+#mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
+mosip.regproc.packet.validator.eventbus.kafka.commit.type=batch
+#mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=4
+#mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
+mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.validator.eventbus.kafka.group.id=packet-validator-stage
 mosip.regproc.packet.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.packet.validator.server.port=8088
@@ -582,7 +587,8 @@ mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:m
 
 ## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
-mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
+#mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
+mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=10
 mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.classifier.eventbus.kafka.group.id=packet-classifier-stage
 mosip.regproc.packet.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -592,7 +598,8 @@ mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/pa
 
 ## Quality classifier stage
 mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
-mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
+#mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
+mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=10
 mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.quality.classifier.eventbus.kafka.group.id=quality-classifier-stage
 mosip.regproc.quality.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -620,9 +627,12 @@ mosip.regproc.introducer-validator.eventbus.port=5728
 mosip.regproc.introducer-validator.server.servlet.path=/registrationprocessor/v1/introducervalidator
 
 #demo-dedupe-stage
-mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
-mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
-mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
+#mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
+mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=auto
+#mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
+mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=10
+#mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
+mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=1000
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
 mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.demo.dedupe.server.port=8091
@@ -631,7 +641,8 @@ mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedu
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
-mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
+#mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
+mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=10
 mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.handler.eventbus.kafka.group.id=abis-handler-stage
 mosip.regproc.abis.handler.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -644,8 +655,10 @@ mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger'
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye'}
 
 #bio-dedupe-stage
-mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
-mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
+#mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
+mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=batch
+#mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
+mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=10
 mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.bio.dedupe.eventbus.kafka.group.id=bio-dedupe-stage
 mosip.regproc.bio.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -654,9 +667,12 @@ mosip.regproc.bio.dedupe.eventbus.port=5718
 mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
 # uin-generator-stage
-mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
-mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
-mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
+#mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
+mosip.regproc.uin.generator.eventbus.kafka.commit.type=batch
+#mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
+mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=3
+#mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
+mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=500
 mosip.regproc.uin.generator.eventbus.kafka.group.id=uin-generator-stage
 mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.uin.generator.server.port=8099
@@ -666,7 +682,8 @@ mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-ge
 # abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
-mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
+#mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
+mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=30000
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
 mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.abis.middleware.server.port=8091
@@ -696,7 +713,8 @@ mosip.regproc.finalization.message.expiry-time-limit=${mosip.regproc.common.stag
 
 # biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
-mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
+#mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
+mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=10
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
 mosip.regproc.biometric.authentication.eventbus.kafka.group.id=biometric-authentication-stage
 mosip.regproc.biometric.authentication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -725,7 +743,8 @@ mosip.regproc.supervisor-validator.server.servlet.path=/registrationprocessor/v1
 
 ## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
-mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
+#mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
+mosip.regproc.message.sender.eventbus.kafka.max.poll.records=10
 mosip.regproc.message.sender.eventbus.kafka.poll.frequency=100
 mosip.regproc.message.sender.eventbus.kafka.group.id=message-sender-stage
 mosip.regproc.message.sender.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -735,7 +754,8 @@ mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sende
 
 #printing-stage
 mosip.regproc.printing.eventbus.kafka.commit.type=single
-mosip.regproc.printing.eventbus.kafka.max.poll.records=100
+#mosip.regproc.printing.eventbus.kafka.max.poll.records=100
+mosip.regproc.printing.eventbus.kafka.max.poll.records=5
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
 mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -745,7 +765,7 @@ mosip.regproc.printing.eventbus.port=5722
 
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
-mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
+#mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
 mosip.regproc.opencrvs.eventbus.kafka.poll.frequency=100
 mosip.regproc.opencrvs.eventbus.kafka.group.id=opencrvs-stage
 mosip.regproc.opencrvs.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}

From 6925b3c7b984fe76ed3b35e891cb0bad7b5c5163 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 11:10:15 +0530
Subject: [PATCH 0914/1358] Space Removed

---
 admin-default.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index ae6f3134041..4174179c65a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -16,9 +16,6 @@ mosip.admin.request-id=ADMIN.REQUEST
 mosip.kernel.database.hostname=postgres-postgresql.postgres
 mosip.kernel.database.port=5432
 
-#test
-
-
 ## Account management
 authmanager.base.url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.accountmgmt.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager

From 2929d697b6bf99daa171bbaea54cedd0f913f322 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 11:20:13 +0530
Subject: [PATCH 0915/1358] Performance Fix Added

---
 registration-processor-default.properties | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2cf7b0d7b22..5bc8d3739d1 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -326,7 +326,8 @@ mosip.regproc.verification.server.servlet.path=/registrationprocessor/v1/verific
 
 # Manual adjudication
 mosip.regproc.manual.adjudication.eventbus.kafka.commit.type=single
-mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
+#mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
+mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=10
 mosip.regproc.manual.adjudication.eventbus.kafka.poll.frequency=100
 mosip.regproc.manual.adjudication.eventbus.kafka.group.id=manual-adjudication-stage
 mosip.regproc.manual.adjudication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -553,7 +554,8 @@ mosip.regproc.packet.validator.validate-applicant-document.processes=NEW,UPDATE,
 
 ## Operator validator
 mosip.regproc.operator-validator.eventbus.kafka.commit.type=single
-mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.operator-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.operator-validator.eventbus.kafka.group.id=operator-validator-stage
 mosip.regproc.operator-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -563,7 +565,8 @@ mosip.regproc.operator-validator.server.servlet.path=/registrationprocessor/v1/o
 
 # Command validator
 mosip.regproc.cmd-validator.eventbus.kafka.commit.type=single
-mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.cmd-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.cmd-validator.eventbus.kafka.group.id=cmd-validator-stage
 mosip.regproc.cmd-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -618,7 +621,8 @@ mosip.regproc.quality.classifier.tagging.quality.modalities=Iris,Finger,Face
 
 ## Introducer validator stage
 mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
-mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.introducer-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.introducer-validator.eventbus.kafka.group.id=introducer-validator-stage
 mosip.regproc.introducer-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -733,7 +737,8 @@ mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reproces
 
 ## Supervisor validator stage
 mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
-mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.supervisor-validator.eventbus.kafka.group.id=supervisor-validator-stage
 mosip.regproc.supervisor-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -765,7 +770,7 @@ mosip.regproc.printing.eventbus.port=5722
 
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
-#mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
+mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
 mosip.regproc.opencrvs.eventbus.kafka.poll.frequency=100
 mosip.regproc.opencrvs.eventbus.kafka.group.id=opencrvs-stage
 mosip.regproc.opencrvs.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}

From 20cecf33790665d51f88e4fea49b5dae09951696 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 11:20:13 +0530
Subject: [PATCH 0916/1358] Performance Fix Added

---
 registration-processor-default.properties | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2cf7b0d7b22..5bc8d3739d1 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -326,7 +326,8 @@ mosip.regproc.verification.server.servlet.path=/registrationprocessor/v1/verific
 
 # Manual adjudication
 mosip.regproc.manual.adjudication.eventbus.kafka.commit.type=single
-mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
+#mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
+mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=10
 mosip.regproc.manual.adjudication.eventbus.kafka.poll.frequency=100
 mosip.regproc.manual.adjudication.eventbus.kafka.group.id=manual-adjudication-stage
 mosip.regproc.manual.adjudication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -553,7 +554,8 @@ mosip.regproc.packet.validator.validate-applicant-document.processes=NEW,UPDATE,
 
 ## Operator validator
 mosip.regproc.operator-validator.eventbus.kafka.commit.type=single
-mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.operator-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.operator-validator.eventbus.kafka.group.id=operator-validator-stage
 mosip.regproc.operator-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -563,7 +565,8 @@ mosip.regproc.operator-validator.server.servlet.path=/registrationprocessor/v1/o
 
 # Command validator
 mosip.regproc.cmd-validator.eventbus.kafka.commit.type=single
-mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.cmd-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.cmd-validator.eventbus.kafka.group.id=cmd-validator-stage
 mosip.regproc.cmd-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -618,7 +621,8 @@ mosip.regproc.quality.classifier.tagging.quality.modalities=Iris,Finger,Face
 
 ## Introducer validator stage
 mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
-mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.introducer-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.introducer-validator.eventbus.kafka.group.id=introducer-validator-stage
 mosip.regproc.introducer-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -733,7 +737,8 @@ mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reproces
 
 ## Supervisor validator stage
 mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
-mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
+#mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.supervisor-validator.eventbus.kafka.group.id=supervisor-validator-stage
 mosip.regproc.supervisor-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -765,7 +770,7 @@ mosip.regproc.printing.eventbus.port=5722
 
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
-#mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
+mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100
 mosip.regproc.opencrvs.eventbus.kafka.poll.frequency=100
 mosip.regproc.opencrvs.eventbus.kafka.group.id=opencrvs-stage
 mosip.regproc.opencrvs.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}

From 03e5c8d098f084b9cb7661b0e6ca7ffd2b0acb60 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 13:02:40 +0530
Subject: [PATCH 0917/1358] Performance Fix Added

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5bc8d3739d1..55ddcbfaafa 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -768,6 +768,7 @@ mosip.regproc.printing.server.port=8097
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 
+
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
 mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100

From a10989caf17a57bc07a94c11b60c21375adbdd72 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 14:17:33 +0530
Subject: [PATCH 0918/1358] Performance Fix Added And Removed the commented
 line

---
 kernel-default.properties                 |  2 --
 registration-processor-default.properties | 25 -----------------------
 2 files changed, 27 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index d9c9ec1ecd0..4989c59c36e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -279,8 +279,6 @@ mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
-#kernel.uin.transfer-scheduler-minutes=48
-#kernel.uin.transfer-scheduler-hours=17
 kernel.uin.transfer-scheduler-minutes=0
 kernel.uin.transfer-scheduler-hours=*
 kernel.uin.transfer-scheduler-days_of_month=*
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 55ddcbfaafa..1154d631084 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -524,9 +524,7 @@ mosip.regproc.securezone.notification.message.tag.loading.disable=true
 
 #packet-uploader-stage
 mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
-#mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=5
-#mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.uploader.eventbus.kafka.group.id=packet-uploader-stage
 mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -538,11 +536,8 @@ packet.manager.iteration.addition.enabled=true
 packet.uploader.stage=registration-processor-packet-uploader-stage
 
 #packet-validator-stage
-#mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
 mosip.regproc.packet.validator.eventbus.kafka.commit.type=batch
-#mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=4
-#mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.validator.eventbus.kafka.group.id=packet-validator-stage
 mosip.regproc.packet.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -554,7 +549,6 @@ mosip.regproc.packet.validator.validate-applicant-document.processes=NEW,UPDATE,
 
 ## Operator validator
 mosip.regproc.operator-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.operator-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.operator-validator.eventbus.kafka.group.id=operator-validator-stage
@@ -565,7 +559,6 @@ mosip.regproc.operator-validator.server.servlet.path=/registrationprocessor/v1/o
 
 # Command validator
 mosip.regproc.cmd-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.cmd-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.cmd-validator.eventbus.kafka.group.id=cmd-validator-stage
@@ -590,7 +583,6 @@ mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:m
 
 ## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
-#mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=10
 mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.classifier.eventbus.kafka.group.id=packet-classifier-stage
@@ -601,7 +593,6 @@ mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/pa
 
 ## Quality classifier stage
 mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
-#mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=10
 mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.quality.classifier.eventbus.kafka.group.id=quality-classifier-stage
@@ -621,7 +612,6 @@ mosip.regproc.quality.classifier.tagging.quality.modalities=Iris,Finger,Face
 
 ## Introducer validator stage
 mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.introducer-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.introducer-validator.eventbus.kafka.group.id=introducer-validator-stage
@@ -631,11 +621,8 @@ mosip.regproc.introducer-validator.eventbus.port=5728
 mosip.regproc.introducer-validator.server.servlet.path=/registrationprocessor/v1/introducervalidator
 
 #demo-dedupe-stage
-#mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=auto
-#mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=10
-#mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=1000
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
 mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -645,7 +632,6 @@ mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedu
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
-#mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=10
 mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.handler.eventbus.kafka.group.id=abis-handler-stage
@@ -659,9 +645,7 @@ mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger'
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye'}
 
 #bio-dedupe-stage
-#mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=batch
-#mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=10
 mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.bio.dedupe.eventbus.kafka.group.id=bio-dedupe-stage
@@ -671,11 +655,8 @@ mosip.regproc.bio.dedupe.eventbus.port=5718
 mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
 # uin-generator-stage
-#mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
 mosip.regproc.uin.generator.eventbus.kafka.commit.type=batch
-#mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
 mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=3
-#mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
 mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=500
 mosip.regproc.uin.generator.eventbus.kafka.group.id=uin-generator-stage
 mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -686,7 +667,6 @@ mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-ge
 # abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
-#mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=30000
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
 mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -717,7 +697,6 @@ mosip.regproc.finalization.message.expiry-time-limit=${mosip.regproc.common.stag
 
 # biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
-#mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
 mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=10
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
 mosip.regproc.biometric.authentication.eventbus.kafka.group.id=biometric-authentication-stage
@@ -737,7 +716,6 @@ mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reproces
 
 ## Supervisor validator stage
 mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.supervisor-validator.eventbus.kafka.group.id=supervisor-validator-stage
@@ -748,7 +726,6 @@ mosip.regproc.supervisor-validator.server.servlet.path=/registrationprocessor/v1
 
 ## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
-#mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
 mosip.regproc.message.sender.eventbus.kafka.max.poll.records=10
 mosip.regproc.message.sender.eventbus.kafka.poll.frequency=100
 mosip.regproc.message.sender.eventbus.kafka.group.id=message-sender-stage
@@ -759,7 +736,6 @@ mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sende
 
 #printing-stage
 mosip.regproc.printing.eventbus.kafka.commit.type=single
-#mosip.regproc.printing.eventbus.kafka.max.poll.records=100
 mosip.regproc.printing.eventbus.kafka.max.poll.records=5
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
@@ -768,7 +744,6 @@ mosip.regproc.printing.server.port=8097
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 
-
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
 mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100

From 11bcd4cb3c32972ec6a41a3d2457850987c94f7a Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 14:17:33 +0530
Subject: [PATCH 0919/1358] Performance Fix Added And Removed the commented
 line

---
 kernel-default.properties                 |  2 --
 registration-processor-default.properties | 25 -----------------------
 2 files changed, 27 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index d9c9ec1ecd0..4989c59c36e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -279,8 +279,6 @@ mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
-#kernel.uin.transfer-scheduler-minutes=48
-#kernel.uin.transfer-scheduler-hours=17
 kernel.uin.transfer-scheduler-minutes=0
 kernel.uin.transfer-scheduler-hours=*
 kernel.uin.transfer-scheduler-days_of_month=*
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 55ddcbfaafa..1154d631084 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -524,9 +524,7 @@ mosip.regproc.securezone.notification.message.tag.loading.disable=true
 
 #packet-uploader-stage
 mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
-#mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=5
-#mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.uploader.eventbus.kafka.group.id=packet-uploader-stage
 mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -538,11 +536,8 @@ packet.manager.iteration.addition.enabled=true
 packet.uploader.stage=registration-processor-packet-uploader-stage
 
 #packet-validator-stage
-#mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
 mosip.regproc.packet.validator.eventbus.kafka.commit.type=batch
-#mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=4
-#mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.validator.eventbus.kafka.group.id=packet-validator-stage
 mosip.regproc.packet.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -554,7 +549,6 @@ mosip.regproc.packet.validator.validate-applicant-document.processes=NEW,UPDATE,
 
 ## Operator validator
 mosip.regproc.operator-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.operator-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.operator-validator.eventbus.kafka.group.id=operator-validator-stage
@@ -565,7 +559,6 @@ mosip.regproc.operator-validator.server.servlet.path=/registrationprocessor/v1/o
 
 # Command validator
 mosip.regproc.cmd-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.cmd-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.cmd-validator.eventbus.kafka.group.id=cmd-validator-stage
@@ -590,7 +583,6 @@ mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:m
 
 ## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
-#mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=10
 mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.classifier.eventbus.kafka.group.id=packet-classifier-stage
@@ -601,7 +593,6 @@ mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/pa
 
 ## Quality classifier stage
 mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
-#mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
 mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=10
 mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.quality.classifier.eventbus.kafka.group.id=quality-classifier-stage
@@ -621,7 +612,6 @@ mosip.regproc.quality.classifier.tagging.quality.modalities=Iris,Finger,Face
 
 ## Introducer validator stage
 mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.introducer-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.introducer-validator.eventbus.kafka.group.id=introducer-validator-stage
@@ -631,11 +621,8 @@ mosip.regproc.introducer-validator.eventbus.port=5728
 mosip.regproc.introducer-validator.server.servlet.path=/registrationprocessor/v1/introducervalidator
 
 #demo-dedupe-stage
-#mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=auto
-#mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=10
-#mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=1000
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
 mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -645,7 +632,6 @@ mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedu
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
-#mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
 mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=10
 mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.handler.eventbus.kafka.group.id=abis-handler-stage
@@ -659,9 +645,7 @@ mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger'
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye'}
 
 #bio-dedupe-stage
-#mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=batch
-#mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
 mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=10
 mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.bio.dedupe.eventbus.kafka.group.id=bio-dedupe-stage
@@ -671,11 +655,8 @@ mosip.regproc.bio.dedupe.eventbus.port=5718
 mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
 # uin-generator-stage
-#mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
 mosip.regproc.uin.generator.eventbus.kafka.commit.type=batch
-#mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
 mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=3
-#mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
 mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=500
 mosip.regproc.uin.generator.eventbus.kafka.group.id=uin-generator-stage
 mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -686,7 +667,6 @@ mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-ge
 # abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
-#mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=30000
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
 mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -717,7 +697,6 @@ mosip.regproc.finalization.message.expiry-time-limit=${mosip.regproc.common.stag
 
 # biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
-#mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
 mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=10
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
 mosip.regproc.biometric.authentication.eventbus.kafka.group.id=biometric-authentication-stage
@@ -737,7 +716,6 @@ mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reproces
 
 ## Supervisor validator stage
 mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
-#mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
 mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.supervisor-validator.eventbus.kafka.group.id=supervisor-validator-stage
@@ -748,7 +726,6 @@ mosip.regproc.supervisor-validator.server.servlet.path=/registrationprocessor/v1
 
 ## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
-#mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
 mosip.regproc.message.sender.eventbus.kafka.max.poll.records=10
 mosip.regproc.message.sender.eventbus.kafka.poll.frequency=100
 mosip.regproc.message.sender.eventbus.kafka.group.id=message-sender-stage
@@ -759,7 +736,6 @@ mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sende
 
 #printing-stage
 mosip.regproc.printing.eventbus.kafka.commit.type=single
-#mosip.regproc.printing.eventbus.kafka.max.poll.records=100
 mosip.regproc.printing.eventbus.kafka.max.poll.records=5
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
@@ -768,7 +744,6 @@ mosip.regproc.printing.server.port=8097
 mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
 mosip.regproc.printing.eventbus.port=5722
 
-
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single
 mosip.regproc.opencrvs.eventbus.kafka.max.poll.records=100

From 9752fc310d6a712a6f399dce2e314196c96c477c Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 14:23:42 +0530
Subject: [PATCH 0920/1358] Performance Fix Added And Removed the commented
 line

---
 kernel-default.properties                 | 1 +
 registration-processor-default.properties | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 4989c59c36e..770ada5c3d3 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -276,6 +276,7 @@ mosip.kernel.prereg.realm-id=mosip
 mosip.kernel.prereg.client.id=mosip-prereg-client
 mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 
+
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1154d631084..07eb4c22c90 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -845,7 +845,6 @@ mosip.regproc.packet.classifier.tagging.exceptionbiometrics.bio-value-mapping={'
 # file Identity segment and should have proper default source configured
 mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-expression-map={'INTRODUCER_AVAILABILITY':'introducerUIN || introducerRID || introducerVID'}
 
-
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
 mock.mv.decision=APPROVED 

From 17053bb332ff0277fd31f2dc97a6226b0c4a78ed Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 16:10:58 +0530
Subject: [PATCH 0921/1358] Performance Fix Added and Reviewed

---
 kernel-default.properties                 | 1 -
 registration-processor-default.properties | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 770ada5c3d3..4989c59c36e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -276,7 +276,6 @@ mosip.kernel.prereg.realm-id=mosip
 mosip.kernel.prereg.client.id=mosip-prereg-client
 mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 
-
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 07eb4c22c90..c05b9fe4665 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -326,7 +326,6 @@ mosip.regproc.verification.server.servlet.path=/registrationprocessor/v1/verific
 
 # Manual adjudication
 mosip.regproc.manual.adjudication.eventbus.kafka.commit.type=single
-#mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
 mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=10
 mosip.regproc.manual.adjudication.eventbus.kafka.poll.frequency=100
 mosip.regproc.manual.adjudication.eventbus.kafka.group.id=manual-adjudication-stage
@@ -593,7 +592,7 @@ mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/pa
 
 ## Quality classifier stage
 mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
-mosip.regproc.quality.checker.eventbus.kafka.max.poll.records=10
+mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=10
 mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.quality.classifier.eventbus.kafka.group.id=quality-classifier-stage
 mosip.regproc.quality.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -621,7 +620,7 @@ mosip.regproc.introducer-validator.eventbus.port=5728
 mosip.regproc.introducer-validator.server.servlet.path=/registrationprocessor/v1/introducervalidator
 
 #demo-dedupe-stage
-mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=auto
+mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
 mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=10
 mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=1000
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
@@ -667,7 +666,7 @@ mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-ge
 # abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
-mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=30000
+mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=5000
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
 mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.abis.middleware.server.port=8091
@@ -845,6 +844,7 @@ mosip.regproc.packet.classifier.tagging.exceptionbiometrics.bio-value-mapping={'
 # file Identity segment and should have proper default source configured
 mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-expression-map={'INTRODUCER_AVAILABILITY':'introducerUIN || introducerRID || introducerVID'}
 
+
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
 mock.mv.decision=APPROVED 

From ea6689cd83ac62e06031b3e05c9e0bc66899fed0 Mon Sep 17 00:00:00 2001
From: Kavya V Nirakari <kavya.nirakari@infystrat.com>
Date: Tue, 20 Sep 2022 16:20:41 +0530
Subject: [PATCH 0922/1358] Performance Fix Added

---
 kernel-default.properties                 |  4 +-
 registration-processor-default.properties | 48 +++++++++++------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 755c755d2ae..f170036ec5a 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -279,8 +279,8 @@ mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
-kernel.uin.transfer-scheduler-minutes=48
-kernel.uin.transfer-scheduler-hours=17
+kernel.uin.transfer-scheduler-minutes=0
+kernel.uin.transfer-scheduler-hours=*
 kernel.uin.transfer-scheduler-days_of_month=*
 kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 83fcd924d08..19c67612a48 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -326,7 +326,7 @@ mosip.regproc.verification.server.servlet.path=/registrationprocessor/v1/verific
 
 # Manual adjudication
 mosip.regproc.manual.adjudication.eventbus.kafka.commit.type=single
-mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=100
+mosip.regproc.manual.adjudication.eventbus.kafka.max.poll.records=10
 mosip.regproc.manual.adjudication.eventbus.kafka.poll.frequency=100
 mosip.regproc.manual.adjudication.eventbus.kafka.group.id=manual-adjudication-stage
 mosip.regproc.manual.adjudication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -523,8 +523,8 @@ mosip.regproc.securezone.notification.message.tag.loading.disable=true
 
 #packet-uploader-stage
 mosip.regproc.packet.uploader.eventbus.kafka.commit.type=single
-mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=100
-mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=100
+mosip.regproc.packet.uploader.eventbus.kafka.max.poll.records=5
+mosip.regproc.packet.uploader.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.uploader.eventbus.kafka.group.id=packet-uploader-stage
 mosip.regproc.packet.uploader.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.packet.uploader.server.port=8087
@@ -535,9 +535,9 @@ packet.manager.iteration.addition.enabled=true
 packet.uploader.stage=registration-processor-packet-uploader-stage
 
 #packet-validator-stage
-mosip.regproc.packet.validator.eventbus.kafka.commit.type=single
-mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=100
-mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=100
+mosip.regproc.packet.validator.eventbus.kafka.commit.type=batch
+mosip.regproc.packet.validator.eventbus.kafka.max.poll.records=4
+mosip.regproc.packet.validator.eventbus.kafka.poll.frequency=500
 mosip.regproc.packet.validator.eventbus.kafka.group.id=packet-validator-stage
 mosip.regproc.packet.validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.packet.validator.server.port=8088
@@ -548,7 +548,7 @@ mosip.regproc.packet.validator.validate-applicant-document.processes=NEW,UPDATE,
 
 ## Operator validator
 mosip.regproc.operator-validator.eventbus.kafka.commit.type=single
-mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.operator-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.operator-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.operator-validator.eventbus.kafka.group.id=operator-validator-stage
 mosip.regproc.operator-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -558,7 +558,7 @@ mosip.regproc.operator-validator.server.servlet.path=/registrationprocessor/v1/o
 
 # Command validator
 mosip.regproc.cmd-validator.eventbus.kafka.commit.type=single
-mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.cmd-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.cmd-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.cmd-validator.eventbus.kafka.group.id=cmd-validator-stage
 mosip.regproc.cmd-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -582,7 +582,7 @@ mosip.regproc.cmd-validator.device.digital-id-timestamp-format=yyyy-MM-dd'T'HH:m
 
 ## Packet classifier stage
 mosip.regproc.packet.classifier.eventbus.kafka.commit.type=single
-mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=100
+mosip.regproc.packet.classifier.eventbus.kafka.max.poll.records=10
 mosip.regproc.packet.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.packet.classifier.eventbus.kafka.group.id=packet-classifier-stage
 mosip.regproc.packet.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -592,7 +592,7 @@ mosip.regproc.packet.classifier.server.servlet.path=/registrationprocessor/v1/pa
 
 ## Quality classifier stage
 mosip.regproc.quality.classifier.eventbus.kafka.commit.type=single
-mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=100
+mosip.regproc.quality.classifier.eventbus.kafka.max.poll.records=10
 mosip.regproc.quality.classifier.eventbus.kafka.poll.frequency=100
 mosip.regproc.quality.classifier.eventbus.kafka.group.id=quality-classifier-stage
 mosip.regproc.quality.classifier.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -611,7 +611,7 @@ mosip.regproc.quality.classifier.tagging.quality.modalities=Iris,Finger,Face
 
 ## Introducer validator stage
 mosip.regproc.introducer-validator.eventbus.kafka.commit.type=single
-mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.introducer-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.introducer-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.introducer-validator.eventbus.kafka.group.id=introducer-validator-stage
 mosip.regproc.introducer-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -621,8 +621,8 @@ mosip.regproc.introducer-validator.server.servlet.path=/registrationprocessor/v1
 
 #demo-dedupe-stage
 mosip.regproc.demo.dedupe.eventbus.kafka.commit.type=single
-mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=100
-mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=100
+mosip.regproc.demo.dedupe.eventbus.kafka.max.poll.records=10
+mosip.regproc.demo.dedupe.eventbus.kafka.poll.frequency=1000
 mosip.regproc.demo.dedupe.eventbus.kafka.group.id=demo-dedupe-stage
 mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.demo.dedupe.server.port=8091
@@ -631,7 +631,7 @@ mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedu
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
-mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=100
+mosip.regproc.abis.handler.eventbus.kafka.max.poll.records=10
 mosip.regproc.abis.handler.eventbus.kafka.poll.frequency=100
 mosip.regproc.abis.handler.eventbus.kafka.group.id=abis-handler-stage
 mosip.regproc.abis.handler.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -644,8 +644,8 @@ mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger'
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye'}
 
 #bio-dedupe-stage
-mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=single
-mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=100
+mosip.regproc.bio.dedupe.eventbus.kafka.commit.type=batch
+mosip.regproc.bio.dedupe.eventbus.kafka.max.poll.records=10
 mosip.regproc.bio.dedupe.eventbus.kafka.poll.frequency=100
 mosip.regproc.bio.dedupe.eventbus.kafka.group.id=bio-dedupe-stage
 mosip.regproc.bio.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -654,9 +654,9 @@ mosip.regproc.bio.dedupe.eventbus.port=5718
 mosip.regproc.bio.dedupe.server.servlet.path=/registrationprocessor/v1/biodedupe
 
 # uin-generator-stage
-mosip.regproc.uin.generator.eventbus.kafka.commit.type=single
-mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=100
-mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=100
+mosip.regproc.uin.generator.eventbus.kafka.commit.type=batch
+mosip.regproc.uin.generator.eventbus.kafka.max.poll.records=3
+mosip.regproc.uin.generator.eventbus.kafka.poll.frequency=500
 mosip.regproc.uin.generator.eventbus.kafka.group.id=uin-generator-stage
 mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.uin.generator.server.port=8099
@@ -666,7 +666,7 @@ mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-ge
 # abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single
 mosip.regproc.abis.middleware.eventbus.kafka.max.poll.records=100
-mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=100
+mosip.regproc.abis.middleware.eventbus.kafka.poll.frequency=5000
 mosip.regproc.abis.middleware.eventbus.kafka.group.id=abis-middle-ware-stage
 mosip.regproc.abis.middleware.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
 mosip.regproc.abis.middleware.server.port=8091
@@ -696,7 +696,7 @@ mosip.regproc.finalization.message.expiry-time-limit=${mosip.regproc.common.stag
 
 # biometric-authentication-stage
 mosip.regproc.biometric.authentication.eventbus.kafka.commit.type=single
-mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=100
+mosip.regproc.biometric.authentication.eventbus.kafka.max.poll.records=10
 mosip.regproc.biometric.authentication.eventbus.kafka.poll.frequency=100
 mosip.regproc.biometric.authentication.eventbus.kafka.group.id=biometric-authentication-stage
 mosip.regproc.biometric.authentication.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -715,7 +715,7 @@ mosip.regproc.reprocessor.server.servlet.path=/registrationprocessor/v1/reproces
 
 ## Supervisor validator stage
 mosip.regproc.supervisor-validator.eventbus.kafka.commit.type=single
-mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=100
+mosip.regproc.supervisor-validator.eventbus.kafka.max.poll.records=10
 mosip.regproc.supervisor-validator.eventbus.kafka.poll.frequency=100
 mosip.regproc.supervisor-validator.eventbus.kafka.group.id=supervisor-validator-stage
 mosip.regproc.supervisor-validator.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -725,7 +725,7 @@ mosip.regproc.supervisor-validator.server.servlet.path=/registrationprocessor/v1
 
 ## Message sender stage
 mosip.regproc.message.sender.eventbus.kafka.commit.type=single
-mosip.regproc.message.sender.eventbus.kafka.max.poll.records=100
+mosip.regproc.message.sender.eventbus.kafka.max.poll.records=10
 mosip.regproc.message.sender.eventbus.kafka.poll.frequency=100
 mosip.regproc.message.sender.eventbus.kafka.group.id=message-sender-stage
 mosip.regproc.message.sender.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
@@ -735,7 +735,7 @@ mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sende
 
 #printing-stage
 mosip.regproc.printing.eventbus.kafka.commit.type=single
-mosip.regproc.printing.eventbus.kafka.max.poll.records=100
+mosip.regproc.printing.eventbus.kafka.max.poll.records=5
 mosip.regproc.printing.eventbus.kafka.poll.frequency=100
 mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
 mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}

From dcb7539d02ecf520641e59988249940bc12adcfd Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Thu, 22 Sep 2022 14:52:56 +0530
Subject: [PATCH 0923/1358] for testing activemq connection (#2702)

* for testing activemq connection

* Update registration-processor-abis.json
---
 registration-processor-abis.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 2f0c1476faf..b2404a8656f 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?reconnectSupported=true&startupMaxReconnectAttempts=100&warnAfterReconnectAttempts=2&maxReconnectDelay=30000&maxReconnectAttempts=1000",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",

From 46b7cc21d87268c8c90783c939a41eddcd18a2c3 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Thu, 22 Sep 2022 15:31:37 +0530
Subject: [PATCH 0924/1358] registration.processor.queue.connection.retry.count
 = 100 (#2703)

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 19c67612a48..018c317b4b0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -275,6 +275,7 @@ registration.processor.queue.username=artemis
 registration.processor.queue.password=${activemq.password}
 registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
+registration.processor.queue.connection.retry.count=100
 
 registration.processor.queue.manualverification.request=mosip-to-mv
 # queue name where mosip will receive response from external mv system

From 4ffd6a679caf97f04a5aeb88c8f861416a450038 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 22 Sep 2022 18:58:28 +0530
Subject: [PATCH 0925/1358] Update reprocess elapse time to 900

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 018c317b4b0..6e58187708c 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -291,7 +291,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=3600
+registration.processor.reprocess.elapse.time=900
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From f266e65c4d03e4c32461e9b580e4d2242b1a4921 Mon Sep 17 00:00:00 2001
From: Monobikash Das <monobikash.das@mindtree.com>
Date: Thu, 22 Sep 2022 20:43:54 +0530
Subject: [PATCH 0926/1358] Added activemq configs

---
 registration-processor-abis.json          | 2 +-
 registration-processor-default.properties | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index 2f0c1476faf..b2404a8656f 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?reconnectSupported=true&startupMaxReconnectAttempts=100&warnAfterReconnectAttempts=2&maxReconnectDelay=30000&maxReconnectAttempts=1000",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c05b9fe4665..656073b40a0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -275,6 +275,7 @@ registration.processor.queue.username=artemis
 registration.processor.queue.password=${activemq.password}
 registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
+registration.processor.queue.connection.retry.count=100
 
 registration.processor.queue.manualverification.request=mosip-to-mv
 # queue name where mosip will receive response from external mv system

From 1f7759554b6a12716b577134994147053bae0977 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Wed, 28 Sep 2022 16:09:18 +0530
Subject: [PATCH 0927/1358] Removed health check for notifier service.

---
 kernel-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 4989c59c36e..92ac5e4956f 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -737,4 +737,3 @@ auth.allowed.urls=http://localhost:5000/
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF]
 
-management.health.mail.enabled=true

From 75addfaa945d9fbefeadcea66a6518b5b71eaa1c Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Mon, 3 Oct 2022 16:30:05 +0530
Subject: [PATCH 0928/1358] [DSD-1491]decreased otp expiry time

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 605caf4484a..8aa05f0a98e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -252,7 +252,7 @@ mosip.kernel.otp.default-length=6
 ## Default crypto function: HmacSHA512, HmacSHA256, HmacSHA1.
 mosip.kernel.otp.mac-algorithm=HmacSHA512
 ## OTP expires after the given time (in seconds).
-mosip.kernel.otp.expiry-time=180
+mosip.kernel.otp.expiry-time=60
 ## Key is frozen for the given time (in seconds).
 mosip.kernel.otp.key-freeze-time=1800
 ## Number of validation attempts allowed.

From fac0c8f40e31846feef699bfd2a427372ef258fb Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:47:15 +0530
Subject: [PATCH 0929/1358] Fix for DDL execution in credential request
 generator on startup

Fix for DDL execution in credential request generator on startup
---
 id-repository-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index ba9965e36a0..a60c65bf737 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -242,7 +242,8 @@ mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.d
 mosip.credential.service.jdbc.user=credentialuser
 mosip.credential.service.jdbc.password=${db.dbuser.password}
 mosip.credential.service.jdbc.driver=org.postgresql.Driver
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=none
+spring.jpa.hibernate.ddl-auto=none
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.show_sql=false

From eabf7fa77086aac7b74625a8356995ca2438deb4 Mon Sep 17 00:00:00 2001
From: M1022006 <sowmya.goudar@mindtree.com>
Date: Wed, 2 Nov 2022 17:42:30 +0530
Subject: [PATCH 0930/1358] MOSIP-24284 config changes

---
 id-repository-default.properties | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index a60c65bf737..d92329309a1 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -266,17 +266,12 @@ mosip.credential.request.crypto-ref-id=credential_request
 mosip.credential.request.job.timedelay=15000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
-# This property can be set to auth,print or keep it empty so batch will pick up all records#
-credential.request.type=auth
 credential.request.retry.max.count=10
 credential.request.reprocess.statuscodes=FAILED,RETRY
-credential.batch.core.pool.size=10
-credential.batch.max.pool.size=10
-credential.batch.queue.capacity=10
 credential.batch.page.size=10
-credential.batch.chunk.size=10
 credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
+credential.batch.status=NEW
 
 ## Rest services
 CRDENTIALSERVICE=${mosip.idrepo.credential.service.url}/v1/credentialservice/issue

From fc97ecb64c1d1d547dd10a4df3c0ae26367af8c9 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 2 Nov 2022 20:19:36 +0530
Subject: [PATCH 0931/1358] added the missing prop

---
 id-repository-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index d92329309a1..b891ca39ca8 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -415,3 +415,5 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
+
+credential.request.type=auth

From ba493ce13f3a5f2bac76e5892c570020bb340649 Mon Sep 17 00:00:00 2001
From: M1022006 <sowmya.goudar@mindtree.com>
Date: Thu, 3 Nov 2022 09:58:01 +0530
Subject: [PATCH 0932/1358] MOSIP-24284 removed unused property

---
 id-repository-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index b891ca39ca8..d92329309a1 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -415,5 +415,3 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
-
-credential.request.type=auth

From f19e25b0770458611f03f7d49e7e76a845f9575b Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Fri, 18 Nov 2022 19:58:18 +0530
Subject: [PATCH 0933/1358] [DSD-1644] added
 compliance-toolkit-default.properties file

---
 compliance-toolkit-default.properties | 177 ++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 compliance-toolkit-default.properties

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
new file mode 100644
index 00000000000..b1c9ad22ef5
--- /dev/null
+++ b/compliance-toolkit-default.properties
@@ -0,0 +1,177 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password
+# mosip.prereg.client.secret
+# prereg.captcha.site.key
+# prereg.captcha.secret.key
+# keycloak.internal.host
+# keycloak.internal.url
+# s3.accesskey
+# s3.region
+# s3.secretkey
+
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port
+#javax.persistence.jdbc.driver=org.postgresql.Driver
+#mosip.database.ip=postgres-postgresql.postgres
+#mosip.database.port=5432
+#javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_prereg?useSSL=false
+#javax.persistence.jdbc.user=prereguser
+#javax.persistence.jdbc.password=${db.dbuser.password}
+
+##DB properties
+javax.persistence.jdbc.driver=org.postgresql.Driver
+mosip.database.ip=postgres-postgresql.postgres
+mosip.database.port=5432
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_toolkit?useSSL=false
+javax.persistence.jdbc.user=toolkituser
+javax.persistence.jdbc.password=${db.dbuser.password}
+
+## Hibernate
+hibernate.hbm2ddl.auto=none
+hibernate.show_sql=false
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.jdbc.lob.non_contextual_creation=true
+
+logging.level.com.zaxxer.hikari=DEBUG
+
+## Project Version for the API response
+version=1.0
+
+server.servlet.context-path=/v1/toolkit
+
+## Security properties
+mosip.security.csrf-enable=false
+mosip.security.cors-enable=false
+mosip.security.origins=localhost:8099
+mosip.security.secure-cookie=false
+
+#iam
+mosip.api.internal.url=https://${mosip.api.internal.host}
+#keycloak.external.url=${mosip.api.internal.url}/keycloak
+iam.base.url=${keycloak.external.url}
+
+#iam adapter setup
+mosip.service-context=${server.servlet.context-path}
+mosip.service.end-points=/**/toolkit/**
+mosip.global.end-points=/**/assets/**,/**/icons/**,/**/screenshots/**,/favicon**,/**/favicon**,/**/css/**,/**/js/**,/**/error**,/**/webjars/**,/**/csrf,/*/,/**/authenticate/**,/**/actuator/**,/sendOtp,/validateOtp,/invalidateToken,/config,/login,/logout,/validateOTP,/sendOTP,/**/login,/**/login/**,/**/login-redirect/**,/**/logout/**,/**/h2-console/**,/**/**/license/**,/**/callback/**,/**/authenticate/**
+#mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT,DELETE
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.auth.filter_disable=false
+mosip.kernel.auth.adapter.ssl-bypass=true
+mosip.kernel.auth.appid-realm-map={toolkit:'mosip'}
+mosip.kernel.auth.appids.realm.map={toolkit:'mosip'}
+
+#iam adapter
+mosip.iam.adapter.appid=toolkit
+mosip.iam.adapter.clientid=mosip-toolkit-client
+mosip.iam.adapter.clientsecret=${mosip.toolkit.client.secret}
+
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.allowed.audience=mosip-toolkit-client
+auth.allowed.urls=https://${mosip.compliance.host}/
+mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+
+auth.server.validate.url=${mosip.api.internal.url}/v1/authmanager/authorize/admin/validateToken
+
+## below are required for kernel-authcodeflowproxy-api dependency
+mosip.iam.module.login_flow.name=authorization_code
+mosip.iam.module.login_flow.scope=email
+mosip.iam.module.login_flow.response_type=code
+mosip.iam.module.clientid=mosip-toolkit-client
+mosip.iam.module.clientsecret=${mosip.toolkit.client.secret}
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/toolkit/login-redirect/
+mosip.iam.module.admin_realm_id=mosip
+mosip.iam.base-url=${iam.base.url}
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${iam.base.url}/auth/realms/mosip/protocol/openid-connect/token
+auth.server.admin.validate.url=${mosip.api.internal.url}/v1/authmanager/authorize/admin/validateToken
+
+## below are required for kernel CBEFF util dependency
+mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+mosip.kernel.xsdfile=mosip-cbeff.xsd
+
+## Minio
+object.store.s3.use.account.as.bucketname=true
+
+## To store documents
+mosip.kernel.objectstore.account-name=compliance-toolkit
+
+# Object store
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
+## Signature Validation of SBI
+mosip.service.auth.appid=regproc
+mosip.service.auth.clientid=mosip-pms-client
+mosip.service.auth.secretkey=${mosip.pms.client.secret}
+mosip.service.validation.url=${mosip.api.internal.url}/v1/partnermanager/deviceprovidermanagement/validate
+mosip.service.authmanager.url=${mosip.api.internal.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.service.keymanager.verifyCertificateTrust.url=${mosip.api.internal.url}/v1/keymanager/verifyCertificateTrust
+
+mosip.toolkit.sbi.ports=4501,4502,4503,4504,4505,4506,4507,4508,4509,4510
+mosip.toolkit.sbi.timeout=20000
+
+# Threshold value against which the quality check score value will be evaluated for Fingerprint biometric type.
+mosip.toolkit.sdk.finger.qualitycheck.threshold.value=60
+# Threshold value against which the quality check score value will be evaluated for Face biometric type.
+mosip.toolkit.sdk.face.qualitycheck.threshold.value=30
+# Threshold value against which the quality check score value will be evaluated for Iris biometric type.
+mosip.toolkit.sdk.iris.qualitycheck.threshold.value=60
+
+# TestRuns more than this limit will be moved to archives
+mosip.toolkit.testrun.archive.offset=5
+
+mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.port=3310
+
+#Enable or disable the virus scanner(true/false)
+mosip.toolkit.document.scan=true
+
+##the id for API
+mosip.toolkit.api.id.projects.get=mosip.toolkit.projects.retrieve
+mosip.toolkit.api.id.sbi.project.get=mosip.toolkit.sbi.project.retrieve
+mosip.toolkit.api.id.collections.get=mosip.toolkit.collections.retrieve
+mosip.toolkit.api.id.collection.get=mosip.toolkit.collection.retrieve
+mosip.toolkit.api.id.sdk.project.get=mosip.toolkit.sdk.project.retrieve
+mosip.toolkit.api.id.sdk.project.put=mosip.toolkit.sdk.project.update
+mosip.toolkit.api.id.sdk.project.post=mosip.toolkit.sdk.project.add
+mosip.toolkit.api.id.collection.post=mosip.toolkit.collection.add
+mosip.toolkit.api.id.sbi.project.post=mosip.toolkit.sbi.project.add
+mosip.toolkit.api.id.testcase.project.get=mosip.toolkit.testcase.project.retrieve
+mosip.toolkit.api.id.validations.post=mosip.toolkit.api.id.validations
+mosip.toolkit.api.id.generate.sdk.request.post=mosip.toolkit.api.id.generate.sdk.request
+mosip.toolkit.api.id.collection.testcases.get=mosip.toolkit.collection.testcases.retrieve
+mosip.toolkit.api.id.collection.testcase.post=mosip.toolkit.collection.testcase.add
+mosip.toolkit.api.id.testrun.post=mosip.toolkit.testrun.add
+mosip.toolkit.api.id.testrun.put=mosip.toolkit.testrun.update
+mosip.toolkit.api.id.testrun.details.post=mosip.toolkit.testrun.details.add
+mosip.toolkit.api.id.testrun.details.get=mosip.toolkit.testrun.details.retrieve
+mosip.toolkit.api.id.testcase.get=mosip.toolkit.testcase.retrieve
+mosip.toolkit.api.id.testrun.history.get=mosip.toolkit.testrun.history.retrieve
+mosip.toolkit.api.id.testrun.status.get=mosip.toolkit.testrun.status.retrieve
+mosip.toolkit.api.id.sdk.generate.request=mosip.toolkit.api.id.sdk.generate.request
+mosip.toolkit.api.id.biometric.testdata.get=mosip.toolkit.biometric.testdata.retrieve
+mosip.toolkit.api.id.biometric.testdata.post=mosip.toolkit.biometric.testdata.add
+mosip.toolkit.api.id.biometric.testdata.filenames.get=mosip.toolkit.biometric.testdata.filenames.retrieve
+mosip.toolkit.api.id.resource.file.post=mosip.toolkit.resource.file.add
+
+#Roles for validation
+mosip.toolkit.roles.uploadResource=GLOBAL_ADMIN
+mosip.toolkit.roles.saveTestCases=GLOBAL_ADMIN
+
+## Determines file upload type allowed in UI
+mosip.toolkit.documentupload.allowed.file.type = application/zip
+# Determines the file name length(with extension) allowed in UI
+mosip.toolkit.documentupload.allowed.file.nameLength = 50
+# Determines maximum size of file allowed uploaded 10 MB
+mosip.toolkit.documentupload.allowed.file.size = 10000000
+
+mosip.toolkit.max.allowed.gallery.files=5
\ No newline at end of file

From f91b34d589aa3697541e2cfc5d5ff0e7614b2a9a Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 21 Nov 2022 16:57:19 +0530
Subject: [PATCH 0934/1358] Toolkit added auth.server.admin.allowed.audience

Updated auth.server.admin.allowed.audience by adding toolkit-client
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index f170036ec5a..3ad194a8df2 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -418,7 +418,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client

From 380d54e181df2ea991baca7841af959181644895 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 25 Nov 2022 10:19:51 +0530
Subject: [PATCH 0935/1358] Updated allowed file size

mosip.toolkit.documentupload.allowed.file.size = 20000000
---
 compliance-toolkit-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index b1c9ad22ef5..e02be544fcb 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -172,6 +172,6 @@ mosip.toolkit.documentupload.allowed.file.type = application/zip
 # Determines the file name length(with extension) allowed in UI
 mosip.toolkit.documentupload.allowed.file.nameLength = 50
 # Determines maximum size of file allowed uploaded 10 MB
-mosip.toolkit.documentupload.allowed.file.size = 10000000
+mosip.toolkit.documentupload.allowed.file.size = 20000000
 
-mosip.toolkit.max.allowed.gallery.files=5
\ No newline at end of file
+mosip.toolkit.max.allowed.gallery.files=5

From c74d6b90c9ff62e926f20484c353c2eb3448ec64 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Fri, 9 Dec 2022 11:46:25 +0530
Subject: [PATCH 0936/1358] [DSD-1773] Added config changes for ida service.

---
 id-authentication-default.properties          | 88 +++++++++----------
 id-authentication-internal-default.properties |  8 +-
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f31b81d12bd..ac7cc120b6f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -114,8 +114,6 @@ ida.id.attribute.separator.fullAddress=,
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
-## For real biosdk
-# mosip.biosdk.default.service.url=${mosip.ida.biosdk-service.url}/api
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -218,14 +216,6 @@ ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
-ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
-## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
-ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
-ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
-ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
-ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.ida.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
@@ -235,9 +225,9 @@ ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet
 ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
 ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
-## Callback url for hotlist event
-ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=${mosip.api.internal.url}/${ida-websub-hotlist-callback-relative-url}
+
+ida-websub-partner-service-oidc-client-created-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/oidc_client_created
+ida-websub-partner-service-oidc-client-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/oidc_client_updated
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
@@ -275,7 +265,8 @@ ida-topic-pmp-misp-license-updated=MISP_LICENSE_UPDATED
 ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
-
+ida-topic-pmp-oidc-client-created=OIDC_CLIENT_CREATED
+ida-topic-pmp-oidc-client-updated=OIDC_CLIENT_UPDATED
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
 # in minutes
@@ -384,7 +375,8 @@ ida.api.id.vid=mosip.identity.vid
 ida.api.id.internal=mosip.identity.auth.internal
 ida.api.id.auth.transactions=mosip.identity.authtransactions.read
 ida.api.id.otp.internal=mosip.identity.otp.internal
-
+ida.api.id.kycauth=mosip.identity.kycauth
+ida.api.id.kycexchange=mosip.identity.kycexchange
 ## Request versions
 ida.api.version.auth=1.0
 ida.api.version.kyc=1.0
@@ -394,7 +386,8 @@ ida.api.version.vid=1.0
 ida.api.version.internal=1.0
 ida.api.version.auth.transactions=1.0
 ida.api.version.otp.internal=1.0
-
+ida.api.version.kycauth=1.0
+ida.api.version.kycexchange=1.0
 ## Auth response token config
 ## Preference to turn on/off of authentication response token for a Country
 ## A partner specific policy will govern how the response token is generated, whether it should be Random/Partner or Policy specific
@@ -421,7 +414,8 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 ## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 ## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.authentication.core.exception.IdAuthRetryException,io.mosip.authentication.core.exception.IdAuthenticationBaseException
+kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
+
 ## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -501,7 +495,7 @@ zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
 ## TODO: For testing. Revert in production
-#mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 ## Admin
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
@@ -543,8 +537,7 @@ ida.fetch.failed.websub.messages.chunk.size=10
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
-ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl
-
+ida.mosip.internal.auth.filter.classes.in.execution.order==io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 ## Demo SDK integration
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
@@ -569,14 +562,14 @@ mosip.ida.allowed.domain.uris=${mosip.api.internal.url}
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
 #The list of attributes in identity that are to be decrypted by default 
-ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email
 
 #------ Un-encrypted Credential Attributes list -----------
 #The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).
 #These attributes will not be decrypted when fetching the records from IDA DB for Authentication/EKYC/OTP requests.
 #By default all attributes are assumed to be Zero Knowledge encrypted.
 #Specify the attributes here only if they are not encrypted as per the datashare policy.
-ida-zero-knowledge-unencrypted-credential-attributes=preferredLang
+ida-zero-knowledge-unencrypted-credential-attributes=
 
 #openapi properties to sort tags and operations in Id Authentication
 springdoc.swagger-ui.tagsSorter=alpha
@@ -596,25 +589,32 @@ mosip.role.idauth.postotp=RESIDENT
 mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.idauth.postverifyidentity=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.idauth.getauthtransactionsindividualid=RESIDENT
-mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
-mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
-mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadotherdomaincertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN
-mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencrypt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postdecrypt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postencryptwithpin=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptwithpin=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptdt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptdt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratemasterkeyobjecttype=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postgeneratecsr=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postuploadcertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postuploadotherdomaincertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postgeneratesymmetrickey=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.putrevokekey=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcacertificate=PARTNER_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postverifycertificatetrust=PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postvalidate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+
+#logging.level.root=DEBUG
+
+# Secret will be used during kyc token generation.
+mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
+kyc.token.expire.time.adjustment.seconds=300
+kyc.exchange.default.lang=eng
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 4b05ca5f01b..33411b5a630 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,4 +32,10 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client,mosip-deployment-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-deployment-client
+
+# Configuration to enable the enable/disable the retriggering of missing credential in IDA internal service startup.
+# If the property is not defined, it is disabled by default.
+# Note: if enabled, a setup with more than one pod of ida-internal-service will result in multiple retriggering of credentials by each pods.
+# To avoid that issue, first keep one pod applied the with enabled flag, then disable the configuration and then scale it up.
+ida-missing-credential-retrigger-enabled=false
\ No newline at end of file

From 8253e289d4ae6102a45fb2b7b367bbbae6e3d9a2 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Fri, 9 Dec 2022 11:49:06 +0530
Subject: [PATCH 0937/1358] [DSD-1773] Added config changes for ida service.

---
 ida-partner.cer | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ida-partner.cer

diff --git a/ida-partner.cer b/ida-partner.cer
new file mode 100644
index 00000000000..92ac02f621e
--- /dev/null
+++ b/ida-partner.cer
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrDCCApSgAwIBAgIIE5RHue4Ke5UwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UE
+BhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCQU5HQUxPUkUxDTALBgNVBAoM
+BElJVEIxIDAeBgNVBAsMF01PU0lQLVRFQ0gtQ0VOVEVSIChJREEpMRUwEwYDVQQD
+DAx3d3cubW9zaXAuaW8wHhcNMjIxMjAyMTM1NDQzWhcNMjQxMjAxMTM1NDQzWjB1
+MQswCQYDVQQGEwJJTjELMAkGA1UECAwCS0ExEjAQBgNVBAcMCUJBTkdBTE9SRTEN
+MAsGA1UECgwESUlUQjEgMB4GA1UECwwXTU9TSVAtVEVDSC1DRU5URVIgKElEQSkx
+FDASBgNVBAMMC0lEQS1QQVJUTkVSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA0IoecLH6IHKZZixLNZO++hC0XtH0wUeMQ5CoFBRC6jBsyZgEHSqvGYUc
+t7r3rcLDWuiufz8VsdlzLCwV/Mw30ZB9sAut7g7wU1ak6pZfkUTLmsOgSq3szW4R
+W3u2FlMoAtUdtHClSSymJ2lwCMsKyIwfXxrB1+T0YzRISIUToYZ/atMs+ntJyyyD
+aIG1SNZi/L5CM5D0L7QhG19bgrMrgFGuk+z4CNcPBx4NHqkcowRePT3/lp98aLtB
+2Rt6FQ/naTQMRK/L19sQTvQgaYClfq9Yeuv1w449NFuJ/MixXdj3A/8OvGM6fgV7
+vHzZR8gSHNK9XpPfkyYUgXq+h2CHzQIDAQABoz8wPTAMBgNVHRMBAf8EAjAAMB0G
+A1UdDgQWBBSpx0wEBrp2hw1U8OMWzalKwaMn5DAOBgNVHQ8BAf8EBAMCBSAwDQYJ
+KoZIhvcNAQELBQADggEBAFzssGHBrBYV6OKY7PbFVge2B+SxvIRrUxFSnJIqxyGs
+mwgvEobzprH2pDir7xmQYNzG/npCw9980sJHxXRaojsby4+zxpECvTDa/00CVa3B
+4BQCumaF6aqXaY9/Eabijay9lmkKOc7robNyn0W0H39XciO0ECas+byK0EjXyvzw
+tUS2WZPnl1DXZBb6Z3yPZ/1e00dhga/IyDvBATR+++m69P0HHAOWOUKqtUDEfHTj
+kopRmdOKv70fgoXOGi0ucnCIqpJF6CiinR7PTsNXZ5IVTDQ3jdpmh9lL4Mi4gmPu
+F0SRhkXVig2LLe/OiQx7+0mjtPdKz4oEy1qeah+gCnY=
+-----END CERTIFICATE-----
\ No newline at end of file

From 6f3cbcf474f7c06189e17a3bcca870c694fb15c0 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 9 Dec 2022 19:36:54 +0530
Subject: [PATCH 0938/1358] Revert "[DSD-1773] Added config changes for ida
 service."

---
 id-authentication-default.properties          | 88 +++++++++----------
 id-authentication-internal-default.properties |  8 +-
 ida-partner.cer                               | 22 -----
 3 files changed, 45 insertions(+), 73 deletions(-)
 delete mode 100644 ida-partner.cer

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index ac7cc120b6f..f31b81d12bd 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -114,6 +114,8 @@ ida.id.attribute.separator.fullAddress=,
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
+## For real biosdk
+# mosip.biosdk.default.service.url=${mosip.ida.biosdk-service.url}/api
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -216,6 +218,14 @@ ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
+ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
+ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
+## Callback url for credential issueance event notification, including id remove/deactivate/activate events
+ida-websub-idchage-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
+ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
+ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
+ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
+ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.ida.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
@@ -225,9 +235,9 @@ ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet
 ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
 ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
-
-ida-websub-partner-service-oidc-client-created-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/oidc_client_created
-ida-websub-partner-service-oidc-client-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/oidc_client_updated
+## Callback url for hotlist event
+ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
+ida-websub-hotlist-callback-url=${mosip.api.internal.url}/${ida-websub-hotlist-callback-relative-url}
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
@@ -265,8 +275,7 @@ ida-topic-pmp-misp-license-updated=MISP_LICENSE_UPDATED
 ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
-ida-topic-pmp-oidc-client-created=OIDC_CLIENT_CREATED
-ida-topic-pmp-oidc-client-updated=OIDC_CLIENT_UPDATED
+
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
 # in minutes
@@ -375,8 +384,7 @@ ida.api.id.vid=mosip.identity.vid
 ida.api.id.internal=mosip.identity.auth.internal
 ida.api.id.auth.transactions=mosip.identity.authtransactions.read
 ida.api.id.otp.internal=mosip.identity.otp.internal
-ida.api.id.kycauth=mosip.identity.kycauth
-ida.api.id.kycexchange=mosip.identity.kycexchange
+
 ## Request versions
 ida.api.version.auth=1.0
 ida.api.version.kyc=1.0
@@ -386,8 +394,7 @@ ida.api.version.vid=1.0
 ida.api.version.internal=1.0
 ida.api.version.auth.transactions=1.0
 ida.api.version.otp.internal=1.0
-ida.api.version.kycauth=1.0
-ida.api.version.kycexchange=1.0
+
 ## Auth response token config
 ## Preference to turn on/off of authentication response token for a Country
 ## A partner specific policy will govern how the response token is generated, whether it should be Random/Partner or Policy specific
@@ -414,8 +421,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 ## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 ## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
-
+kernel.retry.retryable.exceptions=io.mosip.authentication.core.exception.IdAuthRetryException,io.mosip.authentication.core.exception.IdAuthenticationBaseException
 ## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -495,7 +501,7 @@ zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
 ## TODO: For testing. Revert in production
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+#mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 ## Admin
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
@@ -537,7 +543,8 @@ ida.fetch.failed.websub.messages.chunk.size=10
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
-ida.mosip.internal.auth.filter.classes.in.execution.order==io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
+ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl
+
 ## Demo SDK integration
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0
@@ -562,14 +569,14 @@ mosip.ida.allowed.domain.uris=${mosip.api.internal.url}
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
 #The list of attributes in identity that are to be decrypted by default 
-ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
 
 #------ Un-encrypted Credential Attributes list -----------
 #The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).
 #These attributes will not be decrypted when fetching the records from IDA DB for Authentication/EKYC/OTP requests.
 #By default all attributes are assumed to be Zero Knowledge encrypted.
 #Specify the attributes here only if they are not encrypted as per the datashare policy.
-ida-zero-knowledge-unencrypted-credential-attributes=
+ida-zero-knowledge-unencrypted-credential-attributes=preferredLang
 
 #openapi properties to sort tags and operations in Id Authentication
 springdoc.swagger-ui.tagsSorter=alpha
@@ -589,32 +596,25 @@ mosip.role.idauth.postotp=RESIDENT
 mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.idauth.postverifyidentity=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.idauth.getauthtransactionsindividualid=RESIDENT
-mosip.role.keymanager.postencrypt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
-mosip.role.keymanager.postdecrypt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
-mosip.role.keymanager.postencryptwithpin=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptwithpin=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencryptdt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptdt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratemasterkeyobjecttype=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.getgetcertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
-mosip.role.keymanager.postgeneratecsr=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
-mosip.role.keymanager.postuploadcertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
-mosip.role.keymanager.postuploadotherdomaincertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
-mosip.role.keymanager.postgeneratesymmetrickey=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.putrevokekey=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadcacertificate=PARTNER_ADMIN
-mosip.role.keymanager.postuploadpartnercertificate=PARTNER_ADMIN,PARTNER
-mosip.role.keymanager.getgetpartnercertificatepartnercertid=PARTNER_ADMIN,PARTNER
-mosip.role.keymanager.postverifycertificatetrust=PARTNER_ADMIN,PARTNER
-mosip.role.keymanager.postsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postvalidate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postpdfsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-
-#logging.level.root=DEBUG
-
-# Secret will be used during kyc token generation.
-mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
-kyc.token.expire.time.adjustment.seconds=300
-kyc.exchange.default.lang=eng
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadotherdomaincertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 33411b5a630..4b05ca5f01b 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,10 +32,4 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-deployment-client
-
-# Configuration to enable the enable/disable the retriggering of missing credential in IDA internal service startup.
-# If the property is not defined, it is disabled by default.
-# Note: if enabled, a setup with more than one pod of ida-internal-service will result in multiple retriggering of credentials by each pods.
-# To avoid that issue, first keep one pod applied the with enabled flag, then disable the configuration and then scale it up.
-ida-missing-credential-retrigger-enabled=false
\ No newline at end of file
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client,mosip-deployment-client
diff --git a/ida-partner.cer b/ida-partner.cer
deleted file mode 100644
index 92ac02f621e..00000000000
--- a/ida-partner.cer
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrDCCApSgAwIBAgIIE5RHue4Ke5UwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UE
-BhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCQU5HQUxPUkUxDTALBgNVBAoM
-BElJVEIxIDAeBgNVBAsMF01PU0lQLVRFQ0gtQ0VOVEVSIChJREEpMRUwEwYDVQQD
-DAx3d3cubW9zaXAuaW8wHhcNMjIxMjAyMTM1NDQzWhcNMjQxMjAxMTM1NDQzWjB1
-MQswCQYDVQQGEwJJTjELMAkGA1UECAwCS0ExEjAQBgNVBAcMCUJBTkdBTE9SRTEN
-MAsGA1UECgwESUlUQjEgMB4GA1UECwwXTU9TSVAtVEVDSC1DRU5URVIgKElEQSkx
-FDASBgNVBAMMC0lEQS1QQVJUTkVSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA0IoecLH6IHKZZixLNZO++hC0XtH0wUeMQ5CoFBRC6jBsyZgEHSqvGYUc
-t7r3rcLDWuiufz8VsdlzLCwV/Mw30ZB9sAut7g7wU1ak6pZfkUTLmsOgSq3szW4R
-W3u2FlMoAtUdtHClSSymJ2lwCMsKyIwfXxrB1+T0YzRISIUToYZ/atMs+ntJyyyD
-aIG1SNZi/L5CM5D0L7QhG19bgrMrgFGuk+z4CNcPBx4NHqkcowRePT3/lp98aLtB
-2Rt6FQ/naTQMRK/L19sQTvQgaYClfq9Yeuv1w449NFuJ/MixXdj3A/8OvGM6fgV7
-vHzZR8gSHNK9XpPfkyYUgXq+h2CHzQIDAQABoz8wPTAMBgNVHRMBAf8EAjAAMB0G
-A1UdDgQWBBSpx0wEBrp2hw1U8OMWzalKwaMn5DAOBgNVHQ8BAf8EBAMCBSAwDQYJ
-KoZIhvcNAQELBQADggEBAFzssGHBrBYV6OKY7PbFVge2B+SxvIRrUxFSnJIqxyGs
-mwgvEobzprH2pDir7xmQYNzG/npCw9980sJHxXRaojsby4+zxpECvTDa/00CVa3B
-4BQCumaF6aqXaY9/Eabijay9lmkKOc7robNyn0W0H39XciO0ECas+byK0EjXyvzw
-tUS2WZPnl1DXZBb6Z3yPZ/1e00dhga/IyDvBATR+++m69P0HHAOWOUKqtUDEfHTj
-kopRmdOKv70fgoXOGi0ucnCIqpJF6CiinR7PTsNXZ5IVTDQ3jdpmh9lL4Mi4gmPu
-F0SRhkXVig2LLe/OiQx7+0mjtPdKz4oEy1qeah+gCnY=
------END CERTIFICATE-----
\ No newline at end of file

From bc161e1541ec32c42f3207d9d9f8dc1dfb663ffa Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Mon, 12 Dec 2022 14:23:29 +0530
Subject: [PATCH 0939/1358] [DSD-1788] Added config changes for idp service.

---
 id-authentication-default.properties          |  83 +++---
 id-authentication-internal-default.properties |   8 +-
 ida-partner.cer                               |  22 ++
 idp-default.properties                        | 252 ++++++++++++++++++
 4 files changed, 324 insertions(+), 41 deletions(-)
 create mode 100644 ida-partner.cer
 create mode 100644 idp-default.properties

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f31b81d12bd..f664eb039aa 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -115,8 +115,6 @@ ida.id.attribute.separator.fullAddress=,
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 ## For real biosdk
-# mosip.biosdk.default.service.url=${mosip.ida.biosdk-service.url}/api
-# The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 # The version of the BIO SDK API implemeted for Finger modality
@@ -218,14 +216,6 @@ ida-websub-partner-service-callback-secret=${ida.websub.partner.service.callback
 ida-websub-hotlist-callback-secret=${ida.websub.hotlist.callback.secret}
 ida-websub-masterdata-templates-callback-secret=${ida.websub.masterdata.templates.callback.secret}
 ida-websub-masterdata-titles-callback-secret=${ida.websub.masterdata.titles.callback.secret}
-ida-websub-auth-type-callback-relative-url=${server.servlet.context-path}/callback/authTypeCallback/${ida-auth-partner-id}
-ida-websub-auth-type-callback-url=${mosip.api.internal.url}/${ida-websub-auth-type-callback-relative-url}
-## Callback url for credential issueance event notification, including id remove/deactivate/activate events
-ida-websub-idchage-callback-url=${mosip.api.internal.url}/${server.servlet.context-path}/callback/idchange/{eventType}/${ida-auth-partner-id}
-ida-websub-idchange-credential-issued-callback-relative-url=${server.servlet.context-path}/callback/idchange/credential_issued/${ida-auth-partner-id}
-ida-websub-idchange-remove-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/remove_id/${ida-auth-partner-id}
-ida-websub-idchange-deactivate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/deactivate_id/${ida-auth-partner-id}
-ida-websub-idchange-activate-id-callback-relative-url=${server.servlet.context-path}/callback/idchange/activate_id/${ida-auth-partner-id}
 ida-websub-credential-issue-callback-url=
 ## Callback url for MISP/Partner change notification events
 ida-websub-partner-service-callback-url=${mosip.ida.internal.url}/${server.servlet.context-path}/callback/partnermanagement/{eventType}
@@ -235,9 +225,9 @@ ida-websub-partner-service-policy-updated-callback-relative-url=${server.servlet
 ida-websub-partner-service-partner-api-key-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/partner_api_key_updated
 ida-websub-partner-service-misp-license-generated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_generated
 ida-websub-partner-service-misp-license-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/misp_license_updated
-## Callback url for hotlist event
-ida-websub-hotlist-callback-relative-url=${server.servlet.context-path}/callback/hotlist
-ida-websub-hotlist-callback-url=${mosip.api.internal.url}/${ida-websub-hotlist-callback-relative-url}
+ida-websub-partner-service-oidc-client-created-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/oidc_client_created
+ida-websub-partner-service-oidc-client-updated-callback-relative-url=${server.servlet.context-path}/callback/partnermanagement/oidc_client_updated
+
 
 #Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
 subscriptions-delay-on-startup_millisecs=120000
@@ -275,6 +265,8 @@ ida-topic-pmp-misp-license-updated=MISP_LICENSE_UPDATED
 ida-topic-pmp-partner-api-key-approved=APIKEY_APPROVED
 ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
+ida-topic-pmp-oidc-client-created=OIDC_CLIENT_CREATED
+ida-topic-pmp-oidc-client-updated=OIDC_CLIENT_UPDATED
 
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -384,6 +376,8 @@ ida.api.id.vid=mosip.identity.vid
 ida.api.id.internal=mosip.identity.auth.internal
 ida.api.id.auth.transactions=mosip.identity.authtransactions.read
 ida.api.id.otp.internal=mosip.identity.otp.internal
+ida.api.id.kycauth=mosip.identity.kycauth
+ida.api.id.kycexchange=mosip.identity.kycexchange
 
 ## Request versions
 ida.api.version.auth=1.0
@@ -394,6 +388,8 @@ ida.api.version.vid=1.0
 ida.api.version.internal=1.0
 ida.api.version.auth.transactions=1.0
 ida.api.version.otp.internal=1.0
+ida.api.version.kycauth=1.0
+ida.api.version.kycexchange=1.0
 
 ## Auth response token config
 ## Preference to turn on/off of authentication response token for a Country
@@ -421,7 +417,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 ## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 ## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.authentication.core.exception.IdAuthRetryException,io.mosip.authentication.core.exception.IdAuthenticationBaseException
+kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureExceptionf
 ## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -501,7 +497,7 @@ zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
 ## TODO: For testing. Revert in production
-#mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
 
 ## Admin
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
@@ -543,7 +539,7 @@ ida.fetch.failed.websub.messages.chunk.size=10
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
-ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl
+ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 
 ## Demo SDK integration
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
@@ -569,14 +565,14 @@ mosip.ida.allowed.domain.uris=${mosip.api.internal.url}
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
 #The list of attributes in identity that are to be decrypted by default 
-ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email
 
 #------ Un-encrypted Credential Attributes list -----------
 #The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).
 #These attributes will not be decrypted when fetching the records from IDA DB for Authentication/EKYC/OTP requests.
 #By default all attributes are assumed to be Zero Knowledge encrypted.
 #Specify the attributes here only if they are not encrypted as per the datashare policy.
-ida-zero-knowledge-unencrypted-credential-attributes=preferredLang
+ida-zero-knowledge-unencrypted-credential-attributes=
 
 #openapi properties to sort tags and operations in Id Authentication
 springdoc.swagger-ui.tagsSorter=alpha
@@ -596,25 +592,32 @@ mosip.role.idauth.postotp=RESIDENT
 mosip.role.idauth.postauth=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.idauth.postverifyidentity=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 mosip.role.idauth.getauthtransactionsindividualid=RESIDENT
-mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
-mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
-mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadotherdomaincertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN
-mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencrypt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postdecrypt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_REQUEST
+mosip.role.keymanager.postencryptwithpin=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptwithpin=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptdt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptdt=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratemasterkeyobjecttype=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postgeneratecsr=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postuploadcertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postuploadotherdomaincertificate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postgeneratesymmetrickey=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.putrevokekey=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcacertificate=PARTNER_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postverifycertificatetrust=PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postvalidate=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtsign=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+
+#logging.level.root=DEBUG
+
+# Secret will be used during kyc token generation.
+mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
+kyc.token.expire.time.adjustment.seconds=300
+kyc.exchange.default.lang=eng
\ No newline at end of file
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 4b05ca5f01b..33411b5a630 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -32,4 +32,10 @@ authrequest.received-time-allowed.seconds=120
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
 authrequest.biometrics.allowed-segment-time-difference-in-seconds=60
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-partnermanager-client,mosip-deployment-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-ida-client,mosip-deployment-client
+
+# Configuration to enable the enable/disable the retriggering of missing credential in IDA internal service startup.
+# If the property is not defined, it is disabled by default.
+# Note: if enabled, a setup with more than one pod of ida-internal-service will result in multiple retriggering of credentials by each pods.
+# To avoid that issue, first keep one pod applied the with enabled flag, then disable the configuration and then scale it up.
+ida-missing-credential-retrigger-enabled=false
\ No newline at end of file
diff --git a/ida-partner.cer b/ida-partner.cer
new file mode 100644
index 00000000000..92ac02f621e
--- /dev/null
+++ b/ida-partner.cer
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDrDCCApSgAwIBAgIIE5RHue4Ke5UwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UE
+BhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCQU5HQUxPUkUxDTALBgNVBAoM
+BElJVEIxIDAeBgNVBAsMF01PU0lQLVRFQ0gtQ0VOVEVSIChJREEpMRUwEwYDVQQD
+DAx3d3cubW9zaXAuaW8wHhcNMjIxMjAyMTM1NDQzWhcNMjQxMjAxMTM1NDQzWjB1
+MQswCQYDVQQGEwJJTjELMAkGA1UECAwCS0ExEjAQBgNVBAcMCUJBTkdBTE9SRTEN
+MAsGA1UECgwESUlUQjEgMB4GA1UECwwXTU9TSVAtVEVDSC1DRU5URVIgKElEQSkx
+FDASBgNVBAMMC0lEQS1QQVJUTkVSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA0IoecLH6IHKZZixLNZO++hC0XtH0wUeMQ5CoFBRC6jBsyZgEHSqvGYUc
+t7r3rcLDWuiufz8VsdlzLCwV/Mw30ZB9sAut7g7wU1ak6pZfkUTLmsOgSq3szW4R
+W3u2FlMoAtUdtHClSSymJ2lwCMsKyIwfXxrB1+T0YzRISIUToYZ/atMs+ntJyyyD
+aIG1SNZi/L5CM5D0L7QhG19bgrMrgFGuk+z4CNcPBx4NHqkcowRePT3/lp98aLtB
+2Rt6FQ/naTQMRK/L19sQTvQgaYClfq9Yeuv1w449NFuJ/MixXdj3A/8OvGM6fgV7
+vHzZR8gSHNK9XpPfkyYUgXq+h2CHzQIDAQABoz8wPTAMBgNVHRMBAf8EAjAAMB0G
+A1UdDgQWBBSpx0wEBrp2hw1U8OMWzalKwaMn5DAOBgNVHQ8BAf8EBAMCBSAwDQYJ
+KoZIhvcNAQELBQADggEBAFzssGHBrBYV6OKY7PbFVge2B+SxvIRrUxFSnJIqxyGs
+mwgvEobzprH2pDir7xmQYNzG/npCw9980sJHxXRaojsby4+zxpECvTDa/00CVa3B
+4BQCumaF6aqXaY9/Eabijay9lmkKOc7robNyn0W0H39XciO0ECas+byK0EjXyvzw
+tUS2WZPnl1DXZBb6Z3yPZ/1e00dhga/IyDvBATR+++m69P0HHAOWOUKqtUDEfHTj
+kopRmdOKv70fgoXOGi0ucnCIqpJF6CiinR7PTsNXZ5IVTDQ3jdpmh9lL4Mi4gmPu
+F0SRhkXVig2LLe/OiQx7+0mjtPdKz4oEy1qeah+gCnY=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/idp-default.properties b/idp-default.properties
new file mode 100644
index 00000000000..be16464cb3e
--- /dev/null
+++ b/idp-default.properties
@@ -0,0 +1,252 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
+# keycloak.admin.password
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
+# softhsm.kernel.pin
+# softhsm-security-pin
+# email.smtp.host
+# email.smtp.username
+# email.smtp.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
+# mosip.api.internal.url
+# mosip.api.public.url
+
+## IdP MISP License key
+mosip.idp.misp.license.key=nsWvISPTJAzxEOlFX31Z7zorsJeaaDUM2BvKsi8pogLpj3A1Sm
+
+mosip.idp.clientmgmt.create-client=SCOPE_add_oidc_client
+mosip.idp.clientmgmt.update-client=SCOPE_update_oidc_client
+mosip.idp.systeminfo.get-certificate=SCOPE_get_certificate
+mosip.idp.systeminfo.upload-certificate=SCOPE_upload_certificate
+
+mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop-v3/amr-acr-mapping.json
+mosip.idp.auth-ignore-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
+  ${server.servlet.path}/authorization/**,${server.servlet.path}/actuator/**,/favicon.ico,\
+  /v1/notifier/actuator/prometheus,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
+  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/linked-authorization/**
+
+#spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
+spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+
+mosip.idp.supported-id-regex=\\S*
+
+#Id and access token validity intervals
+mosip.idp.access-token.expire.seconds=7200
+mosip.idp.id-token-expire-seconds=7200
+
+## link transaction
+mosip.idp.link-code-expire-in-secs=60
+mosip.idp.kafka.linked-session.topic=idp-linked
+mosip.idp.kafka.linked-auth-code.topic=idp-consented
+
+## kafka configurations
+spring.kafka.bootstrap-servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
+spring.kafka.consumer.group-id=idp-consumer
+spring.kafka.consumer.enable-auto-commit=true
+#spring.kafka.listener.concurrency=1
+
+## ----------------------------------------  IdP (oauth & openid) config -------------------------------------------
+
+## supported scopes
+mosip.idp.supported.authorize.scopes={'identity.readonly','vid.manage','vid.readonly','auth.readonly','auth.method.manage','identity.update','auth.history.readonly','notifications.readonly','notifications.manage','credential.manage','auth.history.manage','card.manage'}
+mosip.idp.supported.openid.scopes={'profile','email','phone'}
+mosip.idp.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone','locale','individual_id'},'email' : {'email'}, 'phone' : {'phone'}}
+
+## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
+mosip.idp.supported.response.types={'code'}
+
+## Form of Authorization Grant presented to token endpoint
+mosip.idp.supported.grant.types={'authorization_code'}
+
+## specifies how the Authorization Server displays the authentication and consent user interface pages to the End-User
+# page-The Authorization Server SHOULD display the authentication and consent UI consistent with a full User Agent page view. If the display parameter is not specified, this is the default display mode.
+# popup-The Authorization Server SHOULD display the authentication and consent UI consistent with a popup User Agent window. The popup User Agent window should be of an appropriate size for a login-focused dialog and should not obscure the entire window that it is popping up over.
+# touch-The Authorization Server SHOULD display the authentication and consent UI consistent with a device that leverages a touch interface.
+# wap-The Authorization Server SHOULD display the authentication and consent UI consistent with a "feature phone" type display.
+mosip.idp.supported.ui.displays={'page','popup','touch','wap'}
+
+## specifies whether the Authorization Server prompts the End-User for reauthentication and consent
+# none-The Authorization Server MUST NOT display any authentication or consent user interface pages.
+# An error is returned if an End-User is not already authenticated or the Client does not have pre-configured consent
+# for the requested Claims or does not fulfill other conditions for processing the request.
+# The error code will typically be login_required, interaction_required, or another code defined in Section 3.1.2.6.
+# This can be used as a method to check for existing authentication and/or consent.
+# login-The Authorization Server SHOULD prompt the End-User for reauthentication. If it cannot reauthenticate the End-User, \
+#  it MUST return an error, typically login_required.
+# consent-The Authorization Server SHOULD prompt the End-User for consent before returning information to the Client.
+# If it cannot obtain consent, it MUST return an error, typically consent_required.
+# select_account-The Authorization Server SHOULD prompt the End-User to select a user account. This enables an End-User
+# who has multiple accounts at the Authorization Server to select amongst the multiple accounts that they might have current
+# sessions for. If it cannot obtain an account selection choice made by the End-User, it MUST return an error,
+# typically account_selection_required.
+mosip.idp.supported.ui.prompts={'none','login','consent','select_account'}
+
+## Type of the client assertion
+mosip.idp.supported.client.assertion.types={'urn:ietf:params:oauth:client-assertion-type:jwt-bearer'}
+
+## Type of the client authentication methods for token endpoint
+mosip.idp.supported.client.auth.methods={'private_key_jwt'}
+
+## ---------------------------------------- Cache configuration -------------------------------------------
+mosip.idp.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented
+
+#spring.cache.type=redis
+#spring.cache.cache-names=${mosip.idp.cache.names}
+#spring.redis.host=localhost
+#spring.redis.port=6379
+management.health.redis.enabled=false
+
+spring.cache.type=simple
+mosip.idp.cache.key.hash.algorithm=SHA3-256
+mosip.idp.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
+   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200 }
+mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'authenticated': 300, 'authcodegenerated': 300, \
+  'userinfo': ${mosip.idp.access-token.expire.seconds}, 'linkcodegenerated' : ${mosip.idp.link-code-expire-in-secs}, \
+  'linked': 300 , 'linkedcode': ${mosip.idp.link-code-expire-in-secs}, 'linkedauth' : 300, 'consented': 300 }
+
+## ------------------------------------------ Auth Wrapper ------------------------------------------------
+
+mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
+mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/ida-partner.cer
+mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
+mosip.idp.authn.wrapper.ida-domainUri=https://idp.dev2.mosip.net
+mosip.idp.authn.wrapper.ida-env=Developer
+mosip.idp.authn.ida.otp-channels=email,mobile
+
+#mosip.idp.authn.wrapper.impl=MockAuthenticationService
+mosip.idp.authn.mock.impl.token-expire-sec=1800
+mosip.idp.authn.mock.impl.persona-repo=/home/mosip/mock-auth-data
+mosip.idp.authn.mock.impl.policy-repo=/home/mosip/mock-auth-data
+mosip.idp.authn.mock.impl.claims-mapping-file=/home/mosip/mock-auth-data/claims_attributes_mapping.json
+
+## ------------------------------------------ Discovery openid-configuration ------------------------------------------------
+mosip.idp.domain.url=https://${mosip.api.public.host}
+mosip.idp.discovery.issuer-id=${mosip.idp.domain.url}${server.servlet.path}
+
+mosip.idp.discovery.key-values={'issuer': '${mosip.idp.discovery.issuer-id}' ,\
+  \ 'authorization_endpoint': '${mosip.idp.domain.url}${server.servlet.path}/authorize' , \
+  \ 'token_endpoint': '${mosip.idp.domain.url}${server.servlet.path}/oauth/token' ,\
+  \ 'userinfo_endpoint' : '${mosip.idp.domain.url}${server.servlet.path}/oidc/userinfo' , \
+  \ 'introspection_endpoint' : '${mosip.idp.domain.url}${server.servlet.path}/oauth/introspect' , \
+  \ 'jwks_uri' : '${mosip.idp.domain.url}${server.servlet.path}/oauth/jwks.json' , \
+  \ 'scopes_supported' : ${mosip.idp.supported.openid.scopes}, \
+  \ 'response_types_supported' : ${mosip.idp.supported.response.types}, \
+  \ 'response_modes_supported' : { 'query' }, \
+  \ 'token_endpoint_auth_methods_supported' : ${mosip.idp.supported.client.auth.methods}, \
+  \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, \
+  \ 'userinfo_signing_alg_values_supported' : {'RS256'}, \
+  \ 'userinfo_encryption_alg_values_supported' : {'RSAXXXXX'},\
+  \ 'userinfo_encryption_enc_values_supported' : {'A128GCM'}, \
+  \ 'id_token_signing_alg_values_supported' : {'RS256'}, \
+  \ 'claim_types_supported': {'normal'}, \
+  \ 'claims_parameter_supported' : true, \
+  \ 'display_values_supported' : ${mosip.idp.supported.ui.displays}, \
+  \ 'subject_types_supported' : { 'pairwise' }, \
+  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone','locale','individual_id'}, \
+  \ 'acr_values_supported' : {},\
+  \ 'request_parameter_supported' : false, \
+  \ 'ui_locales_supported' : {} }
+
+##----------------------------------------- Database properties -------------------------------------------
+
+mosip.idp.database.hostname=postgres-postgresql.postgres
+mosip.idp.database.port=5432
+spring.datasource.url=jdbc:postgresql://${mosip.idp.database.hostname}:${mosip.idp.database.port}/mosip_idp?currentSchema=idp
+spring.datasource.username=idpuser
+spring.datasource.password=${db.dbuser.password}
+
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+#------------------------------------ Key-manager specific properties --------------------------------------
+#Crypto asymmetric algorithm name
+mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
+#Crypto symmetric algorithm name
+mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
+#Keygenerator asymmetric algorithm name
+mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
+#Keygenerator symmetric algorithm name
+mosip.kernel.keygenerator.symmetric-algorithm-name=AES
+#Asymmetric algorithm key length
+mosip.kernel.keygenerator.asymmetric-key-length=2048
+#Symmetric algorithm key length
+mosip.kernel.keygenerator.symmetric-key-length=256
+#Encrypted data and encrypted symmetric key separator
+mosip.kernel.data-key-splitter=#KEY_SPLITTER#
+#GCM tag length
+mosip.kernel.crypto.gcm-tag-length=128
+#Hash algo name
+mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
+#Symmtric key length used in hash
+mosip.kernel.crypto.hash-symmetric-key-length=256
+#No of iterations in hash
+mosip.kernel.crypto.hash-iteration=100000
+#Sign algo name
+mosip.kernel.crypto.sign-algorithm-name=RS256
+#Certificate Sign algo name
+mosip.kernel.certificate.sign.algorithm=SHA256withRSA
+
+#mosip.kernel.keymanager.hsm.config-path=local.p12
+#mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+#mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+
+#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+# For PKCS11 provide Path of config file.
+# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
+# For Offline & JCE property can be left blank, specified value will be ignored.
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+# Passkey of keystore for PKCS11, PKCS12
+# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+
+
+mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
+mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
+mosip.kernel.keymanager.certificate.default.organization=IITB
+mosip.kernel.keymanager.certificate.default.location=BANGALORE
+mosip.kernel.keymanager.certificate.default.state=KA
+mosip.kernel.keymanager.certificate.default.country=IN
+
+mosip.kernel.keymanager.softhsm.certificate.common-name=www.mosip.io
+mosip.kernel.keymanager.softhsm.certificate.organizational-unit=MOSIP
+mosip.kernel.keymanager.softhsm.certificate.organization=IITB
+mosip.kernel.keymanager.softhsm.certificate.country=IN
+
+# Application Id for PMS master key.
+mosip.kernel.partner.sign.masterkey.application.id=PMS
+mosip.kernel.partner.allowed.domains=DEVICE
+
+mosip.kernel.keymanager-service-validate-url=https://${mosip.hostname}/keymanager/validate
+mosip.kernel.keymanager.jwtsign.validate.json=false
+mosip.keymanager.dao.enabled=false
+crypto.PrependThumbprint.enable=true
+
+## ---------------------------------------------- UI configs ------------------------------------------------------------------
+
+mosip.idp.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
+  'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
+  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
+  'send.otp.channels' : 'email' }
+
+
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file

From bdff183c79a07b24cec237cef769585f2cc93863 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Mon, 12 Dec 2022 14:39:16 +0530
Subject: [PATCH 0940/1358] [DSD-1788] Updated config changes for idp service.

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f664eb039aa..391d1a5c207 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -560,7 +560,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url}
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://idp.qa-1201-b2.mosip.net
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 

From ce62859108914adf56d10183a84012353e2034d8 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Mon, 12 Dec 2022 20:27:20 +0530
Subject: [PATCH 0941/1358] Updated properties to enable mock-smtp service

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 92ac5e4956f..2179290188f 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -55,9 +55,9 @@ spring.mail.username=${email.smtp.username}
 spring.mail.password=${email.smtp.secret}
 spring.mail.port=587
 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

From 4c5c37f20b9c14c465bb56907f4b439c70d3521d Mon Sep 17 00:00:00 2001
From: pramod444 <pramodbelal8@gmail.com>
Date: Tue, 13 Dec 2022 12:57:57 +0530
Subject: [PATCH 0942/1358] [DSD-1803] Updated resident-default.properties from
 develop2-v3.

---
 resident-default.properties | 568 +++++++++++++++++++++++++++++++++++-
 1 file changed, 562 insertions(+), 6 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 579f6d44daa..3f131e22d27 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -12,8 +12,15 @@ auth.internal.version=1.0
 mosip.registration.processor.print.id=mosip.registration.print
 mosip.registration.processor.application.version=1.0
 vid.create.id=mosip.vid.create
+mosip.resident.create.vid.version=v1
 resident.vid.version=v1
+resident.vid.version.new=1.0
+resident.revokevid.version=v1
+resident.revokevid.version.new=1.0
 resident.vid.id=mosip.resident.vid
+resident.vid.id.generate=mosip.resident.vid.generate
+resident.vid.policy.id=mosip.resident.vid.policy
+resident.vid.get.id=mosip.resident.vid.get
 auth.type.status.id=mosip.identity.authtype.status.update
 resident.authlock.id=mosip.resident.authlock
 resident.checkstatus.id=mosip.resident.checkstatus
@@ -24,13 +31,41 @@ resident.rid.id=mosip.resident.rid
 resident.updateuin.id=mosip.resident.updateuin
 resident.authunlock.id=mosip.resident.authunlock
 resident.authhistory.id=mosip.resident.authhistory
+resident.authLockStatusUpdateV2.id=mosip.resident.auth.lock.unlock
+resident.authLockStatusUpdateV2.version=v1
+resident.service.history.id=mosip.service.history.get
+resident.service.history.version=1.0
+resident.document.get.id=mosip.resident.document.get	
+resident.document.get.version=v1	
+resident.document.list.id=mosip.resident.document.list	
+resident.document.list.version=v1	
+resident.service.pin.status.id=mosip.resident.pin.status	
+resident.service.pin.status.version=v1	
+resident.service.unpin.status.id=mosip.resident.unpin.status	
+resident.service.unpin.status.version=v1	
+resident.document.delete.id=mosip.resident.document.delete	
+resident.document.delete.version=v1
+resident.contact.details.update.id=mosip.resident.contact.details.update.id
+resident.contact.details.send.otp.id=mosip.resident.contact.details.send.otp.id
 mosip.resident.service.status.check.id=mosip.registration.external.status
 mosip.resident.service.status.check.version=1.0
+resident.service.unreadnotificationlist.id=mosip.resident.service.history.unread
+resident.service.event.id=mosip.resident.event.status
+resident.service.event.version=1.0
+resident.identity.info.id=mosip.resident.identity.info
+resident.identity.info.version=1.0
+resident.share.credential.id=mosip.resident.share.credential
+resident.share.credential.version=1.0
+mosip.resident.request.response.version=1.0
 vid.revoke.id=mosip.vid.update
 resident.revokevid.id=mosip.resident.vidstatus
+mosip.resident.revokevid.id=mosip.resident.vid.revoke
 PARTNER_REFERENCE_Id=mpartner-default-resident
+mosip.resident.transliteration.transliterate.id=mosip.resident.transliteration.transliterate
 APPLICATION_Id=RESIDENT
 DECRYPT_API_URL=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+mosip-prereg-host=${mosip.prereg.host}
+mosip-prereg-ui-url=https://${mosip-prereg-host}/pre-registration-ui/
 
 ## Token generation
 token.request.id=io.mosip.resident
@@ -41,6 +76,10 @@ resident.secretKey=${mosip.resident.client.secret}
 # Below is defined in application properties
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
+
+ida.online-verification-partner-id=mpartner-default-auth
+
+
 ## Auth Services
 KERNELAUTHMANAGER=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
@@ -69,6 +108,20 @@ ENCRYPTURL=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 PACKETSIGNPUBLICKEY=${mosip.kernel.keymanager.url}/v1/keymanager/tpmsigning/publickey
 MIDSCHEMAURL=${mosip.kernel.syncdata.url}/v1/syncdata/latestidschema
 
+#Master Data api calls
+VALID_DOCUMENT_BY_LANGCODE_URL=${MASTER}/validdocuments/{langCode}
+LOCATION_HIERARCHY_LEVEL_BY_LANGCODE_URL=${MASTER}/locationHierarchyLevels/{langcode}
+IMMEDIATE_CHILDREN_BY_LOCATIONCODE_AND_LANGCODE_URL=${MASTER}/locations/immediatechildren/{locationcode}/{langcode}
+LOCATION_INFO_BY_LOCCODE_AND_LANGCODE_URL=${MASTER}/locations/info/{locationcode}/{langcode}
+REGISTRATION_CENTER_FOR_LOCATION_CODE_URL=${MASTER}/registrationcenters/{langcode}/{hierarchylevel}/names
+REGISTRATION_CENTER_BY_LOCATION_TYPE_AND_SEARCH_TEXT_PAGINATED_URL=${MASTER}/registrationcenters/page/{langcode}/{hierarchylevel}/{name}
+COORDINATE_SPECIFIC_REGISTRATION_CENTERS_URL=${MASTER}/getcoordinatespecificregistrationcenters/{langcode}/{longitude}/{latitude}/{proximitydistance}
+APPLICANT_VALID_DOCUMENT_URL=${MASTER}/applicanttype/{applicantId}/languages
+WORKING_DAYS_BY_REGISTRATION_ID=${MASTER}/workingdays/{registrationCenterID}/{langCode}
+LATEST_ID_SCHEMA_URL =${MASTER}/idschema/latest
+TEMPLATES_BY_LANGCODE_AND_TEMPLATETYPECODE_URL=${MASTER}/templates/{langcode}/{templatetypecode}
+GENDER_TYPE_BY_LANGCODE=${MASTER}/gendertypes/{langcode}
+
 # DMZ service call
 SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
 PACKETRECEIVER=http://regproc-group1.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
@@ -79,7 +132,8 @@ AUTHTYPESTATUSUPDATE=${mosip.idrepo.identity.url}/idrepository/v1/identity/autht
 #Registration status service
 REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
 resident.center.id=10001
-resident.machine.id=10001
+resident.machine.id=10080
+
 #Credential Req service
 POLICY_REQ_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
 OTP_GEN_URL=${mosip.ida.internal.url}/idauthentication/v1/internal/otp
@@ -89,10 +143,15 @@ CREDENTIAL_CANCELREQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credential
 CREDENTIAL_TYPES_URL=${mosip.idrepo.credential.service.url}/v1/credentialservice/types
 PARTNER_API_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+RETRIEVE_VIDS=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin/
+
+#IdRepo Service calls
+IDREPO_IDENTITY_UPDATE_COUNT=${mosip.idrepo.identity.url}/idrepository/v1/identity/update-count
+
 
 ## Config data
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-auth.types.allowed=demo,bio-Finger,bio-Iris,bio-FACE
+auth.types.allowed=otp-email,otp-phone,demo,bio-FINGER,bio-IRIS,bio-FACE
 
 resident.identityjson=identity-mapping.json
 mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
@@ -112,7 +171,7 @@ token.request.secretKey=${mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
 
 #TODO remove reg-client service accunt in production env
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client,mosip-resident-service-client-idp
 
 #Mapping Identity json to map with the applicant id json
 registration.processor.identityjson=identity-mapping.json
@@ -126,13 +185,510 @@ resident.update-uin.machine-zone-code = MOR
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
-auth.server.admin.issuer.uri=${keycloak.internal.url}/auth/realms/
 
 mosip.service-context=/resident/v1
-mosip.service.end-points=/**/*
+## The exclusion list of URL patterns that should not be part of authentication and authorization
+mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/get-individual-id,/**/req/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registrationcenters/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user
+
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
 
-object.store.base.location=/home/mosip
 
+#------------Request IDs---------------------
+# The request IDs used in Resident REST APIs
+mosip.resident.api.id.otp.request=mosip.identity.otp.internal
+mosip.resident.api.id.auth=mosip.identity.auth.internal
+
+#------------Request Versions---------------------
+# The request versions used in Resident REST APIs
+mosip.resident.api.version.otp.request=1.0
+mosip.resident.api.version.auth=1.0
+
+resident.view.history.serviceType.filters=ALL,AUTHENTICATION_REQUEST,SERVICE_REQUEST,DATA_UPDATE_REQUEST,ID_MANAGEMENT_REQUEST,DATA_SHARE_REQUEST
+resident.view.history.status.filters=all,success,in-progress,failed
+
+#Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
+
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id,mosip.captcha.sitekey,mosip.captcha.secretkey
+
+
+
+#IdRepo Identity call
+IDREPO_IDENTITY_URL=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{id}
+
+#Pre-reg application service call
+#PREREG_TRANSLITERATION_URL=${mosip.prereg.application.url}/preregistration/v1/transliteration/transliterate
+
+#Database config
+mosip.resident.database.hostname=postgres-postgresql.postgres
+mosip.resident.database.port=5432
+
+javax.persistence.jdbc.driver=org.postgresql.Driver
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.resident.database.hostname}:${mosip.resident.database.port}/mosip_resident
+javax.persistence.jdbc.user=residentuser
+javax.persistence.jdbc.password=${db.dbuser.password}
+
+auth.allowed.urls=https://${mosip.resident.host}/,https://${mosip.resident.host}/resident-ui/
+
+
+# IAM
+mosip.iam.module.login_flow.name=authorization_code
+
+###########################################################
+# IdP config
+# Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
+################## MOSIP IdP config
+#mosip.iam.module.clientID=mosip-resident-service-client-idp
+#mosip.iam.module.clientsecret=
+#mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
+#mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
+#mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
+#mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
+#mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json
+#auth.server.admin.issuer.uri=${mosip.iam.base.url}
+#auth.server.admin.issuer.domain.validate=true
+#auth.server.admin.oidc.userinfo.url=${mosip.iam.userinfo_endpoint}
+#mosip.iam.module.token.endpoint.private-key-jwt.auth.enabled=true
+#mosip.iam.module.token.endpoint.private-key-jwt.expiry.seconds=7200
+#mosip.resident.oidc.userinfo.jwt.signed=true
+# AuthAdaptor ValdidateTokenHelper: This property will directly apply the certs URL without need for constructing the path from issuer URL.
+# This is useful to keep a different certs URL for integrating with MOSIP IdP for offline token validation.
+#auth.server.admin.oidc.certs.url=${mosip.iam.certs_endpoint}
+################### MOSIP IdP config ends
+
+################### Mock-keycloak IdP config
+mosip.iam.module.clientID=mosip-resident-client
+mosip.iam.module.clientsecret=${mosip.resident.client.secret}
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.userinfo_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/userinfo
+mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+mosip.iam.module.token.endpoint.private-key-jwt.auth.enabled=false
+mosip.resident.oidc.userinfo.jwt.signed=false
+################### Mock-keycloak IdP config ends
+###########################################################
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
+#mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
+#mosip.iam.module.login_flow.scope=cls
+mosip.iam.module.login_flow.scope=openid profile identity.readonly identity.update vid.readonly vid.manage auth.readonly auth.method.manage auth.history.readonly auth.history.manage card.manage credential.manage notifications.readonly notifications.manage
+mosip.iam.module.login_flow.response_type=code
+
+mosip.iam.module.admin_realm_id=mosip
+
+#User-info claim attributes in open-id-connect based login with UIN/VID in MOSIP-IDP
+mosip.resident.identity.claim.individual-id=individual_id
+mosip.resident.identity.claim.ida-token=ida_token
+
+#Scopes
+mosip.scope.resident.getinputattributevalues=identity.readonly
+mosip.scope.resident.patchrevokevid=vid.manage
+mosip.scope.resident.postgeneratevid=vid.manage
+mosip.scope.resident.getvids=vid.readonly
+mosip.scope.resident.getAuthTransactions=auth.readonly
+mosip.scope.resident.postAuthTypeUnlock=auth.method.manage
+mosip.scope.resident.postAuthTypeStatus=auth.method.manage
+mosip.scope.resident.getAuthLockStatus=auth.method.manage
+mosip.scope.resident.patchUpdateUin=identity.update
+mosip.scope.resident.getServiceAuthHistoryRoles=auth.history.readonly
+mosip.scope.resident.postSendPhysicalCard=card.manage
+mosip.scope.resident.getUnreadServiceList=notifications.readonly
+mosip.scope.resident.getNotificationCount=notifications.readonly
+mosip.scope.resident.getNotificationClick=notifications.manage
+mosip.scope.resident.getupdatedttimes=notifications.manage
+mosip.scope.resident.postRequestDownloadPersonalizedCard=card.manage
+mosip.scope.resident.postRequestShareCredWithPartner=credential.manage
+mosip.scope.resident.postUnPinStatus=auth.history.manage
+mosip.scope.resident.postPinStatus=auth.history.manage
+mosip.scope.resident.getDownloadCard=card.manage
+mosip.scope.resident.postPersonalizedCard=card.manage
+mosip.scope.resident.getOrderRedirect=card.manage
+
+## Key manager
+mosip.resident.keymanager.encrypt-uri=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt	
+mosip.resident.keymanager.decrypt-uri=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+
+# Object Store configuration
+mosip.resident.object.store.account-name=resident
+mosip.resident.object.store.bucket-name=resident
+mosip.resident.object.store.adapter-name=s3Adapter
+object.store.s3.use.account.as.bucketname=true
+
+# Key manager encryption/decryption configuration
+mosip.resident.keymanager.application-name=RESIDENT
+mosip.resident.keymanager.reference-id=resident_document
+mosip.datashare.application.id=PARTNER
+mosip.datashare.reference.id=mparter-default-euin
+
+# Virus Scanner configuration
+mosip.resident.virus-scanner.enabled=true
+
+# VID Policy url
+mosip.resident.vid-policy-url=${config.server.file.storage.uri}mosip-vid-policy.json
+
+
+
+# Resident UI Schema JSON file name
+resident-ui-schema-file-name-prefix=resident-ui
+# IDA Mapping JSON file URI
+resident-ui-schema-file-url=${config.server.file.storage.uri}${resident-ui-schema-file-name-prefix}
+# Resident UI Schema JSON file property source
+resident-ui-schema-file-source-prefix=url:${resident-ui-schema-file-url}
+
+
+# Identity Mapping JSON file name
+identity-mapping-file-name=identity-mapping.json
+# IDA Mapping JSON file URI
+identity-mapping-file-url=${config.server.file.storage.uri}${identity-mapping-file-name} 
+# Identity Mapping JSON file property source
+identity-mapping-file-source=url:${identity-mapping-file-url}
+
+
+
+# Identity Data format MVEL file name
+resident-data-format-mvel-file-name=identity-data-formatter.mvel
+resident-data-format-mvel-file-url=${config.server.file.storage.uri}${resident-data-format-mvel-file-name} 
+resident-data-format-mvel-file-source=url:${resident-data-format-mvel-file-url}
+
+
+
+# WebSub Topic and callback propertis for auth type status event
+resident.websub.authtype-status.secret=${resident.websub.authtype.status.secret}
+resident.websub.authtype-status.topic=AUTH_TYPE_STATUS_UPDATE_ACK
+resident.websub.callback.authtype-status.relative.url=${server.servlet.context-path}/callback/authTypeCallback
+resident.websub.callback.authtype-status.url=${mosip.api.internal.url}${resident.websub.callback.authtype-status.relative.url}
+
+# Callback properties for AuthTransactionStatus
+resident.websub.authTransaction-status.secret=${resident.websub.auth.transaction.status.secret}
+resident.websub.authTransaction-status.topic=AUTHENTICATION_TRANSACTION_STATUS
+resident.websub.callback.authTransaction-status.relative.url=${server.servlet.context-path}/callback/authTransaction
+resident.websub.callback.authTransaction-status.url=${mosip.api.internal.url}${resident.websub.callback.authTransaction-status.relative.url}
+
+
+
+#--------------------------------TokenId generator---------------------------------------------------#
+mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
+mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
+#------------------------------------
+
+# Object store
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
+# Partner Service URL
+mosip.pms.pmp.partner.rest.uri=${mosip.pms.partnermanager.url}/v1/partnermanager/partners?partnerType=Online_Verification_Partner
+
+#Mask functions
+resident.email.mask.function=maskEmail
+resident.phone.mask.function=maskPhone
+resident.data.mask.function=convertToMaskDataFormat
+
+#property for dateOfBirth
+resident.dateofbirth.pattern=yyyy/MM/dd
+
+resident.documents.category=individualBiometrics
+
+#order card payment
+mosip.resident.order.card.payment.enabled=true
+
+#Check Order Status URL
+GET_ORDER_STATUS_URL=${mosip.resident.url}/resident/v1/mock/print-partner/check-order-status
+
+RESIDENT_REQ_CREDENTIAL_URL=${mosip.resident.url}/resident/v1/req/credential/status/
+
+DIGITAL_CARD_STATUS_URL=${mosip.digitalcard.service.url}/v1/digitalcard/
+mosip.resident.service.mock.pdf.url=https://uidai.gov.in/images/New_eAadhaar1.pdf
+
+
+#templates for resident
+resident.template.tnc.order-a-physical-card=tnc-order-a-physical-card
+resident.template.tnc.share-cred-with-partner=tnc-share-cred-with-partner
+resident.template.tnc.update-demo=tnc-update-demo
+
+# Batch job configuration for credential status update
+mosip.resident.update.service.status.job.enabled=true
+mosip.resident.update.service.status.job.initial-delay=60000
+mosip.resident.update.service.status.job.interval.millisecs=60000
+
+# auth-type unlock duration
+resident.auth-type.default.unlock.duration.seconds=100
+
+#templates for email subject
+resident.template.email.subject.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received-email-subject
+resident.template.email.subject.success.cust-and-down-my-card=cust-and-down-my-card-success-email-subject
+resident.template.email.subject.failure.cust-and-down-my-card=cust-and-down-my-card-failure-email-subject
+
+resident.template.email.subject.request-received.order-a-physical-card=order-a-physical-card-request-received-email-subject
+resident.template.email.subject.success.order-a-physical-card=order-a-physical-card-success-email-subject
+resident.template.email.subject.failure.order-a-physical-card=order-a-physical-card-failure-email-subject
+
+resident.template.email.subject.request-received.share-cred-with-partner=share-cred-with-partner-request-received-email-subject
+resident.template.email.subject.success.share-cred-with-partner=share-cred-with-partner-success-email-subject
+resident.template.email.subject.failure.share-cred-with-partner=share-cred-with-partner-failure-email-subject
+
+resident.template.email.subject.request-received.lock-unlock-auth=lock-unlock-auth-request-received-email-subject
+resident.template.email.subject.success.lock-unlock-auth=lock-unlock-auth-success-email-subject
+resident.template.email.subject.failure.lock-unlock-auth=lock-unlock-auth-failure-email-subject
+
+resident.template.email.subject.request-received.update-demo-data=update-demo-data-request-received-email-subject
+resident.template.email.subject.success.update-demo-data=update-demo-data-success-email-subject
+resident.template.email.subject.failure.update-demo-data=update-demo-data-failure-email-subject
+
+resident.template.email.subject.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received-email-subject
+resident.template.email.subject.success.gen-or-revoke-vid=gen-or-revoke-vid-success-email-subject
+resident.template.email.subject.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure-email-subject
+
+resident.template.email.subject.request-received.get-my-uin-card=get-my-uin-card-request-received-email-subject
+resident.template.email.subject.success.get-my-uin-card=get-my-uin-card-success-email-subject
+resident.template.email.subject.failure.get-my-uin-card=get-my-uin-card-failure-email-subject
+
+resident.template.email.subject.request-received.verify-my-phone-email=verify-my-phone-email-request-received-email-subject
+resident.template.email.subject.success.verify-my-phone-email=verify-my-phone-email-success-email-subject
+resident.template.email.subject.failure.verify-my-phone-email=verify-my-phone-email-failure-email-subject
+
+#templates for email content
+resident.template.email.content.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received-email-content
+resident.template.email.content.success.cust-and-down-my-card=cust-and-down-my-card-success-email-content
+resident.template.email.content.failure.cust-and-down-my-card=cust-and-down-my-card-failure-email-content
+
+resident.template.email.content.request-received.order-a-physical-card=order-a-physical-card-request-received-email-content
+resident.template.email.content.success.order-a-physical-card=order-a-physical-card-success-email-content
+resident.template.email.content.failure.order-a-physical-card=order-a-physical-card-failure-email-content
+
+resident.template.email.content.request-received.share-cred-with-partner=share-cred-with-partner-request-received-email-content
+resident.template.email.content.success.share-cred-with-partner=share-cred-with-partner-success-email-content
+resident.template.email.content.failure.share-cred-with-partner=share-cred-with-partner-failure-email-content
+
+resident.template.email.content.request-received.lock-unlock-auth=lock-unlock-auth-request-received-email-content
+resident.template.email.content.success.lock-unlock-auth=lock-unlock-auth-success-email-content
+resident.template.email.content.failure.lock-unlock-auth=lock-unlock-auth-failure-email-content
+
+resident.template.email.content.request-received.update-demo-data=update-demo-data-request-received-email-content
+resident.template.email.content.success.update-demo-data=update-demo-data-success-email-content
+resident.template.email.content.failure.update-demo-data=update-demo-data-failure-email-content
+
+resident.template.email.content.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received-email-content
+resident.template.email.content.success.gen-or-revoke-vid=gen-or-revoke-vid-success-email-content
+resident.template.email.content.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure-email-content
+
+resident.template.email.content.request-received.get-my-uin-card=get-my-uin-card-request-received-email-content
+resident.template.email.content.success.get-my-uin-card=get-my-uin-card-success-email-content
+resident.template.email.content.failure.get-my-uin-card=get-my-uin-card-failure-email-content
+
+resident.template.email.content.request-received.verify-my-phone-email=verify-my-phone-email-request-received-email-content
+resident.template.email.content.success.verify-my-phone-email=verify-my-phone-email-success-email-content
+resident.template.email.content.failure.verify-my-phone-email=verify-my-phone-email-failure-email-content
+
+#templates for sms content
+resident.template.sms.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received_SMS
+resident.template.sms.success.cust-and-down-my-card=cust-and-down-my-card-success_SMS
+resident.template.sms.failure.cust-and-down-my-card=cust-and-down-my-card-failure_SMS
+
+resident.template.sms.request-received.order-a-physical-card=order-a-physical-card-request-received_SMS
+resident.template.sms.success.order-a-physical-card=order-a-physical-card-success_SMS
+resident.template.sms.failure.order-a-physical-card=order-a-physical-card-failure_SMS
+
+resident.template.sms.request-received.share-cred-with-partner=share-cred-with-partner-request-received_SMS
+resident.template.sms.success.share-cred-with-partner=share-cred-with-partner-success_SMS
+resident.template.sms.failure.share-cred-with-partner=share-cred-with-partner-failure_SMS
+
+resident.template.sms.request-received.lock-unlock-auth=lock-unlock-auth-request-received_SMS
+resident.template.sms.success.lock-unlock-auth=lock-unlock-auth-success_SMS
+resident.template.sms.failure.lock-unlock-auth=lock-unlock-auth-failure_SMS
+
+resident.template.sms.request-received.update-demo-data=update-demo-data-request-received_SMS
+resident.template.sms.success.update-demo-data=update-demo-data-success_SMS
+resident.template.sms.failure.update-demo-data=update-demo-data-failure_SMS
+
+resident.template.sms.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received_SMS
+resident.template.sms.success.gen-or-revoke-vid=gen-or-revoke-vid-success_SMS
+resident.template.sms.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure_SMS
+
+resident.template.sms.request-received.get-my-uin-card=get-my-uin-card-request-received_SMS
+resident.template.sms.success.get-my-uin-card=get-my-uin-card-success_SMS
+resident.template.sms.failure.get-my-uin-card=get-my-uin-card-failure_SMS
+
+resident.template.sms.request-received.verify-my-phone-email=verify-my-phone-email-request-received_SMS
+resident.template.sms.success.verify-my-phone-email=verify-my-phone-email-success_SMS
+resident.template.sms.failure.verify-my-phone-email=verify-my-phone-email-failure_SMS
+
+#templates for bell-icon notification
+resident.template.bell-icon.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received_BELL
+resident.template.bell-icon.success.cust-and-down-my-card=cust-and-down-my-card-success_BELL
+resident.template.bell-icon.failure.cust-and-down-my-card=cust-and-down-my-card-failure_BELL
+
+resident.template.bell-icon.request-received.order-a-physical-card=order-a-physical-card-request-received_BELL
+resident.template.bell-icon.success.order-a-physical-card=order-a-physical-card-success_BELL
+resident.template.bell-icon.failure.order-a-physical-card=order-a-physical-card-failure_BELL
+
+resident.template.bell-icon.request-received.share-cred-with-partner=share-cred-with-partner-request-received_BELL
+resident.template.bell-icon.success.share-cred-with-partner=share-cred-with-partner-success_BELL
+resident.template.bell-icon.failure.share-cred-with-partner=share-cred-with-partner-failure_BELL
+
+resident.template.bell-icon.request-received.lock-unlock-auth=lock-unlock-auth-request-received_BELL
+resident.template.bell-icon.success.lock-unlock-auth=lock-unlock-auth-success_BELL
+resident.template.bell-icon.failure.lock-unlock-auth=lock-unlock-auth-failure_BELL
+
+resident.template.bell-icon.request-received.update-demo-data=update-demo-data-request-received_BELL
+resident.template.bell-icon.success.update-demo-data=update-demo-data-success_BELL
+resident.template.bell-icon.failure.update-demo-data=update-demo-data-failure_BELL
+
+resident.template.bell-icon.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received_BELL
+resident.template.bell-icon.success.gen-or-revoke-vid=gen-or-revoke-vid-success_BELL
+resident.template.bell-icon.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure_BELL
+
+resident.template.bell-icon.request-received.get-my-uin-card=get-my-uin-card-request-received_BELL
+resident.template.bell-icon.success.get-my-uin-card=get-my-uin-card-success_BELL
+resident.template.bell-icon.failure.get-my-uin-card=get-my-uin-card-failure_BELL
+
+resident.template.bell-icon.request-received.verify-my-phone-email=verify-my-phone-email-request-received_BELL
+resident.template.bell-icon.success.verify-my-phone-email=verify-my-phone-email-success_BELL
+resident.template.bell-icon.failure.verify-my-phone-email=verify-my-phone-email-failure_BELL
+
+#templates for purpose (success) content
+resident.template.purpose.success.cust-and-down-my-card=cust-and-down-my-card-positive-purpose
+resident.template.purpose.success.order-a-physical-card=order-a-physical-card-positive purpose
+resident.template.purpose.success.share-cred-with-partner=share-cred-with-partner-positive-purpose
+resident.template.purpose.success.lock-unlock-auth=lock-unlock-auth-positive-purpose
+resident.template.purpose.success.update-demo-data=update-demo-data-positive-purpose
+resident.template.purpose.success.gen-or-revoke-vid=gen-or-revoke-vid-positive-purpose
+resident.template.purpose.success.get-my-uin-card=get-my-uin-card-positive-purpose
+resident.template.purpose.success.verify-my-phone-email=verify-my-phone-email-positive-purpose
+
+#templates for purpose (in-progress/failure) content
+resident.template.purpose.failure.cust-and-down-my-card=cust-and-down-my-card-negative-purpose
+resident.template.purpose.failure.order-a-physical-card=order-a-physical-card-negative purpose
+resident.template.purpose.failure.share-cred-with-partner=share-cred-with-partner-negative-purpose
+resident.template.purpose.failure.lock-unlock-auth=lock-unlock-auth-negative-purpose
+resident.template.purpose.failure.update-demo-data=update-demo-data-negative-purpose
+resident.template.purpose.failure.gen-or-revoke-vid=gen-or-revoke-vid-negative-purpose
+resident.template.purpose.failure.get-my-uin-card=get-my-uin-card-negative-purpose
+resident.template.purpose.failure.verify-my-phone-email=verify-my-phone-email-negative-purpose
+
+#templates for summary (success) content
+resident.template.summary.success.cust-and-down-my-card=cust-and-down-my-card-success-summary
+resident.template.summary.success.order-a-physical-card=order-a-physical-card-success-summary
+resident.template.summary.success.share-cred-with-partner=share-cred-with-partner-success-summary
+resident.template.summary.success.lock-unlock-auth=lock-unlock-auth-success-summary
+resident.template.summary.success.update-demo-data=update-demo-data-success-summary
+resident.template.summary.success.gen-or-revoke-vid=gen-or-revoke-vid-success-summary
+resident.template.summary.success.get-my-uin-card=get-my-uin-card-success-summary
+resident.template.summary.success.verify-my-phone-email=verify-my-phone-email-success-summary
+
+#templates for acknowledgement
+resident.template.ack.share-cred-with-partner=acknowledgement-share-cred-with-partner
+resident.template.ack.manage-my-vid=acknowledgement-manage-my-vid
+resident.template.ack.order-a-physical-card=acknowledgement-order-a-physical-card
+resident.template.ack.download-a-personalized-card=acknowledgement-download-a-personalized-card
+resident.template.ack.update-demographic-data=acknowledgement-update-demographic-data
+resident.template.ack.verify-email-id-or-phone-number=acknowledgement-verify-email-id-or-phone-number
+resident.template.ack.secure-my-id=acknowledgement-secure-my-id
+resident.template.email.subject.success.send-otp=receive-otp-mail-subject
+resident.template.email.content.success.send-otp=receive-otp-mail-content
+resident.template.email.subject.success.validate-otp=validate-otp-mail-subject
+resident.template.email.content.success.validate-otp=validate-otp-mail-content
+resident.template.sms.success.send-otp=receive-otp
+resident.template.sms.success.validate-otp=validate-otp
+
+#template for list of supporting documents
+resident.template.support-docs-list=supporting-docs-list
+
+mosip.resident.service.history.template.type.code=service-history-type
+resident.template.registration.centers.list=registration-centers-list
+mosip.resident.grievance.url=https://${mosip.api.public.host}/resident/v1/mock/external/grievance/redressel?name={name}&emailId={email}&phoneNo={phone}&eventId={eventId}
+
+#template required properties
+resident.template.date.pattern=dd-MM-yyyy
+resident.template.time.pattern=HH:mm:ss
+resident.ui.track-service-request-url=https://${mosip.resident.host}/#/uinservices/trackservicerequest?eid=
+
+otpChannel.mobile=phone
+otpChannel.email=email
+otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+
+#to get id_token in cookie and validate it
+auth.validate.id-token=true
+
+mosip.resident.download.uin.card=mosip.resident.download.uin.card
+GET_RID_BY_INDIVIDUAL_ID=${mosip.idrepo.identity.url}/idrepository/v1/identity/get-rid/{individualId}
+
+mosip.resident.access_token.auth_mode.claim-name=acr
+mosip.resident.oidc.id_token.ida_token.claim-name=sub
+idToken=id_token
+mosip.resident.oidc.userinfo.encryption.enabled=false
+mosip.resident.oidc.keymanager.reference.id=IDP_USER_INFO
+mosip.client.assertion.reference.id=
+mosip.include.payload=true
+mosip.include.certificate=true
+mosip.include.cert.hash=false
+mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
+mosip.iam.module.login_flow.claim={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+resident.identity.schematype.with.photo=personalized-card
+
+#Rectangle coordinates for pfd signataured data
+mosip.resident.service.uincard.lowerleftx=73
+mosip.resident.service.uincard.lowerlefty=100
+mosip.resident.service.uincard.upperrightx=300
+mosip.resident.service.uincard.upperrighty=300
+mosip.resident.service.uincard.signature.reason="Digitally Signed"
+
+PDFSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/pdf/sign
+
+# get partner details
+PARTNER_DETAILS_NEW_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/new
+
+#pdf signature appid & refId
+mosip.resident.sign.pdf.application.id=KERNEL
+mosip.resident.sign.pdf.reference.id=SIGN
+
+mosip.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
+
+# request id for download personalized card
+mosip.resident.download.personalized.card=mosip.resident.euin
+#method name to create password
+resident.create.password.method.name=getPassword
+#File name for the downloaded personalized card.  "eventId" and "timestamp" are configurable. If they are removed from below property then they will be removed from file name also.
+mosip.resident.download.registration.centre.file.name.convention=Registration_centers_{timestamp}
+mosip.resident.download.supporting.document.file.name.convention=Supporting_documents_{timestamp}
+mosip.resident.download.personalized.card.naming.convention=Personalised_card_{eventId}_{timestamp}
+mosip.resident.ack.manage_my_vid.name.convention=Ack_Manage_my_VID_{eventId}_{timestamp}
+mosip.resident.ack.secure_my_id.name.convention=Ack_secure_my_ID_{eventId}_{timestamp}
+mosip.resident.ack.personalised_card.name.convention=Ack_personalised_card_{eventId}_{timestamp}
+mosip.resident.ack.update_my_data.name.convention=Ack_update_my_data_{eventId}_{timestamp}
+mosip.resident.ack.share_credential.name.convention=Ack_share_credential_{eventId}_{timestamp}
+mosip.resident.ack.order_physical_card.name.convention=Ack_order_physical_card_{eventId}_{timestamp}
+mosip.resident.ack.name.convention=Ack_{eventId}_{timestamp}
+mosip.resident.uin.card.name.convention=UIN_{eventId}_{timestamp}
+mosip.resident.vid.card.name.convention=VID_{eventId}_{timestamp}
+mosip.resident.download.nearest.registration.centre.file.name.convention=Registration_centers_{timestamp}
+mosip.resident.download.service.history.file.name.convention=View_history_{timestamp}
+
+mosip.resident.request.credential.credentialType=euin
+mosip.resident.request.credential.isEncrypt=true
+mosip.resident.request.credential.encryption.key=abc123
+
+mosip.resident.request.vid.card.id=mosip.resident.request.vid.card
+mosip.resident.request.vid.card.version=1.0
+mosip.credential.issuer=mpartner-default-digitalcard
+
+#claim names
+mosip.resident.name.token.claim-name=name
+mosip.resident.photo.token.claim-photo=picture
+mosip.resident.individual.id.claim.name=individual_id
+
+mosip.resident.applicant.name.property=applicantName
+mosip.resident.photo.attribute.name=photo
+mosip.digital.card.credential.type=PDFCard
+
+mosip.credential.request.service.id=mosip.credential.request.service.id
+mosip.credential.request.service.version=1.0
+
+## OTP flooding
+## Configure Time limit for OTP Flooding scenario (in minutes)
+otp.request.flooding.duration=1
+otp.request.flooding.max-count=10
\ No newline at end of file

From c02a0456622f900a841d556c1df32359005a9d82 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Tue, 13 Dec 2022 13:48:24 +0530
Subject: [PATCH 0943/1358] [DSD-1788] added missing prop file

---
 identity-data-formatter.mvel | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 identity-data-formatter.mvel

diff --git a/identity-data-formatter.mvel b/identity-data-formatter.mvel
new file mode 100644
index 00000000000..0c9b0ea7b7d
--- /dev/null
+++ b/identity-data-formatter.mvel
@@ -0,0 +1,46 @@
+
+def maskPhone(inputPhoneNum) {
+
+return inputPhoneNum.replaceAll(".(?=.{4})", "*");
+};
+
+def maskEmail(inputEmailAddr) {
+
+return inputEmailAddr.replaceAll("(^[^@]{3}|(?!^)\\G)[^@]", "$1*");
+};
+
+def convertToMaskDataFormat(maskData) {
+	int maskDataLength = 0;
+	char ch = '*';
+	if (maskData.indexOf("@") > 0){
+		maskDataLength = maskData.indexOf("@");
+	} else {
+		maskDataLength = maskData.length();
+	}
+	maskDataLength -= 2;
+	for (int i = 1; i < maskDataLength; ++i) {
+		maskData = maskData.substring(0, i) + ch + maskData.substring(i + 1);
+	}
+	return maskData;
+};
+
+def getPassword(attributeValues) {
+    String pdfPwd = "";
+    for(String attribute:attributeValues) {
+        attribute = getFormattedPasswordAttribute(attribute);
+        pdfPwd = pdfPwd.concat(attribute.substring(0, 4));
+    }
+    return pdfPwd;
+};
+
+def getFormattedPasswordAttribute(password){
+    if(password.length()==3){
+        return password=password.concat(password.substring(0,1));
+    }else if(password.length()==2){
+        return password=password.repeat(2);
+    }else if(password.length()==1) {
+        return password=password.repeat(4);
+    }else {
+        return password;
+    }
+};
\ No newline at end of file

From d4ad8fe79ea89ebf4278bdef94c46c572142b84f Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Tue, 13 Dec 2022 14:17:35 +0530
Subject: [PATCH 0944/1358] [DSD-1788] added missing prop file

---
 resident-ui-personalized-card-schema.json   | 895 ++++++++++++++++++++
 resident-ui-share-credential-schema.json    | 895 ++++++++++++++++++++
 resident-ui-update-demographics-schema.json | 895 ++++++++++++++++++++
 3 files changed, 2685 insertions(+)
 create mode 100644 resident-ui-personalized-card-schema.json
 create mode 100644 resident-ui-share-credential-schema.json
 create mode 100644 resident-ui-update-demographics-schema.json

diff --git a/resident-ui-personalized-card-schema.json b/resident-ui-personalized-card-schema.json
new file mode 100644
index 00000000000..5fba7ed748b
--- /dev/null
+++ b/resident-ui-personalized-card-schema.json
@@ -0,0 +1,895 @@
+{
+  "identity": [
+    {
+      "id": "IDSchemaVersion",
+      "description": "ID Schema Version",
+      "type": "number",
+      "controlType": null,
+      "fieldType": "default",
+      "inputRequired": false,
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "title",
+      "description": "Title",
+      "labelName": {
+        "eng": "Title",
+        "ara": "عنوان",
+        "hin": "पशीर्षक",
+        "kan": "ಶೀರ್ಷಿಕೆ",
+        "tam": "தலைப்பு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "fullName",
+      "description": "Enter Full Name",
+      "labelName": {
+        "eng": "Full Name",
+        "ara": "الاسم الكامل",
+        "fra": "Nom complet",
+        "hin": "पूरा नाम",
+        "kan": "ಪೂರ್ಣ ಹೆಸರು",
+        "tam": "முழு பெயர்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "transliteration": true
+    },
+    {
+      "id": "dateOfBirth",
+      "description": "Enter DOB",
+      "labelName": {
+        "eng": "Date Of Birth",
+        "ara": "تاريخ الولادة",
+        "fra": "Date de naissance",
+        "hin": "जन्म की तारीख",
+        "kan": "ಹುಟ್ತಿದ ದಿನ",
+        "tam": "பிறந்த தேதி"
+      },
+      "controlType": "ageDate",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "gender",
+      "description": "Enter Gender",
+      "labelName": {
+        "eng": "Gender",
+        "ara": "جنس",
+        "fra": "Le genre",
+        "hin": "लिंग",
+        "kan": "ಲಿಂಗ",
+        "tam": "பாலினம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "nationality",
+      "description": "nationality",
+      "labelName": {
+        "fra": "Nationalité",
+        "ara": "الجنسية",
+        "eng": "Nationality",
+        "hin": "राष्ट्रीयता",
+        "kan": "ರಾಷ್ಟ್ರೀಯತೆ",
+        "tam": "தேசியம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "flagb",
+      "description": "Je suis né(e) au maroc",
+      "labelName": {
+        "fra": "Je suis né(e) au maroc",
+        "ara": "ولدت في المغرب",
+        "eng": "I was born in Morocco",
+        "hin": "झंडाब",
+        "kan": "ಧ್ವಜ",
+        "tam": "கொடி"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "placeOfBirth",
+      "description": "Lieu de naissance",
+      "labelName": {
+        "fra": "Lieu de naissance",
+        "ara": "مكان الإزدياد",
+        "eng": "Place of birth",
+        "hin": "जन्म स्थान",
+        "kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
+        "tam": "பிறந்த இடம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "listCountry",
+      "description": "Pay de naissance",
+      "labelName": {
+        "fra": "Pay de naissance",
+        "ara": "بلد الإزدياد",
+        "eng": "Birth Pay",
+        "hin": "सूचीदेश",
+        "kan": "ಪಟ್ಟಿ ದೇಶ",
+        "tam": "பட்டியல் நாடு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "region",
+      "description": "region",
+      "labelName": {
+        "eng": "Region",
+        "ara": "منطقة",
+        "fra": "Région",
+        "hin": "ऊपरी क्षेत्र",
+        "kan": "ಪ್ರದೇಶ",
+        "tam": "பிராந்தியம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 1,
+      "parentLocCode": "MOR",
+      "required": true
+    },
+    {
+      "id": "province",
+      "description": "province",
+      "labelName": {
+        "eng": "Province",
+        "ara": "المحافظة",
+        "fra": "Province",
+        "hin": "प्रांत",
+        "kan": "ಪ್ರಾಂತ್ಯ",
+        "tam": "மாகாணம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 2,
+      "required": true
+    },
+    {
+      "id": "city",
+      "description": "city",
+      "labelName": {
+        "eng": "City",
+        "ara": "مدينة",
+        "fra": "Ville",
+        "hin": "शहर",
+        "kan": "ನಗರ",
+        "tam": "நகரம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 3,
+      "required": true
+    },
+    {
+      "id": "zone",
+      "description": "zone",
+      "labelName": {
+        "eng": "Zone",
+        "ara": "منطقة",
+        "fra": "Zone",
+        "hin": "क्षेत्र",
+        "kan": "ವಲಯ",
+        "tam": "மண்டலம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [],
+      "locationHierarchyLevel": 4,
+      "required": true
+    },
+    {
+      "id": "postalCode",
+      "description": "postalCode",
+      "labelName": {
+        "eng": "Postal Code",
+        "ara": "الكود البريدى",
+        "fra": "code postal",
+        "hin": "डाक कोड",
+        "kan": "ಅಂಚೆ ಕೋಡ್",
+        "tam": "அஞ்சல் குறியீடு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 5,
+      "required": true
+    },
+    {
+      "id": "residenceStatus",
+      "description": "Quartier/Résidence/Douar",
+      "labelName": {
+        "fra": "Quartier/Résidence/Douar",
+        "ara": "الحي / السكن / الدوار",
+        "eng": "Residence Status",
+        "hin": "निवास स्थान",
+        "kan": "ನಿವಾಸ",
+        "tam": "குடியிருப்பு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "addressType",
+      "description": "Type d'habitat",
+      "labelName": {
+        "fra": "Type d'habitat",
+        "ara": "نوع السكن",
+        "eng": "Habitat type",
+        "kan": "ವಿಳಾಸದ ವಿಧ",
+        "hin": "पता मुद्रलेख",
+        "tam": "முகவரி வகை"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "portNo",
+      "description": "N Porte",
+      "labelName": {
+        "fra": "N° Porte",
+        "ara": "رقم الباب",
+        "eng": "Port No",
+        "kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+        "hin": "पोर्ट नंबर",
+        "tam": "துறை எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,10}$).*",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "apptNo",
+      "description": "N immeuble",
+      "labelName": {
+        "fra": "N° immeuble",
+        "ara": "رقم المبنى",
+        "eng": "Appt no",
+        "kan": "appt ಸಂಖ್ಯೆ",
+        "hin": "उपयुक्त संख्या",
+        "tam": "appt எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,10}$).*",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "addressLine1",
+      "description": "Adresse de résidence",
+      "labelName": {
+        "fra": "Adresse de résidence",
+        "ara": "عنوان السكن",
+        "eng": "Adresse Line1",
+        "hin": "पता पंक्ति 1",
+        "kan": "ವಿಳಾಸ 1",
+        "tam": "முகவரி வரி 1"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,100}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "referenceCNIENumber",
+      "description": "CNIE",
+      "labelName": {
+        "fra": "CNIE",
+        "ara": "رقم البطاقة الوطنية",
+        "eng": "CNIE",
+        "kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
+        "hin": "संदर्भ सीएनआईई नंबर",
+        "tam": "குறிப்பு CNIE எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": true,
+      "group": "card_info",
+      "preview": true
+    },
+    {
+      "id": "resOuPass",
+      "description": "Je dispose",
+      "labelName": {
+        "fra": "Je dispose",
+        "ara": "أملك",
+        "eng": "I have",
+        "kan": "resOuPass",
+        "hin": "resOuPass",
+        "tam": "resOuPass"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": false,
+      "tooltip": false
+    },
+    {
+      "id": "referenceResidencyNumber",
+      "description": "Numéro d'identité du résident étranger",
+      "labelName": {
+        "fra": "Numéro d'identité du résident étranger",
+        "ara": "رقم هوية المقيم الأجنبي",
+        "eng": "Identity number of the foreign resident",
+        "kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
+        "hin": "संदर्भ निवास संख्या",
+        "tam": "குறிப்பு குடியிருப்பு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "[A-Za-z][0-9]{6}[A-Za-z]",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "passportNumber",
+      "description": "Numéro de passport",
+      "labelName": {
+        "fra": "Numéro de Passeport",
+        "ara": "رقم جواز السفر",
+        "eng": "Passport number",
+        "kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+        "hin": "पासपोर्ट संख्या",
+        "tam": "கடவுச்சீட்டு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{1,20}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "flagidcs",
+      "description": "Je dispose d'un IDCS",
+      "labelName": {
+        "fra": "Je dispose d'un IDCS",
+        "ara": "أملك المعرف المدني والاجتماعي الرقمي",
+        "eng": "I have an IDCS",
+        "kan": "ಧ್ವಜಗಳು",
+        "hin": "फ्लैगिड्स",
+        "tam": "கொடிகள்"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "birthCertificateNumber",
+      "description": "Numéro Acte de Naissance",
+      "labelName": {
+        "fra": "Numéro Acte de Naissance",
+        "ara": "رقم شهادة الميلاد",
+        "eng": "Birth Certificate Number",
+        "kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
+        "hin": "जन्म प्रमाणपत्र संख्या",
+        "tam": "பிறப்புச் சான்றிதழ் எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{1,20}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true
+    },
+    {
+      "id": "civilRegistryNumber",
+      "description": "Numéro Acte de Naissance digitalisé",
+      "labelName": {
+        "fra": "Numéro Acte de Naissance digitalisé",
+        "ara": "رقم شهادة الميلاد الرقمي",
+        "eng": "Digital Birth Certificate Number",
+        "kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
+        "hin": "सिविल रजिस्ट्री नंबर",
+        "tam": "சிவில் பதிவு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "checksum": true,
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "phone",
+      "description": "phone",
+      "labelName": {
+        "eng": "Phone",
+        "ara": "هاتف",
+        "fra": "Téléphone",
+        "hin": "फ़ोन",
+        "kan": "ದೂರವಾಣಿ",
+        "tam": "தொலைபேசி"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[+]*([0-9]{1})([0-9]{9})$",
+          "arguments": []
+        }
+      ],
+      "required": true
+    },
+    {
+      "id": "email",
+      "description": "email",
+      "labelName": {
+        "eng": "Email",
+        "ara": "البريد الإلكتروني",
+        "fra": "Email",
+        "hin": "ईमेल",
+        "kan": "ಇಮೇಲ್",
+        "tam": "மின்னஞ்சல்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+          "arguments": []
+        }
+      ],
+      "required": true
+    },
+    {
+      "id": "guardianType",
+      "description": "Type de Tuteur",
+      "labelName": {
+        "fra": "Type de Tuteur",
+        "ara": "نوع الوصي",
+        "eng": "Tutor type",
+        "kan": "ರಕ್ಷಕ ವಿಧ",
+        "hin": "संरक्षक प्रकार",
+        "tam": "பாதுகாவலர் வகை"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "introducerName",
+      "description": "Prénom du tuteur",
+      "labelName": {
+        "eng": "introducer Name",
+        "ara": "مقدم Name",
+        "fra": "introducteur Name",
+        "kan": "ಪರಿಚಯಕಾರ Name",
+        "hin": "परिचयकर्ता  Name",
+        "tam": "அறிமுகம் Name"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "introducerUIN",
+      "description": "Identifiant digital civil et social du tuteur",
+      "labelName": {
+        "eng": "introducer UIN",
+        "ara": "مقدم UIN",
+        "fra": "introducteur UIN",
+        "kan": "ಪರಿಚಯಕಾರ UIN",
+        "hin": "परिचयकर्ता  UIN",
+        "tam": "அறிமுகம் UIN"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "checksum": true,
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[0-9]{10}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "introduceRID",
+      "description": "Identifiant RNP RID du tuteur",
+      "labelName": {
+        "eng": "introducer RID",
+        "ara": "مقدم RID",
+        "fra": "introducteur RID",
+        "kan": "ಪರಿಚಯಕಾರ RID",
+        "hin": "परिचयकर्ता  RID",
+        "tam": "அறிமுகம் RID"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[0-9]{29}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "introduceCNIE",
+      "description": "Numéro d'identité du tuteur",
+      "labelName": {
+        "eng": "introducer CNIE",
+        "ara": "مقدم CNIE",
+        "fra": "introducteur CNIE",
+        "kan": "ಪರಿಚಯಕಾರ CNIE",
+        "hin": "परिचयकर्ता  CNIE",
+        "tam": "அறிமுகம் CNIE"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "relationWithChild",
+      "description": "Lien de parenté",
+      "labelName": {
+        "fra": "Lien de parenté",
+        "ara": "صلة القرابة",
+        "eng": "Relationship",
+        "kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
+        "hin": "बच्चे के साथ संबंध",
+        "tam": "குழந்தையுடன் உறவு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "proofOfAddress",
+      "description": "proofOfAddress",
+      "labelName": {
+        "ara": "إثبات العنوان",
+        "fra": "Preuve d'adresse",
+        "eng": "Address Proof",
+        "hin": "निवास प्रमाण पत्र",
+        "kan": "ವಿಳಾಸ ಪುರಾವೆ",
+        "tam": "முகவரி சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POA",
+      "required": false
+    },
+    {
+      "id": "proofOfIdentity",
+      "description": "proofOfIdentity",
+      "labelName": {
+        "ara": "إثبات الهوية",
+        "fra": "Preuve d'identité",
+        "eng": "Identity Proof",
+        "hin": "पहचान प्रमाण",
+        "kan": "ಗುರುತಿನ ಪುರಾವೆ",
+        "tam": "அடையாள சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POI",
+      "required": true
+    },
+    {
+      "id": "proofOfRelationship",
+      "description": "proofOfRelationship",
+      "labelName": {
+        "ara": "إثبات العلاقة",
+        "fra": "Preuve de relation",
+        "eng": "Relationship Proof",
+        "hin": "संबंध प्रमाण",
+        "kan": "ಸಂಬಂಧ ಪುರಾವೆ",
+        "tam": "உறவு சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POR",
+      "required": true
+    },
+    {
+      "id": "proofOfDateOfBirth",
+      "description": "proofOfDateOfBirth",
+      "labelName": {
+        "ara": "دليل DOB",
+        "fra": "Preuve de date de naissance",
+        "eng": "DOB Proof",
+        "hin": "जन्मतिथि प्रमाण",
+        "kan": "DOB ಪ್ರೂಫ್",
+        "tam": "DOB ஆதாரம்"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POB",
+      "required": true
+    },
+    {
+      "id": "proofOfException",
+      "description": "proofOfException",
+      "labelName": {
+        "ara": "إثبات الاستثناء",
+        "fra": "Preuve d'exception",
+        "eng": "Exception Proof",
+        "kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
+        "tam": "விதிவிலக்கு சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POE",
+      "required": true
+    }
+  ],
+  "locationHierarchy": [
+    "region",
+    "province",
+    "city",
+    "zone",
+    "postalCode"
+  ]
+}
\ No newline at end of file
diff --git a/resident-ui-share-credential-schema.json b/resident-ui-share-credential-schema.json
new file mode 100644
index 00000000000..5fba7ed748b
--- /dev/null
+++ b/resident-ui-share-credential-schema.json
@@ -0,0 +1,895 @@
+{
+  "identity": [
+    {
+      "id": "IDSchemaVersion",
+      "description": "ID Schema Version",
+      "type": "number",
+      "controlType": null,
+      "fieldType": "default",
+      "inputRequired": false,
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "title",
+      "description": "Title",
+      "labelName": {
+        "eng": "Title",
+        "ara": "عنوان",
+        "hin": "पशीर्षक",
+        "kan": "ಶೀರ್ಷಿಕೆ",
+        "tam": "தலைப்பு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "fullName",
+      "description": "Enter Full Name",
+      "labelName": {
+        "eng": "Full Name",
+        "ara": "الاسم الكامل",
+        "fra": "Nom complet",
+        "hin": "पूरा नाम",
+        "kan": "ಪೂರ್ಣ ಹೆಸರು",
+        "tam": "முழு பெயர்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "transliteration": true
+    },
+    {
+      "id": "dateOfBirth",
+      "description": "Enter DOB",
+      "labelName": {
+        "eng": "Date Of Birth",
+        "ara": "تاريخ الولادة",
+        "fra": "Date de naissance",
+        "hin": "जन्म की तारीख",
+        "kan": "ಹುಟ್ತಿದ ದಿನ",
+        "tam": "பிறந்த தேதி"
+      },
+      "controlType": "ageDate",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "gender",
+      "description": "Enter Gender",
+      "labelName": {
+        "eng": "Gender",
+        "ara": "جنس",
+        "fra": "Le genre",
+        "hin": "लिंग",
+        "kan": "ಲಿಂಗ",
+        "tam": "பாலினம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "nationality",
+      "description": "nationality",
+      "labelName": {
+        "fra": "Nationalité",
+        "ara": "الجنسية",
+        "eng": "Nationality",
+        "hin": "राष्ट्रीयता",
+        "kan": "ರಾಷ್ಟ್ರೀಯತೆ",
+        "tam": "தேசியம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "flagb",
+      "description": "Je suis né(e) au maroc",
+      "labelName": {
+        "fra": "Je suis né(e) au maroc",
+        "ara": "ولدت في المغرب",
+        "eng": "I was born in Morocco",
+        "hin": "झंडाब",
+        "kan": "ಧ್ವಜ",
+        "tam": "கொடி"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "placeOfBirth",
+      "description": "Lieu de naissance",
+      "labelName": {
+        "fra": "Lieu de naissance",
+        "ara": "مكان الإزدياد",
+        "eng": "Place of birth",
+        "hin": "जन्म स्थान",
+        "kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
+        "tam": "பிறந்த இடம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "listCountry",
+      "description": "Pay de naissance",
+      "labelName": {
+        "fra": "Pay de naissance",
+        "ara": "بلد الإزدياد",
+        "eng": "Birth Pay",
+        "hin": "सूचीदेश",
+        "kan": "ಪಟ್ಟಿ ದೇಶ",
+        "tam": "பட்டியல் நாடு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "region",
+      "description": "region",
+      "labelName": {
+        "eng": "Region",
+        "ara": "منطقة",
+        "fra": "Région",
+        "hin": "ऊपरी क्षेत्र",
+        "kan": "ಪ್ರದೇಶ",
+        "tam": "பிராந்தியம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 1,
+      "parentLocCode": "MOR",
+      "required": true
+    },
+    {
+      "id": "province",
+      "description": "province",
+      "labelName": {
+        "eng": "Province",
+        "ara": "المحافظة",
+        "fra": "Province",
+        "hin": "प्रांत",
+        "kan": "ಪ್ರಾಂತ್ಯ",
+        "tam": "மாகாணம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 2,
+      "required": true
+    },
+    {
+      "id": "city",
+      "description": "city",
+      "labelName": {
+        "eng": "City",
+        "ara": "مدينة",
+        "fra": "Ville",
+        "hin": "शहर",
+        "kan": "ನಗರ",
+        "tam": "நகரம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 3,
+      "required": true
+    },
+    {
+      "id": "zone",
+      "description": "zone",
+      "labelName": {
+        "eng": "Zone",
+        "ara": "منطقة",
+        "fra": "Zone",
+        "hin": "क्षेत्र",
+        "kan": "ವಲಯ",
+        "tam": "மண்டலம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [],
+      "locationHierarchyLevel": 4,
+      "required": true
+    },
+    {
+      "id": "postalCode",
+      "description": "postalCode",
+      "labelName": {
+        "eng": "Postal Code",
+        "ara": "الكود البريدى",
+        "fra": "code postal",
+        "hin": "डाक कोड",
+        "kan": "ಅಂಚೆ ಕೋಡ್",
+        "tam": "அஞ்சல் குறியீடு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 5,
+      "required": true
+    },
+    {
+      "id": "residenceStatus",
+      "description": "Quartier/Résidence/Douar",
+      "labelName": {
+        "fra": "Quartier/Résidence/Douar",
+        "ara": "الحي / السكن / الدوار",
+        "eng": "Residence Status",
+        "hin": "निवास स्थान",
+        "kan": "ನಿವಾಸ",
+        "tam": "குடியிருப்பு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "addressType",
+      "description": "Type d'habitat",
+      "labelName": {
+        "fra": "Type d'habitat",
+        "ara": "نوع السكن",
+        "eng": "Habitat type",
+        "kan": "ವಿಳಾಸದ ವಿಧ",
+        "hin": "पता मुद्रलेख",
+        "tam": "முகவரி வகை"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "portNo",
+      "description": "N Porte",
+      "labelName": {
+        "fra": "N° Porte",
+        "ara": "رقم الباب",
+        "eng": "Port No",
+        "kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+        "hin": "पोर्ट नंबर",
+        "tam": "துறை எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,10}$).*",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "apptNo",
+      "description": "N immeuble",
+      "labelName": {
+        "fra": "N° immeuble",
+        "ara": "رقم المبنى",
+        "eng": "Appt no",
+        "kan": "appt ಸಂಖ್ಯೆ",
+        "hin": "उपयुक्त संख्या",
+        "tam": "appt எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,10}$).*",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "addressLine1",
+      "description": "Adresse de résidence",
+      "labelName": {
+        "fra": "Adresse de résidence",
+        "ara": "عنوان السكن",
+        "eng": "Adresse Line1",
+        "hin": "पता पंक्ति 1",
+        "kan": "ವಿಳಾಸ 1",
+        "tam": "முகவரி வரி 1"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,100}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "referenceCNIENumber",
+      "description": "CNIE",
+      "labelName": {
+        "fra": "CNIE",
+        "ara": "رقم البطاقة الوطنية",
+        "eng": "CNIE",
+        "kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
+        "hin": "संदर्भ सीएनआईई नंबर",
+        "tam": "குறிப்பு CNIE எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": true,
+      "group": "card_info",
+      "preview": true
+    },
+    {
+      "id": "resOuPass",
+      "description": "Je dispose",
+      "labelName": {
+        "fra": "Je dispose",
+        "ara": "أملك",
+        "eng": "I have",
+        "kan": "resOuPass",
+        "hin": "resOuPass",
+        "tam": "resOuPass"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": false,
+      "tooltip": false
+    },
+    {
+      "id": "referenceResidencyNumber",
+      "description": "Numéro d'identité du résident étranger",
+      "labelName": {
+        "fra": "Numéro d'identité du résident étranger",
+        "ara": "رقم هوية المقيم الأجنبي",
+        "eng": "Identity number of the foreign resident",
+        "kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
+        "hin": "संदर्भ निवास संख्या",
+        "tam": "குறிப்பு குடியிருப்பு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "[A-Za-z][0-9]{6}[A-Za-z]",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "passportNumber",
+      "description": "Numéro de passport",
+      "labelName": {
+        "fra": "Numéro de Passeport",
+        "ara": "رقم جواز السفر",
+        "eng": "Passport number",
+        "kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+        "hin": "पासपोर्ट संख्या",
+        "tam": "கடவுச்சீட்டு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{1,20}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "flagidcs",
+      "description": "Je dispose d'un IDCS",
+      "labelName": {
+        "fra": "Je dispose d'un IDCS",
+        "ara": "أملك المعرف المدني والاجتماعي الرقمي",
+        "eng": "I have an IDCS",
+        "kan": "ಧ್ವಜಗಳು",
+        "hin": "फ्लैगिड्स",
+        "tam": "கொடிகள்"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "birthCertificateNumber",
+      "description": "Numéro Acte de Naissance",
+      "labelName": {
+        "fra": "Numéro Acte de Naissance",
+        "ara": "رقم شهادة الميلاد",
+        "eng": "Birth Certificate Number",
+        "kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
+        "hin": "जन्म प्रमाणपत्र संख्या",
+        "tam": "பிறப்புச் சான்றிதழ் எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{1,20}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true
+    },
+    {
+      "id": "civilRegistryNumber",
+      "description": "Numéro Acte de Naissance digitalisé",
+      "labelName": {
+        "fra": "Numéro Acte de Naissance digitalisé",
+        "ara": "رقم شهادة الميلاد الرقمي",
+        "eng": "Digital Birth Certificate Number",
+        "kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
+        "hin": "सिविल रजिस्ट्री नंबर",
+        "tam": "சிவில் பதிவு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "checksum": true,
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "phone",
+      "description": "phone",
+      "labelName": {
+        "eng": "Phone",
+        "ara": "هاتف",
+        "fra": "Téléphone",
+        "hin": "फ़ोन",
+        "kan": "ದೂರವಾಣಿ",
+        "tam": "தொலைபேசி"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[+]*([0-9]{1})([0-9]{9})$",
+          "arguments": []
+        }
+      ],
+      "required": true
+    },
+    {
+      "id": "email",
+      "description": "email",
+      "labelName": {
+        "eng": "Email",
+        "ara": "البريد الإلكتروني",
+        "fra": "Email",
+        "hin": "ईमेल",
+        "kan": "ಇಮೇಲ್",
+        "tam": "மின்னஞ்சல்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+          "arguments": []
+        }
+      ],
+      "required": true
+    },
+    {
+      "id": "guardianType",
+      "description": "Type de Tuteur",
+      "labelName": {
+        "fra": "Type de Tuteur",
+        "ara": "نوع الوصي",
+        "eng": "Tutor type",
+        "kan": "ರಕ್ಷಕ ವಿಧ",
+        "hin": "संरक्षक प्रकार",
+        "tam": "பாதுகாவலர் வகை"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "introducerName",
+      "description": "Prénom du tuteur",
+      "labelName": {
+        "eng": "introducer Name",
+        "ara": "مقدم Name",
+        "fra": "introducteur Name",
+        "kan": "ಪರಿಚಯಕಾರ Name",
+        "hin": "परिचयकर्ता  Name",
+        "tam": "அறிமுகம் Name"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "introducerUIN",
+      "description": "Identifiant digital civil et social du tuteur",
+      "labelName": {
+        "eng": "introducer UIN",
+        "ara": "مقدم UIN",
+        "fra": "introducteur UIN",
+        "kan": "ಪರಿಚಯಕಾರ UIN",
+        "hin": "परिचयकर्ता  UIN",
+        "tam": "அறிமுகம் UIN"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "checksum": true,
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[0-9]{10}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "introduceRID",
+      "description": "Identifiant RNP RID du tuteur",
+      "labelName": {
+        "eng": "introducer RID",
+        "ara": "مقدم RID",
+        "fra": "introducteur RID",
+        "kan": "ಪರಿಚಯಕಾರ RID",
+        "hin": "परिचयकर्ता  RID",
+        "tam": "அறிமுகம் RID"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[0-9]{29}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "introduceCNIE",
+      "description": "Numéro d'identité du tuteur",
+      "labelName": {
+        "eng": "introducer CNIE",
+        "ara": "مقدم CNIE",
+        "fra": "introducteur CNIE",
+        "kan": "ಪರಿಚಯಕಾರ CNIE",
+        "hin": "परिचयकर्ता  CNIE",
+        "tam": "அறிமுகம் CNIE"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "relationWithChild",
+      "description": "Lien de parenté",
+      "labelName": {
+        "fra": "Lien de parenté",
+        "ara": "صلة القرابة",
+        "eng": "Relationship",
+        "kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
+        "hin": "बच्चे के साथ संबंध",
+        "tam": "குழந்தையுடன் உறவு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "proofOfAddress",
+      "description": "proofOfAddress",
+      "labelName": {
+        "ara": "إثبات العنوان",
+        "fra": "Preuve d'adresse",
+        "eng": "Address Proof",
+        "hin": "निवास प्रमाण पत्र",
+        "kan": "ವಿಳಾಸ ಪುರಾವೆ",
+        "tam": "முகவரி சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POA",
+      "required": false
+    },
+    {
+      "id": "proofOfIdentity",
+      "description": "proofOfIdentity",
+      "labelName": {
+        "ara": "إثبات الهوية",
+        "fra": "Preuve d'identité",
+        "eng": "Identity Proof",
+        "hin": "पहचान प्रमाण",
+        "kan": "ಗುರುತಿನ ಪುರಾವೆ",
+        "tam": "அடையாள சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POI",
+      "required": true
+    },
+    {
+      "id": "proofOfRelationship",
+      "description": "proofOfRelationship",
+      "labelName": {
+        "ara": "إثبات العلاقة",
+        "fra": "Preuve de relation",
+        "eng": "Relationship Proof",
+        "hin": "संबंध प्रमाण",
+        "kan": "ಸಂಬಂಧ ಪುರಾವೆ",
+        "tam": "உறவு சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POR",
+      "required": true
+    },
+    {
+      "id": "proofOfDateOfBirth",
+      "description": "proofOfDateOfBirth",
+      "labelName": {
+        "ara": "دليل DOB",
+        "fra": "Preuve de date de naissance",
+        "eng": "DOB Proof",
+        "hin": "जन्मतिथि प्रमाण",
+        "kan": "DOB ಪ್ರೂಫ್",
+        "tam": "DOB ஆதாரம்"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POB",
+      "required": true
+    },
+    {
+      "id": "proofOfException",
+      "description": "proofOfException",
+      "labelName": {
+        "ara": "إثبات الاستثناء",
+        "fra": "Preuve d'exception",
+        "eng": "Exception Proof",
+        "kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
+        "tam": "விதிவிலக்கு சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POE",
+      "required": true
+    }
+  ],
+  "locationHierarchy": [
+    "region",
+    "province",
+    "city",
+    "zone",
+    "postalCode"
+  ]
+}
\ No newline at end of file
diff --git a/resident-ui-update-demographics-schema.json b/resident-ui-update-demographics-schema.json
new file mode 100644
index 00000000000..5fba7ed748b
--- /dev/null
+++ b/resident-ui-update-demographics-schema.json
@@ -0,0 +1,895 @@
+{
+  "identity": [
+    {
+      "id": "IDSchemaVersion",
+      "description": "ID Schema Version",
+      "type": "number",
+      "controlType": null,
+      "fieldType": "default",
+      "inputRequired": false,
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "title",
+      "description": "Title",
+      "labelName": {
+        "eng": "Title",
+        "ara": "عنوان",
+        "hin": "पशीर्षक",
+        "kan": "ಶೀರ್ಷಿಕೆ",
+        "tam": "தலைப்பு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "fullName",
+      "description": "Enter Full Name",
+      "labelName": {
+        "eng": "Full Name",
+        "ara": "الاسم الكامل",
+        "fra": "Nom complet",
+        "hin": "पूरा नाम",
+        "kan": "ಪೂರ್ಣ ಹೆಸರು",
+        "tam": "முழு பெயர்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "transliteration": true
+    },
+    {
+      "id": "dateOfBirth",
+      "description": "Enter DOB",
+      "labelName": {
+        "eng": "Date Of Birth",
+        "ara": "تاريخ الولادة",
+        "fra": "Date de naissance",
+        "hin": "जन्म की तारीख",
+        "kan": "ಹುಟ್ತಿದ ದಿನ",
+        "tam": "பிறந்த தேதி"
+      },
+      "controlType": "ageDate",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "gender",
+      "description": "Enter Gender",
+      "labelName": {
+        "eng": "Gender",
+        "ara": "جنس",
+        "fra": "Le genre",
+        "hin": "लिंग",
+        "kan": "ಲಿಂಗ",
+        "tam": "பாலினம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true
+    },
+    {
+      "id": "nationality",
+      "description": "nationality",
+      "labelName": {
+        "fra": "Nationalité",
+        "ara": "الجنسية",
+        "eng": "Nationality",
+        "hin": "राष्ट्रीयता",
+        "kan": "ರಾಷ್ಟ್ರೀಯತೆ",
+        "tam": "தேசியம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "flagb",
+      "description": "Je suis né(e) au maroc",
+      "labelName": {
+        "fra": "Je suis né(e) au maroc",
+        "ara": "ولدت في المغرب",
+        "eng": "I was born in Morocco",
+        "hin": "झंडाब",
+        "kan": "ಧ್ವಜ",
+        "tam": "கொடி"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "placeOfBirth",
+      "description": "Lieu de naissance",
+      "labelName": {
+        "fra": "Lieu de naissance",
+        "ara": "مكان الإزدياد",
+        "eng": "Place of birth",
+        "hin": "जन्म स्थान",
+        "kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
+        "tam": "பிறந்த இடம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "listCountry",
+      "description": "Pay de naissance",
+      "labelName": {
+        "fra": "Pay de naissance",
+        "ara": "بلد الإزدياد",
+        "eng": "Birth Pay",
+        "hin": "सूचीदेश",
+        "kan": "ಪಟ್ಟಿ ದೇಶ",
+        "tam": "பட்டியல் நாடு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "personal_info",
+      "preview": true
+    },
+    {
+      "id": "region",
+      "description": "region",
+      "labelName": {
+        "eng": "Region",
+        "ara": "منطقة",
+        "fra": "Région",
+        "hin": "ऊपरी क्षेत्र",
+        "kan": "ಪ್ರದೇಶ",
+        "tam": "பிராந்தியம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 1,
+      "parentLocCode": "MOR",
+      "required": true
+    },
+    {
+      "id": "province",
+      "description": "province",
+      "labelName": {
+        "eng": "Province",
+        "ara": "المحافظة",
+        "fra": "Province",
+        "hin": "प्रांत",
+        "kan": "ಪ್ರಾಂತ್ಯ",
+        "tam": "மாகாணம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 2,
+      "required": true
+    },
+    {
+      "id": "city",
+      "description": "city",
+      "labelName": {
+        "eng": "City",
+        "ara": "مدينة",
+        "fra": "Ville",
+        "hin": "शहर",
+        "kan": "ನಗರ",
+        "tam": "நகரம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{3,50}$).*",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 3,
+      "required": true
+    },
+    {
+      "id": "zone",
+      "description": "zone",
+      "labelName": {
+        "eng": "Zone",
+        "ara": "منطقة",
+        "fra": "Zone",
+        "hin": "क्षेत्र",
+        "kan": "ವಲಯ",
+        "tam": "மண்டலம்"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [],
+      "locationHierarchyLevel": 4,
+      "required": true
+    },
+    {
+      "id": "postalCode",
+      "description": "postalCode",
+      "labelName": {
+        "eng": "Postal Code",
+        "ara": "الكود البريدى",
+        "fra": "code postal",
+        "hin": "डाक कोड",
+        "kan": "ಅಂಚೆ ಕೋಡ್",
+        "tam": "அஞ்சல் குறியீடு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+          "arguments": []
+        }
+      ],
+      "locationHierarchyLevel": 5,
+      "required": true
+    },
+    {
+      "id": "residenceStatus",
+      "description": "Quartier/Résidence/Douar",
+      "labelName": {
+        "fra": "Quartier/Résidence/Douar",
+        "ara": "الحي / السكن / الدوار",
+        "eng": "Residence Status",
+        "hin": "निवास स्थान",
+        "kan": "ನಿವಾಸ",
+        "tam": "குடியிருப்பு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "addressType",
+      "description": "Type d'habitat",
+      "labelName": {
+        "fra": "Type d'habitat",
+        "ara": "نوع السكن",
+        "eng": "Habitat type",
+        "kan": "ವಿಳಾಸದ ವಿಧ",
+        "hin": "पता मुद्रलेख",
+        "tam": "முகவரி வகை"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "portNo",
+      "description": "N Porte",
+      "labelName": {
+        "fra": "N° Porte",
+        "ara": "رقم الباب",
+        "eng": "Port No",
+        "kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+        "hin": "पोर्ट नंबर",
+        "tam": "துறை எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,10}$).*",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "apptNo",
+      "description": "N immeuble",
+      "labelName": {
+        "fra": "N° immeuble",
+        "ara": "رقم المبنى",
+        "eng": "Appt no",
+        "kan": "appt ಸಂಖ್ಯೆ",
+        "hin": "उपयुक्त संख्या",
+        "tam": "appt எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,10}$).*",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "addressLine1",
+      "description": "Adresse de résidence",
+      "labelName": {
+        "fra": "Adresse de résidence",
+        "ara": "عنوان السكن",
+        "eng": "Adresse Line1",
+        "hin": "पता पंक्ति 1",
+        "kan": "ವಿಳಾಸ 1",
+        "tam": "முகவரி வரி 1"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{0,100}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": true,
+      "group": "address_info",
+      "preview": true
+    },
+    {
+      "id": "referenceCNIENumber",
+      "description": "CNIE",
+      "labelName": {
+        "fra": "CNIE",
+        "ara": "رقم البطاقة الوطنية",
+        "eng": "CNIE",
+        "kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
+        "hin": "संदर्भ सीएनआईई नंबर",
+        "tam": "குறிப்பு CNIE எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": true,
+      "group": "card_info",
+      "preview": true
+    },
+    {
+      "id": "resOuPass",
+      "description": "Je dispose",
+      "labelName": {
+        "fra": "Je dispose",
+        "ara": "أملك",
+        "eng": "I have",
+        "kan": "resOuPass",
+        "hin": "resOuPass",
+        "tam": "resOuPass"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": false,
+      "tooltip": false
+    },
+    {
+      "id": "referenceResidencyNumber",
+      "description": "Numéro d'identité du résident étranger",
+      "labelName": {
+        "fra": "Numéro d'identité du résident étranger",
+        "ara": "رقم هوية المقيم الأجنبي",
+        "eng": "Identity number of the foreign resident",
+        "kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
+        "hin": "संदर्भ निवास संख्या",
+        "tam": "குறிப்பு குடியிருப்பு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "[A-Za-z][0-9]{6}[A-Za-z]",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "passportNumber",
+      "description": "Numéro de passport",
+      "labelName": {
+        "fra": "Numéro de Passeport",
+        "ara": "رقم جواز السفر",
+        "eng": "Passport number",
+        "kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+        "hin": "पासपोर्ट संख्या",
+        "tam": "கடவுச்சீட்டு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{1,20}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "flagidcs",
+      "description": "Je dispose d'un IDCS",
+      "labelName": {
+        "fra": "Je dispose d'un IDCS",
+        "ara": "أملك المعرف المدني والاجتماعي الرقمي",
+        "eng": "I have an IDCS",
+        "kan": "ಧ್ವಜಗಳು",
+        "hin": "फ्लैगिड्स",
+        "tam": "கொடிகள்"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": true,
+      "visible": true,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "birthCertificateNumber",
+      "description": "Numéro Acte de Naissance",
+      "labelName": {
+        "fra": "Numéro Acte de Naissance",
+        "ara": "رقم شهادة الميلاد",
+        "eng": "Birth Certificate Number",
+        "kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
+        "hin": "जन्म प्रमाणपत्र संख्या",
+        "tam": "பிறப்புச் சான்றிதழ் எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^(?=.{1,20}$).*",
+          "arguments": []
+        }
+      ],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true
+    },
+    {
+      "id": "civilRegistryNumber",
+      "description": "Numéro Acte de Naissance digitalisé",
+      "labelName": {
+        "fra": "Numéro Acte de Naissance digitalisé",
+        "ara": "رقم شهادة الميلاد الرقمي",
+        "eng": "Digital Birth Certificate Number",
+        "kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
+        "hin": "सिविल रजिस्ट्री नंबर",
+        "tam": "சிவில் பதிவு எண்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "checksum": true,
+      "validators": [],
+      "required": true,
+      "visible": false,
+      "group": "card_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "phone",
+      "description": "phone",
+      "labelName": {
+        "eng": "Phone",
+        "ara": "هاتف",
+        "fra": "Téléphone",
+        "hin": "फ़ोन",
+        "kan": "ದೂರವಾಣಿ",
+        "tam": "தொலைபேசி"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[+]*([0-9]{1})([0-9]{9})$",
+          "arguments": []
+        }
+      ],
+      "required": true
+    },
+    {
+      "id": "email",
+      "description": "email",
+      "labelName": {
+        "eng": "Email",
+        "ara": "البريد الإلكتروني",
+        "fra": "Email",
+        "hin": "ईमेल",
+        "kan": "ಇಮೇಲ್",
+        "tam": "மின்னஞ்சல்"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+          "arguments": []
+        }
+      ],
+      "required": true
+    },
+    {
+      "id": "guardianType",
+      "description": "Type de Tuteur",
+      "labelName": {
+        "fra": "Type de Tuteur",
+        "ara": "نوع الوصي",
+        "eng": "Tutor type",
+        "kan": "ರಕ್ಷಕ ವಿಧ",
+        "hin": "संरक्षक प्रकार",
+        "tam": "பாதுகாவலர் வகை"
+      },
+      "controlType": "dropdown",
+      "subtype": "radio",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": false
+    },
+    {
+      "id": "introducerName",
+      "description": "Prénom du tuteur",
+      "labelName": {
+        "eng": "introducer Name",
+        "ara": "مقدم Name",
+        "fra": "introducteur Name",
+        "kan": "ಪರಿಚಯಕಾರ Name",
+        "hin": "परिचयकर्ता  Name",
+        "tam": "அறிமுகம் Name"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "simpleType",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "introducerUIN",
+      "description": "Identifiant digital civil et social du tuteur",
+      "labelName": {
+        "eng": "introducer UIN",
+        "ara": "مقدم UIN",
+        "fra": "introducteur UIN",
+        "kan": "ಪರಿಚಯಕಾರ UIN",
+        "hin": "परिचयकर्ता  UIN",
+        "tam": "அறிமுகம் UIN"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "checksum": true,
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[0-9]{10}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "introduceRID",
+      "description": "Identifiant RNP RID du tuteur",
+      "labelName": {
+        "eng": "introducer RID",
+        "ara": "مقدم RID",
+        "fra": "introducteur RID",
+        "kan": "ಪರಿಚಯಕಾರ RID",
+        "hin": "परिचयकर्ता  RID",
+        "tam": "அறிமுகம் RID"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "^[0-9]{29}$",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true,
+      "tooltip": true
+    },
+    {
+      "id": "introduceCNIE",
+      "description": "Numéro d'identité du tuteur",
+      "labelName": {
+        "eng": "introducer CNIE",
+        "ara": "مقدم CNIE",
+        "fra": "introducteur CNIE",
+        "kan": "ಪರಿಚಯಕಾರ CNIE",
+        "hin": "परिचयकर्ता  CNIE",
+        "tam": "அறிமுகம் CNIE"
+      },
+      "controlType": "textbox",
+      "inputRequired": true,
+      "fieldType": "default",
+      "type": "string",
+      "validators": [
+        {
+          "type": "regex",
+          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
+          "arguments": []
+        }
+      ],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "relationWithChild",
+      "description": "Lien de parenté",
+      "labelName": {
+        "fra": "Lien de parenté",
+        "ara": "صلة القرابة",
+        "eng": "Relationship",
+        "kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
+        "hin": "बच्चे के साथ संबंध",
+        "tam": "குழந்தையுடன் உறவு"
+      },
+      "controlType": "dropdown",
+      "inputRequired": true,
+      "fieldType": "dynamic",
+      "type": "simpleType",
+      "validators": [],
+      "required": false,
+      "visible": false,
+      "group": "guardian_info",
+      "preview": true
+    },
+    {
+      "id": "proofOfAddress",
+      "description": "proofOfAddress",
+      "labelName": {
+        "ara": "إثبات العنوان",
+        "fra": "Preuve d'adresse",
+        "eng": "Address Proof",
+        "hin": "निवास प्रमाण पत्र",
+        "kan": "ವಿಳಾಸ ಪುರಾವೆ",
+        "tam": "முகவரி சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POA",
+      "required": false
+    },
+    {
+      "id": "proofOfIdentity",
+      "description": "proofOfIdentity",
+      "labelName": {
+        "ara": "إثبات الهوية",
+        "fra": "Preuve d'identité",
+        "eng": "Identity Proof",
+        "hin": "पहचान प्रमाण",
+        "kan": "ಗುರುತಿನ ಪುರಾವೆ",
+        "tam": "அடையாள சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POI",
+      "required": true
+    },
+    {
+      "id": "proofOfRelationship",
+      "description": "proofOfRelationship",
+      "labelName": {
+        "ara": "إثبات العلاقة",
+        "fra": "Preuve de relation",
+        "eng": "Relationship Proof",
+        "hin": "संबंध प्रमाण",
+        "kan": "ಸಂಬಂಧ ಪುರಾವೆ",
+        "tam": "உறவு சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POR",
+      "required": true
+    },
+    {
+      "id": "proofOfDateOfBirth",
+      "description": "proofOfDateOfBirth",
+      "labelName": {
+        "ara": "دليل DOB",
+        "fra": "Preuve de date de naissance",
+        "eng": "DOB Proof",
+        "hin": "जन्मतिथि प्रमाण",
+        "kan": "DOB ಪ್ರೂಫ್",
+        "tam": "DOB ஆதாரம்"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POB",
+      "required": true
+    },
+    {
+      "id": "proofOfException",
+      "description": "proofOfException",
+      "labelName": {
+        "ara": "إثبات الاستثناء",
+        "fra": "Preuve d'exception",
+        "eng": "Exception Proof",
+        "kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
+        "tam": "விதிவிலக்கு சான்று"
+      },
+      "controlType": "fileupload",
+      "inputRequired": true,
+      "validators": [],
+      "subType": "POE",
+      "required": true
+    }
+  ],
+  "locationHierarchy": [
+    "region",
+    "province",
+    "city",
+    "zone",
+    "postalCode"
+  ]
+}
\ No newline at end of file

From 258ec9ade473cfdb1d48d302c165c00b500a9bac Mon Sep 17 00:00:00 2001
From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Date: Tue, 13 Dec 2022 14:35:34 +0530
Subject: [PATCH 0945/1358] Updated misp license key for this env.

---
 idp-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-default.properties b/idp-default.properties
index be16464cb3e..dc748453ba3 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,7 +26,7 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=nsWvISPTJAzxEOlFX31Z7zorsJeaaDUM2BvKsi8pogLpj3A1Sm
+mosip.idp.misp.license.key=hVq9XOvlRokmkG23JL7wAJhEGM5ZzgO7Hnx3omJ1ghMap78nYh
 
 mosip.idp.clientmgmt.create-client=SCOPE_add_oidc_client
 mosip.idp.clientmgmt.update-client=SCOPE_update_oidc_client
@@ -249,4 +249,4 @@ mosip.idp.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30,
   'send.otp.channels' : 'email' }
 
 
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file
+logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 9414ab5aec2e2550f3068054738aae8cb4e25236 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 13 Dec 2022 16:00:51 +0530
Subject: [PATCH 0946/1358] Update ida-partner.cer

---
 ida-partner.cer | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ida-partner.cer b/ida-partner.cer
index 92ac02f621e..51ced6ec5b9 100644
--- a/ida-partner.cer
+++ b/ida-partner.cer
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDrDCCApSgAwIBAgIIE5RHue4Ke5UwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UE
+MIIDrDCCApSgAwIBAgIIkcTLqBQn22gwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UE
 BhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCQU5HQUxPUkUxDTALBgNVBAoM
 BElJVEIxIDAeBgNVBAsMF01PU0lQLVRFQ0gtQ0VOVEVSIChJREEpMRUwEwYDVQQD
-DAx3d3cubW9zaXAuaW8wHhcNMjIxMjAyMTM1NDQzWhcNMjQxMjAxMTM1NDQzWjB1
+DAx3d3cubW9zaXAuaW8wHhcNMjIxMjA4MTMzNjM1WhcNMjQxMjA3MTMzNjM1WjB1
 MQswCQYDVQQGEwJJTjELMAkGA1UECAwCS0ExEjAQBgNVBAcMCUJBTkdBTE9SRTEN
 MAsGA1UECgwESUlUQjEgMB4GA1UECwwXTU9TSVAtVEVDSC1DRU5URVIgKElEQSkx
 FDASBgNVBAMMC0lEQS1QQVJUTkVSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA0IoecLH6IHKZZixLNZO++hC0XtH0wUeMQ5CoFBRC6jBsyZgEHSqvGYUc
-t7r3rcLDWuiufz8VsdlzLCwV/Mw30ZB9sAut7g7wU1ak6pZfkUTLmsOgSq3szW4R
-W3u2FlMoAtUdtHClSSymJ2lwCMsKyIwfXxrB1+T0YzRISIUToYZ/atMs+ntJyyyD
-aIG1SNZi/L5CM5D0L7QhG19bgrMrgFGuk+z4CNcPBx4NHqkcowRePT3/lp98aLtB
-2Rt6FQ/naTQMRK/L19sQTvQgaYClfq9Yeuv1w449NFuJ/MixXdj3A/8OvGM6fgV7
-vHzZR8gSHNK9XpPfkyYUgXq+h2CHzQIDAQABoz8wPTAMBgNVHRMBAf8EAjAAMB0G
-A1UdDgQWBBSpx0wEBrp2hw1U8OMWzalKwaMn5DAOBgNVHQ8BAf8EBAMCBSAwDQYJ
-KoZIhvcNAQELBQADggEBAFzssGHBrBYV6OKY7PbFVge2B+SxvIRrUxFSnJIqxyGs
-mwgvEobzprH2pDir7xmQYNzG/npCw9980sJHxXRaojsby4+zxpECvTDa/00CVa3B
-4BQCumaF6aqXaY9/Eabijay9lmkKOc7robNyn0W0H39XciO0ECas+byK0EjXyvzw
-tUS2WZPnl1DXZBb6Z3yPZ/1e00dhga/IyDvBATR+++m69P0HHAOWOUKqtUDEfHTj
-kopRmdOKv70fgoXOGi0ucnCIqpJF6CiinR7PTsNXZ5IVTDQ3jdpmh9lL4Mi4gmPu
-F0SRhkXVig2LLe/OiQx7+0mjtPdKz4oEy1qeah+gCnY=
------END CERTIFICATE-----
\ No newline at end of file
+CgKCAQEAv/SoHX9OB0hR3CGLj/1yaTk5mV48Fi/Wx1nd2gAMe76wre3X7Dz/KyM4
+rCEWryEnIGM1Zj3vGsb1OTxOOQk/zfmVOMwy0uJ3RPM8yKOQu+cJLEUSWho8ILTO
+3HU95XMBJVbwFce1H7Ml2GjinF8tV0REVkEqC1FbB8yNdg+qvmrczx3X0svikAz7
+LB8eWIrWeiDiPlfgfCPMxCx5DaUWgM3/6jtUfax0Hye6P0deOVqWOQznxmdNLdT8
+SyInL3pp0fWdok8yltm80/QK8WQAnjozXDUJh/PegllKZ/9Kt85yp0LIMBie+WqO
+cbooTFtk3d10xlfQ7tzklr667Xw9HwIDAQABoz8wPTAMBgNVHRMBAf8EAjAAMB0G
+A1UdDgQWBBRU99+vXO8/C22alMyvmL78AuavkTAOBgNVHQ8BAf8EBAMCBSAwDQYJ
+KoZIhvcNAQELBQADggEBAJAREKQTnU5nplLnLj8/f0vACxHnEwl/0Qw/APwyocz+
+rhkBloDlrw8/gVJ/1uXuBZz05kb2fBtdmlMpCty30EjWVcd5p7Wkew2TLR6xjeXG
+TElnS9TOqTcHEaGGw9l96Gyv4PDYUkKlikqeiU4qLcozakM8wbGT7RYXFSN63jJs
+fE3/ImGEgXb6d1WX4+W1sVz0Nhj4Pt7f/pSJ2WKSnP7G/5TMKT0kW/dG4RAvaBmO
+V6QikZe9LWrSlapedXnjx74AJoEXD972LWcbxlutrVfOFnj94KWJG5cJ3eAV0Fi6
+JE4RZGnecRX7yZa6d0cziAF0eF8M/ibvRKagmybkckM=
+-----END CERTIFICATE-----

From 12521eb0cb95ce05aa45e1a740a6b7fae1cb0642 Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Tue, 13 Dec 2022 19:38:50 +0530
Subject: [PATCH 0947/1358] Update idp-default.properties

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index dc748453ba3..7ebbecdfd1d 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -122,7 +122,7 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/ida-partner.cer
+mosip.idp.authn.ida.cert-url=${spring.config.url}/*/${spring.config.active.profile}/${spring.config.label}/ida-partner.cer
 mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/

From f7a378b2255e05c400c3a6c5b84541a17e868ba9 Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Tue, 13 Dec 2022 19:47:59 +0530
Subject: [PATCH 0948/1358] Update idp-default.properties

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 7ebbecdfd1d..84d78329dc3 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -126,7 +126,7 @@ mosip.idp.authn.ida.cert-url=${spring.config.url}/*/${spring.config.active.profi
 mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
-mosip.idp.authn.wrapper.ida-domainUri=https://idp.dev2.mosip.net
+mosip.idp.authn.wrapper.ida-domainUri=https://${mosip.idp.host}
 mosip.idp.authn.wrapper.ida-env=Developer
 mosip.idp.authn.ida.otp-channels=email,mobile
 

From 8a2ef4433abb6b8156888cdd74b14dfc9541d26a Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 14 Dec 2022 10:41:34 +0530
Subject: [PATCH 0949/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 2179290188f..9136c7f4ed7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -53,7 +53,7 @@ mosip.kernel.notification.email.from=do-not-reply@mosip.io
 spring.mail.host=${email.smtp.host}
 spring.mail.username=${email.smtp.username}
 spring.mail.password=${email.smtp.secret}
-spring.mail.port=587
+spring.mail.port=${email.smtp.port}
 spring.mail.properties.mail.transport.protocol=smtp
 spring.mail.properties.mail.smtp.starttls.required=false
 spring.mail.properties.mail.smtp.starttls.enable=false

From d7af63f0bbe5bc31c7b450eaf93ec217c4dfbb62 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 14 Dec 2022 18:12:02 +0530
Subject: [PATCH 0950/1358] enabled websub traceLogAdvancedConfig

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 3d4a1aab78c..24a6f526b17 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -91,4 +91,4 @@ console = true              # Default is false
 
 [ballerina.http.traceLogAdvancedConfig]
 # Enable printing trace logs in console
-console = false              # Default is false
\ No newline at end of file
+console = true              # Default is false
\ No newline at end of file

From 988f0d2fe7d404e1e688b3750576e50419ca7ae6 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Wed, 14 Dec 2022 19:40:55 +0530
Subject: [PATCH 0951/1358] Added Resident role to get VIDs.

---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index ba9965e36a0..ca8efa6d295 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -413,7 +413,7 @@ mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR,ID_REPO
 mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.vid.postvid=RESIDENT,REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.vid.getvid=REGISTRATION_PROCESSOR,ID_AUTHENTICATION,RESIDENT,ID_REPOSITORY
-mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR,ID_REPOSITORY,RESIDENT
 mosip.role.idrepo.vid.patchvid=ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY

From 24bcfa43718cacdaeaf1cece6983d2ce530c512f Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Wed, 14 Dec 2022 19:56:17 +0530
Subject: [PATCH 0952/1358] Revert "enabled websub traceLogAdvancedConfig"

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 24a6f526b17..3d4a1aab78c 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -91,4 +91,4 @@ console = true              # Default is false
 
 [ballerina.http.traceLogAdvancedConfig]
 # Enable printing trace logs in console
-console = true              # Default is false
\ No newline at end of file
+console = false              # Default is false
\ No newline at end of file

From 0b51eaeb35fbe6994d3ca885709d8c32f15fdf33 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Fri, 16 Dec 2022 11:49:44 +0530
Subject: [PATCH 0953/1358] Updated otp.request.flooding.max-count=3

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 391d1a5c207..8f414db2ad0 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -334,7 +334,7 @@ ida.errormessages.default-lang=en
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=100
+otp.request.flooding.max-count=3
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content
@@ -620,4 +620,4 @@ mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SU
 # Secret will be used during kyc token generation.
 mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
 kyc.token.expire.time.adjustment.seconds=300
-kyc.exchange.default.lang=eng
\ No newline at end of file
+kyc.exchange.default.lang=eng

From e0e9e0d14717132f2b4cd609b08b6f9792703a78 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Fri, 16 Dec 2022 12:08:16 +0530
Subject: [PATCH 0954/1358] Updated otp.request.flooding.max-count=100

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 8f414db2ad0..d5fadb9834a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -334,7 +334,7 @@ ida.errormessages.default-lang=en
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=3
+otp.request.flooding.max-count=100
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content

From 6b70812ece7b7c0a31c0bffc0321d6ca85879912 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Mon, 19 Dec 2022 16:42:03 +0530
Subject: [PATCH 0955/1358] [DSD-1841] Added config changes for compliance
 toolkit service.

---
 compliance-toolkit-default.properties | 191 ++++++++++++++++++++++++++
 1 file changed, 191 insertions(+)
 create mode 100644 compliance-toolkit-default.properties

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
new file mode 100644
index 00000000000..a96fa48d903
--- /dev/null
+++ b/compliance-toolkit-default.properties
@@ -0,0 +1,191 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password
+# mosip.toolkit.client.secret
+# keycloak.internal.host
+# keycloak.internal.url
+# s3.accesskey
+# s3.region
+# s3.secretkey
+
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port
+
+##DB properties
+javax.persistence.jdbc.driver=org.postgresql.Driver
+mosip.database.ip=postgres-postgresql.postgres
+mosip.database.port=5432
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_toolkit?useSSL=false
+javax.persistence.jdbc.user=toolkituser
+javax.persistence.jdbc.password=${db.dbuser.password}
+
+## Hibernate
+hibernate.hbm2ddl.auto=none
+hibernate.show_sql=false
+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+hibernate.jdbc.lob.non_contextual_creation=true
+
+logging.level.com.zaxxer.hikari=DEBUG
+
+## Project Version for the API response
+version=1.0
+
+server.servlet.context-path=/v1/toolkit
+
+## Security properties
+mosip.security.csrf-enable=false
+mosip.security.cors-enable=false
+mosip.security.origins=localhost:8099
+mosip.security.secure-cookie=false
+
+#iam
+mosip.api.internal.url=https://${mosip.api.internal.host}
+#keycloak.external.url=${mosip.api.internal.url}/keycloak
+iam.base.url=${keycloak.external.url}
+
+#iam adapter setup
+mosip.service-context=${server.servlet.context-path}
+mosip.service.end-points=/**/toolkit/**
+mosip.global.end-points=/**/assets/**,/**/icons/**,/**/screenshots/**,/favicon**,/**/favicon**,/**/css/**,/**/js/**,/**/error**,/**/webjars/**,/**/csrf,/*/,/**/authenticate/**,/**/actuator/**,/sendOtp,/validateOtp,/invalidateToken,/config,/login,/logout,/validateOTP,/sendOTP,/**/login,/**/login/**,/**/login-redirect/**,/**/logout/**,/**/h2-console/**,/**/**/license/**,/**/callback/**,/**/authenticate/**
+#mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT,DELETE
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.auth.filter_disable=false
+mosip.kernel.auth.adapter.ssl-bypass=true
+mosip.kernel.auth.appid-realm-map={toolkit:'mosip'}
+mosip.kernel.auth.appids.realm.map={toolkit:'mosip'}
+
+#iam adapter
+mosip.iam.adapter.appid=toolkit
+mosip.iam.adapter.clientid=mosip-toolkit-client
+mosip.iam.adapter.clientsecret=${mosip.toolkit.client.secret}
+
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+auth.server.admin.allowed.audience=mosip-toolkit-client
+auth.allowed.urls=https://${mosip.compliance.host}/
+mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+
+auth.server.validate.url=${mosip.api.internal.url}/v1/authmanager/authorize/admin/validateToken
+
+## below are required for kernel-authcodeflowproxy-api dependency
+mosip.iam.module.login_flow.name=authorization_code
+mosip.iam.module.login_flow.scope=email
+mosip.iam.module.login_flow.response_type=code
+mosip.iam.module.clientid=mosip-toolkit-client
+mosip.iam.module.clientsecret=${mosip.toolkit.client.secret}
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/toolkit/login-redirect/
+mosip.iam.module.admin_realm_id=mosip
+mosip.iam.base-url=${iam.base.url}
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+mosip.iam.token_endpoint=${iam.base.url}/auth/realms/mosip/protocol/openid-connect/token
+auth.server.admin.validate.url=${mosip.api.internal.url}/v1/authmanager/authorize/admin/validateToken
+
+## below are required for kernel CBEFF util dependency
+mosip.kernel.xsdstorage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+mosip.kernel.xsdfile=mosip-cbeff.xsd
+
+## Minio
+object.store.s3.use.account.as.bucketname=true
+
+## To store documents
+mosip.kernel.objectstore.account-name=compliance-toolkit
+
+# Object store
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## For Minio: object.store.s3.url=http://minio.minio:9000
+## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.url=http://minio.minio:9000
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
+
+## Trust Validation of SBI
+mosip.service.auth.appid=regproc
+mosip.service.auth.clientid=mosip-pms-client
+mosip.service.auth.secretkey=${mosip.pms.client.secret}
+#mosip.service.validation.url=${mosip.api.internal.url}/v1/partnermanager/deviceprovidermanagement/validate
+mosip.service.authmanager.url=${mosip.api.internal.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.service.keymanager.verifyCertificateTrust.url=${mosip.api.internal.url}/v1/keymanager/verifyCertificateTrust
+
+mosip.toolkit.sbi.ports=4501,4502,4503,4504,4505,4506,4507,4508,4509,4510
+mosip.toolkit.sbi.timeout=10000
+mosip.toolkit.sbi.keyrotation.iterations=2
+
+## To decrypt biometrics in SBI Auth
+mosip.service.keymanager.decrypt.appid=COMPLIANCE_TOOLKIT
+mosip.service.keymanager.decrypt.refid=COMP-FIR
+mosip.service.keymanager.decrypt.url=${mosip.api.internal.url}/v1/keymanager/decrypt
+mosip.service.keymanager.encryption.key.url=${mosip.api.internal.url}/v1/keymanager/getCertificate?applicationId=COMPLIANCE_TOOLKIT&referenceId=COMP-FIR
+
+# Threshold value against which the quality check score value will be evaluated for Fingerprint biometric type.
+mosip.toolkit.sdk.finger.qualitycheck.threshold.value=60
+# Threshold value against which the quality check score value will be evaluated for Face biometric type.
+mosip.toolkit.sdk.face.qualitycheck.threshold.value=30
+# Threshold value against which the quality check score value will be evaluated for Iris biometric type.
+mosip.toolkit.sdk.iris.qualitycheck.threshold.value=60
+
+# TestRuns more than this limit will be moved to archives
+mosip.toolkit.testrun.archive.offset=5
+
+mosip.kernel.virus-scanner.host=clamav.clamav
+mosip.kernel.virus-scanner.port=3310
+
+#Enable or disable the virus scanner(true/false)
+mosip.toolkit.document.scan=true
+
+##the id for API
+mosip.toolkit.api.id.projects.get=mosip.toolkit.projects.retrieve
+mosip.toolkit.api.id.sbi.project.get=mosip.toolkit.sbi.project.retrieve
+mosip.toolkit.api.id.collections.get=mosip.toolkit.collections.retrieve
+mosip.toolkit.api.id.collection.get=mosip.toolkit.collection.retrieve
+mosip.toolkit.api.id.sdk.project.get=mosip.toolkit.sdk.project.retrieve
+mosip.toolkit.api.id.sdk.project.put=mosip.toolkit.sdk.project.update
+mosip.toolkit.api.id.sdk.project.post=mosip.toolkit.sdk.project.add
+mosip.toolkit.api.id.collection.post=mosip.toolkit.collection.add
+mosip.toolkit.api.id.sbi.project.post=mosip.toolkit.sbi.project.add
+mosip.toolkit.api.id.testcase.project.get=mosip.toolkit.testcase.project.retrieve
+mosip.toolkit.api.id.validations.post=mosip.toolkit.api.id.validations
+mosip.toolkit.api.id.generate.sdk.request.post=mosip.toolkit.api.id.generate.sdk.request
+mosip.toolkit.api.id.collection.testcases.get=mosip.toolkit.collection.testcases.retrieve
+mosip.toolkit.api.id.collection.testcase.post=mosip.toolkit.collection.testcase.add
+mosip.toolkit.api.id.testrun.post=mosip.toolkit.testrun.add
+mosip.toolkit.api.id.testrun.put=mosip.toolkit.testrun.update
+mosip.toolkit.api.id.testrun.details.post=mosip.toolkit.testrun.details.add
+mosip.toolkit.api.id.testrun.details.get=mosip.toolkit.testrun.details.retrieve
+mosip.toolkit.api.id.testcase.get=mosip.toolkit.testcase.retrieve
+mosip.toolkit.api.id.testrun.history.get=mosip.toolkit.testrun.history.retrieve
+mosip.toolkit.api.id.testrun.status.get=mosip.toolkit.testrun.status.retrieve
+mosip.toolkit.api.id.sdk.generate.request=mosip.toolkit.api.id.sdk.generate.request
+mosip.toolkit.api.id.biometric.testdata.get=mosip.toolkit.biometric.testdata.retrieve
+mosip.toolkit.api.id.biometric.testdata.post=mosip.toolkit.biometric.testdata.add
+mosip.toolkit.api.id.biometric.testdata.filenames.get=mosip.toolkit.biometric.testdata.filenames.retrieve
+mosip.toolkit.api.id.resource.file.post=mosip.toolkit.resource.file.add
+
+#Roles for validation
+mosip.toolkit.roles.uploadResource=GLOBAL_ADMIN
+mosip.toolkit.roles.saveTestCases=GLOBAL_ADMIN
+
+## Determines file upload type allowed in UI
+mosip.toolkit.documentupload.allowed.file.type = application/zip
+# Determines the file name length(with extension) allowed in UI
+mosip.toolkit.documentupload.allowed.file.nameLength = 50
+# Determines maximum size of file allowed uploaded 20 MB
+mosip.toolkit.documentupload.allowed.file.size = 20000000
+
+mosip.toolkit.max.allowed.gallery.files=5
+
+#Swagger
+openapi.info.title=Compliance-Toolkit
+openapi.info.description=Compliance Toolkit Services
+openapi.info.version=1.0
+openapi.info.license.name=Mosip
+openapi.info.license.url=https://docs.mosip.io/platform/license
+mosipbox.public.url=https://${mosip.compliance.host}/
+openapi.service.servers[0].url=${mosipbox.public.url}${server.servlet.context-path}
+openapi.service.servers[0].description=Compliance Toolkit Services
+openapi.group.name=${openapi.info.title}
+openapi.group.paths[0]=/**
+springdoc.swagger-ui.disable-swagger-default-url=true
+springdoc.swagger-ui.tagsSorter=alpha
+springdoc.swagger-ui.operationsSorter=alpha
\ No newline at end of file

From e25fe1d53dcbb3751ffb778f7c1ae92beff70230 Mon Sep 17 00:00:00 2001
From: pramod444 <pramodbelal8@gmail.com>
Date: Mon, 19 Dec 2022 17:15:36 +0530
Subject: [PATCH 0956/1358] [DSD-1836] Updated identity-mapping.jsonand
 idp-default.properties file from develop-v3 config.

---
 identity-mapping.json  | 23 ++++++++++++++++++++++-
 idp-default.properties | 37 ++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 443c34632f7..13cc064003d 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -42,6 +42,9 @@
         "uin": {
             "value": "UIN"
         },
+        "vid": {
+            "value": "VID"
+        },
         "individualBiometrics": {
             "value": "individualBiometrics"
         },
@@ -92,6 +95,18 @@
         },
         "fullAddress": {
             "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+        },
+        "bestTwoFingers": {
+            "value": "bestTwoFingers"
+        },
+        "birthdate": {
+            "value": "dateOfBirth"
+        },
+        "picture": {
+            "value": "face"
+        },
+        "address": {
+            "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
         }
     },
     "metaInfo": {
@@ -116,5 +131,11 @@
         "poe": {
             "value": "proofOfException"
         }
+    },
+    "attributeUpdateCountLimit": {
+        "fullName": 2,
+        "gender": 1,
+        "dob": 1,
+        "age": 1
     }
-}
+}
\ No newline at end of file
diff --git a/idp-default.properties b/idp-default.properties
index 84d78329dc3..342ae212bcd 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,7 +26,7 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=hVq9XOvlRokmkG23JL7wAJhEGM5ZzgO7Hnx3omJ1ghMap78nYh
+mosip.idp.misp.license.key=OLSRA9D5Jb2hhnCnNobNLHHaWAJHiVh5PbVSNavIajJHQB2KfN
 
 mosip.idp.clientmgmt.create-client=SCOPE_add_oidc_client
 mosip.idp.clientmgmt.update-client=SCOPE_update_oidc_client
@@ -43,6 +43,7 @@ mosip.idp.auth-ignore-urls=${server.servlet.path}/oidc/**,${server.servlet.path}
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
 
+mosip.idp.reqtime.leeway-minutes=2
 mosip.idp.supported-id-regex=\\S*
 
 #Id and access token validity intervals
@@ -65,7 +66,7 @@ spring.kafka.consumer.enable-auto-commit=true
 ## supported scopes
 mosip.idp.supported.authorize.scopes={'identity.readonly','vid.manage','vid.readonly','auth.readonly','auth.method.manage','identity.update','auth.history.readonly','notifications.readonly','notifications.manage','credential.manage','auth.history.manage','card.manage'}
 mosip.idp.supported.openid.scopes={'profile','email','phone'}
-mosip.idp.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone','locale','individual_id'},'email' : {'email'}, 'phone' : {'phone'}}
+mosip.idp.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone','locale'},'email' : {'email'}, 'phone' : {'phone'}}
 
 ## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
 mosip.idp.supported.response.types={'code'}
@@ -122,13 +123,13 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=${spring.config.url}/*/${spring.config.active.profile}/${spring.config.label}/ida-partner.cer
-mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/${mosip.idp.misp.license.key}/
-mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/${mosip.idp.misp.license.key}/
-mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/develop-v3/ida-partner.cer
+mosip.idp.authn.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
 mosip.idp.authn.wrapper.ida-domainUri=https://${mosip.idp.host}
 mosip.idp.authn.wrapper.ida-env=Developer
-mosip.idp.authn.ida.otp-channels=email,mobile
+mosip.idp.authn.ida.otp-channels=email,phone
 
 #mosip.idp.authn.wrapper.impl=MockAuthenticationService
 mosip.idp.authn.mock.impl.token-expire-sec=1800
@@ -144,25 +145,18 @@ mosip.idp.discovery.key-values={'issuer': '${mosip.idp.discovery.issuer-id}' ,\
   \ 'authorization_endpoint': '${mosip.idp.domain.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosip.idp.domain.url}${server.servlet.path}/oauth/token' ,\
   \ 'userinfo_endpoint' : '${mosip.idp.domain.url}${server.servlet.path}/oidc/userinfo' , \
-  \ 'introspection_endpoint' : '${mosip.idp.domain.url}${server.servlet.path}/oauth/introspect' , \
+  \ 'registration_endpoint' : '${mosip.idp.domain.url}${server.servlet.path}/client-mgmt/oidc-client' , \
   \ 'jwks_uri' : '${mosip.idp.domain.url}${server.servlet.path}/oauth/jwks.json' , \
   \ 'scopes_supported' : ${mosip.idp.supported.openid.scopes}, \
   \ 'response_types_supported' : ${mosip.idp.supported.response.types}, \
-  \ 'response_modes_supported' : { 'query' }, \
-  \ 'token_endpoint_auth_methods_supported' : ${mosip.idp.supported.client.auth.methods}, \
-  \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, \
+  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
   \ 'userinfo_signing_alg_values_supported' : {'RS256'}, \
   \ 'userinfo_encryption_alg_values_supported' : {'RSAXXXXX'},\
   \ 'userinfo_encryption_enc_values_supported' : {'A128GCM'}, \
-  \ 'id_token_signing_alg_values_supported' : {'RS256'}, \
-  \ 'claim_types_supported': {'normal'}, \
-  \ 'claims_parameter_supported' : true, \
-  \ 'display_values_supported' : ${mosip.idp.supported.ui.displays}, \
-  \ 'subject_types_supported' : { 'pairwise' }, \
-  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone','locale','individual_id'}, \
-  \ 'acr_values_supported' : {},\
-  \ 'request_parameter_supported' : false, \
-  \ 'ui_locales_supported' : {} }
+  \ 'response_modes_supported' : { 'query' }, \
+  \ 'token_endpoint_auth_methods_supported' : ${mosip.idp.supported.client.auth.methods}, \
+  \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, 'id_token_signing_alg_values_supported' : {'RS256'}, 'claim_types_supported': {'normal'}, \
+  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone','locale','individual_id'}, 'claims_locales_supported' : {'en'}, 'display_values_supported' : ${mosip.idp.supported.ui.displays}, 'ui_locales_supported' : {'en'} }
 
 ##----------------------------------------- Database properties -------------------------------------------
 
@@ -246,7 +240,8 @@ crypto.PrependThumbprint.enable=true
 mosip.idp.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
-  'send.otp.channels' : 'email' }
+  'send.otp.channels' : '${mosip.idp.authn.ida.otp-channels}' }
 
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG
+

From 459ceb8d80e93385b369760df9a2b146742792d9 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:27:25 +0530
Subject: [PATCH 0957/1358] updated mosip.preregistration.captcha.enable=true

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 947813721e8..d200225b120 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -381,7 +381,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=false
+mosip.preregistration.captcha.enable=true
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}

From cf4148386581fd4914edf092c11518de42b1e6c8 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 19 Dec 2022 17:58:54 +0530
Subject: [PATCH 0958/1358] Added mosip-toolkitclient in
 auth.server.admin.allowed.audience.

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 9136c7f4ed7..6a1f2053f5a 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -418,7 +418,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client

From d3532f3f69212da36a520457e5273e2ffd74d9eb Mon Sep 17 00:00:00 2001
From: pramod444 <pramodbelal8@gmail.com>
Date: Tue, 20 Dec 2022 13:13:13 +0530
Subject: [PATCH 0959/1358] [DSD-1836] Updated idp-default.properties in auth
 Wrapper section.

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 342ae212bcd..1545c4b2632 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -123,7 +123,7 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/develop-v3/ida-partner.cer
+mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/ida-partner.cer
 mosip.idp.authn.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/

From bafef2cc42c0fe99cd50a02ccb5a36c469d58472 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Tue, 20 Dec 2022 15:19:44 +0530
Subject: [PATCH 0960/1358] DSD-1836

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 1545c4b2632..d9cbce17def 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,7 +26,7 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=OLSRA9D5Jb2hhnCnNobNLHHaWAJHiVh5PbVSNavIajJHQB2KfN
+mosip.idp.misp.license.key=hVq9XOvlRokmkG23JL7wAJhEGM5ZzgO7Hnx3omJ1ghMap78nYh
 
 mosip.idp.clientmgmt.create-client=SCOPE_add_oidc_client
 mosip.idp.clientmgmt.update-client=SCOPE_update_oidc_client

From c4f9725df51c48af95fd89699172cc10c8e107f8 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 20 Dec 2022 18:52:50 +0530
Subject: [PATCH 0961/1358] Update compliance-toolkit-default.properties

---
 compliance-toolkit-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index a96fa48d903..30b7c07da57 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -48,7 +48,7 @@ iam.base.url=${keycloak.external.url}
 #iam adapter setup
 mosip.service-context=${server.servlet.context-path}
 mosip.service.end-points=/**/toolkit/**
-mosip.global.end-points=/**/assets/**,/**/icons/**,/**/screenshots/**,/favicon**,/**/favicon**,/**/css/**,/**/js/**,/**/error**,/**/webjars/**,/**/csrf,/*/,/**/authenticate/**,/**/actuator/**,/sendOtp,/validateOtp,/invalidateToken,/config,/login,/logout,/validateOTP,/sendOTP,/**/login,/**/login/**,/**/login-redirect/**,/**/logout/**,/**/h2-console/**,/**/**/license/**,/**/callback/**,/**/authenticate/**
+mosip.global.end-points=/**/swagger-ui/**,/**/api-docs/**,/**/assets/**,/**/icons/**,/**/screenshots/**,/favicon**,/**/favicon**,/**/css/**,/**/js/**,/**/error**,/**/webjars/**,/**/csrf,/*/,/**/authenticate/**,/**/actuator/**,/sendOtp,/validateOtp,/invalidateToken,/config,/login,/logout,/validateOTP,/sendOTP,/**/login,/**/login/**,/**/login-redirect/**,/**/logout/**,/**/h2-console/**,/**/**/license/**,/**/callback/**,/**/authenticate/**
 #mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT,DELETE
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.auth.filter_disable=false
@@ -181,11 +181,11 @@ openapi.info.description=Compliance Toolkit Services
 openapi.info.version=1.0
 openapi.info.license.name=Mosip
 openapi.info.license.url=https://docs.mosip.io/platform/license
-mosipbox.public.url=https://${mosip.compliance.host}/
+mosipbox.public.url=${mosip.api.internal.url}
 openapi.service.servers[0].url=${mosipbox.public.url}${server.servlet.context-path}
 openapi.service.servers[0].description=Compliance Toolkit Services
 openapi.group.name=${openapi.info.title}
 openapi.group.paths[0]=/**
 springdoc.swagger-ui.disable-swagger-default-url=true
 springdoc.swagger-ui.tagsSorter=alpha
-springdoc.swagger-ui.operationsSorter=alpha
\ No newline at end of file
+springdoc.swagger-ui.operationsSorter=alpha

From 920da45a696403a2653b8dcf6baa03a473114a46 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Wed, 21 Dec 2022 18:09:08 +0530
Subject: [PATCH 0962/1358] [DSD-1847] Added config changes for mock-mv

---
 mock-mv-default.properties | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 mock-mv-default.properties

diff --git a/mock-mv-default.properties b/mock-mv-default.properties
new file mode 100644
index 00000000000..d102b6e8420
--- /dev/null
+++ b/mock-mv-default.properties
@@ -0,0 +1,3 @@
+## Mock Manual Verification Properties
+# Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
+mock.mv.default.decision=APPROVED 
\ No newline at end of file

From d14e79f8c6aa265d8381b7b89b544f2c3d437358 Mon Sep 17 00:00:00 2001
From: Yashavant1629 <102220960+Yashavant1629@users.noreply.github.com>
Date: Thu, 22 Dec 2022 12:11:00 +0530
Subject: [PATCH 0963/1358] otp.request.flooding.max-count=5

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d5fadb9834a..4ec64826b3c 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -334,7 +334,7 @@ ida.errormessages.default-lang=en
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=100
+otp.request.flooding.max-count=5
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content

From 0be45f1446a83855c63866cc2ec815f23d78c76a Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Fri, 23 Dec 2022 18:02:34 +0530
Subject: [PATCH 0964/1358] otp.request.flooding.max-count=100

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4ec64826b3c..d5fadb9834a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -334,7 +334,7 @@ ida.errormessages.default-lang=en
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=5
+otp.request.flooding.max-count=100
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content

From 9855b99332bb686a36d7742bab550556483c8765 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 23 Dec 2022 19:26:33 +0530
Subject: [PATCH 0965/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index efaa89ce00a..bdf540c6983 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -288,7 +288,7 @@ mosip.login.mode= email,mobile
 mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
 mosip.kernel.sms.proxy-sms=true
-mosip.kernel.auth.proxy-otp=true
+mosip.kernel.auth.proxy-otp=false
 mosip.kernel.auth.proxy-email=true
 ## Notification lanugage types: either PRIMARY or BOTH 
 mosip.notification.language-type=BOTH

From f1595e6fbdbbbf7a2f3703ff99ce12bc3df68813 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 26 Dec 2022 12:28:12 +0530
Subject: [PATCH 0966/1358] mosip.kernel.auth.proxy-otp=true

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index bdf540c6983..efaa89ce00a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -288,7 +288,7 @@ mosip.login.mode= email,mobile
 mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
 mosip.kernel.sms.proxy-sms=true
-mosip.kernel.auth.proxy-otp=false
+mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true
 ## Notification lanugage types: either PRIMARY or BOTH 
 mosip.notification.language-type=BOTH

From 11b63f75dcf9285b5fbe071ffc8354f538e3198f Mon Sep 17 00:00:00 2001
From: Madhunagesh1 <96459628+Madhunagesh1@users.noreply.github.com>
Date: Tue, 27 Dec 2022 10:15:49 +0530
Subject: [PATCH 0967/1358] Update id-authentication-default.properties

reduced otp.request.flooding.max-count from 100 to 3
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d5fadb9834a..8f414db2ad0 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -334,7 +334,7 @@ ida.errormessages.default-lang=en
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=100
+otp.request.flooding.max-count=3
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content

From d0d63c37cbdfcd5dee3062970ccb5c872d766400 Mon Sep 17 00:00:00 2001
From: Madhunagesh1 <96459628+Madhunagesh1@users.noreply.github.com>
Date: Tue, 27 Dec 2022 10:28:03 +0530
Subject: [PATCH 0968/1358] Update id-authentication-default.properties

reverted the changes otp.request.flooding.max-count from 3 to 100
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 8f414db2ad0..d5fadb9834a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -334,7 +334,7 @@ ida.errormessages.default-lang=en
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=3
+otp.request.flooding.max-count=100
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content

From a7e9ef5ffeda3b01005486477f62ae5be7e81601 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Wed, 28 Dec 2022 13:39:47 +0530
Subject: [PATCH 0969/1358] [DSD-1888] Added config changes for idp

---
 idp-claims-mapping.json | 28 ++++++++++++++++++++
 idp-default.properties  | 57 ++++++++++++++++++++++++++---------------
 2 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 idp-claims-mapping.json

diff --git a/idp-claims-mapping.json b/idp-claims-mapping.json
new file mode 100644
index 00000000000..8cc700c8717
--- /dev/null
+++ b/idp-claims-mapping.json
@@ -0,0 +1,28 @@
+{
+  "idp-claims-mapping": {
+    "name": {
+      "attributeName": "fullName"
+    },
+    "gender": {
+      "attributeName":  "gender"
+    },
+    "birthdate": {
+      "attributeName":  "dateOfBirth"
+    },
+    "email": {
+      "attributeName":  "email"
+    },
+    "phone_number": {
+      "attributeName":  "phone"
+    },
+    "picture": {
+      "attributeName":  "face"
+    },
+    "individual_id" : {
+      "attributeName":  "UIN,VID"
+    },
+    "address": {
+      "attributeName":  "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+    }
+  }
+}
\ No newline at end of file
diff --git a/idp-default.properties b/idp-default.properties
index d9cbce17def..f4938f8f22e 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,28 +26,38 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=hVq9XOvlRokmkG23JL7wAJhEGM5ZzgO7Hnx3omJ1ghMap78nYh
+mosip.idp.misp.license.key=nsWvISPTJAzxEOlFX31Z7zorsJeaaDUM2BvKsi8pogLpj3A1Sm
 
-mosip.idp.clientmgmt.create-client=SCOPE_add_oidc_client
-mosip.idp.clientmgmt.update-client=SCOPE_update_oidc_client
-mosip.idp.systeminfo.get-certificate=SCOPE_get_certificate
-mosip.idp.systeminfo.upload-certificate=SCOPE_upload_certificate
+# Secure endpoints with required authority
+mosip.idp.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \
+  \ '${server.servlet.path}/system-info/**' : { 'SCOPE_upload_certificate'} }
+mosip.idp.security.auth.put-urls={'${server.servlet.path}/client-mgmt/**' : { 'SCOPE_update_oidc_client'} }
+mosip.idp.security.auth.get-urls={'${server.servlet.path}/system-info/**' : { 'SCOPE_get_certificate'} }
+
+# CSRF token check disabled endpoints
+mosip.idp.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
+  ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,\
+  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus,\
+  ${server.servlet.path}/system-info/**
+
+
+# Authentication ignored endpoint (permit-all)
+mosip.idp.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
+  ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
+  ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
+  ${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus
 
 mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop-v3/amr-acr-mapping.json
-mosip.idp.auth-ignore-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
-  ${server.servlet.path}/authorization/**,${server.servlet.path}/actuator/**,/favicon.ico,\
-  /v1/notifier/actuator/prometheus,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/linked-authorization/**
 
 #spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
 
-mosip.idp.reqtime.leeway-minutes=2
 mosip.idp.supported-id-regex=\\S*
+mosip.idp.reqtime.leeway-minutes=2
 
 #Id and access token validity intervals
-mosip.idp.access-token.expire.seconds=7200
+mosip.idp.access-token-expire-seconds=7200
 mosip.idp.id-token-expire-seconds=7200
 
 ## link transaction
@@ -61,12 +71,14 @@ spring.kafka.consumer.group-id=idp-consumer
 spring.kafka.consumer.enable-auto-commit=true
 #spring.kafka.listener.concurrency=1
 
+mosip.idp.audit.wrapper.impl=LoggerAuditService
+
 ## ----------------------------------------  IdP (oauth & openid) config -------------------------------------------
 
 ## supported scopes
 mosip.idp.supported.authorize.scopes={'identity.readonly','vid.manage','vid.readonly','auth.readonly','auth.method.manage','identity.update','auth.history.readonly','notifications.readonly','notifications.manage','credential.manage','auth.history.manage','card.manage'}
 mosip.idp.supported.openid.scopes={'profile','email','phone'}
-mosip.idp.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone','locale'},'email' : {'email'}, 'phone' : {'phone'}}
+mosip.idp.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number','locale','individual_id'},'email' : {'email'}, 'phone' : {'phone_number'}}
 
 ## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
 mosip.idp.supported.response.types={'code'}
@@ -104,6 +116,11 @@ mosip.idp.supported.client.assertion.types={'urn:ietf:params:oauth:client-assert
 mosip.idp.supported.client.auth.methods={'private_key_jwt'}
 
 ## ---------------------------------------- Cache configuration -------------------------------------------
+mosip.idp.cache.secure.individual-id=true
+mosip.idp.cache.store.individual-id=true
+mosip.idp.cache.security.secretkey.reference-id=TRANSACTION_CACHE
+mosip.idp.cache.security.algorithm-name=AES/ECB/PKCS5Padding
+
 mosip.idp.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented
 
 #spring.cache.type=redis
@@ -117,16 +134,16 @@ mosip.idp.cache.key.hash.algorithm=SHA3-256
 mosip.idp.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
    'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200 }
 mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'authenticated': 300, 'authcodegenerated': 300, \
-  'userinfo': ${mosip.idp.access-token.expire.seconds}, 'linkcodegenerated' : ${mosip.idp.link-code-expire-in-secs}, \
+  'userinfo': ${mosip.idp.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.idp.link-code-expire-in-secs}, \
   'linked': 300 , 'linkedcode': ${mosip.idp.link-code-expire-in-secs}, 'linkedauth' : 300, 'consented': 300 }
 
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/ida-partner.cer
-mosip.idp.authn.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
-mosip.idp.authn.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
-mosip.idp.authn.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/ida-partner.cer
+mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
+mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
 mosip.idp.authn.wrapper.ida-domainUri=https://${mosip.idp.host}
 mosip.idp.authn.wrapper.ida-env=Developer
 mosip.idp.authn.ida.otp-channels=email,phone
@@ -156,7 +173,8 @@ mosip.idp.discovery.key-values={'issuer': '${mosip.idp.discovery.issuer-id}' ,\
   \ 'response_modes_supported' : { 'query' }, \
   \ 'token_endpoint_auth_methods_supported' : ${mosip.idp.supported.client.auth.methods}, \
   \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, 'id_token_signing_alg_values_supported' : {'RS256'}, 'claim_types_supported': {'normal'}, \
-  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone','locale','individual_id'}, 'claims_locales_supported' : {'en'}, 'display_values_supported' : ${mosip.idp.supported.ui.displays}, 'ui_locales_supported' : {'en'} }
+  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','locale','individual_id'}, 'claims_locales_supported' : {'en'}, 'display_values_supported' : ${mosip.idp.supported.ui.displays}, 'ui_locales_supported' : {'en'} }
+
 
 ##----------------------------------------- Database properties -------------------------------------------
 
@@ -243,5 +261,4 @@ mosip.idp.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30,
   'send.otp.channels' : '${mosip.idp.authn.ida.otp-channels}' }
 
 
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
-
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file

From 10ce35f555d417d6c019b1eff06aeb6e7720bb32 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Wed, 28 Dec 2022 14:33:37 +0530
Subject: [PATCH 0970/1358] [DSD-1888] Reverted the misp license key value.

---
 idp-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-default.properties b/idp-default.properties
index f4938f8f22e..7e651f588cd 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,7 +26,7 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=nsWvISPTJAzxEOlFX31Z7zorsJeaaDUM2BvKsi8pogLpj3A1Sm
+mosip.idp.misp.license.key=hVq9XOvlRokmkG23JL7wAJhEGM5ZzgO7Hnx3omJ1ghMap78nYh
 
 # Secure endpoints with required authority
 mosip.idp.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \
@@ -261,4 +261,4 @@ mosip.idp.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30,
   'send.otp.channels' : '${mosip.idp.authn.ida.otp-channels}' }
 
 
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file
+logging.level.org.springframework.web.client.RestTemplate=DEBUG

From f14c94751f86bbff520d9933eaac350d833cbe77 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 28 Dec 2022 15:52:26 +0530
Subject: [PATCH 0971/1358] updated the prop

---
 idp-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-default.properties b/idp-default.properties
index 7e651f588cd..51e866776e3 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -47,7 +47,7 @@ mosip.idp.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.serv
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
   ${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus
 
-mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop-v3/amr-acr-mapping.json
+mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1.2.0.1-B2/amr-acr-mapping.json
 
 #spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
@@ -140,7 +140,7 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/ida-partner.cer
+mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/ida-partner.cer
 mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/

From 7595819891bc8d7ebee465aa0fc7c4a6b34d6f58 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 28 Dec 2022 15:53:33 +0530
Subject: [PATCH 0972/1358] Update idp-default.properties

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 51e866776e3..439cc451fe4 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -47,7 +47,7 @@ mosip.idp.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.serv
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
   ${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus
 
-mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1.2.0.1-B2/amr-acr-mapping.json
+mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/amr-acr-mapping.json
 
 #spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip

From 60b7536f8d7f06a311eba48a92acef2a10a00022 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 28 Dec 2022 16:12:52 +0530
Subject: [PATCH 0973/1358] Create amr-acr-mapping.json

---
 amr-acr-mapping.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 amr-acr-mapping.json

diff --git a/amr-acr-mapping.json b/amr-acr-mapping.json
new file mode 100644
index 00000000000..e6802646629
--- /dev/null
+++ b/amr-acr-mapping.json
@@ -0,0 +1,14 @@
+{
+  "amr" : {
+    "PIN" :  [{ "type": "PIN" }],
+    "OTP" :  [{ "type": "OTP" }],
+    "Wallet" :  [{ "type": "WLA" }],
+    "L1-bio-device" :  [{ "type": "BIO", "count": 1 }]
+  },
+  "acr_amr" : {
+    "mosip:idp:acr:static-code" : ["PIN"],
+    "mosip:idp:acr:generated-code" : ["OTP"],
+    "mosip:idp:acr:linked-wallet" : [ "Wallet" ],
+    "mosip:idp:acr:biometrics" : [ "L1-bio-device" ]
+  }
+}

From 18c482407113864a918a5975566c332e16904806 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Wed, 28 Dec 2022 16:14:31 +0530
Subject: [PATCH 0974/1358] [DSD-1889] Added config changes for pms and ida
 services.

---
 data-share-default.properties                 |   2 +-
 id-authentication-internal-default.properties |   2 +-
 partner-management-default.properties         | 119 +++++++++++++++---
 3 files changed, 106 insertions(+), 17 deletions(-)

diff --git a/data-share-default.properties b/data-share-default.properties
index 52537547358..e0679de3ef0 100644
--- a/data-share-default.properties
+++ b/data-share-default.properties
@@ -39,7 +39,7 @@ mosip.data.share.includePayload=false
 mosip.data.share.digest.algorithm=SHA256
 mosip.data.share.prependThumbprint=true
 mosip.role.durian.postcreatepolicyidsubscriberid=CREATE_SHARE
-auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client,mpartner-default-print,mosip-resident-client,opencrvs-partner
+auth.server.admin.allowed.audience=mosip-partner-client,mosip-creser-client,mpartner-default-auth,mosip-regproc-client,mosip-reg-client,mosip-syncdata-client,mpartner-default-print,mosip-resident-client,opencrvs-partner,mpartner-default-digitalcard,mosip-admin-client,mosip-pms-client
 
 mosip.auth.filter_disable=false
 
diff --git a/id-authentication-internal-default.properties b/id-authentication-internal-default.properties
index 33411b5a630..00b138791e4 100644
--- a/id-authentication-internal-default.properties
+++ b/id-authentication-internal-default.properties
@@ -27,7 +27,7 @@ ida-topic-pmp-ca-certificate-uploaded=CA_CERTIFICATE_UPLOADED
 # ********* ADMIN Configurations ************
 # Configure N time period threshold for accepting auth/OTP/KYC request for a country
 authrequest.received-time-allowed.seconds=120
-# Configuration for +/- time period adjustment in minutes for the request time validation, so that 
+# Configuration for +/- time period adjustment in minutes for the request time validation, so that
 # The requests originating from a system that is not in time-sync will be accepted for the time period
 authrequest.received-time-adjustment.seconds=30
 #Configuration for time period difference between each biometric segment and digital Id capture
diff --git a/partner-management-default.properties b/partner-management-default.properties
index bc07324353b..5fc6d150434 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -1,8 +1,7 @@
 ## Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 ## DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 ## helm chart:
-## db.dbuser.password 
-## mosip.partner.client.secret
+## db.dbuser.password
 ## mosip.pms.client.secret
 ## keycloak.internal.url
 ## keycloak.admin.password
@@ -10,7 +9,7 @@
 
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
-## If database is external to production, provide the DNS or ip of the host and port 
+## If database is external to production, provide the DNS or ip of the host and port
 mosip.pmp.database.hostname=postgres-postgresql.postgres
 mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
@@ -58,8 +57,8 @@ mosip.datasource.regdevice.hibernate.dialect=org.hibernate.dialect.PostgreSQL95D
 hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.hbm2ddl.auto=none
-hibernate.show_sql=false
-hibernate.format_sql=false
+hibernate.show_sql=true
+hibernate.format_sql=true
 hibernate.connection.charSet=utf8
 hibernate.cache.use_second_level_cache=false
 hibernate.cache.use_query_cache=false
@@ -74,7 +73,10 @@ auth.allowed.urls=https://${mosip.pmp.host}/
 application.id=PARTNER
 application.name=partner
 
-## To configure the length of the misp license key
+## To configure starting value or initial value of mispId.
+## ex: if value = 3 ==> mispId starts from  100
+## if value = 4 ==> mispId starts from 1000
+mosip.kernel.mispid.length = 3
 mosip.kernel.idgenerator.misp.license-key-length = 50
 ## To configure the partner types for which extractors are required. It should be "," separated.
 pmp.bioextractors.required.partner.types = Credential_Partner,Online_Verification_Partner
@@ -87,27 +89,31 @@ pmp.policy.schema.url= https://schemas.mosip.io/v1/auth-policy
 ## If we add any new policy type, corresponding schema also needs to be added.
 ## format for adding schema configuration for new policy type is as below
 ## pmp.policyTypeName.policy.schema(all are in lowercase)= schema url
-pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance
+pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP
 pmp.auth.policy.schema = ${mosip.kernel.xsdstorage-uri}auth-policy-schema.json
 pmp.datashare.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
 pmp.credentialissuance.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
+pmp.misp.policy.schema = ${mosip.kernel.xsdstorage-uri}misp-policy-schema.json
 
 pmp.misp.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$
 pmp.partner.valid.email.address.regex=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-z]{2,})$
 pmp.partner.partnerId.max.length=36
 pmp.partner.mobileNumbe.max.length=16
 
+## Time difference between request creation and request processing
+masterdata.registerdevice.timestamp.validate=+5
+
 ## Keymanager
 mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 ## Kernel services
 mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 # ApplicationId for partner
-mosip.pmp.auth.appId=partner
+mosip.pmp.auth.appId =partner
 # Kernel auth client ID for partner management services
-mosip.pmp.auth.clientId=mosip-partner-client
+mosip.pmp.auth.clientId=mosip-pms-client
 # Kernel auth secret key for partner management services
-mosip.pmp.auth.secretKey=${mosip.partner.client.secret}
+mosip.pmp.auth.secretKey= ${mosip.pms.client.secret}
 # Key manager service API's to upload certificates
 pms.cert.service.token.request.clientId=${mosip.pmp.auth.clientId}
 pms.cert.service.token.request.issuerUrl=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -147,7 +153,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client,mosip-deployment-client
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-deployment-client
 auth.jwt.secret=authjwtsecret
 auth.jwt.base=Mosip-Token
 
@@ -162,7 +168,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 
 #To populate required roles which should be allowed in UI.(Roles are nothing but partner types)
-mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,PARTNERMANAGER,POLICYMANAGER,PARTNER_ADMIN
+mosip.pms.ui.required.roles=AUTH_PARTNER,DEVICE_PROVIDER,CREDENTIAL_PARTNER,FTM_PROVIDER,MISP_PARTNER,POLICYMANAGER,PARTNER_ADMIN
 
 # To configure misp partner type
 mosip.pms.misp.partner.type=MISP_Partner
@@ -189,8 +195,8 @@ policy.auth.allowed.token.types=random,partner,policy
 
 # IAM
 mosip.iam.module.login_flow.name=authorization_code
-mosip.iam.module.clientID=mosip-partner-client
-mosip.iam.module.clientsecret=${mosip.partner.client.secret}
+mosip.iam.module.clientID=mosip-pms-client
+mosip.iam.module.clientsecret=${mosip.pms.client.secret}
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/v1/partnermanager/login-redirect/
 mosip.iam.module.login_flow.scope=email
 mosip.iam.module.login_flow.response_type=code
@@ -198,6 +204,7 @@ mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/prot
 mosip.iam.module.admin_realm_id=mosip
 mosip.pms.filtervalue.max_columns =100
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
+mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
 
 ## Unused properties. TODO: delete them once they are removed from code
 pmp.policy.allowed.authtokens.types=random,partner,policy
@@ -227,7 +234,89 @@ pms.notifications-schedule.fixed-rate=24
 
 partner.register.as.user.in.iam.enable=false
 
+## Roles
+mosip.role.pms.postpoliciesgroupnew=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.putpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpolicies=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciespolicyidgrouppublish=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.putpoliciespolicyid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.patchpoliciespolicyidgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpolicies=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciespolicyid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesapikey=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciespolicyidpartnerpartnerid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesgrouppolicygroupid=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesgroupall=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciesgroupsearch=PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciessearch=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.getpoliciesconfigkey=PARTNER_ADMIN,POLICYMANAGER
+mosip.role.pms.postpoliciesgroupfiltervalues=PARTNER_ADMIN,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
+mosip.role.pms.postpoliciesfiltervalues=PARTNER_ADMIN,PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,POLICYMANAGER,PARTNER
+mosip.role.pms.getactivegroupgroupname=AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,ABIS_PARTNER,MANUAL_ADJUDICATION,POLICYMANAGER
+mosip.role.pms.postdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.putdevicedetail=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.patchdevicedetail=PARTNER_ADMIN
+mosip.role.pms.postdevicedetailsearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetaildevicetypesearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetailfiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetaildevicesubtypefiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.putftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.patchftpchipdetail=PARTNER_ADMIN
+mosip.role.pms.postftpchipdetailuploadcertificate=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.getftpchipdetailgetpartnercertificate=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.postftpchipdetailsearch=PARTNER_ADMIN,FTM_PROVIDER
+mosip.role.pms.postsecurebiometricinterface=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.putsecurebiometricinterface=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.patchsecurebiometricinterface=PARTNER_ADMIN
+mosip.role.pms.postsecurebiometricinterfacesearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.putsecurebiometricinterfacedevicedetailsmap=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.putsecurebiometricinterfacedevicedetailsmapremove=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postsecurebiometricinterfacedevicedetailsmapsearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postsecurebiometricinterfacefiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postpartnersbioextractors=PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,CREDENTIAL_ISSUANCE,CREATE_SHARE,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.getpartnersbioextractors=PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,CREDENTIAL_ISSUANCE,CREATE_SHARE,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerscredentialtypepolicies=PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,CREDENTIAL_ISSUANCE,CREATE_SHARE,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.getpartnerscredentialtypepolicies=PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,CREDENTIAL_ISSUANCE,CREATE_SHARE,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerscontactadd=PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,ABIS_PARTNER,MANUAL_ADJUDICATION,MISP_PARTNER
+mosip.role.pms.putpartners=PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,ABIS_PARTNER,MANUAL_ADJUDICATION,MISP_PARTNER
+mosip.role.pms.putpartnersnew=PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,ABIS_PARTNER,MANUAL_ADJUDICATION,MISP_PARTNER
+mosip.role.pms.getpartnerspartnerid=PARTNER,AUTH_PARTNER,CREDENTIAL_PARTNER,RESIDENT,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,ABIS_PARTNER,SDK_PARTNER,MANUAL_ADJUDICATION,MISP_PARTNER
+mosip.role.pms.getpartnersapikeyrequest=PARTNER,AUTH_PARTNER,ABIS_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerscacertificateupload=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.postpartnerscertificateupload=PARTNER,PMS_USER,AUTH_PARTNER,ABIS_PARTNER,SDK_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,ID_AUTHENTICATION,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.getpartnerscertificate=PARTNER,PMS_USER,AUTH_PARTNER,ABIS_PARTNER,SDK_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,CREATE_SHARE,ID_AUTHENTICATION,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerssearch=PARTNER,PMS_USER,AUTH_PARTNER,ABIS_PARTNER,SDK_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,PARTNER_ADMIN,CREDENTIAL_PARTNER,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerspartnertypesearch=PARTNER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,PARTNER_ADMIN,CREDENTIAL_PARTNER,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersfiltervalues=PARTNER,PMS_USER,AUTH_PARTNER,DEVICE_PROVIDER,FTM_PROVIDER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersapikeyrequestfiltervalues=PARTNER,PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersapikeyrequestsearch=PARTNER,PMS_USER,AUTH_PARTNER,ABIS_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnersapikeysearch=PARTNER,PMS_USER,AUTH_PARTNER,ABIS_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.putpartnerspolicygroup=PARTNER,PMS_USER,AUTH_PARTNER,CREDENTIAL_PARTNER,PARTNER_ADMIN,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postpartnerspolicymap=AUTH_PARTNER,ABIS_PARTNER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,ONLINE_VERIFICATION_PARTNER,PARTNER_ADMIN
+mosip.role.pms.patchpartnersgenerateapikey=AUTH_PARTNER,ABIS_PARTNER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.putpartnersapikeypolicies=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.patchpartners=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getpartners=PARTNERMANAGER,PARTNER_ADMIN,partnermanager,ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT,CREDENTIAL_ISSUANCE,ID_REPOSITORY
+mosip.role.pms.getpartnersnew=PARTNERMANAGER,PARTNER_ADMIN,partnermanager,ID_AUTHENTICATION,REGISTRATION_PROCESSOR,RESIDENT,CREDENTIAL_ISSUANCE,ID_REPOSITORY
+mosip.role.pms.getpartnersapikey=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.putpartnerspolicymapping=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.patchpartnerspolicyapikeystatus=PARTNERMANAGER,PARTNER_ADMIN,AUTH_PARTNER,CREDENTIAL_PARTNER,CREDENTIAL_ISSUANCE,ONLINE_VERIFICATION_PARTNER
+mosip.role.pms.postmisplicense=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.putmisplicense=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getmisplicense=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.getmisplicensekey=PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.postmispfiltervalues=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
+
+
 # query param usd to refer url to redirect after logout
 mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
 # end session endpoint in OIDC
-mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
\ No newline at end of file
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
+# IDP claims mapping file url
+mosip.idp.claims-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/idp-claims-mapping.json
+# IDP amr-acr mapping file url
+mosip.idp.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
+## IDP Service apis for create and update
+pmp-idp.oidc.client.create.rest.uri=https://${mosip.api.public.host}/v1/idp/client-mgmt/oidc-client
+pmp-idp.oidc.client.update.rest.uri=https://${mosip.api.public.host}/v1/idp/client-mgmt/oidc-client

From 022a982534746168966cee92f402c5be56223ab2 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 28 Dec 2022 20:26:31 +0530
Subject: [PATCH 0975/1358] Update identity-mapping.json

---
 identity-mapping.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 13cc064003d..dfc6909ece6 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -106,7 +106,7 @@
             "value": "face"
         },
         "address": {
-            "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+            "value": "city,region,province,postalCode"
         }
     },
     "metaInfo": {
@@ -138,4 +138,4 @@
         "dob": 1,
         "age": 1
     }
-}
\ No newline at end of file
+}

From 72609101d93a9d54e245d77ea1eeca75ee3ba309 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 28 Dec 2022 20:33:22 +0530
Subject: [PATCH 0976/1358] Update identity-mapping.json

---
 identity-mapping.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index dfc6909ece6..38233c3d94e 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -104,9 +104,6 @@
         },
         "picture": {
             "value": "face"
-        },
-        "address": {
-            "value": "city,region,province,postalCode"
         }
     },
     "metaInfo": {

From d1475adc0d8f0326bd01c1bdd385589eae1ba01d Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 29 Dec 2022 10:28:15 +0530
Subject: [PATCH 0977/1358] Create misp-policy-schema.json

---
 misp-policy-schema.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 misp-policy-schema.json

diff --git a/misp-policy-schema.json b/misp-policy-schema.json
new file mode 100644
index 00000000000..60d4ce19fc4
--- /dev/null
+++ b/misp-policy-schema.json
@@ -0,0 +1,20 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+      "allowAuthRequestDelegation": {
+        "type": "boolean"
+      },
+      "allowKycRequestDelegation": {
+        "type": "boolean"
+      },
+      "trustBindedAuthVerificationToken": {
+        "type": "boolean"
+      }
+
+    },
+    "required": [
+      "allowAuthRequestDelegation",
+      "allowKycRequestDelegation"
+    ]
+  }

From 199327f13e178af3ca4669bd2e6f8acdea81b196 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Fri, 30 Dec 2022 12:05:35 +0530
Subject: [PATCH 0978/1358] Update identity-mapping.json

---
 identity-mapping.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/identity-mapping.json b/identity-mapping.json
index 38233c3d94e..42cfe2a4bd9 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -104,6 +104,9 @@
         },
         "picture": {
             "value": "face"
+        },
+        "phone_number": {
+            "value": "phone"
         }
     },
     "metaInfo": {

From 97ef335babdb52f037a8c9920b27c689d20d9ffc Mon Sep 17 00:00:00 2001
From: Madhunagesh1 <96459628+Madhunagesh1@users.noreply.github.com>
Date: Mon, 2 Jan 2023 18:21:46 +0530
Subject: [PATCH 0979/1358] Update idp-default.properties

changing mosip.idp.access-token-expire-seconds 7200 to 600
---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 439cc451fe4..c4af2ced7eb 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -57,7 +57,7 @@ mosip.idp.supported-id-regex=\\S*
 mosip.idp.reqtime.leeway-minutes=2
 
 #Id and access token validity intervals
-mosip.idp.access-token-expire-seconds=7200
+mosip.idp.access-token-expire-seconds=600
 mosip.idp.id-token-expire-seconds=7200
 
 ## link transaction

From c3664b1027f9e318f7a5b8a2ab55c8c965ce16c2 Mon Sep 17 00:00:00 2001
From: Madhunagesh1 <96459628+Madhunagesh1@users.noreply.github.com>
Date: Mon, 2 Jan 2023 18:47:13 +0530
Subject: [PATCH 0980/1358] Update idp-default.properties

reverted the changes mosip.idp.access-token-expire-seconds=7200
---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index c4af2ced7eb..439cc451fe4 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -57,7 +57,7 @@ mosip.idp.supported-id-regex=\\S*
 mosip.idp.reqtime.leeway-minutes=2
 
 #Id and access token validity intervals
-mosip.idp.access-token-expire-seconds=600
+mosip.idp.access-token-expire-seconds=7200
 mosip.idp.id-token-expire-seconds=7200
 
 ## link transaction

From f3ac2615ea1e13a84fc43799055d445276b6e37e Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Tue, 3 Jan 2023 14:37:59 +0530
Subject: [PATCH 0981/1358] MOSIP-25353 Added Resident roles to master data
 api.

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 6a1f2053f5a..ae7b418c4f0 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -586,14 +586,14 @@ mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_A
 mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
 mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
 mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
 mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN

From 3cec75a7cd484f9a39ca8640bc7b7f7615badd19 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Tue, 3 Jan 2023 14:41:13 +0530
Subject: [PATCH 0982/1358] Update registration-processor-default.properties

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 656073b40a0..2ec7ff5ebc2 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -960,7 +960,7 @@ object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
 # Roles
-mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN
+mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,RESIDENT
 mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
 mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
 mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT

From c002800cc0c5fdfb741605d3f170acd913508f72 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Tue, 3 Jan 2023 16:37:25 +0530
Subject: [PATCH 0983/1358] MOSIP-25353 Added Resident roles to get rid status
 api.

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2ec7ff5ebc2..2e22683168f 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -960,7 +960,7 @@ object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
 # Roles
-mosip.role.registration.getGetsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,RESIDENT
+mosip.role.registration.getsearchrid=REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,RESIDENT
 mosip.role.registration.getPostauth=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR
 mosip.role.registration.getGetgetcertificate=INDIVIDUAL,REGISTRATION_PROCESSOR,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN
 mosip.role.registration.getPostpacketexternalstatus=REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT

From d65c26710afb2f95dfdd7b7ddbfbe5da8fd44a04 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Wed, 10 Aug 2022 16:03:20 +0530
Subject: [PATCH 0984/1358] Updated abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 6129f3d6c9fe9007a4abc0328749abd780e4421b Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 11 Aug 2022 16:07:26 +0530
Subject: [PATCH 0985/1358] Updated abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 72096163e087c5c8dd1a61540165a8ff06bc4a30 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 16 Aug 2022 16:01:27 +0530
Subject: [PATCH 0986/1358] Update print-default.properties

---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index c40bcd4c3a2..f2c1f7fbb0c 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -122,4 +122,4 @@ mosip.print.crypto.p12.password=password@123
 mosip.print.crypto.p12.alias=partner
 
 # verifiable credential
-mosip.print.verify.credentials.flag=false
+mosip.print.verify.credentials.flag=true

From d3aeaaa07ab667eb21bf451555aec93bdd406313 Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 17 Aug 2022 16:21:08 +0530
Subject: [PATCH 0987/1358] logging.level.io.mosip

changed above property value from INFO to DEBUG
---
 print-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/print-default.properties b/print-default.properties
index f2c1f7fbb0c..bbe922cf1f6 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -74,7 +74,7 @@ mosip.kernel.tokenid.length=36
 
 ## log level
 logging.level.root=INFO
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## tomcat access logs

From dd97095a4ac1c1e72fddcd2a4c390d887a9f31db Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 19 Aug 2022 19:09:48 +0530
Subject: [PATCH 0988/1358] [DSD-1352] updated the languages

---
 admin-default.properties        | 2 +-
 application-default.properties  | 9 ++++-----
 mimoto-default.properties       | 4 ++--
 print-default.properties        | 4 ++--
 resident-app-default.properties | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4174179c65a..060e1902f95 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -71,7 +71,7 @@ mosip.admin.security.policy.userrole-auth-url=${mosip.kernel.authmanager.url}/v1
 
 ## Masterdata cards
 
-mosip.admin.masterdata.lang-code=eng,ara,fra
+mosip.admin.masterdata.lang-code=eng,ara
 mosip.admin-services.required.roles=GLOBAL_ADMIN
 
 #masterdata machine
diff --git a/application-default.properties b/application-default.properties
index efaa89ce00a..605caf4484a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -92,7 +92,7 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng
 
@@ -277,7 +277,6 @@ mosip.kernel.virus-scanner.port=3310
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
 mosip.kernel.transliteration.english-language-code=eng
-mosip.kernel.transliteration.french-language-code=fra
 
 ## DOB
 mosip.default.dob.month=01
@@ -412,11 +411,11 @@ websub.publish.url=${mosip.websub.url}/hub/
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
 mosip.optional-languages=ara
-mosip.min-languages.count=2
-mosip.max-languages.count=3
+mosip.min-languages.count=1
+mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara,fra
+mosip.default.template-languages=eng,ara
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 77cf8701915..ce8fde91263 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
diff --git a/print-default.properties b/print-default.properties
index bbe922cf1f6..d993652f9d7 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -55,9 +55,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 ## CBEFF util
diff --git a/resident-app-default.properties b/resident-app-default.properties
index 8c45381053b..6052fac3a49 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,7 +96,7 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
 mosip.optional-languages=ara,fra

From f851c9588f9ca5e7f436ca36de159658caf394d5 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 19 Aug 2022 19:11:28 +0530
Subject: [PATCH 0989/1358] [DSD-1352] removed fra lang

---
 resident-app-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index 6052fac3a49..dcf8f091b70 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -99,7 +99,7 @@ registration.processor.signature.isEnabled=true
 mosip.supported-languages=eng,ara
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 2e3c107bbeea7f7ae78cbe9edf4e25a02a5d6066 Mon Sep 17 00:00:00 2001
From: Rakshith650 <rakshitham38@gmail.com>
Date: Fri, 19 Aug 2022 21:47:37 +0530
Subject: [PATCH 0990/1358] [DSD-1352] removed semi colon from prop file

---
 websub-consolidator.toml | 3 ++-
 websub-service.toml      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index cb3258ff7c4..fad8956b0ed 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -22,6 +22,7 @@ POLLING_INTERVAL = 10.0
 # The period in which Kafka close method waits to complete
 GRACEFUL_CLOSE_PERIOD = 5.0
 
+CURRENT_WORKING_DIR = "user.dir"
 
 # The disk space threshold for healthcheck
 DISK_SPACE_THRESHOLD = 10485760
@@ -30,4 +31,4 @@ DISK_SPACE_THRESHOLD = 10485760
 CONSOLIDATOR_PORT = 9192
 
 # consolidator health endpoint
-CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
\ No newline at end of file
+CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
diff --git a/websub-service.toml b/websub-service.toml
index 3d4a1aab78c..913c2a1db48 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -55,6 +55,8 @@ DISK_SPACE_THRESHOLD = 10485760
 PARTNER_USER_ID_PREFIX = "service-account-"
 
 
+CURRENT_WORKING_DIR = "user.dir"
+
 # The period between retry requests
 INTENT_VERIFICATION_RETRY_INTERVAL = 3.0
 
@@ -91,4 +93,4 @@ console = true              # Default is false
 
 [ballerina.http.traceLogAdvancedConfig]
 # Enable printing trace logs in console
-console = false              # Default is false
\ No newline at end of file
+console = false              # Default is false

From 6ca4871ba583a9a61f86ac0f97d25b6149c158de Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Sun, 21 Aug 2022 23:36:38 +0530
Subject: [PATCH 0991/1358] Update websub-service.toml

---
 websub-service.toml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/websub-service.toml b/websub-service.toml
index 913c2a1db48..7ebf864c3f9 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -86,11 +86,3 @@ CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
 CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
-
-[ballerina.http.accessLogConfig]
-# Enable printing access logs in console
-console = true              # Default is false
-
-[ballerina.http.traceLogAdvancedConfig]
-# Enable printing trace logs in console
-console = false              # Default is false

From 0b0fd943753aaecb65778098409d8a5eae8a12cb Mon Sep 17 00:00:00 2001
From: urviljoshi <urvvil08@gmail.com>
Date: Mon, 22 Aug 2022 00:33:38 +0530
Subject: [PATCH 0992/1358] removed working dir as it has to be same

---
 websub-consolidator.toml | 1 -
 websub-service.toml      | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/websub-consolidator.toml b/websub-consolidator.toml
index fad8956b0ed..1076b3907f5 100644
--- a/websub-consolidator.toml
+++ b/websub-consolidator.toml
@@ -22,7 +22,6 @@ POLLING_INTERVAL = 10.0
 # The period in which Kafka close method waits to complete
 GRACEFUL_CLOSE_PERIOD = 5.0
 
-CURRENT_WORKING_DIR = "user.dir"
 
 # The disk space threshold for healthcheck
 DISK_SPACE_THRESHOLD = 10485760
diff --git a/websub-service.toml b/websub-service.toml
index 7ebf864c3f9..b55b5112e2a 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -48,6 +48,15 @@ MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"
 
+[ballerina.http.accessLogConfig]
+# Enable printing access logs in console
+console = true              # Default is false
+
+[ballerina.http.traceLogAdvancedConfig]
+# Enable printing trace logs in console
+console = false              # Default is false
+
+
 # The token validation URL of IDP
 DISK_SPACE_THRESHOLD = 10485760
 

From d5cba8be45bba30345d1b75b32c2a9717d20db96 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Mon, 22 Aug 2022 09:12:50 +0530
Subject: [PATCH 0993/1358] Update websub-service.toml

---
 websub-service.toml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/websub-service.toml b/websub-service.toml
index b55b5112e2a..913c2a1db48 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -48,15 +48,6 @@ MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"
 # The token validation URL of IDP
 MOSIP_AUTH_VALIDATE_TOKEN_URL = "/authorize/admin/validateToken"
 
-[ballerina.http.accessLogConfig]
-# Enable printing access logs in console
-console = true              # Default is false
-
-[ballerina.http.traceLogAdvancedConfig]
-# Enable printing trace logs in console
-console = false              # Default is false
-
-
 # The token validation URL of IDP
 DISK_SPACE_THRESHOLD = 10485760
 
@@ -95,3 +86,11 @@ CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 
 # consolidator health endpoint
 CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
+
+[ballerina.http.accessLogConfig]
+# Enable printing access logs in console
+console = true              # Default is false
+
+[ballerina.http.traceLogAdvancedConfig]
+# Enable printing trace logs in console
+console = false              # Default is false

From ba9250af7e3d442bfd201541af796be0faa83bfc Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Wed, 24 Aug 2022 19:07:34 +0530
Subject: [PATCH 0994/1358] cipher password doesnot work | workaround

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index ce8fde91263..76329816669 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -35,7 +35,7 @@ mosip.event.secret=Kslk30SNF2AChs2
 
 
 mosip.partner.crypto.p12.filename=keystore.p12
-mosip.partner.crypto.p12.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.crypto.p12.password=abc123
 mosip.partner.crypto.p12.alias=partner
 mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 mosip.partner.prependThumbprint=true

From 74f95561ba13d9c27d0e8064fef6bb98abad64ae Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 25 Aug 2022 15:44:46 +0530
Subject: [PATCH 0995/1358] Updated abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From dbb7fc5c029e80ffeefadd92043eabcd612d120f Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 29 Aug 2022 12:27:15 +0530
Subject: [PATCH 0996/1358] Reverted abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 8f6df66e683041ae6c6cd29a783f75bd50942308 Mon Sep 17 00:00:00 2001
From: santhoshsunder <102220709+santhoshsunder@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:21:43 +0530
Subject: [PATCH 0997/1358] testing

deleted
---
 mosip-context.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mosip-context.json b/mosip-context.json
index 4da43560e8f..6d7a162b625 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -22,10 +22,6 @@
     "city": {
         "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
-    },
-     "gender": {
-        "@id": "https://${mosip.api.public.host}/mosip#gender",
-        "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
         "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",

From 40d8e5675fc106aa4693cdb9edace62d62e42553 Mon Sep 17 00:00:00 2001
From: santhoshsunder <102220709+santhoshsunder@users.noreply.github.com>
Date: Mon, 29 Aug 2022 19:49:57 +0530
Subject: [PATCH 0998/1358] reverting back the changes

---
 mosip-context.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mosip-context.json b/mosip-context.json
index 6d7a162b625..4da43560e8f 100644
--- a/mosip-context.json
+++ b/mosip-context.json
@@ -22,6 +22,10 @@
     "city": {
         "@id": "https://${mosip.api.public.host}/mosip#city",
         "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+     "gender": {
+        "@id": "https://${mosip.api.public.host}/mosip#gender",
+        "@context": {"value": "rdf:value", "lang": "@language"}
     },
      "residenceStatus": {
         "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",

From e14581837471063beeffe2ebe1bd2a967910796d Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 14 Sep 2022 11:42:19 +0530
Subject: [PATCH 0999/1358] mosip.kernel.mail.content.html.enable=true

Added above property for getting correct email format
---
 kernel-default.properties | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ae7b418c4f0..2632b4a4931 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -55,9 +55,9 @@ spring.mail.username=${email.smtp.username}
 spring.mail.password=${email.smtp.secret}
 spring.mail.port=${email.smtp.port}
 spring.mail.properties.mail.transport.protocol=smtp
-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.properties.mail.smtp.starttls.required=true
+spring.mail.properties.mail.smtp.starttls.enable=true
+spring.mail.properties.mail.smtp.auth=true
 spring.mail.debug=false
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=5MB
@@ -737,3 +737,4 @@ auth.allowed.urls=http://localhost:5000/
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF]
 
+management.health.mail.enabled=true

From 4065e7a2a3f826b62d891152438b1b86aeb390b1 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:53:10 +0530
Subject: [PATCH 1000/1358] Updated mosip.default.template-languages=eng

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 605caf4484a..eea97ab0815 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -415,7 +415,7 @@ mosip.min-languages.count=1
 mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara
+mosip.default.template-languages=eng
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang

From e29a4e866b5c35f53ad911a290a93989e201295a Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Wed, 14 Sep 2022 17:28:24 +0530
Subject: [PATCH 1001/1358] Reverted back the changes to
 mosip.default.template-languages=eng, ara

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index eea97ab0815..605caf4484a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -415,7 +415,7 @@ mosip.min-languages.count=1
 mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng
+mosip.default.template-languages=eng,ara
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang

From c8320c3aaa600816a72049bd8eeb6ab00e875507 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:41:26 +0530
Subject: [PATCH 1002/1358] Updating abis.return.duplicate to true

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..24d8220a166 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=false
+abis.return.duplicate=true
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From d92a77f8367811588609da1980f000cc28c8b9d6 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 16 Sep 2022 11:30:45 +0530
Subject: [PATCH 1003/1358] updated abis.return.duplicate to false

---
 mock-abis-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index 24d8220a166..c0eb32d2b49 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -7,7 +7,7 @@ spring.application.name=mock-abis-service
 management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
-abis.return.duplicate=true
+abis.return.duplicate=false
 secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 secret_url.clientnId=mosip-regproc-client
 secret_url.id=string

From 90289c0690c701c1f2448527f3640b98c3e6853c Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Fri, 16 Sep 2022 14:08:53 +0530
Subject: [PATCH 1004/1358] Changing reprocess elapse time and MockMV decision

Changing reprocess elapse time to 3600 and mock mv decision to REJECTED
---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2e22683168f..1b9e90999b8 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -291,7 +291,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=300
+registration.processor.reprocess.elapse.time=3600
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron
@@ -848,7 +848,7 @@ mosip.regproc.packet.classifier.tagging.idobject-data-availability.availability-
 
 ## Mock Manual Verification Properties 
 # Based on value of below parameter the packets are passed or rejected. Required values are [APPROVED or REJECTED]
-mock.mv.decision=APPROVED 
+mock.mv.decision=REJECTED 
 
 # salt generation properties
 mosip.regproc.db.url=${javax.persistence.jdbc.url}

From d22c97cf3fd629cc60371f1a5206966596a829da Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 22 Sep 2022 18:58:28 +0530
Subject: [PATCH 1005/1358] Update reprocess elapse time to 900

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1b9e90999b8..8d38e836a79 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -291,7 +291,7 @@ registration.processor.reprocess.limit=500
 registration.processor.pause.packets.for.backpressure=true
 # The reprocessor scheduler configurations
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
-registration.processor.reprocess.elapse.time=3600
+registration.processor.reprocess.elapse.time=900
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
 registration.processor.reprocess.attempt.count=300
 registration.processor.reprocess.type=cron

From 0c5d4088cc77db708c9d066b913a6510b05fa7d6 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Mon, 3 Oct 2022 16:30:05 +0530
Subject: [PATCH 1006/1358] [DSD-1491]decreased otp expiry time

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 605caf4484a..8aa05f0a98e 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -252,7 +252,7 @@ mosip.kernel.otp.default-length=6
 ## Default crypto function: HmacSHA512, HmacSHA256, HmacSHA1.
 mosip.kernel.otp.mac-algorithm=HmacSHA512
 ## OTP expires after the given time (in seconds).
-mosip.kernel.otp.expiry-time=180
+mosip.kernel.otp.expiry-time=60
 ## Key is frozen for the given time (in seconds).
 mosip.kernel.otp.key-freeze-time=1800
 ## Number of validation attempts allowed.

From f3f5c2c867673ca8a7539280f9a9a57615ee2936 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Mon, 31 Oct 2022 12:47:15 +0530
Subject: [PATCH 1007/1358] Fix for DDL execution in credential request
 generator on startup

Fix for DDL execution in credential request generator on startup
---
 id-repository-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index ca8efa6d295..c66ecd2c127 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -242,7 +242,8 @@ mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.d
 mosip.credential.service.jdbc.user=credentialuser
 mosip.credential.service.jdbc.password=${db.dbuser.password}
 mosip.credential.service.jdbc.driver=org.postgresql.Driver
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=none
+spring.jpa.hibernate.ddl-auto=none
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
 hibernate.show_sql=false

From aade8f2dd2d825a467bbd2cbad69bff4f694bc87 Mon Sep 17 00:00:00 2001
From: M1022006 <sowmya.goudar@mindtree.com>
Date: Wed, 2 Nov 2022 17:42:30 +0530
Subject: [PATCH 1008/1358] MOSIP-24284 config changes

---
 id-repository-default.properties | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index c66ecd2c127..5acc8f9a85c 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -266,17 +266,12 @@ mosip.credential.request.crypto-ref-id=credential_request
 mosip.credential.request.job.timedelay=15000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
-# This property can be set to auth,print or keep it empty so batch will pick up all records#
-credential.request.type=auth
 credential.request.retry.max.count=10
 credential.request.reprocess.statuscodes=FAILED,RETRY
-credential.batch.core.pool.size=10
-credential.batch.max.pool.size=10
-credential.batch.queue.capacity=10
 credential.batch.page.size=10
-credential.batch.chunk.size=10
 credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
+credential.batch.status=NEW
 
 ## Rest services
 CRDENTIALSERVICE=${mosip.idrepo.credential.service.url}/v1/credentialservice/issue

From e32b5b1b6e91082a08a17f09e33dc8698c0f9018 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 2 Nov 2022 20:19:36 +0530
Subject: [PATCH 1009/1358] added the missing prop

---
 id-repository-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 5acc8f9a85c..9fe682e80a6 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -415,3 +415,5 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
+
+credential.request.type=auth

From 786ade2a0894786693b24b701833e309cd0e4214 Mon Sep 17 00:00:00 2001
From: M1022006 <sowmya.goudar@mindtree.com>
Date: Thu, 3 Nov 2022 09:58:01 +0530
Subject: [PATCH 1010/1358] MOSIP-24284 removed unused property

---
 id-repository-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 9fe682e80a6..5acc8f9a85c 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -415,5 +415,3 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
-
-credential.request.type=auth

From db6e57246af2f3872cf22bc41f5a73e94e73a5e7 Mon Sep 17 00:00:00 2001
From: ase-101 <>
Date: Thu, 5 Jan 2023 17:05:19 +0530
Subject: [PATCH 1011/1358] Fixed review comments

---
 id-authentication-default.properties | 4 ++--
 idp-default.properties               | 8 ++++----
 mimoto-default.properties            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d5fadb9834a..e3910a38aef 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -560,7 +560,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://idp.qa-1201-b2.mosip.net
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.idp.host}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
@@ -618,6 +618,6 @@ mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SU
 #logging.level.root=DEBUG
 
 # Secret will be used during kyc token generation.
-mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
+mosip.ida.kyc.token.secret=${mosip_ida_kyc_token_secret}
 kyc.token.expire.time.adjustment.seconds=300
 kyc.exchange.default.lang=eng
diff --git a/idp-default.properties b/idp-default.properties
index 439cc451fe4..169c8526d09 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -37,7 +37,7 @@ mosip.idp.security.auth.get-urls={'${server.servlet.path}/system-info/**' : { 'S
 # CSRF token check disabled endpoints
 mosip.idp.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,\
-  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus,\
+  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,\
   ${server.servlet.path}/system-info/**
 
 
@@ -45,9 +45,9 @@ mosip.idp.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.serv
 mosip.idp.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus
+  ${server.servlet.path}/v3/api-docs/**
 
-mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/amr-acr-mapping.json
+mosip.idp.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 
 #spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
@@ -140,7 +140,7 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/ida-partner.cer
+mosip.idp.authn.ida.cert-url=https://${mosip.api.host}/mosip-certs/ida-partner.cer
 mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 76329816669..472948e4bf1 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -35,7 +35,7 @@ mosip.event.secret=Kslk30SNF2AChs2
 
 
 mosip.partner.crypto.p12.filename=keystore.p12
-mosip.partner.crypto.p12.password=abc123
+mosip.partner.crypto.p12.password=${mosip_partner_crypto_p12_password}
 mosip.partner.crypto.p12.alias=partner
 mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 mosip.partner.prependThumbprint=true

From be10c34f4e94d08ad48bb30377add1f0113f685d Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Thu, 5 Jan 2023 17:12:23 +0530
Subject: [PATCH 1012/1358] [DSD-1951] updated the required properties for idp
 deployment

---
 id-authentication-default.properties | 4 ++++
 idp-claims-mapping.json              | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index d5fadb9834a..9061e2af96b 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -621,3 +621,7 @@ mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SU
 mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
 kyc.token.expire.time.adjustment.seconds=300
 kyc.exchange.default.lang=eng
+
+idp.amr-acr.mapping.json.filename=amr-acr-mapping.json
+mosip.idp.amr-acr.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${idp.amr-acr.mapping.json.filename} 
+idp.amr-acr.ida.mapping.property.source=${mosip.idp.amr-acr.mapping.json-uri}
diff --git a/idp-claims-mapping.json b/idp-claims-mapping.json
index 8cc700c8717..25ce4aa2ec6 100644
--- a/idp-claims-mapping.json
+++ b/idp-claims-mapping.json
@@ -16,10 +16,10 @@
       "attributeName":  "phone"
     },
     "picture": {
-      "attributeName":  "face"
+      "attributeName":  "photo"
     },
     "individual_id" : {
-      "attributeName":  "UIN,VID"
+      "attributeName":  "individual_id"
     },
     "address": {
       "attributeName":  "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"

From 93646e4f5d84b5d88e11779d409181b815cd5bb9 Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Thu, 5 Jan 2023 19:09:05 +0530
Subject: [PATCH 1013/1358] commend "CURRENT_WORKING_DIR"

---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 913c2a1db48..59728e25aa1 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -55,7 +55,7 @@ DISK_SPACE_THRESHOLD = 10485760
 PARTNER_USER_ID_PREFIX = "service-account-"
 
 
-CURRENT_WORKING_DIR = "user.dir"
+#CURRENT_WORKING_DIR = "user.dir"
 
 # The period between retry requests
 INTENT_VERIFICATION_RETRY_INTERVAL = 3.0

From eb10747e98d61d1d2a30907038b9ff1477d248dc Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Thu, 5 Jan 2023 19:38:14 +0530
Subject: [PATCH 1014/1358] [ DSD-1944 ] disabled auth for smtp

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ca0482a30ab..6e84ec6718e 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -55,9 +55,9 @@ spring.mail.username=${email.smtp.username}
 spring.mail.password=${email.smtp.secret}
 spring.mail.port=${email.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

From bf8384b2b2c125999f18e9c60e38a4aaa487ee78 Mon Sep 17 00:00:00 2001
From: pramod444 <pramodbelal8@gmail.com>
Date: Thu, 5 Jan 2023 19:45:26 +0530
Subject: [PATCH 1015/1358] [DSD-1860] updated resident-captcha properties in
 resident-default.properties.

---
 resident-default.properties | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 3f131e22d27..9133f209cf6 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -2,6 +2,8 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # keycloak.internal.url
+# resident.captcha.site.key
+# resident.captcha.secret.key
 # mosip.resident.client.secret
 # mosip.regproc.client.secret
 # keycloak.internal.url.
@@ -194,6 +196,15 @@ mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
 
+## Captcha service
+## Configuration for google re-captcha
+mosip.resident.captcha.enable=true
+mosip.resident.captcha.id.validate=mosip.resident.captcha.id.validate
+mosip.resident.captcha.sitekey=${resident.captcha.site.key}
+mosip.resident.captcha.secretkey=${resident.captcha.secret.key}
+mosip.resident.captcha.resourse.url=http://resident-captcha.resident/resident/v1/captcha/validatecaptcha
+mosip.resident.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
+
 
 #------------Request IDs---------------------
 # The request IDs used in Resident REST APIs
@@ -210,7 +221,7 @@ resident.view.history.status.filters=all,success,in-progress,failed
 
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id,mosip.captcha.sitekey,mosip.captcha.secretkey
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id
 
 
 

From bca2388fbe60fd63cf47266d7ee25418b477d4a0 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Thu, 5 Jan 2023 20:09:05 +0530
Subject: [PATCH 1016/1358] [DSD-1955] added the latest props to
 resident-default.properties

---
 resident-default.properties | 104 +++++++++++++++++++++++-------------
 1 file changed, 68 insertions(+), 36 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 9133f209cf6..f1439d52d27 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -26,6 +26,7 @@ resident.vid.get.id=mosip.resident.vid.get
 auth.type.status.id=mosip.identity.authtype.status.update
 resident.authlock.id=mosip.resident.authlock
 resident.checkstatus.id=mosip.resident.checkstatus
+resident.checkstatus.version=v1
 resident.euin.id=mosip.resident.euin
 resident.printuin.id=mosip.resident.printuin
 resident.uin.id=mosip.resident.uin
@@ -34,19 +35,20 @@ resident.updateuin.id=mosip.resident.updateuin
 resident.authunlock.id=mosip.resident.authunlock
 resident.authhistory.id=mosip.resident.authhistory
 resident.authLockStatusUpdateV2.id=mosip.resident.auth.lock.unlock
-resident.authLockStatusUpdateV2.version=v1
+resident.authLockStatusUpdateV2.version=1.0
 resident.service.history.id=mosip.service.history.get
 resident.service.history.version=1.0
+resident.document.upload.id=mosip.resident.document.upload
 resident.document.get.id=mosip.resident.document.get	
-resident.document.get.version=v1	
+resident.document.get.version=1.0
 resident.document.list.id=mosip.resident.document.list	
-resident.document.list.version=v1	
+resident.document.list.version=1.0
 resident.service.pin.status.id=mosip.resident.pin.status	
 resident.service.pin.status.version=v1	
 resident.service.unpin.status.id=mosip.resident.unpin.status	
 resident.service.unpin.status.version=v1	
 resident.document.delete.id=mosip.resident.document.delete	
-resident.document.delete.version=v1
+resident.document.delete.version=1.0
 resident.contact.details.update.id=mosip.resident.contact.details.update.id
 resident.contact.details.send.otp.id=mosip.resident.contact.details.send.otp.id
 mosip.resident.service.status.check.id=mosip.registration.external.status
@@ -62,12 +64,22 @@ mosip.resident.request.response.version=1.0
 vid.revoke.id=mosip.vid.update
 resident.revokevid.id=mosip.resident.vidstatus
 mosip.resident.revokevid.id=mosip.resident.vid.revoke
+mosip.resident.grievance.ticket.request.id=mosip.resident.grievance.ticket.request
+mosip.resident.grievance.ticket.request.version=1.0
 PARTNER_REFERENCE_Id=mpartner-default-resident
 mosip.resident.transliteration.transliterate.id=mosip.resident.transliteration.transliterate
 APPLICATION_Id=RESIDENT
 DECRYPT_API_URL=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 mosip-prereg-host=${mosip.prereg.host}
 mosip-prereg-ui-url=https://${mosip-prereg-host}/pre-registration-ui/
+resident.ui.properties.id=resident.ui.properties
+resident.ui.properties.version=1.0
+resident.channel.verification.status.id=mosip.resident.channel.verification.status
+resident.channel.verification.status.version=1.0
+resident.event.ack.download.id=mosip.resident.event.ack.download
+resident.event.ack.download.version=1.0
+resident.download.card.eventid.id =mosip.resident.download.card.eventid
+resident.download.card.eventid.version=1.0
 
 ## Token generation
 token.request.id=io.mosip.resident
@@ -123,6 +135,8 @@ WORKING_DAYS_BY_REGISTRATION_ID=${MASTER}/workingdays/{registrationCenterID}/{la
 LATEST_ID_SCHEMA_URL =${MASTER}/idschema/latest
 TEMPLATES_BY_LANGCODE_AND_TEMPLATETYPECODE_URL=${MASTER}/templates/{langcode}/{templatetypecode}
 GENDER_TYPE_BY_LANGCODE=${MASTER}/gendertypes/{langcode}
+DOCUMENT_TYPE_BY_DOCUMENT_CATEGORY_AND_LANG_CODE=${MASTER}/documenttypes/{documentcategorycode}/{langcode}
+
 
 # DMZ service call
 SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
@@ -148,7 +162,7 @@ mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanag
 RETRIEVE_VIDS=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin/
 
 #IdRepo Service calls
-IDREPO_IDENTITY_UPDATE_COUNT=${mosip.idrepo.identity.url}/idrepository/v1/identity/update-count
+IDREPO_IDENTITY_UPDATE_COUNT=${mosip.idrepo.identity.url}/idrepository/v1/identity/{individualId}/update-counts
 
 
 ## Config data
@@ -173,7 +187,7 @@ token.request.secretKey=${mosip.resident.client.secret}
 objectstore.adapter.name=PosixAdapter
 
 #TODO remove reg-client service accunt in production env
-auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client,mosip-resident-service-client-idp
+auth.server.admin.allowed.audience=mosip-resident-client,mosip-reg-client,${mosip.iam.module.clientID}
 
 #Mapping Identity json to map with the applicant id json
 registration.processor.identityjson=identity-mapping.json
@@ -190,7 +204,7 @@ mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 
 mosip.service-context=/resident/v1
 ## The exclusion list of URL patterns that should not be part of authentication and authorization
-mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/get-individual-id,/**/req/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registrationcenters/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user
+mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/get-individual-id,/**/req/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registrationcenters/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user,/**/status/individualId/**
 
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
@@ -221,7 +235,7 @@ resident.view.history.status.filters=all,success,in-progress,failed
 
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,resident.contact.details.update.id,resident.contact.details.send.otp.id
 
 
 
@@ -240,7 +254,10 @@ javax.persistence.jdbc.url=jdbc:postgresql://${mosip.resident.database.hostname}
 javax.persistence.jdbc.user=residentuser
 javax.persistence.jdbc.password=${db.dbuser.password}
 
-auth.allowed.urls=https://${mosip.resident.host}/,https://${mosip.resident.host}/resident-ui/
+
+
+
+auth.allowed.urls=https://${mosip.resident.host}/,https://${mosip.resident.host}/resident-ui/,https://${mosip.resident.host}/resident-ui/**
 
 
 # IAM
@@ -250,33 +267,36 @@ mosip.iam.module.login_flow.name=authorization_code
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
 ################## MOSIP IdP config
-#mosip.iam.module.clientID=mosip-resident-service-client-idp
-#mosip.iam.module.clientsecret=
-#mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
-#mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
-#mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
-#mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
-#mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json
-#auth.server.admin.issuer.uri=${mosip.iam.base.url}
-#auth.server.admin.issuer.domain.validate=true
-#auth.server.admin.oidc.userinfo.url=${mosip.iam.userinfo_endpoint}
-#mosip.iam.module.token.endpoint.private-key-jwt.auth.enabled=true
-#mosip.iam.module.token.endpoint.private-key-jwt.expiry.seconds=7200
-#mosip.resident.oidc.userinfo.jwt.signed=true
+mosip.iam.module.clientID=yDHDuozxkePAN340NtmazlDVmrRMkY4z6zH658zYBgI
+mosip.iam.module.clientsecret=
+mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
+mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
+mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
+mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
+mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json
+auth.server.admin.issuer.uri=${mosip.iam.base.url}
+auth.server.admin.issuer.domain.validate=true
+auth.server.admin.oidc.userinfo.url=${mosip.iam.userinfo_endpoint}
+mosip.iam.module.token.endpoint.private-key-jwt.auth.enabled=true
+mosip.iam.module.token.endpoint.private-key-jwt.expiry.seconds=7200
+mosip.resident.oidc.userinfo.jwt.signed=true
 # AuthAdaptor ValdidateTokenHelper: This property will directly apply the certs URL without need for constructing the path from issuer URL.
 # This is useful to keep a different certs URL for integrating with MOSIP IdP for offline token validation.
-#auth.server.admin.oidc.certs.url=${mosip.iam.certs_endpoint}
+auth.server.admin.oidc.certs.url=${mosip.iam.certs_endpoint}
+mosip.iam.logout.offline=true
+auth.server.admin.validate.url=
+mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 ################### MOSIP IdP config ends
 
 ################### Mock-keycloak IdP config
-mosip.iam.module.clientID=mosip-resident-client
-mosip.iam.module.clientsecret=${mosip.resident.client.secret}
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
-mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
-mosip.iam.userinfo_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/userinfo
-mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
-mosip.iam.module.token.endpoint.private-key-jwt.auth.enabled=false
-mosip.resident.oidc.userinfo.jwt.signed=false
+#mosip.iam.module.clientID=mosip-resident-client
+#mosip.iam.module.clientsecret=${mosip.resident.client.secret}
+#mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
+#mosip.iam.token_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/token
+#mosip.iam.userinfo_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/userinfo
+#mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+#mosip.iam.module.token.endpoint.private-key-jwt.auth.enabled=false
+#mosip.resident.oidc.userinfo.jwt.signed=false
 ################### Mock-keycloak IdP config ends
 ###########################################################
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
@@ -626,7 +646,7 @@ otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
 auth.validate.id-token=true
 
 mosip.resident.download.uin.card=mosip.resident.download.uin.card
-GET_RID_BY_INDIVIDUAL_ID=${mosip.idrepo.identity.url}/idrepository/v1/identity/get-rid/{individualId}
+GET_RID_BY_INDIVIDUAL_ID=${mosip.idrepo.identity.url}/idrepository/v1/identity/rid/{individualId}
 
 mosip.resident.access_token.auth_mode.claim-name=acr
 mosip.resident.oidc.id_token.ida_token.claim-name=sub
@@ -638,7 +658,8 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claim={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+
 resident.identity.schematype.with.photo=personalized-card
 
 #Rectangle coordinates for pfd signataured data
@@ -660,7 +681,7 @@ mosip.resident.sign.pdf.reference.id=SIGN
 mosip.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
 
 # request id for download personalized card
-mosip.resident.download.personalized.card=mosip.resident.euin
+mosip.resident.download.personalized.card=mosip.resident.download.personalized.card
 #method name to create password
 resident.create.password.method.name=getPassword
 #File name for the downloaded personalized card.  "eventId" and "timestamp" are configurable. If they are removed from below property then they will be removed from file name also.
@@ -676,8 +697,8 @@ mosip.resident.ack.order_physical_card.name.convention=Ack_order_physical_card_{
 mosip.resident.ack.name.convention=Ack_{eventId}_{timestamp}
 mosip.resident.uin.card.name.convention=UIN_{eventId}_{timestamp}
 mosip.resident.vid.card.name.convention=VID_{eventId}_{timestamp}
-mosip.resident.download.nearest.registration.centre.file.name.convention=Registration_centers_{timestamp}
 mosip.resident.download.service.history.file.name.convention=View_history_{timestamp}
+mosip.resident.download.nearest.registration.centre.file.name.convention=Registration_centers_{timestamp}
 
 mosip.resident.request.credential.credentialType=euin
 mosip.resident.request.credential.isEncrypt=true
@@ -691,6 +712,8 @@ mosip.credential.issuer=mpartner-default-digitalcard
 mosip.resident.name.token.claim-name=name
 mosip.resident.photo.token.claim-photo=picture
 mosip.resident.individual.id.claim.name=individual_id
+mosip.resident.email.token.claim-email=email
+mosip.resident.phone.token.claim-phone=phone_number
 
 mosip.resident.applicant.name.property=applicantName
 mosip.resident.photo.attribute.name=photo
@@ -702,4 +725,13 @@ mosip.credential.request.service.version=1.0
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes)
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=10
\ No newline at end of file
+otp.request.flooding.max-count=10
+mosip.resident.message.code.maximum.length=1024
+
+GET_RID_STATUS=${mosipbox.public.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
+sequence-order=Request received, Validation stage, Verification stage, Uin generation stage, Card ready to download
+
+mosip.resident.checkstatus.individualid.id=mosip.resident.checkstatus.individualid
+mosip.resident.checkstatus.individualid.version=1.0
+
+resident.additional.identity.attribute.to.fetch=UIN,email,phone,dob,name,photo
\ No newline at end of file

From 48aa7b31c943681795249611e4c7c2c1c632b3e9 Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Thu, 5 Jan 2023 20:15:11 +0530
Subject: [PATCH 1017/1358] [  DSD-1944 ] added missing properties

---
 id-repository-default.properties | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 5acc8f9a85c..1151d138c6d 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -120,6 +120,12 @@ mosip.idrepo.vid.deactive-status=DEACTIVATED
 # VID status value which is stored in database for reactivated VIDs. Used in reactivate-all-vids api.
 mosip.idrepo.vid.reactive-status=ACTIVE
 
+#RID
+# Application version expected in the request
+mosip.idrepo.rid.get.version=1.0
+# Application ids expected in the requests
+mosip.idrepo.rid.get.id=mosip.idrepo.rid.get
+
 # Config server url
 mosip.idrepo.mosip-config-url=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 # VID policy schema against which VID policy is validated
@@ -261,17 +267,22 @@ mosip.credential.request.service.version=1.0
 # Reference Id which is used for encryption/decryption of credential request using keymanager
 mosip.credential.request.crypto-ref-id=credential_request
 
-## Batch job
+	## Batch job
 # batch job time intervel in miliseconds
 mosip.credential.request.job.timedelay=15000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
+# This property can be set to auth,print or keep it empty so batch will pick up all records#
+credential.request.type=auth
 credential.request.retry.max.count=10
 credential.request.reprocess.statuscodes=FAILED,RETRY
+credential.batch.core.pool.size=10
+credential.batch.max.pool.size=10
+credential.batch.queue.capacity=10
 credential.batch.page.size=10
+credential.batch.chunk.size=10
 credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
-credential.batch.status=NEW
 
 ## Rest services
 CRDENTIALSERVICE=${mosip.idrepo.credential.service.url}/v1/credentialservice/issue

From 6cc37229640575c692518ef795308b3f658cb3ea Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Thu, 5 Jan 2023 20:42:51 +0530
Subject: [PATCH 1018/1358] [ DSD-1944 ] added properties for ida

---
 id-authentication-default.properties | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index e3910a38aef..a56dfad4ef1 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -95,6 +95,10 @@ mosip.ida.request.mediaType=application/json
 ida.mapping.json.filename=identity-mapping.json
 mosip.ida.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${ida.mapping.json.filename} 
 ida.mapping.property.source=url:${mosip.ida.mapping.json-uri}
+	
+idp.amr-acr.mapping.json.filename=amr-acr-mapping.json
+mosip.idp.amr-acr.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${idp.amr-acr.mapping.json.filename} 
+idp.amr-acr.ida.mapping.property.source=${mosip.idp.amr-acr.mapping.json-uri}
 
 # The attribute name in the Mapping Json used to fetch Anonymous profile preferred language attribute
 mosip.preferred.language.attribute.name=preferredLanguage
@@ -114,7 +118,7 @@ ida.id.attribute.separator.fullAddress=,
 ## Biosdk
 ## Url below assumes the biosdk server is running inside cluster in `biosdk` namespace 
 mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
-## For real biosdk
+# The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
 # The version of the BIO SDK API implemeted for Finger modality
@@ -417,7 +421,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 ## Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 ## Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureExceptionf
+kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
 ## Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -478,7 +482,7 @@ mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
 ## Partner Management Service allowed partner domains
-mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
+mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 
 # IAM Adapter 
 mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
@@ -539,8 +543,8 @@ ida.fetch.failed.websub.messages.chunk.size=10
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
-ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
-
+ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl
+ 
 ## Demo SDK integration
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0
 mosip.normalizer.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Normalizer_V_1_0

From e1ccb04aa90c165a832dbd8e83856ce993342842 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 6 Jan 2023 11:21:31 +0530
Subject: [PATCH 1019/1358] [DSD-1944] added DIGITAL_CARD to autogen keys list

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 6e84ec6718e..b60f725afdc 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -333,7 +333,7 @@ datastores=ldap_1_DS,db_1_DS,db_2_DS
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
 
 ## List of keys to auto generate.
-mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES
+mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD
 
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000

From 9214d63c660de3aa30a5b69ab10e9ebbace680cc Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Fri, 6 Jan 2023 12:01:44 +0530
Subject: [PATCH 1020/1358] [DSD-1958] Added BiometricsQualityCheckValidator to
 compliance-toolkit-default.properties

---
 compliance-toolkit-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 30b7c07da57..8344d83a3b0 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -189,3 +189,8 @@ openapi.group.paths[0]=/**
 springdoc.swagger-ui.disable-swagger-default-url=true
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
+
+#SBI BiometricsQualityCheckValidator
+mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
\ No newline at end of file

From e5a928f08dded1c087320247cb8ef5b66ab8c057 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <rakshitham38@gmail.com>
Date: Fri, 6 Jan 2023 12:01:44 +0530
Subject: [PATCH 1021/1358] [DSD-1958] Added BiometricsQualityCheckValidator to
 compliance-toolkit-default.properties

---
 compliance-toolkit-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index c990e4e691f..de33b3134c5 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -190,3 +190,8 @@ openapi.group.paths[0]=/**
 springdoc.swagger-ui.disable-swagger-default-url=true
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
+
+#SBI BiometricsQualityCheckValidator
+mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
\ No newline at end of file

From dcd93427258fcfd5f59e255f5d789c7204ad571f Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 6 Jan 2023 13:58:11 +0530
Subject: [PATCH 1022/1358] [ DSD-1944 ] Updated hsm keystore password variable

---
 idp-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-default.properties b/idp-default.properties
index 169c8526d09..fb0888ab611 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -219,7 +219,7 @@ mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 
 #mosip.kernel.keymanager.hsm.config-path=local.p12
 #mosip.kernel.keymanager.hsm.keystore-type=PKCS12
-#mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+#mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.security.pin}
 
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
 mosip.kernel.keymanager.hsm.keystore-type=PKCS11
@@ -229,7 +229,7 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.security.pin}
 
 
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io

From 1b7f3a2e533ed585825ae68ec50268e0ed9d2f4a Mon Sep 17 00:00:00 2001
From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Date: Fri, 6 Jan 2023 14:21:56 +0530
Subject: [PATCH 1023/1358] [DSD-1955]Updated mosip.iam.module.clientID  for
 IDP

---
 resident-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index f1439d52d27..770fa185aee 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -267,7 +267,7 @@ mosip.iam.module.login_flow.name=authorization_code
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
 ################## MOSIP IdP config
-mosip.iam.module.clientID=yDHDuozxkePAN340NtmazlDVmrRMkY4z6zH658zYBgI
+mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
 mosip.iam.module.clientsecret=
 mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
 mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
@@ -734,4 +734,4 @@ sequence-order=Request received, Validation stage, Verification stage, Uin gener
 mosip.resident.checkstatus.individualid.id=mosip.resident.checkstatus.individualid
 mosip.resident.checkstatus.individualid.version=1.0
 
-resident.additional.identity.attribute.to.fetch=UIN,email,phone,dob,name,photo
\ No newline at end of file
+resident.additional.identity.attribute.to.fetch=UIN,email,phone,dob,name,photo

From 44b5c3a0fe5cb5d98eaaae89bad5a0ca43a9e797 Mon Sep 17 00:00:00 2001
From: pramod444 <pramodbelal8@gmail.com>
Date: Fri, 6 Jan 2023 16:00:41 +0530
Subject: [PATCH 1024/1358] Updated resident-captcha properties in
 resident-default.properties.

---
 resident-default.properties | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 3f131e22d27..d49f5233752 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -2,6 +2,8 @@
 # DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 # helm chart:
 # keycloak.internal.url
+# resident.captcha.site.key
+# resident.captcha.secret.key
 # mosip.resident.client.secret
 # mosip.regproc.client.secret
 # keycloak.internal.url.
@@ -194,6 +196,15 @@ mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
 
+## Captcha service
+## Configuration for google re-captcha
+mosip.resident.captcha.enable=true
+mosip.resident.captcha.id.validate=mosip.resident.captcha.id.validate
+mosip.resident.captcha.sitekey=${resident.captcha.site.key}
+mosip.resident.captcha.secretkey=${resident.captcha.secret.key}
+mosip.resident.captcha.resourse.url=http://resident-captcha.resident/resident/v1/captcha/validatecaptcha
+mosip.resident.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
+
 
 #------------Request IDs---------------------
 # The request IDs used in Resident REST APIs
@@ -210,7 +221,7 @@ resident.view.history.status.filters=all,success,in-progress,failed
 
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id,mosip.captcha.sitekey,mosip.captcha.secretkey
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey
 
 
 

From 6a6710a5173eb8810f4855abb91fa0e68ac86d4c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 6 Jan 2023 16:25:04 +0530
Subject: [PATCH 1025/1358] [ DSD-1944 ] corrected api public domain name

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index fb0888ab611..951a5a09830 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -140,7 +140,7 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://${mosip.api.host}/mosip-certs/ida-partner.cer
+mosip.idp.authn.ida.cert-url=https://${mosip.api.public.host}/mosip-certs/ida-partner.cer
 mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/

From 11bbe0630851cac52e95998d0b9cd0058a3ea964 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 6 Jan 2023 18:42:18 +0530
Subject: [PATCH 1026/1358] [DSD-1944] updated licence key

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 951a5a09830..7c96dc6083b 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,7 +26,7 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=hVq9XOvlRokmkG23JL7wAJhEGM5ZzgO7Hnx3omJ1ghMap78nYh
+mosip.idp.misp.license.key=znBeKylIcyPFqFcu3wVrtzzgMn93q64L02Tkh2bijY9G8nGeAh
 
 # Secure endpoints with required authority
 mosip.idp.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \

From 5e83555b804d4234199eaca3678afac2c45cc8bb Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 9 Jan 2023 10:55:34 +0530
Subject: [PATCH 1027/1358] DSD-1963 : cipher passwords not working for private
 keys

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 77cf8701915..832e4d05603 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -35,7 +35,7 @@ mosip.event.secret=Kslk30SNF2AChs2
 
 
 mosip.partner.crypto.p12.filename=keystore.p12
-mosip.partner.crypto.p12.password={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.crypto.p12.password=abc123
 mosip.partner.crypto.p12.alias=partner
 mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 mosip.partner.prependThumbprint=true

From 2232165467ecc1ddc86c87b018e7fc00c8b9549c Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 11:51:08 +0530
Subject: [PATCH 1028/1358] MOSIP-25450 Changed partner manager end-point.

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 770fa185aee..6d47ff9724b 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -672,7 +672,7 @@ mosip.resident.service.uincard.signature.reason="Digitally Signed"
 PDFSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/pdf/sign
 
 # get partner details
-PARTNER_DETAILS_NEW_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/new
+PARTNER_DETAILS_NEW_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/v2
 
 #pdf signature appid & refId
 mosip.resident.sign.pdf.application.id=KERNEL

From 97882adb846919bd60038e4c604312066a51b873 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Wed, 11 Jan 2023 11:27:25 +0530
Subject: [PATCH 1029/1358] Update admin-default.properties

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 060e1902f95..4174179c65a 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -71,7 +71,7 @@ mosip.admin.security.policy.userrole-auth-url=${mosip.kernel.authmanager.url}/v1
 
 ## Masterdata cards
 
-mosip.admin.masterdata.lang-code=eng,ara
+mosip.admin.masterdata.lang-code=eng,ara,fra
 mosip.admin-services.required.roles=GLOBAL_ADMIN
 
 #masterdata machine

From 2687ec240c5d1b7a54ebbcdf66bf6bd73d6374c6 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Wed, 11 Jan 2023 11:35:44 +0530
Subject: [PATCH 1030/1358] MOSIP-25057

---
 registration-processor-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 656073b40a0..00dc791bdf7 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -18,7 +18,6 @@ packetmanager.base.url=http://packetmanager.packetmanager/commons
 
 ## Health check
 management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=info,health,refresh
 
 ## ABIS 
 # Maximum abis records to be fetched at a time

From f671512a3227aec0d33e05d4a28496f2628bb538 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Wed, 11 Jan 2023 11:40:46 +0530
Subject: [PATCH 1031/1358] Update application-default.properties

---
 application-default.properties | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 8aa05f0a98e..efaa89ce00a 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -92,7 +92,7 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng
 
@@ -252,7 +252,7 @@ mosip.kernel.otp.default-length=6
 ## Default crypto function: HmacSHA512, HmacSHA256, HmacSHA1.
 mosip.kernel.otp.mac-algorithm=HmacSHA512
 ## OTP expires after the given time (in seconds).
-mosip.kernel.otp.expiry-time=60
+mosip.kernel.otp.expiry-time=180
 ## Key is frozen for the given time (in seconds).
 mosip.kernel.otp.key-freeze-time=1800
 ## Number of validation attempts allowed.
@@ -277,6 +277,7 @@ mosip.kernel.virus-scanner.port=3310
 ## Transliteration
 mosip.kernel.transliteration.arabic-language-code=ara
 mosip.kernel.transliteration.english-language-code=eng
+mosip.kernel.transliteration.french-language-code=fra
 
 ## DOB
 mosip.default.dob.month=01
@@ -411,11 +412,11 @@ websub.publish.url=${mosip.websub.url}/hub/
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
 mosip.optional-languages=ara
-mosip.min-languages.count=1
-mosip.max-languages.count=2
+mosip.min-languages.count=2
+mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara
+mosip.default.template-languages=eng,ara,fra
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang

From 1c881949a4f94c31304778047060304addcf0233 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Wed, 11 Jan 2023 11:46:38 +0530
Subject: [PATCH 1032/1358] Update mimoto-default.properties

---
 mimoto-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 472948e4bf1..75e47f8afb4 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From df9331b474577bb24705190cbf25f40022746c88 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Wed, 11 Jan 2023 11:49:27 +0530
Subject: [PATCH 1033/1358] Update print-default.properties

---
 print-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/print-default.properties b/print-default.properties
index d993652f9d7..f2c1f7fbb0c 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -55,9 +55,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 mosip.template-language=eng
-mosip.optional-languages=ara
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 ## CBEFF util
@@ -74,7 +74,7 @@ mosip.kernel.tokenid.length=36
 
 ## log level
 logging.level.root=INFO
-logging.level.io.mosip=DEBUG
+logging.level.io.mosip=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## tomcat access logs

From 3aaaf8581eec3e2505501c6c9d0d410514ae5b70 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Wed, 11 Jan 2023 11:50:21 +0530
Subject: [PATCH 1034/1358] Update resident-app-default.properties

---
 resident-app-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resident-app-default.properties b/resident-app-default.properties
index dcf8f091b70..8c45381053b 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 4b10a9c0f3daf1476d87542c4e7f3e7f1661e0c2 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 16 Jan 2023 11:07:35 +0530
Subject: [PATCH 1035/1358] removing auth type lock finger for internal auth

removed io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 9061e2af96b..4da677bacca 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -539,7 +539,7 @@ ida.fetch.failed.websub.messages.chunk.size=10
 #Auth Filters for external auth
 ida.mosip.external.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.PartnerIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceProviderHotlistFilterImpl,io.mosip.authentication.hotlistfilter.impl.DeviceHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
 #Auth Filters for kyc auth
-ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl,io.mosip.authentication.authtypelockfilter.impl.AuthTypeLockFilterImpl
+ida.mosip.internal.auth.filter.classes.in.execution.order=io.mosip.authentication.hotlistfilter.impl.IndividualIdHotlistFilterImpl,io.mosip.authentication.childauthfilter.impl.ChildAuthFilterImpl
 
 ## Demo SDK integration
 mosip.demographic.sdk.api.classname=io.mosip.demosdk.client.impl.spec_1_0.Client_V_1_0

From 97f7df78187bc83eb6d5a03a7c210d41e24778f2 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 16 Jan 2023 11:54:44 +0530
Subject: [PATCH 1036/1358] MOSIP-23978 Added password enable property for pdf.
 (#3176)

---
 application-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index efaa89ce00a..3171d25e515 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -434,3 +434,7 @@ openapi.service.servers[0].url=${mosip.api.internal.url}${server.servlet.context
 openapi.service.servers[0].description=For Swagger
 
 mosip.auth.filter_disable=false
+
+# PDF Digital card is protected with password using below property based on define attribute it will encrypt by taking first 4 character.
+mosip.digitalcard.uincard.password=fullName|dateOfBirth
+mosip.digitalcard.pdf.password.enable.flag=true

From 814f046424d7030470d4ccecf4794d2d8392e005 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Tue, 17 Jan 2023 15:58:09 +0530
Subject: [PATCH 1037/1358] disabled captcha

mosip.preregistration.captcha.enable=false
---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index d200225b120..947813721e8 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -381,7 +381,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=true
+mosip.preregistration.captcha.enable=false
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}

From 1eafaf7a5fe7be59b0f5170d1139e22bddbc4e51 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:38:00 +0530
Subject: [PATCH 1038/1358] enable captcha

mosip.preregistration.captcha.enable=true
---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 947813721e8..d200225b120 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -381,7 +381,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=false
+mosip.preregistration.captcha.enable=true
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}

From d3cd0ebf5c60aef3c4589e55742157194ec2e120 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Tue, 17 Jan 2023 16:44:26 +0530
Subject: [PATCH 1039/1358] pre.reg.login.otp.validation-attempt-threshold=10

added new property pre.reg.login.otp.validation-attempt-threshold=10
---
 pre-registration-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index d200225b120..747add3880d 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -276,6 +276,7 @@ otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
 pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
+pre.reg.login.otp.validation-attempt-threshold=10
 
 ## Login service 
 mosip.preregistration.login.service.version=1.0

From 463baa2603d9f869b6176ad547f579e48d5ab625 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Tue, 17 Jan 2023 18:28:04 +0530
Subject: [PATCH 1040/1358] qa-1201-b2 env url added for finger quality check

---
 compliance-toolkit-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 8344d83a3b0..0a80ce167ec 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -191,6 +191,6 @@ springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
 #SBI BiometricsQualityCheckValidator
-mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
 mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
\ No newline at end of file
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]

From d01597a39232c69e15e5a19ac62c811c90d6cb95 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 17 Jan 2023 19:21:44 +0530
Subject: [PATCH 1041/1358] [ MOSIP-25730 ] [ DSD-1954 ] updated properties

id-authentication-default.properties
mimoto-default.properties
---
 id-authentication-default.properties | 2 +-
 mimoto-default.properties            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index a56dfad4ef1..dee72a8cbc3 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -622,6 +622,6 @@ mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SU
 #logging.level.root=DEBUG
 
 # Secret will be used during kyc token generation.
-mosip.ida.kyc.token.secret=${mosip_ida_kyc_token_secret}
+mosip.ida.kyc.token.secret=${mosip.ida.kyc.token.secret}
 kyc.token.expire.time.adjustment.seconds=300
 kyc.exchange.default.lang=eng
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 75e47f8afb4..b29c75cb8f2 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -35,9 +35,9 @@ mosip.event.secret=Kslk30SNF2AChs2
 
 
 mosip.partner.crypto.p12.filename=keystore.p12
-mosip.partner.crypto.p12.password=${mosip_partner_crypto_p12_password}
+mosip.partner.crypto.p12.password=${mosip.partner.crypto.p12.password}
 mosip.partner.crypto.p12.alias=partner
-mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.encryption.key=${mosip.partner.crypto.p12.password}
 mosip.partner.prependThumbprint=true
 
 

From 0defdf04de18d2c38cb2182598ca2d7a1f564d05 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 17 Jan 2023 19:56:40 +0530
Subject: [PATCH 1042/1358] [ MOSIP-25730 ] [ DSD-1954 ] updated properties

id-authentication-default.properties
mimoto-default.properties
removed ida-partner.cer
---
 id-authentication-default.properties |  4 ++--
 ida-partner.cer                      | 22 ----------------------
 mimoto-default.properties            |  4 ++--
 3 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 ida-partner.cer

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4da677bacca..0d585b52bee 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -560,7 +560,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://idp.qa-1201-b2.mosip.net
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.idp.host}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
@@ -618,7 +618,7 @@ mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SU
 #logging.level.root=DEBUG
 
 # Secret will be used during kyc token generation.
-mosip.ida.kyc.token.secret=j91eRPq0n4zbOZFQ6uBgWMwV7lnV8_2mpRw_sozLSdQ
+mosip.ida.kyc.token.secret=${mosip.ida.kyc.token.secret}
 kyc.token.expire.time.adjustment.seconds=300
 kyc.exchange.default.lang=eng
 
diff --git a/ida-partner.cer b/ida-partner.cer
deleted file mode 100644
index 51ced6ec5b9..00000000000
--- a/ida-partner.cer
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrDCCApSgAwIBAgIIkcTLqBQn22gwDQYJKoZIhvcNAQELBQAwdjELMAkGA1UE
-BhMCSU4xCzAJBgNVBAgMAktBMRIwEAYDVQQHDAlCQU5HQUxPUkUxDTALBgNVBAoM
-BElJVEIxIDAeBgNVBAsMF01PU0lQLVRFQ0gtQ0VOVEVSIChJREEpMRUwEwYDVQQD
-DAx3d3cubW9zaXAuaW8wHhcNMjIxMjA4MTMzNjM1WhcNMjQxMjA3MTMzNjM1WjB1
-MQswCQYDVQQGEwJJTjELMAkGA1UECAwCS0ExEjAQBgNVBAcMCUJBTkdBTE9SRTEN
-MAsGA1UECgwESUlUQjEgMB4GA1UECwwXTU9TSVAtVEVDSC1DRU5URVIgKElEQSkx
-FDASBgNVBAMMC0lEQS1QQVJUTkVSMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAv/SoHX9OB0hR3CGLj/1yaTk5mV48Fi/Wx1nd2gAMe76wre3X7Dz/KyM4
-rCEWryEnIGM1Zj3vGsb1OTxOOQk/zfmVOMwy0uJ3RPM8yKOQu+cJLEUSWho8ILTO
-3HU95XMBJVbwFce1H7Ml2GjinF8tV0REVkEqC1FbB8yNdg+qvmrczx3X0svikAz7
-LB8eWIrWeiDiPlfgfCPMxCx5DaUWgM3/6jtUfax0Hye6P0deOVqWOQznxmdNLdT8
-SyInL3pp0fWdok8yltm80/QK8WQAnjozXDUJh/PegllKZ/9Kt85yp0LIMBie+WqO
-cbooTFtk3d10xlfQ7tzklr667Xw9HwIDAQABoz8wPTAMBgNVHRMBAf8EAjAAMB0G
-A1UdDgQWBBRU99+vXO8/C22alMyvmL78AuavkTAOBgNVHQ8BAf8EBAMCBSAwDQYJ
-KoZIhvcNAQELBQADggEBAJAREKQTnU5nplLnLj8/f0vACxHnEwl/0Qw/APwyocz+
-rhkBloDlrw8/gVJ/1uXuBZz05kb2fBtdmlMpCty30EjWVcd5p7Wkew2TLR6xjeXG
-TElnS9TOqTcHEaGGw9l96Gyv4PDYUkKlikqeiU4qLcozakM8wbGT7RYXFSN63jJs
-fE3/ImGEgXb6d1WX4+W1sVz0Nhj4Pt7f/pSJ2WKSnP7G/5TMKT0kW/dG4RAvaBmO
-V6QikZe9LWrSlapedXnjx74AJoEXD972LWcbxlutrVfOFnj94KWJG5cJ3eAV0Fi6
-JE4RZGnecRX7yZa6d0cziAF0eF8M/ibvRKagmybkckM=
------END CERTIFICATE-----
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 832e4d05603..b29c75cb8f2 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -35,9 +35,9 @@ mosip.event.secret=Kslk30SNF2AChs2
 
 
 mosip.partner.crypto.p12.filename=keystore.p12
-mosip.partner.crypto.p12.password=abc123
+mosip.partner.crypto.p12.password=${mosip.partner.crypto.p12.password}
 mosip.partner.crypto.p12.alias=partner
-mosip.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+mosip.partner.encryption.key=${mosip.partner.crypto.p12.password}
 mosip.partner.prependThumbprint=true
 
 

From f0602ca1697984258a1fc9613c0e9137d505e1e8 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 17 Jan 2023 20:22:44 +0530
Subject: [PATCH 1043/1358] [ MOSIP-25730 ] [ DSD-1954 ] updated properties

id-authentication-default.properties
mimoto-default.properties
removed ida-partner.cer
updated ida-partner.cer url
---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 439cc451fe4..71a4f8e2a01 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -140,7 +140,7 @@ mosip.idp.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300, 'aut
 ## ------------------------------------------ Auth Wrapper ------------------------------------------------
 
 mosip.idp.authn.wrapper.impl=IdentityAuthenticationService
-mosip.idp.authn.ida.cert-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/ida-partner.cer
+mosip.idp.authn.ida.cert-url=https://${mosip.api.public.host}/mosip-certs/ida-partner.cer
 mosip.idp.authn.ida.kyc-auth-url=${mosip.api.internal.url}/idauthentication/v1/kyc-auth/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.kyc-exchange-url=${mosip.api.internal.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.idp.misp.license.key}/
 mosip.idp.authn.ida.send-otp-url=${mosip.api.internal.url}/idauthentication/v1/otp/${mosip.idp.misp.license.key}/

From f5968f7a8aed65a91cf7be2635714e3eb0299bb7 Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 18 Jan 2023 14:05:46 +0530
Subject: [PATCH 1044/1358] ida.child-auth-filter.child.max.age=5

changed the above value to 3
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 0d585b52bee..a72735fca08 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -526,7 +526,7 @@ cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.ti
 
 # Child Auth Filter configurations
 ida.child-auth-filter.factors.denied=otp,bio
-ida.child-auth-filter.child.max.age=5
+ida.child-auth-filter.child.max.age=3
 
 # The chunk size of failed message items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.
 ida.fetch.failed.websub.messages.chunk.size=10

From 0d666ef378a2bbf84fcac0ad517e138b16c662d4 Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 18 Jan 2023 15:58:34 +0530
Subject: [PATCH 1045/1358] ida.child-auth-filter.factors.denied=bio

Removed otp from above property
---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index a72735fca08..c0ef196aaed 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -525,8 +525,8 @@ cred-request-service-retrigger-cred-issuance.rest.headers.mediaType=${mosip.ida.
 cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.timeout.secs}
 
 # Child Auth Filter configurations
-ida.child-auth-filter.factors.denied=otp,bio
-ida.child-auth-filter.child.max.age=3
+ida.child-auth-filter.factors.denied=bio
+ida.child-auth-filter.child.max.age=5
 
 # The chunk size of failed message items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.
 ida.fetch.failed.websub.messages.chunk.size=10

From 8d65166b4fb90cd6105fac9efefe96e0c797d7ff Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Wed, 18 Jan 2023 16:06:04 +0530
Subject: [PATCH 1046/1358] Reverted back the changes.

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index c0ef196aaed..0d585b52bee 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -525,7 +525,7 @@ cred-request-service-retrigger-cred-issuance.rest.headers.mediaType=${mosip.ida.
 cred-request-service-retrigger-cred-issuance.rest.timeout=${mosip.ida.request.timeout.secs}
 
 # Child Auth Filter configurations
-ida.child-auth-filter.factors.denied=bio
+ida.child-auth-filter.factors.denied=otp,bio
 ida.child-auth-filter.child.max.age=5
 
 # The chunk size of failed message items to be processed in spring batch. This value also assigned to the thread count, and hence all the items are processed in parellel asynchronusly.

From 9734d9014a71b6c1a5ad954c6336538d59ede5e7 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Wed, 18 Jan 2023 20:43:37 +0530
Subject: [PATCH 1047/1358] [DSD-2012] Added property files for
 idp-binding-service, inji and mimoto

---
 idp-binding-default.properties | 128 +++++++++++++++++++++++++++++++++
 inji-default.properties        |  16 +++++
 mimoto-default.properties      |  15 +++-
 3 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 idp-binding-default.properties
 create mode 100644 inji-default.properties

diff --git a/idp-binding-default.properties b/idp-binding-default.properties
new file mode 100644
index 00000000000..4fbe99f2921
--- /dev/null
+++ b/idp-binding-default.properties
@@ -0,0 +1,128 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
+# keycloak.admin.password
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
+# softhsm.kernel.pin
+# softhsm-security-pin
+# email.smtp.host
+# email.smtp.username
+# email.smtp.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
+# mosip.api.internal.url
+# mosip.api.public.url
+# mosipbox.public.url
+
+## -------------------------------------------- IdP Binding ------------------------------------------------------------
+mosip.idp.binding.issuer-id=${mosipbox.public.url}${server.servlet.path}
+mosip.idp.binding.public-key-expire-days=10
+mosip.idp.binding.salt-length=16
+
+mosip.idp.binding.send-binding-otp=SCOPE_send_binding_otp
+mosip.idp.binding.wallet-binding=SCOPE_wallet_binding
+mosip.idp.binding.systeminfo.get-certificate=SCOPE_get_certificate
+
+mosip.idp.binding.auth-ignore-urls=${server.servlet.path}/validate-binding/**,${server.servlet.path}/actuator/**,/favicon.ico,\
+  /v1/notifier/actuator/prometheus,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
+  ${server.servlet.path}/v3/api-docs/**
+
+spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+
+mosip.idp.binding.validate-binding-url=${mosipbox.public.url}${server.servlet.path}/validate-binding
+mosip.idp.binding.encrypt-binding-id=false
+
+mosip.idp.binding.wrapper.impl=MockKeyBindingWrapperService
+mosip.idp.authn.wrapper.validate-binding-url=${mosip.idp.binding.validate-binding-url}
+mosip.idp.binding.key-expire-days=10
+
+management.health.redis.enabled=false
+
+##----------------------------------------- Database properties --------------------------------------------------------
+
+mosip.idp.database.hostname=postgres-postgresql.postgres
+mosip.idp.database.port=5432
+spring.datasource.url=jdbc:postgresql://${mosip.idp.database.hostname}:${mosip.idp.database.port}/mosip_idpbinding?currentSchema=idpbinding
+spring.datasource.username=idpbindinguser
+spring.datasource.password=${db.dbuser.password}
+
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+#------------------------------------ Key-manager specific properties --------------------------------------------------
+#Crypto asymmetric algorithm name
+mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
+#Crypto symmetric algorithm name
+mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
+#Keygenerator asymmetric algorithm name
+mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
+#Keygenerator symmetric algorithm name
+mosip.kernel.keygenerator.symmetric-algorithm-name=AES
+#Asymmetric algorithm key length
+mosip.kernel.keygenerator.asymmetric-key-length=2048
+#Symmetric algorithm key length
+mosip.kernel.keygenerator.symmetric-key-length=256
+#Encrypted data and encrypted symmetric key separator
+mosip.kernel.data-key-splitter=#KEY_SPLITTER#
+#GCM tag length
+mosip.kernel.crypto.gcm-tag-length=128
+#Hash algo name
+mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
+#Symmtric key length used in hash
+mosip.kernel.crypto.hash-symmetric-key-length=256
+#No of iterations in hash
+mosip.kernel.crypto.hash-iteration=100000
+#Sign algo name
+mosip.kernel.crypto.sign-algorithm-name=RS256
+#Certificate Sign algo name
+mosip.kernel.certificate.sign.algorithm=SHA256withRSA
+
+#mosip.kernel.keymanager.hsm.config-path=local.p12
+#mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+#mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+
+#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+# For PKCS11 provide Path of config file.
+# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
+# For Offline & JCE property can be left blank, specified value will be ignored.
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+# Passkey of keystore for PKCS11, PKCS12
+# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+
+mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
+mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
+mosip.kernel.keymanager.certificate.default.organization=IITB
+mosip.kernel.keymanager.certificate.default.location=BANGALORE
+mosip.kernel.keymanager.certificate.default.state=KA
+mosip.kernel.keymanager.certificate.default.country=IN
+
+mosip.kernel.keymanager.softhsm.certificate.common-name=www.mosip.io
+mosip.kernel.keymanager.softhsm.certificate.organizational-unit=MOSIP
+mosip.kernel.keymanager.softhsm.certificate.organization=IITB
+mosip.kernel.keymanager.softhsm.certificate.country=IN
+
+# Application Id for PMS master key.
+mosip.kernel.partner.sign.masterkey.application.id=PMS
+mosip.kernel.partner.allowed.domains=DEVICE
+
+mosip.kernel.keymanager-service-validate-url=https://${mosip.hostname}/keymanager/validate
+mosip.kernel.keymanager.jwtsign.validate.json=false
+mosip.keymanager.dao.enabled=false
+crypto.PrependThumbprint.enable=true
\ No newline at end of file
diff --git a/inji-default.properties b/inji-default.properties
new file mode 100644
index 00000000000..55da551e13c
--- /dev/null
+++ b/inji-default.properties
@@ -0,0 +1,16 @@
+#################### add prefix as mosip.inji. for all new properties here ####################
+
+mosip.inji.allowedAuthType=demo,otp,bio-Finger,bio-Iris,bio-Face
+mosip.inji.allowedEkycAuthType=demo,otp,bio-Finger,bio-Iris,bio-Face
+mosip.inji.allowedInternalAuthType=otp,bio-Finger,bio-Iris,bio-Face
+mosip.inji.faceSdkModelUrl=https://drive.google.com/u/0/uc?id=1Z8Puici9alcmH-oU-VoXlHXCagAe1ago&export=download
+# maximum number of retry for downloading vc
+mosip.inji.vcDownloadMaxRetry=10
+# pool interval in milli seconds
+mosip.inji.vcDownloadPoolInterval=6000
+# validate binding audience url to be sent in token
+mosip.inji.audience=${mosip.api.internal.url}/v1/idpbinding/validate-binding
+# issuer to be sent in token
+mosip.inji.issuer=residentapp
+# warning screen domain name
+mosip.inji.warningDomainName=https://www.mosiphealthservices.com
\ No newline at end of file
diff --git a/mimoto-default.properties b/mimoto-default.properties
index b29c75cb8f2..0b71f812a6c 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -2,7 +2,8 @@
 
 public.url=${mosip.api.internal.url}/residentmobileapp
 mosip.resident.base.url=${mosip.resident.url}/resident/v1
-
+idp.base.url=${mosip.api.public.host}/v1/idp/linked-authorization
+idp.binding.base.url=${mosip.api.public.host}/v1/idpbinding
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp
 RESIDENT_CREDENTIAL_REQUEST=${mosip.resident.base.url}/req/credential
@@ -10,7 +11,14 @@ RESIDENT_CREDENTIAL_REQUEST_STATUS=${RESIDENT_CREDENTIAL_REQUEST}/status
 RESIDENT_VID=${mosip.resident.base.url}/vid
 RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
 RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
-
+RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/req/individualId/otp
+RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/get-individual-id
+IDP_LINK_TRANSACTION=${idp.base.url}/link-transaction
+IDP_AUTHENTICATE=${idp.base.url}/authenticate
+IDP_CONSENT=${idp.base.url}/consent
+IDP_OTP=${idp.base.url}/send-otp
+BINDING_OTP=${idp.binding.base.url}/binding-otp
+WALLET_BINDING=${idp.binding.base.url}/wallet-binding
 
 # Resident App
 credential.template=template.json
@@ -123,7 +131,7 @@ mosip.kernel.tokenid.length=36
 
 # log level
 logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 # logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
 logging.level.org.springframework.http.client=DEBUG
@@ -173,3 +181,4 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
+vercred.type.vid=VID
\ No newline at end of file

From 824c60432e497685c45d2f785e965433c2251f50 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Wed, 18 Jan 2023 20:46:42 +0530
Subject: [PATCH 1048/1358] [DSD-2012] Updated idp property

---
 idp-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/idp-default.properties b/idp-default.properties
index 71a4f8e2a01..7c13b4f5e71 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -154,6 +154,8 @@ mosip.idp.authn.mock.impl.persona-repo=/home/mosip/mock-auth-data
 mosip.idp.authn.mock.impl.policy-repo=/home/mosip/mock-auth-data
 mosip.idp.authn.mock.impl.claims-mapping-file=/home/mosip/mock-auth-data/claims_attributes_mapping.json
 
+mosip.idp.authn.wrapper.validate-binding-url=https://${mosip.api.public.host}/v1/idpbinding/validate-binding
+
 ## ------------------------------------------ Discovery openid-configuration ------------------------------------------------
 mosip.idp.domain.url=https://${mosip.api.public.host}
 mosip.idp.discovery.issuer-id=${mosip.idp.domain.url}${server.servlet.path}

From 96316589a2c09bde2d2d3098dd9b11fc5ea92299 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Thu, 19 Jan 2023 16:15:29 +0530
Subject: [PATCH 1049/1358] MOSIP-25739 config changes

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index efaa89ce00a..dcb4475b4bd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,6 +359,8 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
+## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
+object.store.s3.bucket-name-prefix=mgr-
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl

From 98349954c125303b9b36e83dc31eeda9fa5b8e93 Mon Sep 17 00:00:00 2001
From: AswinG123 <120560207+AswinG123@users.noreply.github.com>
Date: Fri, 20 Jan 2023 11:42:11 +0530
Subject: [PATCH 1050/1358] Disabled the captcha for testing purpose. (#3236)

In line number 385, I made captcha value is false.
---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 747add3880d..92d1e07ab17 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -382,7 +382,7 @@ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.preregistration.captcha.enable=true
+mosip.preregistration.captcha.enable=false
 mosip.preregistration.captcha.id.validate=mosip.pre-registration.captcha.id.validate
 mosip.preregistration.captcha.sitekey=${prereg.captcha.site.key}
 mosip.preregistration.captcha.secretkey=${prereg.captcha.secret.key}

From 9b10e5f97f39924f2974e314cf7a6fc4d5cbe984 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Fri, 20 Jan 2023 12:28:37 +0530
Subject: [PATCH 1051/1358] MOSIP-25739 config changes (#3221)

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index efaa89ce00a..dcb4475b4bd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,6 +359,8 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
+## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
+object.store.s3.bucket-name-prefix=mgr-
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl

From f3f2ea6174e7217eaaf7c53fbaefb0c816c6dc7d Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Fri, 20 Jan 2023 16:09:45 +0530
Subject: [PATCH 1052/1358] [DSD-2042] Updated config changes for mimoto

---
 mimoto-default.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 0b71f812a6c..3fd41fb990f 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -2,8 +2,8 @@
 
 public.url=${mosip.api.internal.url}/residentmobileapp
 mosip.resident.base.url=${mosip.resident.url}/resident/v1
-idp.base.url=${mosip.api.public.host}/v1/idp/linked-authorization
-idp.binding.base.url=${mosip.api.public.host}/v1/idpbinding
+idp.base.url=https://${mosip.api.public.host}/v1/idp/linked-authorization
+idp.binding.base.url=${mosip.api.internal.url}/v1/idpbinding
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp
 RESIDENT_CREDENTIAL_REQUEST=${mosip.resident.base.url}/req/credential
@@ -11,8 +11,8 @@ RESIDENT_CREDENTIAL_REQUEST_STATUS=${RESIDENT_CREDENTIAL_REQUEST}/status
 RESIDENT_VID=${mosip.resident.base.url}/vid
 RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
 RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
-RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/req/individualId/otp
-RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/get-individual-id
+RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/individualId/otp
+RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/status
 IDP_LINK_TRANSACTION=${idp.base.url}/link-transaction
 IDP_AUTHENTICATE=${idp.base.url}/authenticate
 IDP_CONSENT=${idp.base.url}/consent
@@ -107,7 +107,7 @@ registration.processor.signature.isEnabled=true
 mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=fra,ara
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
@@ -181,4 +181,4 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
-vercred.type.vid=VID
\ No newline at end of file
+vercred.type.vid=VID

From b3defde40a52e96671c7f7e4086366f98126e498 Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Fri, 20 Jan 2023 16:38:27 +0530
Subject: [PATCH 1053/1358] [DSD-2042] Updated config changes for mimoto

---
 idp-default.properties | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/idp-default.properties b/idp-default.properties
index 7c13b4f5e71..07119fa49df 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -37,17 +37,18 @@ mosip.idp.security.auth.get-urls={'${server.servlet.path}/system-info/**' : { 'S
 # CSRF token check disabled endpoints
 mosip.idp.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,\
-  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus,\
-  ${server.servlet.path}/system-info/**
+  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,\
+  ${server.servlet.path}/system-info/**,${server.servlet.path}/linked-authorization/link-transaction,\
+  ${server.servlet.path}/linked-authorization/authenticate,${server.servlet.path}/linked-authorization/consent
 
 
 # Authentication ignored endpoint (permit-all)
 mosip.idp.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**,/v1/notifier/actuator/prometheus
+  ${server.servlet.path}/v3/api-docs/**
 
-mosip.idp.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/qa-1201-B2/amr-acr-mapping.json
+mosip.idp.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 
 #spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
@@ -154,7 +155,8 @@ mosip.idp.authn.mock.impl.persona-repo=/home/mosip/mock-auth-data
 mosip.idp.authn.mock.impl.policy-repo=/home/mosip/mock-auth-data
 mosip.idp.authn.mock.impl.claims-mapping-file=/home/mosip/mock-auth-data/claims_attributes_mapping.json
 
-mosip.idp.authn.wrapper.validate-binding-url=https://${mosip.api.public.host}/v1/idpbinding/validate-binding
+mosip.idp.authn.wrapper.validate-binding-url=${mosip.api.internal.url}/v1/idpbinding/validate-binding
+
 
 ## ------------------------------------------ Discovery openid-configuration ------------------------------------------------
 mosip.idp.domain.url=https://${mosip.api.public.host}

From dd3dba89a5a364a25a221819cb3369024d94149c Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Sat, 21 Jan 2023 00:05:05 +0530
Subject: [PATCH 1054/1358] Updated quality check sdk urls for face and iris

---
 compliance-toolkit-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 0a80ce167ec..351280b3e4c 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -192,5 +192,5 @@ springdoc.swagger-ui.operationsSorter=alpha
 
 #SBI BiometricsQualityCheckValidator
 mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]

From 3f8b155b3a3434d463028acd83fd15105afa34e4 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Sat, 21 Jan 2023 00:21:42 +0530
Subject: [PATCH 1055/1358] Updated quality check url for face

---
 compliance-toolkit-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 351280b3e4c..9cecffb41d2 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -192,5 +192,5 @@ springdoc.swagger-ui.operationsSorter=alpha
 
 #SBI BiometricsQualityCheckValidator
 mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
+mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
 mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]

From 3d75fc565f9ac9d67f15082e10d24835fba6ef7a Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:50:00 +0530
Subject: [PATCH 1056/1358] DSD-2045 Moved dev2 resident config to qa 1201 b2

---
 resident-default.properties | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 6d47ff9724b..59478f49836 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -80,6 +80,7 @@ resident.event.ack.download.id=mosip.resident.event.ack.download
 resident.event.ack.download.version=1.0
 resident.download.card.eventid.id =mosip.resident.download.card.eventid
 resident.download.card.eventid.version=1.0
+resident.version.new=1.0
 
 ## Token generation
 token.request.id=io.mosip.resident
@@ -204,8 +205,7 @@ mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 
 mosip.service-context=/resident/v1
 ## The exclusion list of URL patterns that should not be part of authentication and authorization
-mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/get-individual-id,/**/req/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registrationcenters/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user,/**/status/individualId/**
-
+mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/status,/**/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registration-centers-list/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user,/**/aid-stage/**
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
@@ -231,11 +231,11 @@ mosip.resident.api.version.otp.request=1.0
 mosip.resident.api.version.auth=1.0
 
 resident.view.history.serviceType.filters=ALL,AUTHENTICATION_REQUEST,SERVICE_REQUEST,DATA_UPDATE_REQUEST,ID_MANAGEMENT_REQUEST,DATA_SHARE_REQUEST
-resident.view.history.status.filters=all,success,in-progress,failed
+resident.view.history.status.filters=all,Success,In Progress,Failed
 
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,resident.vid.version,resident.revokevid.version,resident.vid.id,resident.revokevid.id,auth.type.status.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,resident.vid.policy.id,resident.vid.get.id,resident.vid.version.new,resident.revokevid.version.new,resident.vid.id.generate,mosip.resident.revokevid.id,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,resident.contact.details.update.id,resident.contact.details.send.otp.id
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters
 
 
 
@@ -731,7 +731,18 @@ mosip.resident.message.code.maximum.length=1024
 GET_RID_STATUS=${mosipbox.public.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
 sequence-order=Request received, Validation stage, Verification stage, Uin generation stage, Card ready to download
 
-mosip.resident.checkstatus.individualid.id=mosip.resident.checkstatus.individualid
+mosip.resident.checkstatus.individualid.id=mosip.resident.check-stage-status
 mosip.resident.checkstatus.individualid.version=1.0
 
 resident.additional.identity.attribute.to.fetch=UIN,email,phone,dob,name,photo
+
+resident.template.ack.authentication.request=acknowledgment-authentication-request
+resident.template.ack.get.my.id=acknowledgment-get-my-id
+resident.template.ack.vid.card.download=acknowledgment-vid-card-download
+resident.template.purpose.success.vid-card-download=vid-card-download-positive-purpose
+resident.template.purpose.failure.vid-card-download=vid-card-download-negative-purpose
+resident.template.summary.success.vid-card-download=vid-card-download-positive-summary
+resident.ui.datetime.pattern=yyyy-MM-dd HH:mm:ss
+resident.filename.datetime.pattern=yyyy-MM-dd'T'HH_mm_ss
+## The Registration centers will be searched based on the distance value in meters from the Geo location identified
+resident.nearby.centers.distance.meters=2000

From f22503206db31b2dc94f84ce7d0fe4cda15a8b11 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:52:17 +0530
Subject: [PATCH 1057/1358] Update application-default.properties

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 3171d25e515..aeb506fe362 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -55,7 +55,7 @@ mosip.resident.url=http://resident.resident
 mosip.artifactory.url=http://artifactory.artifactory
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
-
+mosip.digitalcard.service.url=http://digitalcard.digitalcard
 
 config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 

From 7a808ff0b32cd946dcccbd6315140408d9286a92 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:56:38 +0530
Subject: [PATCH 1058/1358] Update resident-default.properties

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 59478f49836..c59c100e17d 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -713,7 +713,7 @@ mosip.resident.name.token.claim-name=name
 mosip.resident.photo.token.claim-photo=picture
 mosip.resident.individual.id.claim.name=individual_id
 mosip.resident.email.token.claim-email=email
-mosip.resident.phone.token.claim-phone=phone_number
+mosip.resident.phone.token.claim-phone=phone
 
 mosip.resident.applicant.name.property=applicantName
 mosip.resident.photo.attribute.name=photo

From c3a5f9ad84f6afb0c030a8a697371870f470460c Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:58:36 +0530
Subject: [PATCH 1059/1358] Updated Bio quality check urls for Iris

---
 compliance-toolkit-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 9cecffb41d2..dc04f971811 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -193,4 +193,4 @@ springdoc.swagger-ui.operationsSorter=alpha
 #SBI BiometricsQualityCheckValidator
 mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
 mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
-mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]

From d96fe97c67d7080b1990232d77415a9760bb40b8 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 23 Jan 2023 14:05:18 +0530
Subject: [PATCH 1060/1358] Added latest schema for personalized card

---
 resident-ui-personalized-card-schema.json | 1830 +++++++++++----------
 1 file changed, 936 insertions(+), 894 deletions(-)

diff --git a/resident-ui-personalized-card-schema.json b/resident-ui-personalized-card-schema.json
index 5fba7ed748b..85c7380f804 100644
--- a/resident-ui-personalized-card-schema.json
+++ b/resident-ui-personalized-card-schema.json
@@ -1,895 +1,937 @@
 {
-  "identity": [
-    {
-      "id": "IDSchemaVersion",
-      "description": "ID Schema Version",
-      "type": "number",
-      "controlType": null,
-      "fieldType": "default",
-      "inputRequired": false,
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "title",
-      "description": "Title",
-      "labelName": {
-        "eng": "Title",
-        "ara": "عنوان",
-        "hin": "पशीर्षक",
-        "kan": "ಶೀರ್ಷಿಕೆ",
-        "tam": "தலைப்பு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "fullName",
-      "description": "Enter Full Name",
-      "labelName": {
-        "eng": "Full Name",
-        "ara": "الاسم الكامل",
-        "fra": "Nom complet",
-        "hin": "पूरा नाम",
-        "kan": "ಪೂರ್ಣ ಹೆಸರು",
-        "tam": "முழு பெயர்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "transliteration": true
-    },
-    {
-      "id": "dateOfBirth",
-      "description": "Enter DOB",
-      "labelName": {
-        "eng": "Date Of Birth",
-        "ara": "تاريخ الولادة",
-        "fra": "Date de naissance",
-        "hin": "जन्म की तारीख",
-        "kan": "ಹುಟ್ತಿದ ದಿನ",
-        "tam": "பிறந்த தேதி"
-      },
-      "controlType": "ageDate",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "gender",
-      "description": "Enter Gender",
-      "labelName": {
-        "eng": "Gender",
-        "ara": "جنس",
-        "fra": "Le genre",
-        "hin": "लिंग",
-        "kan": "ಲಿಂಗ",
-        "tam": "பாலினம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "nationality",
-      "description": "nationality",
-      "labelName": {
-        "fra": "Nationalité",
-        "ara": "الجنسية",
-        "eng": "Nationality",
-        "hin": "राष्ट्रीयता",
-        "kan": "ರಾಷ್ಟ್ರೀಯತೆ",
-        "tam": "தேசியம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "flagb",
-      "description": "Je suis né(e) au maroc",
-      "labelName": {
-        "fra": "Je suis né(e) au maroc",
-        "ara": "ولدت في المغرب",
-        "eng": "I was born in Morocco",
-        "hin": "झंडाब",
-        "kan": "ಧ್ವಜ",
-        "tam": "கொடி"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "placeOfBirth",
-      "description": "Lieu de naissance",
-      "labelName": {
-        "fra": "Lieu de naissance",
-        "ara": "مكان الإزدياد",
-        "eng": "Place of birth",
-        "hin": "जन्म स्थान",
-        "kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
-        "tam": "பிறந்த இடம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "listCountry",
-      "description": "Pay de naissance",
-      "labelName": {
-        "fra": "Pay de naissance",
-        "ara": "بلد الإزدياد",
-        "eng": "Birth Pay",
-        "hin": "सूचीदेश",
-        "kan": "ಪಟ್ಟಿ ದೇಶ",
-        "tam": "பட்டியல் நாடு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "region",
-      "description": "region",
-      "labelName": {
-        "eng": "Region",
-        "ara": "منطقة",
-        "fra": "Région",
-        "hin": "ऊपरी क्षेत्र",
-        "kan": "ಪ್ರದೇಶ",
-        "tam": "பிராந்தியம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 1,
-      "parentLocCode": "MOR",
-      "required": true
-    },
-    {
-      "id": "province",
-      "description": "province",
-      "labelName": {
-        "eng": "Province",
-        "ara": "المحافظة",
-        "fra": "Province",
-        "hin": "प्रांत",
-        "kan": "ಪ್ರಾಂತ್ಯ",
-        "tam": "மாகாணம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 2,
-      "required": true
-    },
-    {
-      "id": "city",
-      "description": "city",
-      "labelName": {
-        "eng": "City",
-        "ara": "مدينة",
-        "fra": "Ville",
-        "hin": "शहर",
-        "kan": "ನಗರ",
-        "tam": "நகரம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 3,
-      "required": true
-    },
-    {
-      "id": "zone",
-      "description": "zone",
-      "labelName": {
-        "eng": "Zone",
-        "ara": "منطقة",
-        "fra": "Zone",
-        "hin": "क्षेत्र",
-        "kan": "ವಲಯ",
-        "tam": "மண்டலம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [],
-      "locationHierarchyLevel": 4,
-      "required": true
-    },
-    {
-      "id": "postalCode",
-      "description": "postalCode",
-      "labelName": {
-        "eng": "Postal Code",
-        "ara": "الكود البريدى",
-        "fra": "code postal",
-        "hin": "डाक कोड",
-        "kan": "ಅಂಚೆ ಕೋಡ್",
-        "tam": "அஞ்சல் குறியீடு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 5,
-      "required": true
-    },
-    {
-      "id": "residenceStatus",
-      "description": "Quartier/Résidence/Douar",
-      "labelName": {
-        "fra": "Quartier/Résidence/Douar",
-        "ara": "الحي / السكن / الدوار",
-        "eng": "Residence Status",
-        "hin": "निवास स्थान",
-        "kan": "ನಿವಾಸ",
-        "tam": "குடியிருப்பு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "addressType",
-      "description": "Type d'habitat",
-      "labelName": {
-        "fra": "Type d'habitat",
-        "ara": "نوع السكن",
-        "eng": "Habitat type",
-        "kan": "ವಿಳಾಸದ ವಿಧ",
-        "hin": "पता मुद्रलेख",
-        "tam": "முகவரி வகை"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "portNo",
-      "description": "N Porte",
-      "labelName": {
-        "fra": "N° Porte",
-        "ara": "رقم الباب",
-        "eng": "Port No",
-        "kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-        "hin": "पोर्ट नंबर",
-        "tam": "துறை எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,10}$).*",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "apptNo",
-      "description": "N immeuble",
-      "labelName": {
-        "fra": "N° immeuble",
-        "ara": "رقم المبنى",
-        "eng": "Appt no",
-        "kan": "appt ಸಂಖ್ಯೆ",
-        "hin": "उपयुक्त संख्या",
-        "tam": "appt எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,10}$).*",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "addressLine1",
-      "description": "Adresse de résidence",
-      "labelName": {
-        "fra": "Adresse de résidence",
-        "ara": "عنوان السكن",
-        "eng": "Adresse Line1",
-        "hin": "पता पंक्ति 1",
-        "kan": "ವಿಳಾಸ 1",
-        "tam": "முகவரி வரி 1"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,100}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "referenceCNIENumber",
-      "description": "CNIE",
-      "labelName": {
-        "fra": "CNIE",
-        "ara": "رقم البطاقة الوطنية",
-        "eng": "CNIE",
-        "kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
-        "hin": "संदर्भ सीएनआईई नंबर",
-        "tam": "குறிப்பு CNIE எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": true,
-      "group": "card_info",
-      "preview": true
-    },
-    {
-      "id": "resOuPass",
-      "description": "Je dispose",
-      "labelName": {
-        "fra": "Je dispose",
-        "ara": "أملك",
-        "eng": "I have",
-        "kan": "resOuPass",
-        "hin": "resOuPass",
-        "tam": "resOuPass"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": false,
-      "tooltip": false
-    },
-    {
-      "id": "referenceResidencyNumber",
-      "description": "Numéro d'identité du résident étranger",
-      "labelName": {
-        "fra": "Numéro d'identité du résident étranger",
-        "ara": "رقم هوية المقيم الأجنبي",
-        "eng": "Identity number of the foreign resident",
-        "kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
-        "hin": "संदर्भ निवास संख्या",
-        "tam": "குறிப்பு குடியிருப்பு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "[A-Za-z][0-9]{6}[A-Za-z]",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "passportNumber",
-      "description": "Numéro de passport",
-      "labelName": {
-        "fra": "Numéro de Passeport",
-        "ara": "رقم جواز السفر",
-        "eng": "Passport number",
-        "kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-        "hin": "पासपोर्ट संख्या",
-        "tam": "கடவுச்சீட்டு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{1,20}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "flagidcs",
-      "description": "Je dispose d'un IDCS",
-      "labelName": {
-        "fra": "Je dispose d'un IDCS",
-        "ara": "أملك المعرف المدني والاجتماعي الرقمي",
-        "eng": "I have an IDCS",
-        "kan": "ಧ್ವಜಗಳು",
-        "hin": "फ्लैगिड्स",
-        "tam": "கொடிகள்"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "birthCertificateNumber",
-      "description": "Numéro Acte de Naissance",
-      "labelName": {
-        "fra": "Numéro Acte de Naissance",
-        "ara": "رقم شهادة الميلاد",
-        "eng": "Birth Certificate Number",
-        "kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
-        "hin": "जन्म प्रमाणपत्र संख्या",
-        "tam": "பிறப்புச் சான்றிதழ் எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{1,20}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true
-    },
-    {
-      "id": "civilRegistryNumber",
-      "description": "Numéro Acte de Naissance digitalisé",
-      "labelName": {
-        "fra": "Numéro Acte de Naissance digitalisé",
-        "ara": "رقم شهادة الميلاد الرقمي",
-        "eng": "Digital Birth Certificate Number",
-        "kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
-        "hin": "सिविल रजिस्ट्री नंबर",
-        "tam": "சிவில் பதிவு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "checksum": true,
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "phone",
-      "description": "phone",
-      "labelName": {
-        "eng": "Phone",
-        "ara": "هاتف",
-        "fra": "Téléphone",
-        "hin": "फ़ोन",
-        "kan": "ದೂರವಾಣಿ",
-        "tam": "தொலைபேசி"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[+]*([0-9]{1})([0-9]{9})$",
-          "arguments": []
-        }
-      ],
-      "required": true
-    },
-    {
-      "id": "email",
-      "description": "email",
-      "labelName": {
-        "eng": "Email",
-        "ara": "البريد الإلكتروني",
-        "fra": "Email",
-        "hin": "ईमेल",
-        "kan": "ಇಮೇಲ್",
-        "tam": "மின்னஞ்சல்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-          "arguments": []
-        }
-      ],
-      "required": true
-    },
-    {
-      "id": "guardianType",
-      "description": "Type de Tuteur",
-      "labelName": {
-        "fra": "Type de Tuteur",
-        "ara": "نوع الوصي",
-        "eng": "Tutor type",
-        "kan": "ರಕ್ಷಕ ವಿಧ",
-        "hin": "संरक्षक प्रकार",
-        "tam": "பாதுகாவலர் வகை"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "introducerName",
-      "description": "Prénom du tuteur",
-      "labelName": {
-        "eng": "introducer Name",
-        "ara": "مقدم Name",
-        "fra": "introducteur Name",
-        "kan": "ಪರಿಚಯಕಾರ Name",
-        "hin": "परिचयकर्ता  Name",
-        "tam": "அறிமுகம் Name"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "introducerUIN",
-      "description": "Identifiant digital civil et social du tuteur",
-      "labelName": {
-        "eng": "introducer UIN",
-        "ara": "مقدم UIN",
-        "fra": "introducteur UIN",
-        "kan": "ಪರಿಚಯಕಾರ UIN",
-        "hin": "परिचयकर्ता  UIN",
-        "tam": "அறிமுகம் UIN"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "checksum": true,
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[0-9]{10}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "introduceRID",
-      "description": "Identifiant RNP RID du tuteur",
-      "labelName": {
-        "eng": "introducer RID",
-        "ara": "مقدم RID",
-        "fra": "introducteur RID",
-        "kan": "ಪರಿಚಯಕಾರ RID",
-        "hin": "परिचयकर्ता  RID",
-        "tam": "அறிமுகம் RID"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[0-9]{29}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "introduceCNIE",
-      "description": "Numéro d'identité du tuteur",
-      "labelName": {
-        "eng": "introducer CNIE",
-        "ara": "مقدم CNIE",
-        "fra": "introducteur CNIE",
-        "kan": "ಪರಿಚಯಕಾರ CNIE",
-        "hin": "परिचयकर्ता  CNIE",
-        "tam": "அறிமுகம் CNIE"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "relationWithChild",
-      "description": "Lien de parenté",
-      "labelName": {
-        "fra": "Lien de parenté",
-        "ara": "صلة القرابة",
-        "eng": "Relationship",
-        "kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
-        "hin": "बच्चे के साथ संबंध",
-        "tam": "குழந்தையுடன் உறவு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "proofOfAddress",
-      "description": "proofOfAddress",
-      "labelName": {
-        "ara": "إثبات العنوان",
-        "fra": "Preuve d'adresse",
-        "eng": "Address Proof",
-        "hin": "निवास प्रमाण पत्र",
-        "kan": "ವಿಳಾಸ ಪುರಾವೆ",
-        "tam": "முகவரி சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POA",
-      "required": false
-    },
-    {
-      "id": "proofOfIdentity",
-      "description": "proofOfIdentity",
-      "labelName": {
-        "ara": "إثبات الهوية",
-        "fra": "Preuve d'identité",
-        "eng": "Identity Proof",
-        "hin": "पहचान प्रमाण",
-        "kan": "ಗುರುತಿನ ಪುರಾವೆ",
-        "tam": "அடையாள சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POI",
-      "required": true
-    },
-    {
-      "id": "proofOfRelationship",
-      "description": "proofOfRelationship",
-      "labelName": {
-        "ara": "إثبات العلاقة",
-        "fra": "Preuve de relation",
-        "eng": "Relationship Proof",
-        "hin": "संबंध प्रमाण",
-        "kan": "ಸಂಬಂಧ ಪುರಾವೆ",
-        "tam": "உறவு சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POR",
-      "required": true
-    },
-    {
-      "id": "proofOfDateOfBirth",
-      "description": "proofOfDateOfBirth",
-      "labelName": {
-        "ara": "دليل DOB",
-        "fra": "Preuve de date de naissance",
-        "eng": "DOB Proof",
-        "hin": "जन्मतिथि प्रमाण",
-        "kan": "DOB ಪ್ರೂಫ್",
-        "tam": "DOB ஆதாரம்"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POB",
-      "required": true
-    },
-    {
-      "id": "proofOfException",
-      "description": "proofOfException",
-      "labelName": {
-        "ara": "إثبات الاستثناء",
-        "fra": "Preuve d'exception",
-        "eng": "Exception Proof",
-        "kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
-        "tam": "விதிவிலக்கு சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POE",
-      "required": true
-    }
-  ],
-  "locationHierarchy": [
-    "region",
-    "province",
-    "city",
-    "zone",
-    "postalCode"
-  ]
-}
\ No newline at end of file
+	"identity": [
+		{
+			"id": "IDSchemaVersion",
+			"description": "ID Schema Version",
+			"type": "number",
+			"controlType": null,
+			"fieldType": "default",
+			"inputRequired": false,
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "title",
+			"description": "Title",
+			"labelName": {
+				"eng": "Title",
+				"ara": "عنوان",
+				"hin": "पशीर्षक",
+				"kan": "ಶೀರ್ಷಿಕೆ",
+				"tam": "தலைப்பு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "fullName",
+			"description": "Enter Full Name",
+			"labelName": {
+				"eng": "Full Name",
+				"ara": "الاسم الكامل",
+				"fra": "Nom complet",
+				"hin": "पूरा नाम",
+				"kan": "ಪೂರ್ಣ ಹೆಸರು",
+				"tam": "முழு பெயர்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"transliteration": true
+		},
+		{
+			"id": "dateOfBirth",
+			"description": "Enter DOB",
+			"labelName": {
+				"eng": "Date Of Birth",
+				"ara": "تاريخ الولادة",
+				"fra": "Date de naissance",
+				"hin": "जन्म की तारीख",
+				"kan": "ಹುಟ್ತಿದ ದಿನ",
+				"tam": "பிறந்த தேதி"
+			},
+			"controlType": "ageDate",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "gender",
+			"description": "Enter Gender",
+			"labelName": {
+				"eng": "Gender",
+				"ara": "جنس",
+				"fra": "Le genre",
+				"hin": "लिंग",
+				"kan": "ಲಿಂಗ",
+				"tam": "பாலினம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "UIN",
+			"description": "Enter UIN",
+			"labelName": {
+				"eng": "UIN"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "perpetualVID",
+			"description": "Enter perpetualVID",
+			"labelName": {
+				"eng": "perpetualVID"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "nationality",
+			"description": "nationality",
+			"labelName": {
+				"fra": "Nationalité",
+				"ara": "الجنسية",
+				"eng": "Nationality",
+				"hin": "राष्ट्रीयता",
+				"kan": "ರಾಷ್ಟ್ರೀಯತೆ",
+				"tam": "தேசியம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "flagb",
+			"description": "Je suis né(e) au maroc",
+			"labelName": {
+				"fra": "Je suis né(e) au maroc",
+				"ara": "ولدت في المغرب",
+				"eng": "I was born in Morocco",
+				"hin": "झंडाब",
+				"kan": "ಧ್ವಜ",
+				"tam": "கொடி"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "placeOfBirth",
+			"description": "Lieu de naissance",
+			"labelName": {
+				"fra": "Lieu de naissance",
+				"ara": "مكان الإزدياد",
+				"eng": "Place of birth",
+				"hin": "जन्म स्थान",
+				"kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
+				"tam": "பிறந்த இடம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "listCountry",
+			"description": "Pay de naissance",
+			"labelName": {
+				"fra": "Pay de naissance",
+				"ara": "بلد الإزدياد",
+				"eng": "Birth Pay",
+				"hin": "सूचीदेश",
+				"kan": "ಪಟ್ಟಿ ದೇಶ",
+				"tam": "பட்டியல் நாடு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "region",
+			"description": "region",
+			"labelName": {
+				"eng": "Region",
+				"ara": "منطقة",
+				"fra": "Région",
+				"hin": "ऊपरी क्षेत्र",
+				"kan": "ಪ್ರದೇಶ",
+				"tam": "பிராந்தியம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 1,
+			"parentLocCode": "MOR",
+			"required": true
+		},
+		{
+			"id": "province",
+			"description": "province",
+			"labelName": {
+				"eng": "Province",
+				"ara": "المحافظة",
+				"fra": "Province",
+				"hin": "प्रांत",
+				"kan": "ಪ್ರಾಂತ್ಯ",
+				"tam": "மாகாணம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 2,
+			"required": true
+		},
+		{
+			"id": "city",
+			"description": "city",
+			"labelName": {
+				"eng": "City",
+				"ara": "مدينة",
+				"fra": "Ville",
+				"hin": "शहर",
+				"kan": "ನಗರ",
+				"tam": "நகரம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 3,
+			"required": true
+		},
+		{
+			"id": "zone",
+			"description": "zone",
+			"labelName": {
+				"eng": "Zone",
+				"ara": "منطقة",
+				"fra": "Zone",
+				"hin": "क्षेत्र",
+				"kan": "ವಲಯ",
+				"tam": "மண்டலம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [],
+			"locationHierarchyLevel": 4,
+			"required": true
+		},
+		{
+			"id": "postalCode",
+			"description": "postalCode",
+			"labelName": {
+				"eng": "Postal Code",
+				"ara": "الكود البريدى",
+				"fra": "code postal",
+				"hin": "डाक कोड",
+				"kan": "ಅಂಚೆ ಕೋಡ್",
+				"tam": "அஞ்சல் குறியீடு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 5,
+			"required": true
+		},
+		{
+			"id": "residenceStatus",
+			"description": "Quartier/Résidence/Douar",
+			"labelName": {
+				"fra": "Quartier/Résidence/Douar",
+				"ara": "الحي / السكن / الدوار",
+				"eng": "Residence Status",
+				"hin": "निवास स्थान",
+				"kan": "ನಿವಾಸ",
+				"tam": "குடியிருப்பு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "addressType",
+			"description": "Type d'habitat",
+			"labelName": {
+				"fra": "Type d'habitat",
+				"ara": "نوع السكن",
+				"eng": "Habitat type",
+				"kan": "ವಿಳಾಸದ ವಿಧ",
+				"hin": "पता मुद्रलेख",
+				"tam": "முகவரி வகை"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "portNo",
+			"description": "N Porte",
+			"labelName": {
+				"fra": "N° Porte",
+				"ara": "رقم الباب",
+				"eng": "Port No",
+				"kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+				"hin": "पोर्ट नंबर",
+				"tam": "துறை எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,10}$).*",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "apptNo",
+			"description": "N immeuble",
+			"labelName": {
+				"fra": "N° immeuble",
+				"ara": "رقم المبنى",
+				"eng": "Appt no",
+				"kan": "appt ಸಂಖ್ಯೆ",
+				"hin": "उपयुक्त संख्या",
+				"tam": "appt எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,10}$).*",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "addressLine1",
+			"description": "Adresse de résidence",
+			"labelName": {
+				"fra": "Adresse de résidence",
+				"ara": "عنوان السكن",
+				"eng": "Adresse Line1",
+				"hin": "पता पंक्ति 1",
+				"kan": "ವಿಳಾಸ 1",
+				"tam": "முகவரி வரி 1"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,100}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "referenceCNIENumber",
+			"description": "CNIE",
+			"labelName": {
+				"fra": "CNIE",
+				"ara": "رقم البطاقة الوطنية",
+				"eng": "CNIE",
+				"kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
+				"hin": "संदर्भ सीएनआईई नंबर",
+				"tam": "குறிப்பு CNIE எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": true,
+			"group": "card_info",
+			"preview": true
+		},
+		{
+			"id": "resOuPass",
+			"description": "Je dispose",
+			"labelName": {
+				"fra": "Je dispose",
+				"ara": "أملك",
+				"eng": "I have",
+				"kan": "resOuPass",
+				"hin": "resOuPass",
+				"tam": "resOuPass"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": false,
+			"tooltip": false
+		},
+		{
+			"id": "referenceResidencyNumber",
+			"description": "Numéro d'identité du résident étranger",
+			"labelName": {
+				"fra": "Numéro d'identité du résident étranger",
+				"ara": "رقم هوية المقيم الأجنبي",
+				"eng": "Identity number of the foreign resident",
+				"kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
+				"hin": "संदर्भ निवास संख्या",
+				"tam": "குறிப்பு குடியிருப்பு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "[A-Za-z][0-9]{6}[A-Za-z]",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "passportNumber",
+			"description": "Numéro de passport",
+			"labelName": {
+				"fra": "Numéro de Passeport",
+				"ara": "رقم جواز السفر",
+				"eng": "Passport number",
+				"kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+				"hin": "पासपोर्ट संख्या",
+				"tam": "கடவுச்சீட்டு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{1,20}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "flagidcs",
+			"description": "Je dispose d'un IDCS",
+			"labelName": {
+				"fra": "Je dispose d'un IDCS",
+				"ara": "أملك المعرف المدني والاجتماعي الرقمي",
+				"eng": "I have an IDCS",
+				"kan": "ಧ್ವಜಗಳು",
+				"hin": "फ्लैगिड्स",
+				"tam": "கொடிகள்"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "birthCertificateNumber",
+			"description": "Numéro Acte de Naissance",
+			"labelName": {
+				"fra": "Numéro Acte de Naissance",
+				"ara": "رقم شهادة الميلاد",
+				"eng": "Birth Certificate Number",
+				"kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
+				"hin": "जन्म प्रमाणपत्र संख्या",
+				"tam": "பிறப்புச் சான்றிதழ் எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{1,20}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true
+		},
+		{
+			"id": "civilRegistryNumber",
+			"description": "Numéro Acte de Naissance digitalisé",
+			"labelName": {
+				"fra": "Numéro Acte de Naissance digitalisé",
+				"ara": "رقم شهادة الميلاد الرقمي",
+				"eng": "Digital Birth Certificate Number",
+				"kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
+				"hin": "सिविल रजिस्ट्री नंबर",
+				"tam": "சிவில் பதிவு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"checksum": true,
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "phone",
+			"description": "phone",
+			"labelName": {
+				"eng": "Phone",
+				"ara": "هاتف",
+				"fra": "Téléphone",
+				"hin": "फ़ोन",
+				"kan": "ದೂರವಾಣಿ",
+				"tam": "தொலைபேசி"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[+]*([0-9]{1})([0-9]{9})$",
+					"arguments": []
+				}
+			],
+			"required": true
+		},
+		{
+			"id": "email",
+			"description": "email",
+			"labelName": {
+				"eng": "Email",
+				"ara": "البريد الإلكتروني",
+				"fra": "Email",
+				"hin": "ईमेल",
+				"kan": "ಇಮೇಲ್",
+				"tam": "மின்னஞ்சல்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+					"arguments": []
+				}
+			],
+			"required": true
+		},
+		{
+			"id": "guardianType",
+			"description": "Type de Tuteur",
+			"labelName": {
+				"fra": "Type de Tuteur",
+				"ara": "نوع الوصي",
+				"eng": "Tutor type",
+				"kan": "ರಕ್ಷಕ ವಿಧ",
+				"hin": "संरक्षक प्रकार",
+				"tam": "பாதுகாவலர் வகை"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "introducerName",
+			"description": "Prénom du tuteur",
+			"labelName": {
+				"eng": "introducer Name",
+				"ara": "مقدم Name",
+				"fra": "introducteur Name",
+				"kan": "ಪರಿಚಯಕಾರ Name",
+				"hin": "परिचयकर्ता  Name",
+				"tam": "அறிமுகம் Name"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "introducerUIN",
+			"description": "Identifiant digital civil et social du tuteur",
+			"labelName": {
+				"eng": "introducer UIN",
+				"ara": "مقدم UIN",
+				"fra": "introducteur UIN",
+				"kan": "ಪರಿಚಯಕಾರ UIN",
+				"hin": "परिचयकर्ता  UIN",
+				"tam": "அறிமுகம் UIN"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"checksum": true,
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[0-9]{10}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "introduceRID",
+			"description": "Identifiant RNP RID du tuteur",
+			"labelName": {
+				"eng": "introducer RID",
+				"ara": "مقدم RID",
+				"fra": "introducteur RID",
+				"kan": "ಪರಿಚಯಕಾರ RID",
+				"hin": "परिचयकर्ता  RID",
+				"tam": "அறிமுகம் RID"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[0-9]{29}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "introduceCNIE",
+			"description": "Numéro d'identité du tuteur",
+			"labelName": {
+				"eng": "introducer CNIE",
+				"ara": "مقدم CNIE",
+				"fra": "introducteur CNIE",
+				"kan": "ಪರಿಚಯಕಾರ CNIE",
+				"hin": "परिचयकर्ता  CNIE",
+				"tam": "அறிமுகம் CNIE"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "relationWithChild",
+			"description": "Lien de parenté",
+			"labelName": {
+				"fra": "Lien de parenté",
+				"ara": "صلة القرابة",
+				"eng": "Relationship",
+				"kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
+				"hin": "बच्चे के साथ संबंध",
+				"tam": "குழந்தையுடன் உறவு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "proofOfAddress",
+			"description": "proofOfAddress",
+			"labelName": {
+				"ara": "إثبات العنوان",
+				"fra": "Preuve d'adresse",
+				"eng": "Address Proof",
+				"hin": "निवास प्रमाण पत्र",
+				"kan": "ವಿಳಾಸ ಪುರಾವೆ",
+				"tam": "முகவரி சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POA",
+			"required": false
+		},
+		{
+			"id": "proofOfIdentity",
+			"description": "proofOfIdentity",
+			"labelName": {
+				"ara": "إثبات الهوية",
+				"fra": "Preuve d'identité",
+				"eng": "Identity Proof",
+				"hin": "पहचान प्रमाण",
+				"kan": "ಗುರುತಿನ ಪುರಾವೆ",
+				"tam": "அடையாள சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POI",
+			"required": true
+		},
+		{
+			"id": "proofOfRelationship",
+			"description": "proofOfRelationship",
+			"labelName": {
+				"ara": "إثبات العلاقة",
+				"fra": "Preuve de relation",
+				"eng": "Relationship Proof",
+				"hin": "संबंध प्रमाण",
+				"kan": "ಸಂಬಂಧ ಪುರಾವೆ",
+				"tam": "உறவு சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POR",
+			"required": true
+		},
+		{
+			"id": "proofOfDateOfBirth",
+			"description": "proofOfDateOfBirth",
+			"labelName": {
+				"ara": "دليل DOB",
+				"fra": "Preuve de date de naissance",
+				"eng": "DOB Proof",
+				"hin": "जन्मतिथि प्रमाण",
+				"kan": "DOB ಪ್ರೂಫ್",
+				"tam": "DOB ஆதாரம்"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POB",
+			"required": true
+		},
+		{
+			"id": "proofOfException",
+			"description": "proofOfException",
+			"labelName": {
+				"ara": "إثبات الاستثناء",
+				"fra": "Preuve d'exception",
+				"eng": "Exception Proof",
+				"kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
+				"tam": "விதிவிலக்கு சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POE",
+			"required": true
+		}
+	],
+	"locationHierarchy": [
+		"region",
+		"province",
+		"city",
+		"zone",
+		"postalCode"
+	]
+}

From 3987f180858f36d296911c9fdee13153332e35b6 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 23 Jan 2023 14:06:37 +0530
Subject: [PATCH 1061/1358] Update resident-ui-share-credential-schema.json

---
 resident-ui-share-credential-schema.json | 1830 +++++++++++-----------
 1 file changed, 936 insertions(+), 894 deletions(-)

diff --git a/resident-ui-share-credential-schema.json b/resident-ui-share-credential-schema.json
index 5fba7ed748b..85c7380f804 100644
--- a/resident-ui-share-credential-schema.json
+++ b/resident-ui-share-credential-schema.json
@@ -1,895 +1,937 @@
 {
-  "identity": [
-    {
-      "id": "IDSchemaVersion",
-      "description": "ID Schema Version",
-      "type": "number",
-      "controlType": null,
-      "fieldType": "default",
-      "inputRequired": false,
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "title",
-      "description": "Title",
-      "labelName": {
-        "eng": "Title",
-        "ara": "عنوان",
-        "hin": "पशीर्षक",
-        "kan": "ಶೀರ್ಷಿಕೆ",
-        "tam": "தலைப்பு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "fullName",
-      "description": "Enter Full Name",
-      "labelName": {
-        "eng": "Full Name",
-        "ara": "الاسم الكامل",
-        "fra": "Nom complet",
-        "hin": "पूरा नाम",
-        "kan": "ಪೂರ್ಣ ಹೆಸರು",
-        "tam": "முழு பெயர்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "transliteration": true
-    },
-    {
-      "id": "dateOfBirth",
-      "description": "Enter DOB",
-      "labelName": {
-        "eng": "Date Of Birth",
-        "ara": "تاريخ الولادة",
-        "fra": "Date de naissance",
-        "hin": "जन्म की तारीख",
-        "kan": "ಹುಟ್ತಿದ ದಿನ",
-        "tam": "பிறந்த தேதி"
-      },
-      "controlType": "ageDate",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "gender",
-      "description": "Enter Gender",
-      "labelName": {
-        "eng": "Gender",
-        "ara": "جنس",
-        "fra": "Le genre",
-        "hin": "लिंग",
-        "kan": "ಲಿಂಗ",
-        "tam": "பாலினம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "nationality",
-      "description": "nationality",
-      "labelName": {
-        "fra": "Nationalité",
-        "ara": "الجنسية",
-        "eng": "Nationality",
-        "hin": "राष्ट्रीयता",
-        "kan": "ರಾಷ್ಟ್ರೀಯತೆ",
-        "tam": "தேசியம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "flagb",
-      "description": "Je suis né(e) au maroc",
-      "labelName": {
-        "fra": "Je suis né(e) au maroc",
-        "ara": "ولدت في المغرب",
-        "eng": "I was born in Morocco",
-        "hin": "झंडाब",
-        "kan": "ಧ್ವಜ",
-        "tam": "கொடி"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "placeOfBirth",
-      "description": "Lieu de naissance",
-      "labelName": {
-        "fra": "Lieu de naissance",
-        "ara": "مكان الإزدياد",
-        "eng": "Place of birth",
-        "hin": "जन्म स्थान",
-        "kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
-        "tam": "பிறந்த இடம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "listCountry",
-      "description": "Pay de naissance",
-      "labelName": {
-        "fra": "Pay de naissance",
-        "ara": "بلد الإزدياد",
-        "eng": "Birth Pay",
-        "hin": "सूचीदेश",
-        "kan": "ಪಟ್ಟಿ ದೇಶ",
-        "tam": "பட்டியல் நாடு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "region",
-      "description": "region",
-      "labelName": {
-        "eng": "Region",
-        "ara": "منطقة",
-        "fra": "Région",
-        "hin": "ऊपरी क्षेत्र",
-        "kan": "ಪ್ರದೇಶ",
-        "tam": "பிராந்தியம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 1,
-      "parentLocCode": "MOR",
-      "required": true
-    },
-    {
-      "id": "province",
-      "description": "province",
-      "labelName": {
-        "eng": "Province",
-        "ara": "المحافظة",
-        "fra": "Province",
-        "hin": "प्रांत",
-        "kan": "ಪ್ರಾಂತ್ಯ",
-        "tam": "மாகாணம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 2,
-      "required": true
-    },
-    {
-      "id": "city",
-      "description": "city",
-      "labelName": {
-        "eng": "City",
-        "ara": "مدينة",
-        "fra": "Ville",
-        "hin": "शहर",
-        "kan": "ನಗರ",
-        "tam": "நகரம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 3,
-      "required": true
-    },
-    {
-      "id": "zone",
-      "description": "zone",
-      "labelName": {
-        "eng": "Zone",
-        "ara": "منطقة",
-        "fra": "Zone",
-        "hin": "क्षेत्र",
-        "kan": "ವಲಯ",
-        "tam": "மண்டலம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [],
-      "locationHierarchyLevel": 4,
-      "required": true
-    },
-    {
-      "id": "postalCode",
-      "description": "postalCode",
-      "labelName": {
-        "eng": "Postal Code",
-        "ara": "الكود البريدى",
-        "fra": "code postal",
-        "hin": "डाक कोड",
-        "kan": "ಅಂಚೆ ಕೋಡ್",
-        "tam": "அஞ்சல் குறியீடு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 5,
-      "required": true
-    },
-    {
-      "id": "residenceStatus",
-      "description": "Quartier/Résidence/Douar",
-      "labelName": {
-        "fra": "Quartier/Résidence/Douar",
-        "ara": "الحي / السكن / الدوار",
-        "eng": "Residence Status",
-        "hin": "निवास स्थान",
-        "kan": "ನಿವಾಸ",
-        "tam": "குடியிருப்பு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "addressType",
-      "description": "Type d'habitat",
-      "labelName": {
-        "fra": "Type d'habitat",
-        "ara": "نوع السكن",
-        "eng": "Habitat type",
-        "kan": "ವಿಳಾಸದ ವಿಧ",
-        "hin": "पता मुद्रलेख",
-        "tam": "முகவரி வகை"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "portNo",
-      "description": "N Porte",
-      "labelName": {
-        "fra": "N° Porte",
-        "ara": "رقم الباب",
-        "eng": "Port No",
-        "kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-        "hin": "पोर्ट नंबर",
-        "tam": "துறை எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,10}$).*",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "apptNo",
-      "description": "N immeuble",
-      "labelName": {
-        "fra": "N° immeuble",
-        "ara": "رقم المبنى",
-        "eng": "Appt no",
-        "kan": "appt ಸಂಖ್ಯೆ",
-        "hin": "उपयुक्त संख्या",
-        "tam": "appt எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,10}$).*",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "addressLine1",
-      "description": "Adresse de résidence",
-      "labelName": {
-        "fra": "Adresse de résidence",
-        "ara": "عنوان السكن",
-        "eng": "Adresse Line1",
-        "hin": "पता पंक्ति 1",
-        "kan": "ವಿಳಾಸ 1",
-        "tam": "முகவரி வரி 1"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,100}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "referenceCNIENumber",
-      "description": "CNIE",
-      "labelName": {
-        "fra": "CNIE",
-        "ara": "رقم البطاقة الوطنية",
-        "eng": "CNIE",
-        "kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
-        "hin": "संदर्भ सीएनआईई नंबर",
-        "tam": "குறிப்பு CNIE எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": true,
-      "group": "card_info",
-      "preview": true
-    },
-    {
-      "id": "resOuPass",
-      "description": "Je dispose",
-      "labelName": {
-        "fra": "Je dispose",
-        "ara": "أملك",
-        "eng": "I have",
-        "kan": "resOuPass",
-        "hin": "resOuPass",
-        "tam": "resOuPass"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": false,
-      "tooltip": false
-    },
-    {
-      "id": "referenceResidencyNumber",
-      "description": "Numéro d'identité du résident étranger",
-      "labelName": {
-        "fra": "Numéro d'identité du résident étranger",
-        "ara": "رقم هوية المقيم الأجنبي",
-        "eng": "Identity number of the foreign resident",
-        "kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
-        "hin": "संदर्भ निवास संख्या",
-        "tam": "குறிப்பு குடியிருப்பு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "[A-Za-z][0-9]{6}[A-Za-z]",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "passportNumber",
-      "description": "Numéro de passport",
-      "labelName": {
-        "fra": "Numéro de Passeport",
-        "ara": "رقم جواز السفر",
-        "eng": "Passport number",
-        "kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-        "hin": "पासपोर्ट संख्या",
-        "tam": "கடவுச்சீட்டு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{1,20}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "flagidcs",
-      "description": "Je dispose d'un IDCS",
-      "labelName": {
-        "fra": "Je dispose d'un IDCS",
-        "ara": "أملك المعرف المدني والاجتماعي الرقمي",
-        "eng": "I have an IDCS",
-        "kan": "ಧ್ವಜಗಳು",
-        "hin": "फ्लैगिड्स",
-        "tam": "கொடிகள்"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "birthCertificateNumber",
-      "description": "Numéro Acte de Naissance",
-      "labelName": {
-        "fra": "Numéro Acte de Naissance",
-        "ara": "رقم شهادة الميلاد",
-        "eng": "Birth Certificate Number",
-        "kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
-        "hin": "जन्म प्रमाणपत्र संख्या",
-        "tam": "பிறப்புச் சான்றிதழ் எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{1,20}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true
-    },
-    {
-      "id": "civilRegistryNumber",
-      "description": "Numéro Acte de Naissance digitalisé",
-      "labelName": {
-        "fra": "Numéro Acte de Naissance digitalisé",
-        "ara": "رقم شهادة الميلاد الرقمي",
-        "eng": "Digital Birth Certificate Number",
-        "kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
-        "hin": "सिविल रजिस्ट्री नंबर",
-        "tam": "சிவில் பதிவு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "checksum": true,
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "phone",
-      "description": "phone",
-      "labelName": {
-        "eng": "Phone",
-        "ara": "هاتف",
-        "fra": "Téléphone",
-        "hin": "फ़ोन",
-        "kan": "ದೂರವಾಣಿ",
-        "tam": "தொலைபேசி"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[+]*([0-9]{1})([0-9]{9})$",
-          "arguments": []
-        }
-      ],
-      "required": true
-    },
-    {
-      "id": "email",
-      "description": "email",
-      "labelName": {
-        "eng": "Email",
-        "ara": "البريد الإلكتروني",
-        "fra": "Email",
-        "hin": "ईमेल",
-        "kan": "ಇಮೇಲ್",
-        "tam": "மின்னஞ்சல்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-          "arguments": []
-        }
-      ],
-      "required": true
-    },
-    {
-      "id": "guardianType",
-      "description": "Type de Tuteur",
-      "labelName": {
-        "fra": "Type de Tuteur",
-        "ara": "نوع الوصي",
-        "eng": "Tutor type",
-        "kan": "ರಕ್ಷಕ ವಿಧ",
-        "hin": "संरक्षक प्रकार",
-        "tam": "பாதுகாவலர் வகை"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "introducerName",
-      "description": "Prénom du tuteur",
-      "labelName": {
-        "eng": "introducer Name",
-        "ara": "مقدم Name",
-        "fra": "introducteur Name",
-        "kan": "ಪರಿಚಯಕಾರ Name",
-        "hin": "परिचयकर्ता  Name",
-        "tam": "அறிமுகம் Name"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "introducerUIN",
-      "description": "Identifiant digital civil et social du tuteur",
-      "labelName": {
-        "eng": "introducer UIN",
-        "ara": "مقدم UIN",
-        "fra": "introducteur UIN",
-        "kan": "ಪರಿಚಯಕಾರ UIN",
-        "hin": "परिचयकर्ता  UIN",
-        "tam": "அறிமுகம் UIN"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "checksum": true,
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[0-9]{10}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "introduceRID",
-      "description": "Identifiant RNP RID du tuteur",
-      "labelName": {
-        "eng": "introducer RID",
-        "ara": "مقدم RID",
-        "fra": "introducteur RID",
-        "kan": "ಪರಿಚಯಕಾರ RID",
-        "hin": "परिचयकर्ता  RID",
-        "tam": "அறிமுகம் RID"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[0-9]{29}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "introduceCNIE",
-      "description": "Numéro d'identité du tuteur",
-      "labelName": {
-        "eng": "introducer CNIE",
-        "ara": "مقدم CNIE",
-        "fra": "introducteur CNIE",
-        "kan": "ಪರಿಚಯಕಾರ CNIE",
-        "hin": "परिचयकर्ता  CNIE",
-        "tam": "அறிமுகம் CNIE"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "relationWithChild",
-      "description": "Lien de parenté",
-      "labelName": {
-        "fra": "Lien de parenté",
-        "ara": "صلة القرابة",
-        "eng": "Relationship",
-        "kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
-        "hin": "बच्चे के साथ संबंध",
-        "tam": "குழந்தையுடன் உறவு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "proofOfAddress",
-      "description": "proofOfAddress",
-      "labelName": {
-        "ara": "إثبات العنوان",
-        "fra": "Preuve d'adresse",
-        "eng": "Address Proof",
-        "hin": "निवास प्रमाण पत्र",
-        "kan": "ವಿಳಾಸ ಪುರಾವೆ",
-        "tam": "முகவரி சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POA",
-      "required": false
-    },
-    {
-      "id": "proofOfIdentity",
-      "description": "proofOfIdentity",
-      "labelName": {
-        "ara": "إثبات الهوية",
-        "fra": "Preuve d'identité",
-        "eng": "Identity Proof",
-        "hin": "पहचान प्रमाण",
-        "kan": "ಗುರುತಿನ ಪುರಾವೆ",
-        "tam": "அடையாள சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POI",
-      "required": true
-    },
-    {
-      "id": "proofOfRelationship",
-      "description": "proofOfRelationship",
-      "labelName": {
-        "ara": "إثبات العلاقة",
-        "fra": "Preuve de relation",
-        "eng": "Relationship Proof",
-        "hin": "संबंध प्रमाण",
-        "kan": "ಸಂಬಂಧ ಪುರಾವೆ",
-        "tam": "உறவு சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POR",
-      "required": true
-    },
-    {
-      "id": "proofOfDateOfBirth",
-      "description": "proofOfDateOfBirth",
-      "labelName": {
-        "ara": "دليل DOB",
-        "fra": "Preuve de date de naissance",
-        "eng": "DOB Proof",
-        "hin": "जन्मतिथि प्रमाण",
-        "kan": "DOB ಪ್ರೂಫ್",
-        "tam": "DOB ஆதாரம்"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POB",
-      "required": true
-    },
-    {
-      "id": "proofOfException",
-      "description": "proofOfException",
-      "labelName": {
-        "ara": "إثبات الاستثناء",
-        "fra": "Preuve d'exception",
-        "eng": "Exception Proof",
-        "kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
-        "tam": "விதிவிலக்கு சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POE",
-      "required": true
-    }
-  ],
-  "locationHierarchy": [
-    "region",
-    "province",
-    "city",
-    "zone",
-    "postalCode"
-  ]
-}
\ No newline at end of file
+	"identity": [
+		{
+			"id": "IDSchemaVersion",
+			"description": "ID Schema Version",
+			"type": "number",
+			"controlType": null,
+			"fieldType": "default",
+			"inputRequired": false,
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "title",
+			"description": "Title",
+			"labelName": {
+				"eng": "Title",
+				"ara": "عنوان",
+				"hin": "पशीर्षक",
+				"kan": "ಶೀರ್ಷಿಕೆ",
+				"tam": "தலைப்பு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "fullName",
+			"description": "Enter Full Name",
+			"labelName": {
+				"eng": "Full Name",
+				"ara": "الاسم الكامل",
+				"fra": "Nom complet",
+				"hin": "पूरा नाम",
+				"kan": "ಪೂರ್ಣ ಹೆಸರು",
+				"tam": "முழு பெயர்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"transliteration": true
+		},
+		{
+			"id": "dateOfBirth",
+			"description": "Enter DOB",
+			"labelName": {
+				"eng": "Date Of Birth",
+				"ara": "تاريخ الولادة",
+				"fra": "Date de naissance",
+				"hin": "जन्म की तारीख",
+				"kan": "ಹುಟ್ತಿದ ದಿನ",
+				"tam": "பிறந்த தேதி"
+			},
+			"controlType": "ageDate",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "gender",
+			"description": "Enter Gender",
+			"labelName": {
+				"eng": "Gender",
+				"ara": "جنس",
+				"fra": "Le genre",
+				"hin": "लिंग",
+				"kan": "ಲಿಂಗ",
+				"tam": "பாலினம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "UIN",
+			"description": "Enter UIN",
+			"labelName": {
+				"eng": "UIN"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "perpetualVID",
+			"description": "Enter perpetualVID",
+			"labelName": {
+				"eng": "perpetualVID"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "nationality",
+			"description": "nationality",
+			"labelName": {
+				"fra": "Nationalité",
+				"ara": "الجنسية",
+				"eng": "Nationality",
+				"hin": "राष्ट्रीयता",
+				"kan": "ರಾಷ್ಟ್ರೀಯತೆ",
+				"tam": "தேசியம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "flagb",
+			"description": "Je suis né(e) au maroc",
+			"labelName": {
+				"fra": "Je suis né(e) au maroc",
+				"ara": "ولدت في المغرب",
+				"eng": "I was born in Morocco",
+				"hin": "झंडाब",
+				"kan": "ಧ್ವಜ",
+				"tam": "கொடி"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "placeOfBirth",
+			"description": "Lieu de naissance",
+			"labelName": {
+				"fra": "Lieu de naissance",
+				"ara": "مكان الإزدياد",
+				"eng": "Place of birth",
+				"hin": "जन्म स्थान",
+				"kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
+				"tam": "பிறந்த இடம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "listCountry",
+			"description": "Pay de naissance",
+			"labelName": {
+				"fra": "Pay de naissance",
+				"ara": "بلد الإزدياد",
+				"eng": "Birth Pay",
+				"hin": "सूचीदेश",
+				"kan": "ಪಟ್ಟಿ ದೇಶ",
+				"tam": "பட்டியல் நாடு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "region",
+			"description": "region",
+			"labelName": {
+				"eng": "Region",
+				"ara": "منطقة",
+				"fra": "Région",
+				"hin": "ऊपरी क्षेत्र",
+				"kan": "ಪ್ರದೇಶ",
+				"tam": "பிராந்தியம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 1,
+			"parentLocCode": "MOR",
+			"required": true
+		},
+		{
+			"id": "province",
+			"description": "province",
+			"labelName": {
+				"eng": "Province",
+				"ara": "المحافظة",
+				"fra": "Province",
+				"hin": "प्रांत",
+				"kan": "ಪ್ರಾಂತ್ಯ",
+				"tam": "மாகாணம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 2,
+			"required": true
+		},
+		{
+			"id": "city",
+			"description": "city",
+			"labelName": {
+				"eng": "City",
+				"ara": "مدينة",
+				"fra": "Ville",
+				"hin": "शहर",
+				"kan": "ನಗರ",
+				"tam": "நகரம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 3,
+			"required": true
+		},
+		{
+			"id": "zone",
+			"description": "zone",
+			"labelName": {
+				"eng": "Zone",
+				"ara": "منطقة",
+				"fra": "Zone",
+				"hin": "क्षेत्र",
+				"kan": "ವಲಯ",
+				"tam": "மண்டலம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [],
+			"locationHierarchyLevel": 4,
+			"required": true
+		},
+		{
+			"id": "postalCode",
+			"description": "postalCode",
+			"labelName": {
+				"eng": "Postal Code",
+				"ara": "الكود البريدى",
+				"fra": "code postal",
+				"hin": "डाक कोड",
+				"kan": "ಅಂಚೆ ಕೋಡ್",
+				"tam": "அஞ்சல் குறியீடு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 5,
+			"required": true
+		},
+		{
+			"id": "residenceStatus",
+			"description": "Quartier/Résidence/Douar",
+			"labelName": {
+				"fra": "Quartier/Résidence/Douar",
+				"ara": "الحي / السكن / الدوار",
+				"eng": "Residence Status",
+				"hin": "निवास स्थान",
+				"kan": "ನಿವಾಸ",
+				"tam": "குடியிருப்பு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "addressType",
+			"description": "Type d'habitat",
+			"labelName": {
+				"fra": "Type d'habitat",
+				"ara": "نوع السكن",
+				"eng": "Habitat type",
+				"kan": "ವಿಳಾಸದ ವಿಧ",
+				"hin": "पता मुद्रलेख",
+				"tam": "முகவரி வகை"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "portNo",
+			"description": "N Porte",
+			"labelName": {
+				"fra": "N° Porte",
+				"ara": "رقم الباب",
+				"eng": "Port No",
+				"kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+				"hin": "पोर्ट नंबर",
+				"tam": "துறை எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,10}$).*",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "apptNo",
+			"description": "N immeuble",
+			"labelName": {
+				"fra": "N° immeuble",
+				"ara": "رقم المبنى",
+				"eng": "Appt no",
+				"kan": "appt ಸಂಖ್ಯೆ",
+				"hin": "उपयुक्त संख्या",
+				"tam": "appt எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,10}$).*",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "addressLine1",
+			"description": "Adresse de résidence",
+			"labelName": {
+				"fra": "Adresse de résidence",
+				"ara": "عنوان السكن",
+				"eng": "Adresse Line1",
+				"hin": "पता पंक्ति 1",
+				"kan": "ವಿಳಾಸ 1",
+				"tam": "முகவரி வரி 1"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,100}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "referenceCNIENumber",
+			"description": "CNIE",
+			"labelName": {
+				"fra": "CNIE",
+				"ara": "رقم البطاقة الوطنية",
+				"eng": "CNIE",
+				"kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
+				"hin": "संदर्भ सीएनआईई नंबर",
+				"tam": "குறிப்பு CNIE எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": true,
+			"group": "card_info",
+			"preview": true
+		},
+		{
+			"id": "resOuPass",
+			"description": "Je dispose",
+			"labelName": {
+				"fra": "Je dispose",
+				"ara": "أملك",
+				"eng": "I have",
+				"kan": "resOuPass",
+				"hin": "resOuPass",
+				"tam": "resOuPass"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": false,
+			"tooltip": false
+		},
+		{
+			"id": "referenceResidencyNumber",
+			"description": "Numéro d'identité du résident étranger",
+			"labelName": {
+				"fra": "Numéro d'identité du résident étranger",
+				"ara": "رقم هوية المقيم الأجنبي",
+				"eng": "Identity number of the foreign resident",
+				"kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
+				"hin": "संदर्भ निवास संख्या",
+				"tam": "குறிப்பு குடியிருப்பு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "[A-Za-z][0-9]{6}[A-Za-z]",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "passportNumber",
+			"description": "Numéro de passport",
+			"labelName": {
+				"fra": "Numéro de Passeport",
+				"ara": "رقم جواز السفر",
+				"eng": "Passport number",
+				"kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+				"hin": "पासपोर्ट संख्या",
+				"tam": "கடவுச்சீட்டு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{1,20}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "flagidcs",
+			"description": "Je dispose d'un IDCS",
+			"labelName": {
+				"fra": "Je dispose d'un IDCS",
+				"ara": "أملك المعرف المدني والاجتماعي الرقمي",
+				"eng": "I have an IDCS",
+				"kan": "ಧ್ವಜಗಳು",
+				"hin": "फ्लैगिड्स",
+				"tam": "கொடிகள்"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "birthCertificateNumber",
+			"description": "Numéro Acte de Naissance",
+			"labelName": {
+				"fra": "Numéro Acte de Naissance",
+				"ara": "رقم شهادة الميلاد",
+				"eng": "Birth Certificate Number",
+				"kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
+				"hin": "जन्म प्रमाणपत्र संख्या",
+				"tam": "பிறப்புச் சான்றிதழ் எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{1,20}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true
+		},
+		{
+			"id": "civilRegistryNumber",
+			"description": "Numéro Acte de Naissance digitalisé",
+			"labelName": {
+				"fra": "Numéro Acte de Naissance digitalisé",
+				"ara": "رقم شهادة الميلاد الرقمي",
+				"eng": "Digital Birth Certificate Number",
+				"kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
+				"hin": "सिविल रजिस्ट्री नंबर",
+				"tam": "சிவில் பதிவு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"checksum": true,
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "phone",
+			"description": "phone",
+			"labelName": {
+				"eng": "Phone",
+				"ara": "هاتف",
+				"fra": "Téléphone",
+				"hin": "फ़ोन",
+				"kan": "ದೂರವಾಣಿ",
+				"tam": "தொலைபேசி"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[+]*([0-9]{1})([0-9]{9})$",
+					"arguments": []
+				}
+			],
+			"required": true
+		},
+		{
+			"id": "email",
+			"description": "email",
+			"labelName": {
+				"eng": "Email",
+				"ara": "البريد الإلكتروني",
+				"fra": "Email",
+				"hin": "ईमेल",
+				"kan": "ಇಮೇಲ್",
+				"tam": "மின்னஞ்சல்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"maskRequired": true,
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+					"arguments": []
+				}
+			],
+			"required": true
+		},
+		{
+			"id": "guardianType",
+			"description": "Type de Tuteur",
+			"labelName": {
+				"fra": "Type de Tuteur",
+				"ara": "نوع الوصي",
+				"eng": "Tutor type",
+				"kan": "ರಕ್ಷಕ ವಿಧ",
+				"hin": "संरक्षक प्रकार",
+				"tam": "பாதுகாவலர் வகை"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "introducerName",
+			"description": "Prénom du tuteur",
+			"labelName": {
+				"eng": "introducer Name",
+				"ara": "مقدم Name",
+				"fra": "introducteur Name",
+				"kan": "ಪರಿಚಯಕಾರ Name",
+				"hin": "परिचयकर्ता  Name",
+				"tam": "அறிமுகம் Name"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "introducerUIN",
+			"description": "Identifiant digital civil et social du tuteur",
+			"labelName": {
+				"eng": "introducer UIN",
+				"ara": "مقدم UIN",
+				"fra": "introducteur UIN",
+				"kan": "ಪರಿಚಯಕಾರ UIN",
+				"hin": "परिचयकर्ता  UIN",
+				"tam": "அறிமுகம் UIN"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"checksum": true,
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[0-9]{10}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "introduceRID",
+			"description": "Identifiant RNP RID du tuteur",
+			"labelName": {
+				"eng": "introducer RID",
+				"ara": "مقدم RID",
+				"fra": "introducteur RID",
+				"kan": "ಪರಿಚಯಕಾರ RID",
+				"hin": "परिचयकर्ता  RID",
+				"tam": "அறிமுகம் RID"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[0-9]{29}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "introduceCNIE",
+			"description": "Numéro d'identité du tuteur",
+			"labelName": {
+				"eng": "introducer CNIE",
+				"ara": "مقدم CNIE",
+				"fra": "introducteur CNIE",
+				"kan": "ಪರಿಚಯಕಾರ CNIE",
+				"hin": "परिचयकर्ता  CNIE",
+				"tam": "அறிமுகம் CNIE"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "relationWithChild",
+			"description": "Lien de parenté",
+			"labelName": {
+				"fra": "Lien de parenté",
+				"ara": "صلة القرابة",
+				"eng": "Relationship",
+				"kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
+				"hin": "बच्चे के साथ संबंध",
+				"tam": "குழந்தையுடன் உறவு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "proofOfAddress",
+			"description": "proofOfAddress",
+			"labelName": {
+				"ara": "إثبات العنوان",
+				"fra": "Preuve d'adresse",
+				"eng": "Address Proof",
+				"hin": "निवास प्रमाण पत्र",
+				"kan": "ವಿಳಾಸ ಪುರಾವೆ",
+				"tam": "முகவரி சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POA",
+			"required": false
+		},
+		{
+			"id": "proofOfIdentity",
+			"description": "proofOfIdentity",
+			"labelName": {
+				"ara": "إثبات الهوية",
+				"fra": "Preuve d'identité",
+				"eng": "Identity Proof",
+				"hin": "पहचान प्रमाण",
+				"kan": "ಗುರುತಿನ ಪುರಾವೆ",
+				"tam": "அடையாள சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POI",
+			"required": true
+		},
+		{
+			"id": "proofOfRelationship",
+			"description": "proofOfRelationship",
+			"labelName": {
+				"ara": "إثبات العلاقة",
+				"fra": "Preuve de relation",
+				"eng": "Relationship Proof",
+				"hin": "संबंध प्रमाण",
+				"kan": "ಸಂಬಂಧ ಪುರಾವೆ",
+				"tam": "உறவு சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POR",
+			"required": true
+		},
+		{
+			"id": "proofOfDateOfBirth",
+			"description": "proofOfDateOfBirth",
+			"labelName": {
+				"ara": "دليل DOB",
+				"fra": "Preuve de date de naissance",
+				"eng": "DOB Proof",
+				"hin": "जन्मतिथि प्रमाण",
+				"kan": "DOB ಪ್ರೂಫ್",
+				"tam": "DOB ஆதாரம்"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POB",
+			"required": true
+		},
+		{
+			"id": "proofOfException",
+			"description": "proofOfException",
+			"labelName": {
+				"ara": "إثبات الاستثناء",
+				"fra": "Preuve d'exception",
+				"eng": "Exception Proof",
+				"kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
+				"tam": "விதிவிலக்கு சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POE",
+			"required": true
+		}
+	],
+	"locationHierarchy": [
+		"region",
+		"province",
+		"city",
+		"zone",
+		"postalCode"
+	]
+}

From 2f5c47ac211e65be6a75636895c33882d9c32520 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Mon, 23 Jan 2023 14:07:28 +0530
Subject: [PATCH 1062/1358] Update resident-ui-update-demographics-schema.json

---
 resident-ui-update-demographics-schema.json | 1816 ++++++++++---------
 1 file changed, 922 insertions(+), 894 deletions(-)

diff --git a/resident-ui-update-demographics-schema.json b/resident-ui-update-demographics-schema.json
index 5fba7ed748b..6976929e3f4 100644
--- a/resident-ui-update-demographics-schema.json
+++ b/resident-ui-update-demographics-schema.json
@@ -1,895 +1,923 @@
 {
-  "identity": [
-    {
-      "id": "IDSchemaVersion",
-      "description": "ID Schema Version",
-      "type": "number",
-      "controlType": null,
-      "fieldType": "default",
-      "inputRequired": false,
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "title",
-      "description": "Title",
-      "labelName": {
-        "eng": "Title",
-        "ara": "عنوان",
-        "hin": "पशीर्षक",
-        "kan": "ಶೀರ್ಷಿಕೆ",
-        "tam": "தலைப்பு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "fullName",
-      "description": "Enter Full Name",
-      "labelName": {
-        "eng": "Full Name",
-        "ara": "الاسم الكامل",
-        "fra": "Nom complet",
-        "hin": "पूरा नाम",
-        "kan": "ಪೂರ್ಣ ಹೆಸರು",
-        "tam": "முழு பெயர்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "transliteration": true
-    },
-    {
-      "id": "dateOfBirth",
-      "description": "Enter DOB",
-      "labelName": {
-        "eng": "Date Of Birth",
-        "ara": "تاريخ الولادة",
-        "fra": "Date de naissance",
-        "hin": "जन्म की तारीख",
-        "kan": "ಹುಟ್ತಿದ ದಿನ",
-        "tam": "பிறந்த தேதி"
-      },
-      "controlType": "ageDate",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "gender",
-      "description": "Enter Gender",
-      "labelName": {
-        "eng": "Gender",
-        "ara": "جنس",
-        "fra": "Le genre",
-        "hin": "लिंग",
-        "kan": "ಲಿಂಗ",
-        "tam": "பாலினம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true
-    },
-    {
-      "id": "nationality",
-      "description": "nationality",
-      "labelName": {
-        "fra": "Nationalité",
-        "ara": "الجنسية",
-        "eng": "Nationality",
-        "hin": "राष्ट्रीयता",
-        "kan": "ರಾಷ್ಟ್ರೀಯತೆ",
-        "tam": "தேசியம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "flagb",
-      "description": "Je suis né(e) au maroc",
-      "labelName": {
-        "fra": "Je suis né(e) au maroc",
-        "ara": "ولدت في المغرب",
-        "eng": "I was born in Morocco",
-        "hin": "झंडाब",
-        "kan": "ಧ್ವಜ",
-        "tam": "கொடி"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "placeOfBirth",
-      "description": "Lieu de naissance",
-      "labelName": {
-        "fra": "Lieu de naissance",
-        "ara": "مكان الإزدياد",
-        "eng": "Place of birth",
-        "hin": "जन्म स्थान",
-        "kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
-        "tam": "பிறந்த இடம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "listCountry",
-      "description": "Pay de naissance",
-      "labelName": {
-        "fra": "Pay de naissance",
-        "ara": "بلد الإزدياد",
-        "eng": "Birth Pay",
-        "hin": "सूचीदेश",
-        "kan": "ಪಟ್ಟಿ ದೇಶ",
-        "tam": "பட்டியல் நாடு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "personal_info",
-      "preview": true
-    },
-    {
-      "id": "region",
-      "description": "region",
-      "labelName": {
-        "eng": "Region",
-        "ara": "منطقة",
-        "fra": "Région",
-        "hin": "ऊपरी क्षेत्र",
-        "kan": "ಪ್ರದೇಶ",
-        "tam": "பிராந்தியம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 1,
-      "parentLocCode": "MOR",
-      "required": true
-    },
-    {
-      "id": "province",
-      "description": "province",
-      "labelName": {
-        "eng": "Province",
-        "ara": "المحافظة",
-        "fra": "Province",
-        "hin": "प्रांत",
-        "kan": "ಪ್ರಾಂತ್ಯ",
-        "tam": "மாகாணம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 2,
-      "required": true
-    },
-    {
-      "id": "city",
-      "description": "city",
-      "labelName": {
-        "eng": "City",
-        "ara": "مدينة",
-        "fra": "Ville",
-        "hin": "शहर",
-        "kan": "ನಗರ",
-        "tam": "நகரம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{3,50}$).*",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 3,
-      "required": true
-    },
-    {
-      "id": "zone",
-      "description": "zone",
-      "labelName": {
-        "eng": "Zone",
-        "ara": "منطقة",
-        "fra": "Zone",
-        "hin": "क्षेत्र",
-        "kan": "ವಲಯ",
-        "tam": "மண்டலம்"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [],
-      "locationHierarchyLevel": 4,
-      "required": true
-    },
-    {
-      "id": "postalCode",
-      "description": "postalCode",
-      "labelName": {
-        "eng": "Postal Code",
-        "ara": "الكود البريدى",
-        "fra": "code postal",
-        "hin": "डाक कोड",
-        "kan": "ಅಂಚೆ ಕೋಡ್",
-        "tam": "அஞ்சல் குறியீடு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-          "arguments": []
-        }
-      ],
-      "locationHierarchyLevel": 5,
-      "required": true
-    },
-    {
-      "id": "residenceStatus",
-      "description": "Quartier/Résidence/Douar",
-      "labelName": {
-        "fra": "Quartier/Résidence/Douar",
-        "ara": "الحي / السكن / الدوار",
-        "eng": "Residence Status",
-        "hin": "निवास स्थान",
-        "kan": "ನಿವಾಸ",
-        "tam": "குடியிருப்பு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "addressType",
-      "description": "Type d'habitat",
-      "labelName": {
-        "fra": "Type d'habitat",
-        "ara": "نوع السكن",
-        "eng": "Habitat type",
-        "kan": "ವಿಳಾಸದ ವಿಧ",
-        "hin": "पता मुद्रलेख",
-        "tam": "முகவரி வகை"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "portNo",
-      "description": "N Porte",
-      "labelName": {
-        "fra": "N° Porte",
-        "ara": "رقم الباب",
-        "eng": "Port No",
-        "kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-        "hin": "पोर्ट नंबर",
-        "tam": "துறை எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,10}$).*",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "apptNo",
-      "description": "N immeuble",
-      "labelName": {
-        "fra": "N° immeuble",
-        "ara": "رقم المبنى",
-        "eng": "Appt no",
-        "kan": "appt ಸಂಖ್ಯೆ",
-        "hin": "उपयुक्त संख्या",
-        "tam": "appt எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,10}$).*",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "addressLine1",
-      "description": "Adresse de résidence",
-      "labelName": {
-        "fra": "Adresse de résidence",
-        "ara": "عنوان السكن",
-        "eng": "Adresse Line1",
-        "hin": "पता पंक्ति 1",
-        "kan": "ವಿಳಾಸ 1",
-        "tam": "முகவரி வரி 1"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{0,100}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": true,
-      "group": "address_info",
-      "preview": true
-    },
-    {
-      "id": "referenceCNIENumber",
-      "description": "CNIE",
-      "labelName": {
-        "fra": "CNIE",
-        "ara": "رقم البطاقة الوطنية",
-        "eng": "CNIE",
-        "kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
-        "hin": "संदर्भ सीएनआईई नंबर",
-        "tam": "குறிப்பு CNIE எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": true,
-      "group": "card_info",
-      "preview": true
-    },
-    {
-      "id": "resOuPass",
-      "description": "Je dispose",
-      "labelName": {
-        "fra": "Je dispose",
-        "ara": "أملك",
-        "eng": "I have",
-        "kan": "resOuPass",
-        "hin": "resOuPass",
-        "tam": "resOuPass"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": false,
-      "tooltip": false
-    },
-    {
-      "id": "referenceResidencyNumber",
-      "description": "Numéro d'identité du résident étranger",
-      "labelName": {
-        "fra": "Numéro d'identité du résident étranger",
-        "ara": "رقم هوية المقيم الأجنبي",
-        "eng": "Identity number of the foreign resident",
-        "kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
-        "hin": "संदर्भ निवास संख्या",
-        "tam": "குறிப்பு குடியிருப்பு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "[A-Za-z][0-9]{6}[A-Za-z]",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "passportNumber",
-      "description": "Numéro de passport",
-      "labelName": {
-        "fra": "Numéro de Passeport",
-        "ara": "رقم جواز السفر",
-        "eng": "Passport number",
-        "kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-        "hin": "पासपोर्ट संख्या",
-        "tam": "கடவுச்சீட்டு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{1,20}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "flagidcs",
-      "description": "Je dispose d'un IDCS",
-      "labelName": {
-        "fra": "Je dispose d'un IDCS",
-        "ara": "أملك المعرف المدني والاجتماعي الرقمي",
-        "eng": "I have an IDCS",
-        "kan": "ಧ್ವಜಗಳು",
-        "hin": "फ्लैगिड्स",
-        "tam": "கொடிகள்"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": true,
-      "visible": true,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "birthCertificateNumber",
-      "description": "Numéro Acte de Naissance",
-      "labelName": {
-        "fra": "Numéro Acte de Naissance",
-        "ara": "رقم شهادة الميلاد",
-        "eng": "Birth Certificate Number",
-        "kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
-        "hin": "जन्म प्रमाणपत्र संख्या",
-        "tam": "பிறப்புச் சான்றிதழ் எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^(?=.{1,20}$).*",
-          "arguments": []
-        }
-      ],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true
-    },
-    {
-      "id": "civilRegistryNumber",
-      "description": "Numéro Acte de Naissance digitalisé",
-      "labelName": {
-        "fra": "Numéro Acte de Naissance digitalisé",
-        "ara": "رقم شهادة الميلاد الرقمي",
-        "eng": "Digital Birth Certificate Number",
-        "kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
-        "hin": "सिविल रजिस्ट्री नंबर",
-        "tam": "சிவில் பதிவு எண்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "checksum": true,
-      "validators": [],
-      "required": true,
-      "visible": false,
-      "group": "card_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "phone",
-      "description": "phone",
-      "labelName": {
-        "eng": "Phone",
-        "ara": "هاتف",
-        "fra": "Téléphone",
-        "hin": "फ़ोन",
-        "kan": "ದೂರವಾಣಿ",
-        "tam": "தொலைபேசி"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[+]*([0-9]{1})([0-9]{9})$",
-          "arguments": []
-        }
-      ],
-      "required": true
-    },
-    {
-      "id": "email",
-      "description": "email",
-      "labelName": {
-        "eng": "Email",
-        "ara": "البريد الإلكتروني",
-        "fra": "Email",
-        "hin": "ईमेल",
-        "kan": "ಇಮೇಲ್",
-        "tam": "மின்னஞ்சல்"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-          "arguments": []
-        }
-      ],
-      "required": true
-    },
-    {
-      "id": "guardianType",
-      "description": "Type de Tuteur",
-      "labelName": {
-        "fra": "Type de Tuteur",
-        "ara": "نوع الوصي",
-        "eng": "Tutor type",
-        "kan": "ರಕ್ಷಕ ವಿಧ",
-        "hin": "संरक्षक प्रकार",
-        "tam": "பாதுகாவலர் வகை"
-      },
-      "controlType": "dropdown",
-      "subtype": "radio",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": false
-    },
-    {
-      "id": "introducerName",
-      "description": "Prénom du tuteur",
-      "labelName": {
-        "eng": "introducer Name",
-        "ara": "مقدم Name",
-        "fra": "introducteur Name",
-        "kan": "ಪರಿಚಯಕಾರ Name",
-        "hin": "परिचयकर्ता  Name",
-        "tam": "அறிமுகம் Name"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "simpleType",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "introducerUIN",
-      "description": "Identifiant digital civil et social du tuteur",
-      "labelName": {
-        "eng": "introducer UIN",
-        "ara": "مقدم UIN",
-        "fra": "introducteur UIN",
-        "kan": "ಪರಿಚಯಕಾರ UIN",
-        "hin": "परिचयकर्ता  UIN",
-        "tam": "அறிமுகம் UIN"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "checksum": true,
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[0-9]{10}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "introduceRID",
-      "description": "Identifiant RNP RID du tuteur",
-      "labelName": {
-        "eng": "introducer RID",
-        "ara": "مقدم RID",
-        "fra": "introducteur RID",
-        "kan": "ಪರಿಚಯಕಾರ RID",
-        "hin": "परिचयकर्ता  RID",
-        "tam": "அறிமுகம் RID"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "^[0-9]{29}$",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true,
-      "tooltip": true
-    },
-    {
-      "id": "introduceCNIE",
-      "description": "Numéro d'identité du tuteur",
-      "labelName": {
-        "eng": "introducer CNIE",
-        "ara": "مقدم CNIE",
-        "fra": "introducteur CNIE",
-        "kan": "ಪರಿಚಯಕಾರ CNIE",
-        "hin": "परिचयकर्ता  CNIE",
-        "tam": "அறிமுகம் CNIE"
-      },
-      "controlType": "textbox",
-      "inputRequired": true,
-      "fieldType": "default",
-      "type": "string",
-      "validators": [
-        {
-          "type": "regex",
-          "validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
-          "arguments": []
-        }
-      ],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "relationWithChild",
-      "description": "Lien de parenté",
-      "labelName": {
-        "fra": "Lien de parenté",
-        "ara": "صلة القرابة",
-        "eng": "Relationship",
-        "kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
-        "hin": "बच्चे के साथ संबंध",
-        "tam": "குழந்தையுடன் உறவு"
-      },
-      "controlType": "dropdown",
-      "inputRequired": true,
-      "fieldType": "dynamic",
-      "type": "simpleType",
-      "validators": [],
-      "required": false,
-      "visible": false,
-      "group": "guardian_info",
-      "preview": true
-    },
-    {
-      "id": "proofOfAddress",
-      "description": "proofOfAddress",
-      "labelName": {
-        "ara": "إثبات العنوان",
-        "fra": "Preuve d'adresse",
-        "eng": "Address Proof",
-        "hin": "निवास प्रमाण पत्र",
-        "kan": "ವಿಳಾಸ ಪುರಾವೆ",
-        "tam": "முகவரி சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POA",
-      "required": false
-    },
-    {
-      "id": "proofOfIdentity",
-      "description": "proofOfIdentity",
-      "labelName": {
-        "ara": "إثبات الهوية",
-        "fra": "Preuve d'identité",
-        "eng": "Identity Proof",
-        "hin": "पहचान प्रमाण",
-        "kan": "ಗುರುತಿನ ಪುರಾವೆ",
-        "tam": "அடையாள சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POI",
-      "required": true
-    },
-    {
-      "id": "proofOfRelationship",
-      "description": "proofOfRelationship",
-      "labelName": {
-        "ara": "إثبات العلاقة",
-        "fra": "Preuve de relation",
-        "eng": "Relationship Proof",
-        "hin": "संबंध प्रमाण",
-        "kan": "ಸಂಬಂಧ ಪುರಾವೆ",
-        "tam": "உறவு சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POR",
-      "required": true
-    },
-    {
-      "id": "proofOfDateOfBirth",
-      "description": "proofOfDateOfBirth",
-      "labelName": {
-        "ara": "دليل DOB",
-        "fra": "Preuve de date de naissance",
-        "eng": "DOB Proof",
-        "hin": "जन्मतिथि प्रमाण",
-        "kan": "DOB ಪ್ರೂಫ್",
-        "tam": "DOB ஆதாரம்"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POB",
-      "required": true
-    },
-    {
-      "id": "proofOfException",
-      "description": "proofOfException",
-      "labelName": {
-        "ara": "إثبات الاستثناء",
-        "fra": "Preuve d'exception",
-        "eng": "Exception Proof",
-        "kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
-        "tam": "விதிவிலக்கு சான்று"
-      },
-      "controlType": "fileupload",
-      "inputRequired": true,
-      "validators": [],
-      "subType": "POE",
-      "required": true
-    }
-  ],
-  "locationHierarchy": [
-    "region",
-    "province",
-    "city",
-    "zone",
-    "postalCode"
-  ]
-}
\ No newline at end of file
+	"identity": [
+		{
+			"id": "IDSchemaVersion",
+			"description": "ID Schema Version",
+			"type": "number",
+			"controlType": null,
+			"fieldType": "default",
+			"inputRequired": false,
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "title",
+			"description": "Title",
+			"labelName": {
+				"eng": "Title",
+				"ara": "عنوان",
+				"hin": "पशीर्षक",
+				"kan": "ಶೀರ್ಷಿಕೆ",
+				"tam": "தலைப்பு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "fullName",
+			"description": "Enter Full Name",
+			"labelName": {
+				"eng": "Full Name",
+				"ara": "الاسم الكامل",
+				"fra": "Nom complet",
+				"hin": "पूरा नाम",
+				"kan": "ಪೂರ್ಣ ಹೆಸರು",
+				"tam": "முழு பெயர்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"transliteration": true
+		},
+		{
+			"id": "dateOfBirth",
+			"description": "Enter DOB",
+			"labelName": {
+				"eng": "Date Of Birth",
+				"ara": "تاريخ الولادة",
+				"fra": "Date de naissance",
+				"hin": "जन्म की तारीख",
+				"kan": "ಹುಟ್ತಿದ ದಿನ",
+				"tam": "பிறந்த தேதி"
+			},
+			"controlType": "ageDate",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "gender",
+			"description": "Enter Gender",
+			"labelName": {
+				"eng": "Gender",
+				"ara": "جنس",
+				"fra": "Le genre",
+				"hin": "लिंग",
+				"kan": "ಲಿಂಗ",
+				"tam": "பாலினம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true
+		},
+		{
+			"id": "nationality",
+			"description": "nationality",
+			"labelName": {
+				"fra": "Nationalité",
+				"ara": "الجنسية",
+				"eng": "Nationality",
+				"hin": "राष्ट्रीयता",
+				"kan": "ರಾಷ್ಟ್ರೀಯತೆ",
+				"tam": "தேசியம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "flagb",
+			"description": "Je suis né(e) au maroc",
+			"labelName": {
+				"fra": "Je suis né(e) au maroc",
+				"ara": "ولدت في المغرب",
+				"eng": "I was born in Morocco",
+				"hin": "झंडाब",
+				"kan": "ಧ್ವಜ",
+				"tam": "கொடி"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "placeOfBirth",
+			"description": "Lieu de naissance",
+			"labelName": {
+				"fra": "Lieu de naissance",
+				"ara": "مكان الإزدياد",
+				"eng": "Place of birth",
+				"hin": "जन्म स्थान",
+				"kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
+				"tam": "பிறந்த இடம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "listCountry",
+			"description": "Pay de naissance",
+			"labelName": {
+				"fra": "Pay de naissance",
+				"ara": "بلد الإزدياد",
+				"eng": "Birth Pay",
+				"hin": "सूचीदेश",
+				"kan": "ಪಟ್ಟಿ ದೇಶ",
+				"tam": "பட்டியல் நாடு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "personal_info",
+			"preview": true
+		},
+		{
+			"id": "region",
+			"description": "region",
+			"labelName": {
+				"eng": "Region",
+				"ara": "منطقة",
+				"fra": "Région",
+				"hin": "ऊपरी क्षेत्र",
+				"kan": "ಪ್ರದೇಶ",
+				"tam": "பிராந்தியம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 1,
+			"parentLocCode": "MOR",
+			"required": true
+		},
+		{
+			"id": "province",
+			"description": "province",
+			"labelName": {
+				"eng": "Province",
+				"ara": "المحافظة",
+				"fra": "Province",
+				"hin": "प्रांत",
+				"kan": "ಪ್ರಾಂತ್ಯ",
+				"tam": "மாகாணம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 2,
+			"required": true
+		},
+		{
+			"id": "city",
+			"description": "city",
+			"labelName": {
+				"eng": "City",
+				"ara": "مدينة",
+				"fra": "Ville",
+				"hin": "शहर",
+				"kan": "ನಗರ",
+				"tam": "நகரம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{3,50}$).*",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 3,
+			"required": true
+		},
+		{
+			"id": "zone",
+			"description": "zone",
+			"labelName": {
+				"eng": "Zone",
+				"ara": "منطقة",
+				"fra": "Zone",
+				"hin": "क्षेत्र",
+				"kan": "ವಲಯ",
+				"tam": "மண்டலம்"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [],
+			"locationHierarchyLevel": 4,
+			"required": true
+		},
+		{
+			"id": "postalCode",
+			"description": "postalCode",
+			"labelName": {
+				"eng": "Postal Code",
+				"ara": "الكود البريدى",
+				"fra": "code postal",
+				"hin": "डाक कोड",
+				"kan": "ಅಂಚೆ ಕೋಡ್",
+				"tam": "அஞ்சல் குறியீடு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[(?i)A-Z0-9]{5}$|^NA$",
+					"arguments": []
+				}
+			],
+			"locationHierarchyLevel": 5,
+			"required": true
+		},
+		{
+			"id": "residenceStatus",
+			"description": "Quartier/Résidence/Douar",
+			"labelName": {
+				"fra": "Quartier/Résidence/Douar",
+				"ara": "الحي / السكن / الدوار",
+				"eng": "Residence Status",
+				"hin": "निवास स्थान",
+				"kan": "ನಿವಾಸ",
+				"tam": "குடியிருப்பு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "addressType",
+			"description": "Type d'habitat",
+			"labelName": {
+				"fra": "Type d'habitat",
+				"ara": "نوع السكن",
+				"eng": "Habitat type",
+				"kan": "ವಿಳಾಸದ ವಿಧ",
+				"hin": "पता मुद्रलेख",
+				"tam": "முகவரி வகை"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "portNo",
+			"description": "N Porte",
+			"labelName": {
+				"fra": "N° Porte",
+				"ara": "رقم الباب",
+				"eng": "Port No",
+				"kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+				"hin": "पोर्ट नंबर",
+				"tam": "துறை எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,10}$).*",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "apptNo",
+			"description": "N immeuble",
+			"labelName": {
+				"fra": "N° immeuble",
+				"ara": "رقم المبنى",
+				"eng": "Appt no",
+				"kan": "appt ಸಂಖ್ಯೆ",
+				"hin": "उपयुक्त संख्या",
+				"tam": "appt எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,10}$).*",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "addressLine1",
+			"description": "Adresse de résidence",
+			"labelName": {
+				"fra": "Adresse de résidence",
+				"ara": "عنوان السكن",
+				"eng": "Adresse Line1",
+				"hin": "पता पंक्ति 1",
+				"kan": "ವಿಳಾಸ 1",
+				"tam": "முகவரி வரி 1"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{0,100}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": true,
+			"group": "address_info",
+			"preview": true
+		},
+		{
+			"id": "referenceCNIENumber",
+			"description": "CNIE",
+			"labelName": {
+				"fra": "CNIE",
+				"ara": "رقم البطاقة الوطنية",
+				"eng": "CNIE",
+				"kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
+				"hin": "संदर्भ सीएनआईई नंबर",
+				"tam": "குறிப்பு CNIE எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": true,
+			"group": "card_info",
+			"preview": true
+		},
+		{
+			"id": "resOuPass",
+			"description": "Je dispose",
+			"labelName": {
+				"fra": "Je dispose",
+				"ara": "أملك",
+				"eng": "I have",
+				"kan": "resOuPass",
+				"hin": "resOuPass",
+				"tam": "resOuPass"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": false,
+			"tooltip": false
+		},
+		{
+			"id": "referenceResidencyNumber",
+			"description": "Numéro d'identité du résident étranger",
+			"labelName": {
+				"fra": "Numéro d'identité du résident étranger",
+				"ara": "رقم هوية المقيم الأجنبي",
+				"eng": "Identity number of the foreign resident",
+				"kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
+				"hin": "संदर्भ निवास संख्या",
+				"tam": "குறிப்பு குடியிருப்பு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "[A-Za-z][0-9]{6}[A-Za-z]",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "passportNumber",
+			"description": "Numéro de passport",
+			"labelName": {
+				"fra": "Numéro de Passeport",
+				"ara": "رقم جواز السفر",
+				"eng": "Passport number",
+				"kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
+				"hin": "पासपोर्ट संख्या",
+				"tam": "கடவுச்சீட்டு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{1,20}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "flagidcs",
+			"description": "Je dispose d'un IDCS",
+			"labelName": {
+				"fra": "Je dispose d'un IDCS",
+				"ara": "أملك المعرف المدني والاجتماعي الرقمي",
+				"eng": "I have an IDCS",
+				"kan": "ಧ್ವಜಗಳು",
+				"hin": "फ्लैगिड्स",
+				"tam": "கொடிகள்"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": true,
+			"visible": true,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "birthCertificateNumber",
+			"description": "Numéro Acte de Naissance",
+			"labelName": {
+				"fra": "Numéro Acte de Naissance",
+				"ara": "رقم شهادة الميلاد",
+				"eng": "Birth Certificate Number",
+				"kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
+				"hin": "जन्म प्रमाणपत्र संख्या",
+				"tam": "பிறப்புச் சான்றிதழ் எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^(?=.{1,20}$).*",
+					"arguments": []
+				}
+			],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true
+		},
+		{
+			"id": "civilRegistryNumber",
+			"description": "Numéro Acte de Naissance digitalisé",
+			"labelName": {
+				"fra": "Numéro Acte de Naissance digitalisé",
+				"ara": "رقم شهادة الميلاد الرقمي",
+				"eng": "Digital Birth Certificate Number",
+				"kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
+				"hin": "सिविल रजिस्ट्री नंबर",
+				"tam": "சிவில் பதிவு எண்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"checksum": true,
+			"validators": [],
+			"required": true,
+			"visible": false,
+			"group": "card_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "phone",
+			"description": "phone",
+			"labelName": {
+				"eng": "Phone",
+				"ara": "هاتف",
+				"fra": "Téléphone",
+				"hin": "फ़ोन",
+				"kan": "ದೂರವಾಣಿ",
+				"tam": "தொலைபேசி"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[+]*([0-9]{1})([0-9]{9})$",
+					"arguments": []
+				}
+			],
+			"required": true
+		},
+		{
+			"id": "email",
+			"description": "email",
+			"labelName": {
+				"eng": "Email",
+				"ara": "البريد الإلكتروني",
+				"fra": "Email",
+				"hin": "ईमेल",
+				"kan": "ಇಮೇಲ್",
+				"tam": "மின்னஞ்சல்"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
+					"arguments": []
+				}
+			],
+			"required": true
+		},
+		{
+			"id": "guardianType",
+			"description": "Type de Tuteur",
+			"labelName": {
+				"fra": "Type de Tuteur",
+				"ara": "نوع الوصي",
+				"eng": "Tutor type",
+				"kan": "ರಕ್ಷಕ ವಿಧ",
+				"hin": "संरक्षक प्रकार",
+				"tam": "பாதுகாவலர் வகை"
+			},
+			"controlType": "dropdown",
+			"subtype": "radio",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": false
+		},
+		{
+			"id": "introducerName",
+			"description": "Prénom du tuteur",
+			"labelName": {
+				"eng": "introducer Name",
+				"ara": "مقدم Name",
+				"fra": "introducteur Name",
+				"kan": "ಪರಿಚಯಕಾರ Name",
+				"hin": "परिचयकर्ता  Name",
+				"tam": "அறிமுகம் Name"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "simpleType",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "introducerUIN",
+			"description": "Identifiant digital civil et social du tuteur",
+			"labelName": {
+				"eng": "introducer UIN",
+				"ara": "مقدم UIN",
+				"fra": "introducteur UIN",
+				"kan": "ಪರಿಚಯಕಾರ UIN",
+				"hin": "परिचयकर्ता  UIN",
+				"tam": "அறிமுகம் UIN"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"checksum": true,
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[0-9]{10}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "introduceRID",
+			"description": "Identifiant RNP RID du tuteur",
+			"labelName": {
+				"eng": "introducer RID",
+				"ara": "مقدم RID",
+				"fra": "introducteur RID",
+				"kan": "ಪರಿಚಯಕಾರ RID",
+				"hin": "परिचयकर्ता  RID",
+				"tam": "அறிமுகம் RID"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "^[0-9]{29}$",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true,
+			"tooltip": true
+		},
+		{
+			"id": "introduceCNIE",
+			"description": "Numéro d'identité du tuteur",
+			"labelName": {
+				"eng": "introducer CNIE",
+				"ara": "مقدم CNIE",
+				"fra": "introducteur CNIE",
+				"kan": "ಪರಿಚಯಕಾರ CNIE",
+				"hin": "परिचयकर्ता  CNIE",
+				"tam": "அறிமுகம் CNIE"
+			},
+			"controlType": "textbox",
+			"inputRequired": true,
+			"fieldType": "default",
+			"type": "string",
+			"validators": [
+				{
+					"type": "regex",
+					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
+					"arguments": []
+				}
+			],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "relationWithChild",
+			"description": "Lien de parenté",
+			"labelName": {
+				"fra": "Lien de parenté",
+				"ara": "صلة القرابة",
+				"eng": "Relationship",
+				"kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
+				"hin": "बच्चे के साथ संबंध",
+				"tam": "குழந்தையுடன் உறவு"
+			},
+			"controlType": "dropdown",
+			"inputRequired": true,
+			"fieldType": "dynamic",
+			"type": "simpleType",
+			"validators": [],
+			"required": false,
+			"visible": false,
+			"group": "guardian_info",
+			"preview": true
+		},
+		{
+			"id": "proofOfAddress",
+			"description": "proofOfAddress",
+			"labelName": {
+				"ara": "إثبات العنوان",
+				"fra": "Preuve d'adresse",
+				"eng": "Address Proof",
+				"hin": "निवास प्रमाण पत्र",
+				"kan": "ವಿಳಾಸ ಪುರಾವೆ",
+				"tam": "முகவரி சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POA",
+			"required": false
+		},
+		{
+			"id": "proofOfIdentity",
+			"description": "proofOfIdentity",
+			"labelName": {
+				"ara": "إثبات الهوية",
+				"fra": "Preuve d'identité",
+				"eng": "Identity Proof",
+				"hin": "पहचान प्रमाण",
+				"kan": "ಗುರುತಿನ ಪುರಾವೆ",
+				"tam": "அடையாள சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POI",
+			"required": true
+		},
+		{
+			"id": "proofOfRelationship",
+			"description": "proofOfRelationship",
+			"labelName": {
+				"ara": "إثبات العلاقة",
+				"fra": "Preuve de relation",
+				"eng": "Relationship Proof",
+				"hin": "संबंध प्रमाण",
+				"kan": "ಸಂಬಂಧ ಪುರಾವೆ",
+				"tam": "உறவு சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POR",
+			"required": true
+		},
+		{
+			"id": "proofOfDateOfBirth",
+			"description": "proofOfDateOfBirth",
+			"labelName": {
+				"ara": "دليل DOB",
+				"fra": "Preuve de date de naissance",
+				"eng": "DOB Proof",
+				"hin": "जन्मतिथि प्रमाण",
+				"kan": "DOB ಪ್ರೂಫ್",
+				"tam": "DOB ஆதாரம்"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POB",
+			"required": true
+		},
+		{
+			"id": "proofOfException",
+			"description": "proofOfException",
+			"labelName": {
+				"ara": "إثبات الاستثناء",
+				"fra": "Preuve d'exception",
+				"eng": "Exception Proof",
+				"kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
+				"tam": "விதிவிலக்கு சான்று"
+			},
+			"controlType": "fileupload",
+			"inputRequired": true,
+			"validators": [],
+			"subType": "POE",
+			"required": true
+		},
+		{
+			"controlType": "dropdown",
+			"description": "",
+			"id": "preferredLang",
+			"labelName": {
+				"ara": [
+					"Current Notification Language_ara",
+					"New Notification Language_ara"
+				],
+				"eng": [
+					"Current Notification Language",
+					"New Notification Language"
+				],
+				"fra": [
+					"Current Notification Language_fra",
+					"New Notification Language_fra"
+				],
+				"kan": [
+					"Current Notification Language_kan",
+					"New Notification Language_kan"
+				],
+				"tam": [
+					"Current Notification Language_tam",
+					"New Notification Language_tam"
+				]
+			},
+			"tabgroup": "notificationLanguage"
+		}
+	],
+	"locationHierarchy": [
+		"region",
+		"province",
+		"city",
+		"zone",
+		"postalCode"
+	]
+}

From c9ae63aafd56169fda88796e5dc2bba71faeb827 Mon Sep 17 00:00:00 2001
From: RitikJain4108 <99730411+RitikJain4108@users.noreply.github.com>
Date: Tue, 24 Jan 2023 19:25:27 +0530
Subject: [PATCH 1063/1358] updated schema (#3257)

Co-authored-by: Ritik Jain <M1074108@mindtree.com>
---
 resident-ui-update-demographics-schema.json | 1243 +++++--------------
 1 file changed, 322 insertions(+), 921 deletions(-)

diff --git a/resident-ui-update-demographics-schema.json b/resident-ui-update-demographics-schema.json
index 6976929e3f4..4133325b8fd 100644
--- a/resident-ui-update-demographics-schema.json
+++ b/resident-ui-update-demographics-schema.json
@@ -1,923 +1,324 @@
 {
-	"identity": [
-		{
-			"id": "IDSchemaVersion",
-			"description": "ID Schema Version",
-			"type": "number",
-			"controlType": null,
-			"fieldType": "default",
-			"inputRequired": false,
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "title",
-			"description": "Title",
-			"labelName": {
-				"eng": "Title",
-				"ara": "عنوان",
-				"hin": "पशीर्षक",
-				"kan": "ಶೀರ್ಷಿಕೆ",
-				"tam": "தலைப்பு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "fullName",
-			"description": "Enter Full Name",
-			"labelName": {
-				"eng": "Full Name",
-				"ara": "الاسم الكامل",
-				"fra": "Nom complet",
-				"hin": "पूरा नाम",
-				"kan": "ಪೂರ್ಣ ಹೆಸರು",
-				"tam": "முழு பெயர்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"transliteration": true
-		},
-		{
-			"id": "dateOfBirth",
-			"description": "Enter DOB",
-			"labelName": {
-				"eng": "Date Of Birth",
-				"ara": "تاريخ الولادة",
-				"fra": "Date de naissance",
-				"hin": "जन्म की तारीख",
-				"kan": "ಹುಟ್ತಿದ ದಿನ",
-				"tam": "பிறந்த தேதி"
-			},
-			"controlType": "ageDate",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "gender",
-			"description": "Enter Gender",
-			"labelName": {
-				"eng": "Gender",
-				"ara": "جنس",
-				"fra": "Le genre",
-				"hin": "लिंग",
-				"kan": "ಲಿಂಗ",
-				"tam": "பாலினம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "nationality",
-			"description": "nationality",
-			"labelName": {
-				"fra": "Nationalité",
-				"ara": "الجنسية",
-				"eng": "Nationality",
-				"hin": "राष्ट्रीयता",
-				"kan": "ರಾಷ್ಟ್ರೀಯತೆ",
-				"tam": "தேசியம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "flagb",
-			"description": "Je suis né(e) au maroc",
-			"labelName": {
-				"fra": "Je suis né(e) au maroc",
-				"ara": "ولدت في المغرب",
-				"eng": "I was born in Morocco",
-				"hin": "झंडाब",
-				"kan": "ಧ್ವಜ",
-				"tam": "கொடி"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "placeOfBirth",
-			"description": "Lieu de naissance",
-			"labelName": {
-				"fra": "Lieu de naissance",
-				"ara": "مكان الإزدياد",
-				"eng": "Place of birth",
-				"hin": "जन्म स्थान",
-				"kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
-				"tam": "பிறந்த இடம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "listCountry",
-			"description": "Pay de naissance",
-			"labelName": {
-				"fra": "Pay de naissance",
-				"ara": "بلد الإزدياد",
-				"eng": "Birth Pay",
-				"hin": "सूचीदेश",
-				"kan": "ಪಟ್ಟಿ ದೇಶ",
-				"tam": "பட்டியல் நாடு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "region",
-			"description": "region",
-			"labelName": {
-				"eng": "Region",
-				"ara": "منطقة",
-				"fra": "Région",
-				"hin": "ऊपरी क्षेत्र",
-				"kan": "ಪ್ರದೇಶ",
-				"tam": "பிராந்தியம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 1,
-			"parentLocCode": "MOR",
-			"required": true
-		},
-		{
-			"id": "province",
-			"description": "province",
-			"labelName": {
-				"eng": "Province",
-				"ara": "المحافظة",
-				"fra": "Province",
-				"hin": "प्रांत",
-				"kan": "ಪ್ರಾಂತ್ಯ",
-				"tam": "மாகாணம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 2,
-			"required": true
-		},
-		{
-			"id": "city",
-			"description": "city",
-			"labelName": {
-				"eng": "City",
-				"ara": "مدينة",
-				"fra": "Ville",
-				"hin": "शहर",
-				"kan": "ನಗರ",
-				"tam": "நகரம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 3,
-			"required": true
-		},
-		{
-			"id": "zone",
-			"description": "zone",
-			"labelName": {
-				"eng": "Zone",
-				"ara": "منطقة",
-				"fra": "Zone",
-				"hin": "क्षेत्र",
-				"kan": "ವಲಯ",
-				"tam": "மண்டலம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [],
-			"locationHierarchyLevel": 4,
-			"required": true
-		},
-		{
-			"id": "postalCode",
-			"description": "postalCode",
-			"labelName": {
-				"eng": "Postal Code",
-				"ara": "الكود البريدى",
-				"fra": "code postal",
-				"hin": "डाक कोड",
-				"kan": "ಅಂಚೆ ಕೋಡ್",
-				"tam": "அஞ்சல் குறியீடு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 5,
-			"required": true
-		},
-		{
-			"id": "residenceStatus",
-			"description": "Quartier/Résidence/Douar",
-			"labelName": {
-				"fra": "Quartier/Résidence/Douar",
-				"ara": "الحي / السكن / الدوار",
-				"eng": "Residence Status",
-				"hin": "निवास स्थान",
-				"kan": "ನಿವಾಸ",
-				"tam": "குடியிருப்பு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "addressType",
-			"description": "Type d'habitat",
-			"labelName": {
-				"fra": "Type d'habitat",
-				"ara": "نوع السكن",
-				"eng": "Habitat type",
-				"kan": "ವಿಳಾಸದ ವಿಧ",
-				"hin": "पता मुद्रलेख",
-				"tam": "முகவரி வகை"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "portNo",
-			"description": "N Porte",
-			"labelName": {
-				"fra": "N° Porte",
-				"ara": "رقم الباب",
-				"eng": "Port No",
-				"kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-				"hin": "पोर्ट नंबर",
-				"tam": "துறை எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,10}$).*",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "apptNo",
-			"description": "N immeuble",
-			"labelName": {
-				"fra": "N° immeuble",
-				"ara": "رقم المبنى",
-				"eng": "Appt no",
-				"kan": "appt ಸಂಖ್ಯೆ",
-				"hin": "उपयुक्त संख्या",
-				"tam": "appt எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,10}$).*",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "addressLine1",
-			"description": "Adresse de résidence",
-			"labelName": {
-				"fra": "Adresse de résidence",
-				"ara": "عنوان السكن",
-				"eng": "Adresse Line1",
-				"hin": "पता पंक्ति 1",
-				"kan": "ವಿಳಾಸ 1",
-				"tam": "முகவரி வரி 1"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,100}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "referenceCNIENumber",
-			"description": "CNIE",
-			"labelName": {
-				"fra": "CNIE",
-				"ara": "رقم البطاقة الوطنية",
-				"eng": "CNIE",
-				"kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
-				"hin": "संदर्भ सीएनआईई नंबर",
-				"tam": "குறிப்பு CNIE எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": true,
-			"group": "card_info",
-			"preview": true
-		},
-		{
-			"id": "resOuPass",
-			"description": "Je dispose",
-			"labelName": {
-				"fra": "Je dispose",
-				"ara": "أملك",
-				"eng": "I have",
-				"kan": "resOuPass",
-				"hin": "resOuPass",
-				"tam": "resOuPass"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": false,
-			"tooltip": false
-		},
-		{
-			"id": "referenceResidencyNumber",
-			"description": "Numéro d'identité du résident étranger",
-			"labelName": {
-				"fra": "Numéro d'identité du résident étranger",
-				"ara": "رقم هوية المقيم الأجنبي",
-				"eng": "Identity number of the foreign resident",
-				"kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
-				"hin": "संदर्भ निवास संख्या",
-				"tam": "குறிப்பு குடியிருப்பு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "[A-Za-z][0-9]{6}[A-Za-z]",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "passportNumber",
-			"description": "Numéro de passport",
-			"labelName": {
-				"fra": "Numéro de Passeport",
-				"ara": "رقم جواز السفر",
-				"eng": "Passport number",
-				"kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-				"hin": "पासपोर्ट संख्या",
-				"tam": "கடவுச்சீட்டு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{1,20}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "flagidcs",
-			"description": "Je dispose d'un IDCS",
-			"labelName": {
-				"fra": "Je dispose d'un IDCS",
-				"ara": "أملك المعرف المدني والاجتماعي الرقمي",
-				"eng": "I have an IDCS",
-				"kan": "ಧ್ವಜಗಳು",
-				"hin": "फ्लैगिड्स",
-				"tam": "கொடிகள்"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "birthCertificateNumber",
-			"description": "Numéro Acte de Naissance",
-			"labelName": {
-				"fra": "Numéro Acte de Naissance",
-				"ara": "رقم شهادة الميلاد",
-				"eng": "Birth Certificate Number",
-				"kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
-				"hin": "जन्म प्रमाणपत्र संख्या",
-				"tam": "பிறப்புச் சான்றிதழ் எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{1,20}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true
-		},
-		{
-			"id": "civilRegistryNumber",
-			"description": "Numéro Acte de Naissance digitalisé",
-			"labelName": {
-				"fra": "Numéro Acte de Naissance digitalisé",
-				"ara": "رقم شهادة الميلاد الرقمي",
-				"eng": "Digital Birth Certificate Number",
-				"kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
-				"hin": "सिविल रजिस्ट्री नंबर",
-				"tam": "சிவில் பதிவு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"checksum": true,
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "phone",
-			"description": "phone",
-			"labelName": {
-				"eng": "Phone",
-				"ara": "هاتف",
-				"fra": "Téléphone",
-				"hin": "फ़ोन",
-				"kan": "ದೂರವಾಣಿ",
-				"tam": "தொலைபேசி"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[+]*([0-9]{1})([0-9]{9})$",
-					"arguments": []
-				}
-			],
-			"required": true
-		},
-		{
-			"id": "email",
-			"description": "email",
-			"labelName": {
-				"eng": "Email",
-				"ara": "البريد الإلكتروني",
-				"fra": "Email",
-				"hin": "ईमेल",
-				"kan": "ಇಮೇಲ್",
-				"tam": "மின்னஞ்சல்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-					"arguments": []
-				}
-			],
-			"required": true
-		},
-		{
-			"id": "guardianType",
-			"description": "Type de Tuteur",
-			"labelName": {
-				"fra": "Type de Tuteur",
-				"ara": "نوع الوصي",
-				"eng": "Tutor type",
-				"kan": "ರಕ್ಷಕ ವಿಧ",
-				"hin": "संरक्षक प्रकार",
-				"tam": "பாதுகாவலர் வகை"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "introducerName",
-			"description": "Prénom du tuteur",
-			"labelName": {
-				"eng": "introducer Name",
-				"ara": "مقدم Name",
-				"fra": "introducteur Name",
-				"kan": "ಪರಿಚಯಕಾರ Name",
-				"hin": "परिचयकर्ता  Name",
-				"tam": "அறிமுகம் Name"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
-		},
-		{
-			"id": "introducerUIN",
-			"description": "Identifiant digital civil et social du tuteur",
-			"labelName": {
-				"eng": "introducer UIN",
-				"ara": "مقدم UIN",
-				"fra": "introducteur UIN",
-				"kan": "ಪರಿಚಯಕಾರ UIN",
-				"hin": "परिचयकर्ता  UIN",
-				"tam": "அறிமுகம் UIN"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"checksum": true,
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[0-9]{10}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "introduceRID",
-			"description": "Identifiant RNP RID du tuteur",
-			"labelName": {
-				"eng": "introducer RID",
-				"ara": "مقدم RID",
-				"fra": "introducteur RID",
-				"kan": "ಪರಿಚಯಕಾರ RID",
-				"hin": "परिचयकर्ता  RID",
-				"tam": "அறிமுகம் RID"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[0-9]{29}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "introduceCNIE",
-			"description": "Numéro d'identité du tuteur",
-			"labelName": {
-				"eng": "introducer CNIE",
-				"ara": "مقدم CNIE",
-				"fra": "introducteur CNIE",
-				"kan": "ಪರಿಚಯಕಾರ CNIE",
-				"hin": "परिचयकर्ता  CNIE",
-				"tam": "அறிமுகம் CNIE"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
-		},
-		{
-			"id": "relationWithChild",
-			"description": "Lien de parenté",
-			"labelName": {
-				"fra": "Lien de parenté",
-				"ara": "صلة القرابة",
-				"eng": "Relationship",
-				"kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
-				"hin": "बच्चे के साथ संबंध",
-				"tam": "குழந்தையுடன் உறவு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
-		},
-		{
-			"id": "proofOfAddress",
-			"description": "proofOfAddress",
-			"labelName": {
-				"ara": "إثبات العنوان",
-				"fra": "Preuve d'adresse",
-				"eng": "Address Proof",
-				"hin": "निवास प्रमाण पत्र",
-				"kan": "ವಿಳಾಸ ಪುರಾವೆ",
-				"tam": "முகவரி சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POA",
-			"required": false
-		},
-		{
-			"id": "proofOfIdentity",
-			"description": "proofOfIdentity",
-			"labelName": {
-				"ara": "إثبات الهوية",
-				"fra": "Preuve d'identité",
-				"eng": "Identity Proof",
-				"hin": "पहचान प्रमाण",
-				"kan": "ಗುರುತಿನ ಪುರಾವೆ",
-				"tam": "அடையாள சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POI",
-			"required": true
-		},
-		{
-			"id": "proofOfRelationship",
-			"description": "proofOfRelationship",
-			"labelName": {
-				"ara": "إثبات العلاقة",
-				"fra": "Preuve de relation",
-				"eng": "Relationship Proof",
-				"hin": "संबंध प्रमाण",
-				"kan": "ಸಂಬಂಧ ಪುರಾವೆ",
-				"tam": "உறவு சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POR",
-			"required": true
-		},
-		{
-			"id": "proofOfDateOfBirth",
-			"description": "proofOfDateOfBirth",
-			"labelName": {
-				"ara": "دليل DOB",
-				"fra": "Preuve de date de naissance",
-				"eng": "DOB Proof",
-				"hin": "जन्मतिथि प्रमाण",
-				"kan": "DOB ಪ್ರೂಫ್",
-				"tam": "DOB ஆதாரம்"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POB",
-			"required": true
-		},
-		{
-			"id": "proofOfException",
-			"description": "proofOfException",
-			"labelName": {
-				"ara": "إثبات الاستثناء",
-				"fra": "Preuve d'exception",
-				"eng": "Exception Proof",
-				"kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
-				"tam": "விதிவிலக்கு சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POE",
-			"required": true
-		},
-		{
-			"controlType": "dropdown",
-			"description": "",
-			"id": "preferredLang",
-			"labelName": {
-				"ara": [
-					"Current Notification Language_ara",
-					"New Notification Language_ara"
-				],
-				"eng": [
-					"Current Notification Language",
-					"New Notification Language"
-				],
-				"fra": [
-					"Current Notification Language_fra",
-					"New Notification Language_fra"
-				],
-				"kan": [
-					"Current Notification Language_kan",
-					"New Notification Language_kan"
-				],
-				"tam": [
-					"Current Notification Language_tam",
-					"New Notification Language_tam"
-				]
-			},
-			"tabgroup": "notificationLanguage"
-		}
-	],
-	"locationHierarchy": [
-		"region",
-		"province",
-		"city",
-		"zone",
-		"postalCode"
-	]
+  "identity": [
+    {
+      "id": "fullName",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Name",
+          "New Name"
+        ],
+        "ara": [
+          "Current Name_ara",
+          "New Name_ara"
+        ],
+        "fra": [
+          "Current Name_fra",
+          "New Name_fra"
+        ]
+      },
+      "controlType": "textbox",
+      "tabgroup": "identity"
+    },
+    {
+      "id": "dateOfBirth",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current DOB",
+          "New DOB"
+        ],
+        "ara": [
+          "Current DOB_ara",
+          "New DOB_ara"
+        ],
+        "fra": [
+          "Current DOB_fra",
+          "New DOB_fra"
+        ]
+      },
+      "controlType": "calendar",
+      "tabgroup": "identity"
+    },
+    {
+      "id": "gender",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Gender",
+          "New Gender"
+        ],
+        "ara": [
+          "Current Gender_ara",
+          "New Gender_ara"
+        ],
+        "fra": [
+          "Current Gender_fra",
+          "New Gender_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "identity"
+    },
+    {
+      "id": "proofOfIdentity",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Identity Proof",
+          "Document Type",
+          "Document Reference ID",
+          "Proof Of Document",
+          "Allowed file type : pdf,jpeg,png,jpg and allowed file size : 2mb"
+        ],
+        "ara": [
+          "Identity Proof_ara",
+          "Document Type_ara",
+          "Document Reference ID_ara",
+          "Proof Of Document_ara",
+          "Allowed file type_ara : pdf,jpeg,png,jpg and allowed file size : 2mb"
+        ],
+        "fra": [
+          "Identity Proof_fra",
+          "Document Type_fra",
+          "Document Reference ID_fra",
+          "Proof Of Document_fra",
+          "Allowed file type_fra : pdf,jpeg,png,jpg and allowed file size : 2mb"
+        ]
+      },
+      "controlType": "fileupload",
+      "tabgroup": "identity"
+    },
+    {
+      "id": "addressLine1",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Address Line1",
+          "New Address Line1"
+        ],
+        "ara": [
+          "Current Address Line1_ara",
+          "New Address Line1_ara"
+        ],
+        "fra": [
+          "Current Address Line1_fra",
+          "New Address Line1_fra"
+        ]
+      },
+      "controlType": "textbox",
+      "tabgroup": "address"
+    },
+    {
+      "id": "region",
+      "name": "Region",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Region",
+          "New Region"
+        ],
+        "ara": [
+          "Current Region_ara",
+          "New Region_ara"
+        ],
+        "fra": [
+          "Current Region_fra",
+          "New Region_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "address",
+      "locationHierarchyLevel": 1
+    },
+    {
+      "id": "province",
+      "name": "Province",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Province",
+          "New Province"
+        ],
+        "ara": [
+          "Current Province_ara",
+          "New Province_ara"
+        ],
+        "fra": [
+          "Current Province_fra",
+          "New Province_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "address",
+      "locationHierarchyLevel": 2
+    },
+    {
+      "id": "city",
+      "name": "City",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current City",
+          "New City"
+        ],
+        "ara": [
+          "Current City_ara",
+          "New City_ara"
+        ],
+        "fra": [
+          "Current City_fra",
+          "New City_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "address",
+      "locationHierarchyLevel": 3
+    },
+    {
+      "id": "zone",
+      "name": "Zone",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Zone",
+          "New Zone"
+        ],
+        "ara": [
+          "Current Zone_ara",
+          "New Zone_ara"
+        ],
+        "fra": [
+          "Current Zone_fra",
+          "New Zone_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "address",
+      "locationHierarchyLevel": 4
+    },
+    {
+      "id": "postalCode",
+      "name": "Postal Code",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Postal Code",
+          "New Postal Code"
+        ],
+        "ara": [
+          "Current Postal Code_ara",
+          "New Postal Code_ara"
+        ],
+        "fra": [
+          "Current Postal Code_fra",
+          "New Postal Code_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "address",
+      "locationHierarchyLevel": 5
+    },
+    {
+      "id": "proofOfAddress",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Address Proof",
+          "Document Type",
+          "Document Reference ID",
+          "Proof Of Document",
+          "Allowed file type : pdf,jpeg,png,jpg and allowed file size : 2mb"
+        ],
+        "ara": [
+          "Address Proof_ara",
+          "Document Type_ara",
+          "Document Reference ID_ara",
+          "Proof Of Document_ara",
+          "Allowed file type_ara : pdf,jpeg,png,jpg and allowed file size : 2mb"
+        ],
+        "fra": [
+          "Address Proof_fra",
+          "Document Type_fra",
+          "Document Reference ID_fra",
+          "Proof Of Document_fra",
+          "Allowed file type_fra : pdf,jpeg,png,jpg and allowed file size : 2mb"
+        ]
+      },
+      "controlType": "fileupload",
+      "tabgroup": "address"
+    },
+    {
+      "id": "email",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current email ID",
+          "New email ID",
+          "Confirm New email ID",
+          "Send OTP"
+        ],
+        "ara": [
+          "Current email ID_ara",
+          "New email ID_ara",
+          "Confirm New email ID_ara",
+          "Send OTP_ara"
+        ],
+        "fra": [
+          "Current email ID_fra",
+          "New email ID_fra",
+          "Confirm New email ID_fra",
+          "Send OTP_fra"
+        ]
+      },
+      "controlType": "textbox",
+      "tabgroup": "contact"
+    },
+    {
+      "id": "phone",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Phone Number",
+          "New Phone Number",
+          "Confirm New Phone Number",
+          "Send OTP"
+        ],
+        "ara": [
+          "Current Phone Number_ara",
+          "New Phone Number_ara",
+          "Confirm New Phone Number_ara",
+          "Send OTP_ara"
+        ],
+        "fra": [
+          "Current Phone Number_fra",
+          "New Phone Number_fra",
+          "Confirm New Phone Number_fra",
+          "Send OTP_fra"
+        ]
+      },
+      "controlType": "textbox",
+      "tabgroup": "contact"
+    },
+    {
+      "id": "preferredLang",
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Notification Language",
+          "New Notification Language"
+        ],
+        "ara": [
+          "Current Notification Language_ara",
+          "New Notification Language_ara"
+        ],
+        "fra": [
+          "Current Notification Language_fra",
+          "New Notification Language_fra"
+        ]
+      },
+      "controlType": "dropdown",
+      "tabgroup": "notificationLanguage"
+    }
+  ]
 }

From 91331092437df9fb8715cd4c669335745955255b Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Wed, 25 Jan 2023 10:41:28 +0530
Subject: [PATCH 1064/1358] Merging new properties

---
 resident-default.properties | 45 +++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index c59c100e17d..59109f3c532 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -8,7 +8,7 @@
 # mosip.regproc.client.secret
 # keycloak.internal.url.
 
-#--------------ID and Version --------------
+#--------------APIs ID and Version --------------
 auth.internal.id=mosip.identity.auth.internal
 auth.internal.version=1.0
 mosip.registration.processor.print.id=mosip.registration.print
@@ -19,6 +19,7 @@ resident.vid.version=v1
 resident.vid.version.new=1.0
 resident.revokevid.version=v1
 resident.revokevid.version.new=1.0
+resident.version.new=1.0
 resident.vid.id=mosip.resident.vid
 resident.vid.id.generate=mosip.resident.vid.generate
 resident.vid.policy.id=mosip.resident.vid.policy
@@ -66,21 +67,32 @@ resident.revokevid.id=mosip.resident.vidstatus
 mosip.resident.revokevid.id=mosip.resident.vid.revoke
 mosip.resident.grievance.ticket.request.id=mosip.resident.grievance.ticket.request
 mosip.resident.grievance.ticket.request.version=1.0
-PARTNER_REFERENCE_Id=mpartner-default-resident
-mosip.resident.transliteration.transliterate.id=mosip.resident.transliteration.transliterate
-APPLICATION_Id=RESIDENT
-DECRYPT_API_URL=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
-mosip-prereg-host=${mosip.prereg.host}
-mosip-prereg-ui-url=https://${mosip-prereg-host}/pre-registration-ui/
-resident.ui.properties.id=resident.ui.properties
-resident.ui.properties.version=1.0
 resident.channel.verification.status.id=mosip.resident.channel.verification.status
 resident.channel.verification.status.version=1.0
 resident.event.ack.download.id=mosip.resident.event.ack.download
 resident.event.ack.download.version=1.0
 resident.download.card.eventid.id =mosip.resident.download.card.eventid
 resident.download.card.eventid.version=1.0
-resident.version.new=1.0
+mosip.resident.request.vid.card.id=mosip.resident.request.vid.card
+mosip.resident.request.vid.card.version=1.0
+mosip.credential.request.service.id=mosip.credential.request.service.id
+mosip.credential.request.service.version=1.0
+mosip.resident.checkstatus.individualid.id=mosip.resident.check-stage-status
+mosip.resident.checkstatus.individualid.version=1.0
+mosip.resident.download.personalized.card.id=mosip.resident.download.personalized.card
+mosip.resident.transliteration.transliterate.id=mosip.resident.transliteration.transliterate
+resident.ui.properties.id=resident.ui.properties
+resident.ui.properties.version=1.0
+mosip.resident.identity.auth.internal.id=mosip.identity.auth.internal
+
+
+PARTNER_REFERENCE_Id=mpartner-default-resident
+APPLICATION_Id=RESIDENT
+
+DECRYPT_API_URL=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+mosip-prereg-host=${mosip.prereg.host}
+mosip-prereg-ui-url=https://${mosip-prereg-host}/pre-registration-ui/
+
 
 ## Token generation
 token.request.id=io.mosip.resident
@@ -94,6 +106,12 @@ token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
 ida.online-verification-partner-id=mpartner-default-auth
 
+#DB properties to skip automatic table creation in startup
+hibernate.hbm2ddl.auto=none
+hibernate.show_sql=false
+hibernate.temp.use_jdbc_metadata_defaults=false
+spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
+hibernate.jdbc.lob.non_contextual_creation = true
 
 ## Auth Services
 KERNELAUTHMANAGER=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -680,8 +698,6 @@ mosip.resident.sign.pdf.reference.id=SIGN
 
 mosip.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
 
-# request id for download personalized card
-mosip.resident.download.personalized.card=mosip.resident.download.personalized.card
 #method name to create password
 resident.create.password.method.name=getPassword
 #File name for the downloaded personalized card.  "eventId" and "timestamp" are configurable. If they are removed from below property then they will be removed from file name also.
@@ -704,8 +720,6 @@ mosip.resident.request.credential.credentialType=euin
 mosip.resident.request.credential.isEncrypt=true
 mosip.resident.request.credential.encryption.key=abc123
 
-mosip.resident.request.vid.card.id=mosip.resident.request.vid.card
-mosip.resident.request.vid.card.version=1.0
 mosip.credential.issuer=mpartner-default-digitalcard
 
 #claim names
@@ -719,9 +733,6 @@ mosip.resident.applicant.name.property=applicantName
 mosip.resident.photo.attribute.name=photo
 mosip.digital.card.credential.type=PDFCard
 
-mosip.credential.request.service.id=mosip.credential.request.service.id
-mosip.credential.request.service.version=1.0
-
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes)
 otp.request.flooding.duration=1

From 685719e6ea590a407d804c09c4e5be5e5a4a7673 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 30 Jan 2023 12:16:01 +0530
Subject: [PATCH 1065/1358] updated VID policy

updated as dev
---
 mosip-vid-policy.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index 9261a14506f..21f619be932 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -14,7 +14,7 @@
             "vidPolicy": {
                 "validForInMinutes": 30,
                 "transactionsAllowed": 1,
-                "instancesAllowed": 5,
+                "instancesAllowed": 20,
                 "autoRestoreAllowed": false,
                 "restoreOnAction": "REGENERATE"
             }
@@ -24,8 +24,8 @@
             "vidPolicy": {
                 "validForInMinutes": null,
                 "transactionsAllowed": 1,
-                "instancesAllowed": 1,
-                "autoRestoreAllowed": true,
+                "instancesAllowed": 20,
+                "autoRestoreAllowed": false,
                 "restoreOnAction": "REVOKED"
             }
         }

From ca305eb89883c0073551de16537a87b7ae74a243 Mon Sep 17 00:00:00 2001
From: Yash <102220960+Yashavant1629@users.noreply.github.com>
Date: Mon, 30 Jan 2023 13:38:07 +0530
Subject: [PATCH 1066/1358] request.idtypes.allowed=VID

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 0d585b52bee..11ce6e01ca8 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -398,7 +398,7 @@ ida.api.version.kycexchange=1.0
 static.token.enable=true
 
 ## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
-request.idtypes.allowed=VID,UIN
+request.idtypes.allowed=VID
 ## The ID types to be supported for Internal Authentication/OTP Requests
 request.idtypes.allowed.internalauth=UIN,VID
 

From 6bf2737bb47f330681b9a6ac564fac0e2330ef3b Mon Sep 17 00:00:00 2001
From: akilalakshmanan <Akila.L@iiitb.ac.in>
Date: Mon, 30 Jan 2023 17:06:09 +0530
Subject: [PATCH 1067/1358] [DSD-2065] Added config changes for including minio
 pretext value

---
 application-default.properties      | 4 +++-
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index aeb506fe362..058e89886bf 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,6 +359,8 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
+## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
+object.store.s3.bucket-name-prefix=qa1201-
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -375,7 +377,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=packet-manager
+packet.manager.account.name=qa1201-packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ca8efa6d295..358b9587226 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepo
+mosip.idrepo.objectstore.bucket-name=qa1201-idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 92d1e07ab17..18da1be960b 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=prereg
+mosip.kernel.objectstore.account-name=qa1201-prereg
 
 ## Booking Service
 booking.service.version=v1

From 8cd6b19fb9a6d01a61dae2024829d45c126829ab Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:42:30 +0530
Subject: [PATCH 1068/1358] Revert "[DSD-2065] Added config changes for
 including minio pretext value"

---
 application-default.properties      | 4 +---
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 058e89886bf..aeb506fe362 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,8 +359,6 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
-## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
-object.store.s3.bucket-name-prefix=qa1201-
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -377,7 +375,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=qa1201-packet-manager
+packet.manager.account.name=packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 358b9587226..ca8efa6d295 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=qa1201-idrepo
+mosip.idrepo.objectstore.bucket-name=idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 18da1be960b..92d1e07ab17 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=qa1201-prereg
+mosip.kernel.objectstore.account-name=prereg
 
 ## Booking Service
 booking.service.version=v1

From 663012c2e70d8cb6794e334c9bf7795578df1495 Mon Sep 17 00:00:00 2001
From: dell <gaganaa10@gmail.com>
Date: Mon, 6 Feb 2023 18:28:02 +0530
Subject: [PATCH 1069/1358] [DSD-2065] Added config changes for including minio
 pretext value

---
 application-default.properties      | 4 +++-
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index efaa89ce00a..0e05a79588d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,6 +359,8 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
+## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
+object.store.s3.bucket-name-prefix=qa1201-
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -375,7 +377,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=packet-manager
+packet.manager.account.name=qa1201-packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ca8efa6d295..358b9587226 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepo
+mosip.idrepo.objectstore.bucket-name=qa1201-idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index d200225b120..022dca93c35 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=prereg
+mosip.kernel.objectstore.account-name=qa1201-prereg
 
 ## Booking Service
 booking.service.version=v1

From 6fb1563f5143396185620c198bf6414a8cd66daa Mon Sep 17 00:00:00 2001
From: gaganamadival <94885434+gaganamadival@users.noreply.github.com>
Date: Tue, 7 Feb 2023 13:44:10 +0530
Subject: [PATCH 1070/1358] [DSD-2065] Added config changes for including minio
 pretext value (#3317)

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 058e89886bf..e20e657eb00 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -360,7 +360,7 @@ provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
 ## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
-object.store.s3.bucket-name-prefix=qa1201-
+object.store.s3.bucket-name-prefix=
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl

From cdea5659f8b5acb3ec31a3294d2a7d1609f72ac9 Mon Sep 17 00:00:00 2001
From: dell <gaganaa10@gmail.com>
Date: Tue, 7 Feb 2023 14:10:29 +0530
Subject: [PATCH 1071/1358] [DSD-2065]  reverted the changes

---
 application-default.properties      | 4 +---
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index e20e657eb00..aeb506fe362 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,8 +359,6 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
-## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
-object.store.s3.bucket-name-prefix=
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -377,7 +375,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=qa1201-packet-manager
+packet.manager.account.name=packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 358b9587226..ca8efa6d295 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=qa1201-idrepo
+mosip.idrepo.objectstore.bucket-name=idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 18da1be960b..92d1e07ab17 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=qa1201-prereg
+mosip.kernel.objectstore.account-name=prereg
 
 ## Booking Service
 booking.service.version=v1

From 0c0252975aaea5c532bc708e452d60bba396ac5c Mon Sep 17 00:00:00 2001
From: damodarguru <124761463+damodarguru@users.noreply.github.com>
Date: Wed, 8 Feb 2023 11:15:58 +0530
Subject: [PATCH 1072/1358] mosip.iam.module.login_flow.claims

Updated property mosip.iam.module.login_flow.claims, email as false for testing.
---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 59109f3c532..b449ca96337 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -676,7 +676,7 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":false},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
 resident.identity.schematype.with.photo=personalized-card
 

From fd96af9a9e7cbdd100193e3041e09c48d158669f Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 8 Feb 2023 14:34:08 +0530
Subject: [PATCH 1073/1358] [DSD-2101] added the missing prop

---
 resident-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resident-default.properties b/resident-default.properties
index 59109f3c532..e1ac589c359 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -757,3 +757,4 @@ resident.ui.datetime.pattern=yyyy-MM-dd HH:mm:ss
 resident.filename.datetime.pattern=yyyy-MM-dd'T'HH_mm_ss
 ## The Registration centers will be searched based on the distance value in meters from the Geo location identified
 resident.nearby.centers.distance.meters=2000
+mosip.max.file.upload.size.in.bytes=2000000

From 534dc147642d5d5a169a7d1fd100ebac83594c4a Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Wed, 8 Feb 2023 15:16:19 +0530
Subject: [PATCH 1074/1358] reverting mosip.iam.module.login_flow.claims back
 to default

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index b53235ace33..e1ac589c359 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -676,7 +676,7 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":false},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
 resident.identity.schematype.with.photo=personalized-card
 

From 96e278d6f9d3d5cc899ae994aac5bcc3e0496a53 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Thu, 9 Feb 2023 11:34:40 +0530
Subject: [PATCH 1075/1358] Merge dev2 to qa resident config

---
 resident-default.properties                 |   18 +-
 resident-ui-personalized-card-schema.json   | 1071 ++++---------------
 resident-ui-share-credential-schema.json    | 1071 ++++---------------
 resident-ui-update-demographics-schema.json |   28 +-
 4 files changed, 398 insertions(+), 1790 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index e1ac589c359..8b83c46b508 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -84,6 +84,7 @@ mosip.resident.transliteration.transliterate.id=mosip.resident.transliteration.t
 resident.ui.properties.id=resident.ui.properties
 resident.ui.properties.version=1.0
 mosip.resident.identity.auth.internal.id=mosip.identity.auth.internal
+mosip.resident.user.profile.id=mosip.resident.profile
 
 
 PARTNER_REFERENCE_Id=mpartner-default-resident
@@ -253,7 +254,7 @@ resident.view.history.status.filters=all,Success,In Progress,Failed
 
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters,resident.ui.notification.update.interval.seconds,mosip.kernel.otp.expiry-time
 
 
 
@@ -678,8 +679,6 @@ mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
-resident.identity.schematype.with.photo=personalized-card
-
 #Rectangle coordinates for pfd signataured data
 mosip.resident.service.uincard.lowerleftx=73
 mosip.resident.service.uincard.lowerlefty=100
@@ -745,7 +744,7 @@ sequence-order=Request received, Validation stage, Verification stage, Uin gener
 mosip.resident.checkstatus.individualid.id=mosip.resident.check-stage-status
 mosip.resident.checkstatus.individualid.version=1.0
 
-resident.additional.identity.attribute.to.fetch=UIN,email,phone,dob,name,photo
+resident.additional.identity.attribute.to.fetch=UIN,email,phone,dateOfBirth,fullName,photo
 
 resident.template.ack.authentication.request=acknowledgment-authentication-request
 resident.template.ack.get.my.id=acknowledgment-get-my-id
@@ -757,4 +756,15 @@ resident.ui.datetime.pattern=yyyy-MM-dd HH:mm:ss
 resident.filename.datetime.pattern=yyyy-MM-dd'T'HH_mm_ss
 ## The Registration centers will be searched based on the distance value in meters from the Geo location identified
 resident.nearby.centers.distance.meters=2000
+
+mosip.idrepo.vid.reactive-status=ACTIVE
+
+# Asyc Request Types
+resident.async.request.types=VID_CARD_DOWNLOAD,ORDER_PHYSICAL_CARD,SHARE_CRED_WITH_PARTNER,UPDATE_MY_UIN
+resident.batchjob.process.status.list=NEW,ISSUED,RECEIVED,PRINTING,FAILED,DELIVERED,PAYMENT_CONFIRMED,IN_TRANSIT
+resident.ui.notification.update.interval.seconds=30
+
+mosip.allowed.extension=pdf,jpeg,png,jpg
+
+mosip.resident.schema.attribute-name=attributeName
 mosip.max.file.upload.size.in.bytes=2000000
diff --git a/resident-ui-personalized-card-schema.json b/resident-ui-personalized-card-schema.json
index 85c7380f804..375ebabf0d8 100644
--- a/resident-ui-personalized-card-schema.json
+++ b/resident-ui-personalized-card-schema.json
@@ -1,937 +1,236 @@
 {
 	"identity": [
 		{
-			"id": "IDSchemaVersion",
-			"description": "ID Schema Version",
-			"type": "number",
-			"controlType": null,
-			"fieldType": "default",
-			"inputRequired": false,
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "title",
-			"description": "Title",
-			"labelName": {
-				"eng": "Title",
-				"ara": "عنوان",
-				"hin": "पशीर्षक",
-				"kan": "ಶೀರ್ಷಿಕೆ",
-				"tam": "தலைப்பு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "fullName",
-			"description": "Enter Full Name",
-			"labelName": {
-				"eng": "Full Name",
-				"ara": "الاسم الكامل",
-				"fra": "Nom complet",
-				"hin": "पूरा नाम",
-				"kan": "ಪೂರ್ಣ ಹೆಸರು",
-				"tam": "முழு பெயர்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"transliteration": true
-		},
-		{
-			"id": "dateOfBirth",
-			"description": "Enter DOB",
-			"labelName": {
-				"eng": "Date Of Birth",
-				"ara": "تاريخ الولادة",
-				"fra": "Date de naissance",
-				"hin": "जन्म की तारीख",
-				"kan": "ಹುಟ್ತಿದ ದಿನ",
-				"tam": "பிறந்த தேதி"
-			},
-			"controlType": "ageDate",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [],
-			"required": true
+			"attributeName": "fullName",
+			"maskRequired": false,			
+			"formatRequired": true,
+			"label": {
+				"eng": "Name"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"formatOptionLabel":{
+				"eng": "Name Format"
+			},
+			"formatOption":{
+				"eng": [{"label":"First Name", "value":"firstName"}, {"label":"Middle Name", "value":"middleName"}, {"label":"Last Name", "value":"lastName"}, {"label":"Full Name", "value":"fullName"}]
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "gender",
-			"description": "Enter Gender",
-			"labelName": {
-				"eng": "Gender",
-				"ara": "جنس",
-				"fra": "Le genre",
-				"hin": "लिंग",
-				"kan": "ಲಿಂಗ",
-				"tam": "பாலினம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
+			"attributeName": "dateOfBirth",
+			"maskRequired": false,
+			"formatRequired": true,
+			"label": {
+				"eng": "DOB"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"formatOptionLabel":{
+				"eng": "Date Format"
+			},
+			"formatOption":{
+				"eng": [{"label":"DD/MM", "value":"DD/MM"}, {"label":"DD/MM/YYYY", "value":"DD/MM/YYYY"}]
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "UIN",
-			"description": "Enter UIN",
-			"labelName": {
+			"attributeName": "UIN",
+			"maskAttributeName":"masked_UIN",
+			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
 				"eng": "UIN"
 			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"maskRequired": true,
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":false,
+			"checked":false
 		},
 		{
-			"id": "perpetualVID",
-			"description": "Enter perpetualVID",
-			"labelName": {
-				"eng": "perpetualVID"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
+			"attributeName": "perpetualVID",
+			"maskAttributeName":"masked_perpetualVID",
 			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
+				"eng": "Perpetual VID"
+			},
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "nationality",
-			"description": "nationality",
-			"labelName": {
-				"fra": "Nationalité",
-				"ara": "الجنسية",
-				"eng": "Nationality",
-				"hin": "राष्ट्रीयता",
-				"kan": "ರಾಷ್ಟ್ರೀಯತೆ",
-				"tam": "தேசியம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "flagb",
-			"description": "Je suis né(e) au maroc",
-			"labelName": {
-				"fra": "Je suis né(e) au maroc",
-				"ara": "ولدت في المغرب",
-				"eng": "I was born in Morocco",
-				"hin": "झंडाब",
-				"kan": "ಧ್ವಜ",
-				"tam": "கொடி"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "placeOfBirth",
-			"description": "Lieu de naissance",
-			"labelName": {
-				"fra": "Lieu de naissance",
-				"ara": "مكان الإزدياد",
-				"eng": "Place of birth",
-				"hin": "जन्म स्थान",
-				"kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
-				"tam": "பிறந்த இடம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "listCountry",
-			"description": "Pay de naissance",
-			"labelName": {
-				"fra": "Pay de naissance",
-				"ara": "بلد الإزدياد",
-				"eng": "Birth Pay",
-				"hin": "सूचीदेश",
-				"kan": "ಪಟ್ಟಿ ದೇಶ",
-				"tam": "பட்டியல் நாடு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "region",
-			"description": "region",
-			"labelName": {
-				"eng": "Region",
-				"ara": "منطقة",
-				"fra": "Région",
-				"hin": "ऊपरी क्षेत्र",
-				"kan": "ಪ್ರದೇಶ",
-				"tam": "பிராந்தியம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 1,
-			"parentLocCode": "MOR",
-			"required": true
-		},
-		{
-			"id": "province",
-			"description": "province",
-			"labelName": {
-				"eng": "Province",
-				"ara": "المحافظة",
-				"fra": "Province",
-				"hin": "प्रांत",
-				"kan": "ಪ್ರಾಂತ್ಯ",
-				"tam": "மாகாணம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 2,
-			"required": true
-		},
-		{
-			"id": "city",
-			"description": "city",
-			"labelName": {
-				"eng": "City",
-				"ara": "مدينة",
-				"fra": "Ville",
-				"hin": "शहर",
-				"kan": "ನಗರ",
-				"tam": "நகரம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 3,
-			"required": true
-		},
-		{
-			"id": "zone",
-			"description": "zone",
-			"labelName": {
-				"eng": "Zone",
-				"ara": "منطقة",
-				"fra": "Zone",
-				"hin": "क्षेत्र",
-				"kan": "ವಲಯ",
-				"tam": "மண்டலம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [],
-			"locationHierarchyLevel": 4,
-			"required": true
-		},
-		{
-			"id": "postalCode",
-			"description": "postalCode",
-			"labelName": {
-				"eng": "Postal Code",
-				"ara": "الكود البريدى",
-				"fra": "code postal",
-				"hin": "डाक कोड",
-				"kan": "ಅಂಚೆ ಕೋಡ್",
-				"tam": "அஞ்சல் குறியீடு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 5,
-			"required": true
-		},
-		{
-			"id": "residenceStatus",
-			"description": "Quartier/Résidence/Douar",
-			"labelName": {
-				"fra": "Quartier/Résidence/Douar",
-				"ara": "الحي / السكن / الدوار",
-				"eng": "Residence Status",
-				"hin": "निवास स्थान",
-				"kan": "ನಿವಾಸ",
-				"tam": "குடியிருப்பு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "addressType",
-			"description": "Type d'habitat",
-			"labelName": {
-				"fra": "Type d'habitat",
-				"ara": "نوع السكن",
-				"eng": "Habitat type",
-				"kan": "ವಿಳಾಸದ ವಿಧ",
-				"hin": "पता मुद्रलेख",
-				"tam": "முகவரி வகை"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "portNo",
-			"description": "N Porte",
-			"labelName": {
-				"fra": "N° Porte",
-				"ara": "رقم الباب",
-				"eng": "Port No",
-				"kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-				"hin": "पोर्ट नंबर",
-				"tam": "துறை எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,10}$).*",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "apptNo",
-			"description": "N immeuble",
-			"labelName": {
-				"fra": "N° immeuble",
-				"ara": "رقم المبنى",
-				"eng": "Appt no",
-				"kan": "appt ಸಂಖ್ಯೆ",
-				"hin": "उपयुक्त संख्या",
-				"tam": "appt எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,10}$).*",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "addressLine1",
-			"description": "Adresse de résidence",
-			"labelName": {
-				"fra": "Adresse de résidence",
-				"ara": "عنوان السكن",
-				"eng": "Adresse Line1",
-				"hin": "पता पंक्ति 1",
-				"kan": "ವಿಳಾಸ 1",
-				"tam": "முகவரி வரி 1"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,100}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "referenceCNIENumber",
-			"description": "CNIE",
-			"labelName": {
-				"fra": "CNIE",
-				"ara": "رقم البطاقة الوطنية",
-				"eng": "CNIE",
-				"kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
-				"hin": "संदर्भ सीएनआईई नंबर",
-				"tam": "குறிப்பு CNIE எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": true,
-			"group": "card_info",
-			"preview": true
-		},
-		{
-			"id": "resOuPass",
-			"description": "Je dispose",
-			"labelName": {
-				"fra": "Je dispose",
-				"ara": "أملك",
-				"eng": "I have",
-				"kan": "resOuPass",
-				"hin": "resOuPass",
-				"tam": "resOuPass"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": false,
-			"tooltip": false
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":false,
+			"checked":false
 		},
 		{
-			"id": "referenceResidencyNumber",
-			"description": "Numéro d'identité du résident étranger",
-			"labelName": {
-				"fra": "Numéro d'identité du résident étranger",
-				"ara": "رقم هوية المقيم الأجنبي",
-				"eng": "Identity number of the foreign resident",
-				"kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
-				"hin": "संदर्भ निवास संख्या",
-				"tam": "குறிப்பு குடியிருப்பு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "[A-Za-z][0-9]{6}[A-Za-z]",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "passportNumber",
-			"description": "Numéro de passport",
-			"labelName": {
-				"fra": "Numéro de Passeport",
-				"ara": "رقم جواز السفر",
-				"eng": "Passport number",
-				"kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-				"hin": "पासपोर्ट संख्या",
-				"tam": "கடவுச்சீட்டு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{1,20}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "flagidcs",
-			"description": "Je dispose d'un IDCS",
-			"labelName": {
-				"fra": "Je dispose d'un IDCS",
-				"ara": "أملك المعرف المدني والاجتماعي الرقمي",
-				"eng": "I have an IDCS",
-				"kan": "ಧ್ವಜಗಳು",
-				"hin": "फ्लैगिड्स",
-				"tam": "கொடிகள்"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "birthCertificateNumber",
-			"description": "Numéro Acte de Naissance",
-			"labelName": {
-				"fra": "Numéro Acte de Naissance",
-				"ara": "رقم شهادة الميلاد",
-				"eng": "Birth Certificate Number",
-				"kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
-				"hin": "जन्म प्रमाणपत्र संख्या",
-				"tam": "பிறப்புச் சான்றிதழ் எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{1,20}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true
-		},
-		{
-			"id": "civilRegistryNumber",
-			"description": "Numéro Acte de Naissance digitalisé",
-			"labelName": {
-				"fra": "Numéro Acte de Naissance digitalisé",
-				"ara": "رقم شهادة الميلاد الرقمي",
-				"eng": "Digital Birth Certificate Number",
-				"kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
-				"hin": "सिविल रजिस्ट्री नंबर",
-				"tam": "சிவில் பதிவு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"checksum": true,
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "phone",
-			"description": "phone",
-			"labelName": {
-				"eng": "Phone",
-				"ara": "هاتف",
-				"fra": "Téléphone",
-				"hin": "फ़ोन",
-				"kan": "ದೂರವಾಣಿ",
-				"tam": "தொலைபேசி"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
+			"attributeName": "phone",
+			"maskAttributeName":"masked_phone",
 			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
+				"eng": "Phone Number"
+			},
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[+]*([0-9]{1})([0-9]{9})$",
-					"arguments": []
-				}
-			],
-			"required": true
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "email",
-			"description": "email",
-			"labelName": {
-				"eng": "Email",
-				"ara": "البريد الإلكتروني",
-				"fra": "Email",
-				"hin": "ईमेल",
-				"kan": "ಇಮೇಲ್",
-				"tam": "மின்னஞ்சல்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
+			"attributeName": "email",
+			"maskAttributeName":"masked_email",
 			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
+				"eng": "Email ID"
+			},
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-					"arguments": []
-				}
-			],
-			"required": true
-		},
-		{
-			"id": "guardianType",
-			"description": "Type de Tuteur",
-			"labelName": {
-				"fra": "Type de Tuteur",
-				"ara": "نوع الوصي",
-				"eng": "Tutor type",
-				"kan": "ರಕ್ಷಕ ವಿಧ",
-				"hin": "संरक्षक प्रकार",
-				"tam": "பாதுகாவலர் வகை"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": false
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "introducerName",
-			"description": "Prénom du tuteur",
-			"labelName": {
-				"eng": "introducer Name",
-				"ara": "مقدم Name",
-				"fra": "introducteur Name",
-				"kan": "ಪರಿಚಯಕಾರ Name",
-				"hin": "परिचयकर्ता  Name",
-				"tam": "அறிமுகம் Name"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
-		},
-		{
-			"id": "introducerUIN",
-			"description": "Identifiant digital civil et social du tuteur",
-			"labelName": {
-				"eng": "introducer UIN",
-				"ara": "مقدم UIN",
-				"fra": "introducteur UIN",
-				"kan": "ಪರಿಚಯಕಾರ UIN",
-				"hin": "परिचयकर्ता  UIN",
-				"tam": "அறிமுகம் UIN"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"checksum": true,
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[0-9]{10}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": true
+			"attributeName": "addressLine1",
+			"maskRequired": false,
+			"formatRequired": true,
+			"label": {
+				"eng": "Address"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"formatOptionLabel":{
+				"eng": "Address Format"
+			},
+			"formatOption":{
+				"eng": [{"label":"Region", "value":"region"}, {"label":"Province", "value":"province"}, {"label":"City", "value":"city"}, {"label":"Full Address", "value":"fullAddress"}]
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "introduceRID",
-			"description": "Identifiant RNP RID du tuteur",
-			"labelName": {
-				"eng": "introducer RID",
-				"ara": "مقدم RID",
-				"fra": "introducteur RID",
-				"kan": "ಪರಿಚಯಕಾರ RID",
-				"hin": "परिचयकर्ता  RID",
-				"tam": "அறிமுகம் RID"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[0-9]{29}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": true
+			"attributeName": "addressLine2",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Address Line2"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "introduceCNIE",
-			"description": "Numéro d'identité du tuteur",
-			"labelName": {
-				"eng": "introducer CNIE",
-				"ara": "مقدم CNIE",
-				"fra": "introducteur CNIE",
-				"kan": "ಪರಿಚಯಕಾರ CNIE",
-				"hin": "परिचयकर्ता  CNIE",
-				"tam": "அறிமுகம் CNIE"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
+			"attributeName": "addressLine3",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Address Line3"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "relationWithChild",
-			"description": "Lien de parenté",
-			"labelName": {
-				"fra": "Lien de parenté",
-				"ara": "صلة القرابة",
-				"eng": "Relationship",
-				"kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
-				"hin": "बच्चे के साथ संबंध",
-				"tam": "குழந்தையுடன் உறவு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
+			"attributeName": "city",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "City"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfAddress",
-			"description": "proofOfAddress",
-			"labelName": {
-				"ara": "إثبات العنوان",
-				"fra": "Preuve d'adresse",
-				"eng": "Address Proof",
-				"hin": "निवास प्रमाण पत्र",
-				"kan": "ವಿಳಾಸ ಪುರಾವೆ",
-				"tam": "முகவரி சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POA",
-			"required": false
+			"attributeName": "region",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Region"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfIdentity",
-			"description": "proofOfIdentity",
-			"labelName": {
-				"ara": "إثبات الهوية",
-				"fra": "Preuve d'identité",
-				"eng": "Identity Proof",
-				"hin": "पहचान प्रमाण",
-				"kan": "ಗುರುತಿನ ಪುರಾವೆ",
-				"tam": "அடையாள சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POI",
-			"required": true
+			"attributeName": "province",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Province"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfRelationship",
-			"description": "proofOfRelationship",
-			"labelName": {
-				"ara": "إثبات العلاقة",
-				"fra": "Preuve de relation",
-				"eng": "Relationship Proof",
-				"hin": "संबंध प्रमाण",
-				"kan": "ಸಂಬಂಧ ಪುರಾವೆ",
-				"tam": "உறவு சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POR",
-			"required": true
+			"attributeName": "postalCode",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Postal Code"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfDateOfBirth",
-			"description": "proofOfDateOfBirth",
-			"labelName": {
-				"ara": "دليل DOB",
-				"fra": "Preuve de date de naissance",
-				"eng": "DOB Proof",
-				"hin": "जन्मतिथि प्रमाण",
-				"kan": "DOB ಪ್ರೂಫ್",
-				"tam": "DOB ஆதாரம்"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POB",
-			"required": true
+			"attributeName": "gender",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Gender"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfException",
-			"description": "proofOfException",
-			"labelName": {
-				"ara": "إثبات الاستثناء",
-				"fra": "Preuve d'exception",
-				"eng": "Exception Proof",
-				"kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
-				"tam": "விதிவிலக்கு சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POE",
-			"required": true
+			"attributeName": "photo",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Image"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		}
-	],
-	"locationHierarchy": [
-		"region",
-		"province",
-		"city",
-		"zone",
-		"postalCode"
 	]
 }
diff --git a/resident-ui-share-credential-schema.json b/resident-ui-share-credential-schema.json
index 85c7380f804..375ebabf0d8 100644
--- a/resident-ui-share-credential-schema.json
+++ b/resident-ui-share-credential-schema.json
@@ -1,937 +1,236 @@
 {
 	"identity": [
 		{
-			"id": "IDSchemaVersion",
-			"description": "ID Schema Version",
-			"type": "number",
-			"controlType": null,
-			"fieldType": "default",
-			"inputRequired": false,
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "title",
-			"description": "Title",
-			"labelName": {
-				"eng": "Title",
-				"ara": "عنوان",
-				"hin": "पशीर्षक",
-				"kan": "ಶೀರ್ಷಿಕೆ",
-				"tam": "தலைப்பு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "fullName",
-			"description": "Enter Full Name",
-			"labelName": {
-				"eng": "Full Name",
-				"ara": "الاسم الكامل",
-				"fra": "Nom complet",
-				"hin": "पूरा नाम",
-				"kan": "ಪೂರ್ಣ ಹೆಸರು",
-				"tam": "முழு பெயர்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?!.*[ ]{4})(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"transliteration": true
-		},
-		{
-			"id": "dateOfBirth",
-			"description": "Enter DOB",
-			"labelName": {
-				"eng": "Date Of Birth",
-				"ara": "تاريخ الولادة",
-				"fra": "Date de naissance",
-				"hin": "जन्म की तारीख",
-				"kan": "ಹುಟ್ತಿದ ದಿನ",
-				"tam": "பிறந்த தேதி"
-			},
-			"controlType": "ageDate",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [],
-			"required": true
+			"attributeName": "fullName",
+			"maskRequired": false,			
+			"formatRequired": true,
+			"label": {
+				"eng": "Name"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"formatOptionLabel":{
+				"eng": "Name Format"
+			},
+			"formatOption":{
+				"eng": [{"label":"First Name", "value":"firstName"}, {"label":"Middle Name", "value":"middleName"}, {"label":"Last Name", "value":"lastName"}, {"label":"Full Name", "value":"fullName"}]
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "gender",
-			"description": "Enter Gender",
-			"labelName": {
-				"eng": "Gender",
-				"ara": "جنس",
-				"fra": "Le genre",
-				"hin": "लिंग",
-				"kan": "ಲಿಂಗ",
-				"tam": "பாலினம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
+			"attributeName": "dateOfBirth",
+			"maskRequired": false,
+			"formatRequired": true,
+			"label": {
+				"eng": "DOB"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"formatOptionLabel":{
+				"eng": "Date Format"
+			},
+			"formatOption":{
+				"eng": [{"label":"DD/MM", "value":"DD/MM"}, {"label":"DD/MM/YYYY", "value":"DD/MM/YYYY"}]
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "UIN",
-			"description": "Enter UIN",
-			"labelName": {
+			"attributeName": "UIN",
+			"maskAttributeName":"masked_UIN",
+			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
 				"eng": "UIN"
 			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"maskRequired": true,
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":false,
+			"checked":false
 		},
 		{
-			"id": "perpetualVID",
-			"description": "Enter perpetualVID",
-			"labelName": {
-				"eng": "perpetualVID"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
+			"attributeName": "perpetualVID",
+			"maskAttributeName":"masked_perpetualVID",
 			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
+				"eng": "Perpetual VID"
+			},
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true
-		},
-		{
-			"id": "nationality",
-			"description": "nationality",
-			"labelName": {
-				"fra": "Nationalité",
-				"ara": "الجنسية",
-				"eng": "Nationality",
-				"hin": "राष्ट्रीयता",
-				"kan": "ರಾಷ್ಟ್ರೀಯತೆ",
-				"tam": "தேசியம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "flagb",
-			"description": "Je suis né(e) au maroc",
-			"labelName": {
-				"fra": "Je suis né(e) au maroc",
-				"ara": "ولدت في المغرب",
-				"eng": "I was born in Morocco",
-				"hin": "झंडाब",
-				"kan": "ಧ್ವಜ",
-				"tam": "கொடி"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "placeOfBirth",
-			"description": "Lieu de naissance",
-			"labelName": {
-				"fra": "Lieu de naissance",
-				"ara": "مكان الإزدياد",
-				"eng": "Place of birth",
-				"hin": "जन्म स्थान",
-				"kan": "ಹುಟ್ಟಿದ ಸ್ಥಳ",
-				"tam": "பிறந்த இடம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "listCountry",
-			"description": "Pay de naissance",
-			"labelName": {
-				"fra": "Pay de naissance",
-				"ara": "بلد الإزدياد",
-				"eng": "Birth Pay",
-				"hin": "सूचीदेश",
-				"kan": "ಪಟ್ಟಿ ದೇಶ",
-				"tam": "பட்டியல் நாடு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "personal_info",
-			"preview": true
-		},
-		{
-			"id": "region",
-			"description": "region",
-			"labelName": {
-				"eng": "Region",
-				"ara": "منطقة",
-				"fra": "Région",
-				"hin": "ऊपरी क्षेत्र",
-				"kan": "ಪ್ರದೇಶ",
-				"tam": "பிராந்தியம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 1,
-			"parentLocCode": "MOR",
-			"required": true
-		},
-		{
-			"id": "province",
-			"description": "province",
-			"labelName": {
-				"eng": "Province",
-				"ara": "المحافظة",
-				"fra": "Province",
-				"hin": "प्रांत",
-				"kan": "ಪ್ರಾಂತ್ಯ",
-				"tam": "மாகாணம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 2,
-			"required": true
-		},
-		{
-			"id": "city",
-			"description": "city",
-			"labelName": {
-				"eng": "City",
-				"ara": "مدينة",
-				"fra": "Ville",
-				"hin": "शहर",
-				"kan": "ನಗರ",
-				"tam": "நகரம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{3,50}$).*",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 3,
-			"required": true
-		},
-		{
-			"id": "zone",
-			"description": "zone",
-			"labelName": {
-				"eng": "Zone",
-				"ara": "منطقة",
-				"fra": "Zone",
-				"hin": "क्षेत्र",
-				"kan": "ವಲಯ",
-				"tam": "மண்டலம்"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [],
-			"locationHierarchyLevel": 4,
-			"required": true
-		},
-		{
-			"id": "postalCode",
-			"description": "postalCode",
-			"labelName": {
-				"eng": "Postal Code",
-				"ara": "الكود البريدى",
-				"fra": "code postal",
-				"hin": "डाक कोड",
-				"kan": "ಅಂಚೆ ಕೋಡ್",
-				"tam": "அஞ்சல் குறியீடு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[(?i)A-Z0-9]{5}$|^NA$",
-					"arguments": []
-				}
-			],
-			"locationHierarchyLevel": 5,
-			"required": true
-		},
-		{
-			"id": "residenceStatus",
-			"description": "Quartier/Résidence/Douar",
-			"labelName": {
-				"fra": "Quartier/Résidence/Douar",
-				"ara": "الحي / السكن / الدوار",
-				"eng": "Residence Status",
-				"hin": "निवास स्थान",
-				"kan": "ನಿವಾಸ",
-				"tam": "குடியிருப்பு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "addressType",
-			"description": "Type d'habitat",
-			"labelName": {
-				"fra": "Type d'habitat",
-				"ara": "نوع السكن",
-				"eng": "Habitat type",
-				"kan": "ವಿಳಾಸದ ವಿಧ",
-				"hin": "पता मुद्रलेख",
-				"tam": "முகவரி வகை"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "portNo",
-			"description": "N Porte",
-			"labelName": {
-				"fra": "N° Porte",
-				"ara": "رقم الباب",
-				"eng": "Port No",
-				"kan": "ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-				"hin": "पोर्ट नंबर",
-				"tam": "துறை எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,10}$).*",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "apptNo",
-			"description": "N immeuble",
-			"labelName": {
-				"fra": "N° immeuble",
-				"ara": "رقم المبنى",
-				"eng": "Appt no",
-				"kan": "appt ಸಂಖ್ಯೆ",
-				"hin": "उपयुक्त संख्या",
-				"tam": "appt எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,10}$).*",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "addressLine1",
-			"description": "Adresse de résidence",
-			"labelName": {
-				"fra": "Adresse de résidence",
-				"ara": "عنوان السكن",
-				"eng": "Adresse Line1",
-				"hin": "पता पंक्ति 1",
-				"kan": "ವಿಳಾಸ 1",
-				"tam": "முகவரி வரி 1"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{0,100}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": true,
-			"group": "address_info",
-			"preview": true
-		},
-		{
-			"id": "referenceCNIENumber",
-			"description": "CNIE",
-			"labelName": {
-				"fra": "CNIE",
-				"ara": "رقم البطاقة الوطنية",
-				"eng": "CNIE",
-				"kan": "ಉಲ್ಲೇಖ CNIE ಸಂಖ್ಯೆ",
-				"hin": "संदर्भ सीएनआईई नंबर",
-				"tam": "குறிப்பு CNIE எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)|(^[a-z]{2}[0-9]{1,6}$)|(^[a-z]{1}[0-9]{1,7}$)",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": true,
-			"group": "card_info",
-			"preview": true
-		},
-		{
-			"id": "resOuPass",
-			"description": "Je dispose",
-			"labelName": {
-				"fra": "Je dispose",
-				"ara": "أملك",
-				"eng": "I have",
-				"kan": "resOuPass",
-				"hin": "resOuPass",
-				"tam": "resOuPass"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": false,
-			"tooltip": false
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":false,
+			"checked":false
 		},
 		{
-			"id": "referenceResidencyNumber",
-			"description": "Numéro d'identité du résident étranger",
-			"labelName": {
-				"fra": "Numéro d'identité du résident étranger",
-				"ara": "رقم هوية المقيم الأجنبي",
-				"eng": "Identity number of the foreign resident",
-				"kan": "ರೆಸಿಡೆನ್ಸಿ ಸಂಖ್ಯೆ ಉಲ್ಲೇಖ",
-				"hin": "संदर्भ निवास संख्या",
-				"tam": "குறிப்பு குடியிருப்பு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "[A-Za-z][0-9]{6}[A-Za-z]",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "passportNumber",
-			"description": "Numéro de passport",
-			"labelName": {
-				"fra": "Numéro de Passeport",
-				"ara": "رقم جواز السفر",
-				"eng": "Passport number",
-				"kan": "ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ",
-				"hin": "पासपोर्ट संख्या",
-				"tam": "கடவுச்சீட்டு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{1,20}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": false
-		},
-		{
-			"id": "flagidcs",
-			"description": "Je dispose d'un IDCS",
-			"labelName": {
-				"fra": "Je dispose d'un IDCS",
-				"ara": "أملك المعرف المدني والاجتماعي الرقمي",
-				"eng": "I have an IDCS",
-				"kan": "ಧ್ವಜಗಳು",
-				"hin": "फ्लैगिड्स",
-				"tam": "கொடிகள்"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": true,
-			"visible": true,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "birthCertificateNumber",
-			"description": "Numéro Acte de Naissance",
-			"labelName": {
-				"fra": "Numéro Acte de Naissance",
-				"ara": "رقم شهادة الميلاد",
-				"eng": "Birth Certificate Number",
-				"kan": "ಜನನ ಪ್ರಮಾಣಪತ್ರ ಸಂಖ್ಯೆ",
-				"hin": "जन्म प्रमाणपत्र संख्या",
-				"tam": "பிறப்புச் சான்றிதழ் எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^(?=.{1,20}$).*",
-					"arguments": []
-				}
-			],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true
-		},
-		{
-			"id": "civilRegistryNumber",
-			"description": "Numéro Acte de Naissance digitalisé",
-			"labelName": {
-				"fra": "Numéro Acte de Naissance digitalisé",
-				"ara": "رقم شهادة الميلاد الرقمي",
-				"eng": "Digital Birth Certificate Number",
-				"kan": "ನಾಗರಿಕ ನೋಂದಣಿ ಸಂಖ್ಯೆ",
-				"hin": "सिविल रजिस्ट्री नंबर",
-				"tam": "சிவில் பதிவு எண்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"checksum": true,
-			"validators": [],
-			"required": true,
-			"visible": false,
-			"group": "card_info",
-			"preview": true,
-			"tooltip": true
-		},
-		{
-			"id": "phone",
-			"description": "phone",
-			"labelName": {
-				"eng": "Phone",
-				"ara": "هاتف",
-				"fra": "Téléphone",
-				"hin": "फ़ोन",
-				"kan": "ದೂರವಾಣಿ",
-				"tam": "தொலைபேசி"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
+			"attributeName": "phone",
+			"maskAttributeName":"masked_phone",
 			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
+				"eng": "Phone Number"
+			},
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[+]*([0-9]{1})([0-9]{9})$",
-					"arguments": []
-				}
-			],
-			"required": true
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "email",
-			"description": "email",
-			"labelName": {
-				"eng": "Email",
-				"ara": "البريد الإلكتروني",
-				"fra": "Email",
-				"hin": "ईमेल",
-				"kan": "ಇಮೇಲ್",
-				"tam": "மின்னஞ்சல்"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
+			"attributeName": "email",
+			"maskAttributeName":"masked_email",
 			"maskRequired": true,
+			"formatRequired": false,
+			"label": {
+				"eng": "Email ID"
+			},
 			"maskRequiredLabel": {
 				"eng": "Mask It"
 			},
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$",
-					"arguments": []
-				}
-			],
-			"required": true
-		},
-		{
-			"id": "guardianType",
-			"description": "Type de Tuteur",
-			"labelName": {
-				"fra": "Type de Tuteur",
-				"ara": "نوع الوصي",
-				"eng": "Tutor type",
-				"kan": "ರಕ್ಷಕ ವಿಧ",
-				"hin": "संरक्षक प्रकार",
-				"tam": "பாதுகாவலர் வகை"
-			},
-			"controlType": "dropdown",
-			"subtype": "radio",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": false
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "introducerName",
-			"description": "Prénom du tuteur",
-			"labelName": {
-				"eng": "introducer Name",
-				"ara": "مقدم Name",
-				"fra": "introducteur Name",
-				"kan": "ಪರಿಚಯಕಾರ Name",
-				"hin": "परिचयकर्ता  Name",
-				"tam": "அறிமுகம் Name"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "simpleType",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[a-zA-ZÀ-ÿء-ي٠-٩ ]{2,47}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
-		},
-		{
-			"id": "introducerUIN",
-			"description": "Identifiant digital civil et social du tuteur",
-			"labelName": {
-				"eng": "introducer UIN",
-				"ara": "مقدم UIN",
-				"fra": "introducteur UIN",
-				"kan": "ಪರಿಚಯಕಾರ UIN",
-				"hin": "परिचयकर्ता  UIN",
-				"tam": "அறிமுகம் UIN"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"checksum": true,
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[0-9]{10}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": true
+			"attributeName": "addressLine1",
+			"maskRequired": false,
+			"formatRequired": true,
+			"label": {
+				"eng": "Address"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"formatOptionLabel":{
+				"eng": "Address Format"
+			},
+			"formatOption":{
+				"eng": [{"label":"Region", "value":"region"}, {"label":"Province", "value":"province"}, {"label":"City", "value":"city"}, {"label":"Full Address", "value":"fullAddress"}]
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "introduceRID",
-			"description": "Identifiant RNP RID du tuteur",
-			"labelName": {
-				"eng": "introducer RID",
-				"ara": "مقدم RID",
-				"fra": "introducteur RID",
-				"kan": "ಪರಿಚಯಕಾರ RID",
-				"hin": "परिचयकर्ता  RID",
-				"tam": "அறிமுகம் RID"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "^[0-9]{29}$",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true,
-			"tooltip": true
+			"attributeName": "addressLine2",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Address Line2"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "introduceCNIE",
-			"description": "Numéro d'identité du tuteur",
-			"labelName": {
-				"eng": "introducer CNIE",
-				"ara": "مقدم CNIE",
-				"fra": "introducteur CNIE",
-				"kan": "ಪರಿಚಯಕಾರ CNIE",
-				"hin": "परिचयकर्ता  CNIE",
-				"tam": "அறிமுகம் CNIE"
-			},
-			"controlType": "textbox",
-			"inputRequired": true,
-			"fieldType": "default",
-			"type": "string",
-			"validators": [
-				{
-					"type": "regex",
-					"validator": "(^[A-Z]{2}[0-9]{1,6}$)|(^[A-Z]{1}[0-9]{1,7}$)",
-					"arguments": []
-				}
-			],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
+			"attributeName": "addressLine3",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Address Line3"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "relationWithChild",
-			"description": "Lien de parenté",
-			"labelName": {
-				"fra": "Lien de parenté",
-				"ara": "صلة القرابة",
-				"eng": "Relationship",
-				"kan": "ಮಗುವಿನೊಂದಿಗೆ ಸಂಬಂಧ",
-				"hin": "बच्चे के साथ संबंध",
-				"tam": "குழந்தையுடன் உறவு"
-			},
-			"controlType": "dropdown",
-			"inputRequired": true,
-			"fieldType": "dynamic",
-			"type": "simpleType",
-			"validators": [],
-			"required": false,
-			"visible": false,
-			"group": "guardian_info",
-			"preview": true
+			"attributeName": "city",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "City"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfAddress",
-			"description": "proofOfAddress",
-			"labelName": {
-				"ara": "إثبات العنوان",
-				"fra": "Preuve d'adresse",
-				"eng": "Address Proof",
-				"hin": "निवास प्रमाण पत्र",
-				"kan": "ವಿಳಾಸ ಪುರಾವೆ",
-				"tam": "முகவரி சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POA",
-			"required": false
+			"attributeName": "region",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Region"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfIdentity",
-			"description": "proofOfIdentity",
-			"labelName": {
-				"ara": "إثبات الهوية",
-				"fra": "Preuve d'identité",
-				"eng": "Identity Proof",
-				"hin": "पहचान प्रमाण",
-				"kan": "ಗುರುತಿನ ಪುರಾವೆ",
-				"tam": "அடையாள சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POI",
-			"required": true
+			"attributeName": "province",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Province"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfRelationship",
-			"description": "proofOfRelationship",
-			"labelName": {
-				"ara": "إثبات العلاقة",
-				"fra": "Preuve de relation",
-				"eng": "Relationship Proof",
-				"hin": "संबंध प्रमाण",
-				"kan": "ಸಂಬಂಧ ಪುರಾವೆ",
-				"tam": "உறவு சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POR",
-			"required": true
+			"attributeName": "postalCode",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Postal Code"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfDateOfBirth",
-			"description": "proofOfDateOfBirth",
-			"labelName": {
-				"ara": "دليل DOB",
-				"fra": "Preuve de date de naissance",
-				"eng": "DOB Proof",
-				"hin": "जन्मतिथि प्रमाण",
-				"kan": "DOB ಪ್ರೂಫ್",
-				"tam": "DOB ஆதாரம்"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POB",
-			"required": true
+			"attributeName": "gender",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Gender"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		},
 		{
-			"id": "proofOfException",
-			"description": "proofOfException",
-			"labelName": {
-				"ara": "إثبات الاستثناء",
-				"fra": "Preuve d'exception",
-				"eng": "Exception Proof",
-				"kan": "ಎಕ್ಸೆಪ್ಶನ್ ಪ್ರೂಫ್",
-				"tam": "விதிவிலக்கு சான்று"
-			},
-			"controlType": "fileupload",
-			"inputRequired": true,
-			"validators": [],
-			"subType": "POE",
-			"required": true
+			"attributeName": "photo",
+			"maskRequired": false,
+			"formatRequired": false,
+			"label": {
+				"eng": "Image"
+			},
+			"maskRequiredLabel": {
+				"eng": "Mask It"
+			},
+			"displaykeyinsharewithpartner":true,
+			"displaykeyinpersonalisedcard":true,
+			"checked":false
 		}
-	],
-	"locationHierarchy": [
-		"region",
-		"province",
-		"city",
-		"zone",
-		"postalCode"
 	]
 }
diff --git a/resident-ui-update-demographics-schema.json b/resident-ui-update-demographics-schema.json
index 4133325b8fd..7bb6ee0d40b 100644
--- a/resident-ui-update-demographics-schema.json
+++ b/resident-ui-update-demographics-schema.json
@@ -1,7 +1,7 @@
 {
   "identity": [
     {
-      "id": "fullName",
+      "attributeName": "fullName",
       "description": "",
       "labelName": {
         "eng": [
@@ -21,7 +21,7 @@
       "tabgroup": "identity"
     },
     {
-      "id": "dateOfBirth",
+      "attributeName": "dateOfBirth",
       "description": "",
       "labelName": {
         "eng": [
@@ -41,7 +41,7 @@
       "tabgroup": "identity"
     },
     {
-      "id": "gender",
+      "attributeName": "gender",
       "description": "",
       "labelName": {
         "eng": [
@@ -61,7 +61,7 @@
       "tabgroup": "identity"
     },
     {
-      "id": "proofOfIdentity",
+      "attributeName": "proofOfIdentity",
       "description": "",
       "labelName": {
         "eng": [
@@ -90,7 +90,7 @@
       "tabgroup": "identity"
     },
     {
-      "id": "addressLine1",
+      "attributeName": "addressLine1",
       "description": "",
       "labelName": {
         "eng": [
@@ -110,7 +110,7 @@
       "tabgroup": "address"
     },
     {
-      "id": "region",
+      "attributeName": "region",
       "name": "Region",
       "description": "",
       "labelName": {
@@ -132,7 +132,7 @@
       "locationHierarchyLevel": 1
     },
     {
-      "id": "province",
+      "attributeName": "province",
       "name": "Province",
       "description": "",
       "labelName": {
@@ -154,7 +154,7 @@
       "locationHierarchyLevel": 2
     },
     {
-      "id": "city",
+      "attributeName": "city",
       "name": "City",
       "description": "",
       "labelName": {
@@ -176,7 +176,7 @@
       "locationHierarchyLevel": 3
     },
     {
-      "id": "zone",
+      "attributeName": "zone",
       "name": "Zone",
       "description": "",
       "labelName": {
@@ -198,7 +198,7 @@
       "locationHierarchyLevel": 4
     },
     {
-      "id": "postalCode",
+      "attributeName": "postalCode",
       "name": "Postal Code",
       "description": "",
       "labelName": {
@@ -220,7 +220,7 @@
       "locationHierarchyLevel": 5
     },
     {
-      "id": "proofOfAddress",
+      "attributeName": "proofOfAddress",
       "description": "",
       "labelName": {
         "eng": [
@@ -249,7 +249,7 @@
       "tabgroup": "address"
     },
     {
-      "id": "email",
+      "attributeName": "email",
       "description": "",
       "labelName": {
         "eng": [
@@ -275,7 +275,7 @@
       "tabgroup": "contact"
     },
     {
-      "id": "phone",
+      "attributeName": "phone",
       "description": "",
       "labelName": {
         "eng": [
@@ -301,7 +301,7 @@
       "tabgroup": "contact"
     },
     {
-      "id": "preferredLang",
+      "attributeName": "preferredLang",
       "description": "",
       "labelName": {
         "eng": [

From 4e09d7af06dee8b54811f75467389e499620c9b2 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Thu, 9 Feb 2023 11:38:09 +0530
Subject: [PATCH 1076/1358] Added app prop

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index aeb506fe362..a73288893dc 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -438,3 +438,4 @@ mosip.auth.filter_disable=false
 # PDF Digital card is protected with password using below property based on define attribute it will encrypt by taking first 4 character.
 mosip.digitalcard.uincard.password=fullName|dateOfBirth
 mosip.digitalcard.pdf.password.enable.flag=true
+mosip.access_token.subject.claim-name=sub

From b50f51386d2795a006e55d9c3f9a3484c4e19ccb Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 10 Feb 2023 13:07:54 +0530
Subject: [PATCH 1077/1358] [MOSIP-25959][MOSIP-25960] Added config changes for
 S3 bucket pretext (#3335)

---
 application-default.properties      | 4 ++--
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index dcb4475b4bd..707a1d296fe 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -360,7 +360,7 @@ provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
 ## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
-object.store.s3.bucket-name-prefix=mgr-
+object.store.s3.bucket-name-prefix=${s3.pretext.value}
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -377,7 +377,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=packet-manager
+packet.manager.account.name=${s3.pretext.value}packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 1151d138c6d..067d71c16d3 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepo
+mosip.idrepo.objectstore.bucket-name=${s3.pretext.value}idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index d200225b120..07d4af0b4f9 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=prereg
+mosip.kernel.objectstore.account-name=${s3.pretext.value}prereg
 
 ## Booking Service
 booking.service.version=v1

From fa2ec66015073ed663724455237cbc4186484e81 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Fri, 10 Feb 2023 13:46:25 +0530
Subject: [PATCH 1078/1358] enabled debug level for activemq

---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 2e22683168f..568d2056ef0 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -974,3 +974,4 @@ mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,L
 
 registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
+logging.level.org.apache.activemq.ActiveMQConnectionFactory=DEBUG

From 50de99e1f06caffc956ac21ff4948c5f8c16b157 Mon Sep 17 00:00:00 2001
From: damodarguru <124761463+damodarguru@users.noreply.github.com>
Date: Mon, 13 Feb 2023 11:23:01 +0530
Subject: [PATCH 1079/1358] Update resident-default.properties (#3353)

Updated property mosip.iam.module.login_flow.claims, email as false for testing.
---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 8b83c46b508..baa3e0e81ac 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -677,7 +677,7 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":false},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
 #Rectangle coordinates for pfd signataured data
 mosip.resident.service.uincard.lowerleftx=73

From 751cdcc505168424bc18ff1fcca92a1052efc41b Mon Sep 17 00:00:00 2001
From: damodarguru <124761463+damodarguru@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:10:18 +0530
Subject: [PATCH 1080/1358] Update resident-default.properties (#3354)

Updated proprety mosip.iam.module.login_flow.claims, email as true
and also update property mosip.iam.module.login_flow.scope, remove vid.manage for testing.
---
 resident-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index baa3e0e81ac..19c403d1cae 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -321,7 +321,7 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
-mosip.iam.module.login_flow.scope=openid profile identity.readonly identity.update vid.readonly vid.manage auth.readonly auth.method.manage auth.history.readonly auth.history.manage card.manage credential.manage notifications.readonly notifications.manage
+mosip.iam.module.login_flow.scope=openid profile identity.readonly identity.update vid.readonly  auth.readonly auth.method.manage auth.history.readonly auth.history.manage card.manage credential.manage notifications.readonly notifications.manage
 mosip.iam.module.login_flow.response_type=code
 
 mosip.iam.module.admin_realm_id=mosip
@@ -677,7 +677,7 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":false},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
 #Rectangle coordinates for pfd signataured data
 mosip.resident.service.uincard.lowerleftx=73

From 60b895edff30b6273c52f2e03c9da066e7d9c121 Mon Sep 17 00:00:00 2001
From: damodarguru <124761463+damodarguru@users.noreply.github.com>
Date: Tue, 14 Feb 2023 13:25:21 +0530
Subject: [PATCH 1081/1358] Update resident-default.properties (#3359)

Update the scope--mosip.iam.module.login_flow.scope, add vid.manage for testing.
---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 19c403d1cae..8b83c46b508 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -321,7 +321,7 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
-mosip.iam.module.login_flow.scope=openid profile identity.readonly identity.update vid.readonly  auth.readonly auth.method.manage auth.history.readonly auth.history.manage card.manage credential.manage notifications.readonly notifications.manage
+mosip.iam.module.login_flow.scope=openid profile identity.readonly identity.update vid.readonly vid.manage auth.readonly auth.method.manage auth.history.readonly auth.history.manage card.manage credential.manage notifications.readonly notifications.manage
 mosip.iam.module.login_flow.response_type=code
 
 mosip.iam.module.admin_realm_id=mosip

From 1818a7712bdbdccb077063aca7a171677dcae9ff Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Thu, 16 Feb 2023 10:05:36 +0530
Subject: [PATCH 1082/1358] [DSD-2145] Added config changes for esignet

---
 esignet-default.properties           | 290 +++++++++++++++++++++++++++
 id-authentication-default.properties |   2 +-
 2 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 esignet-default.properties

diff --git a/esignet-default.properties b/esignet-default.properties
new file mode 100644
index 00000000000..805c0898827
--- /dev/null
+++ b/esignet-default.properties
@@ -0,0 +1,290 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
+# keycloak.admin.password
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
+# softhsm.kernel.pin
+# softhsm-security-pin
+# email.smtp.host
+# email.smtp.username
+# email.smtp.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
+# mosip.api.internal.url
+# mosip.api.public.url
+
+
+## ------------------------------------------------- e-Signet ----------------------------------------------------------
+mosip.esignet.misp.license.key=IXp6hUchx0oed84ukwpFAbnn3hiioxidzZMv75hchuIgnB0wuD
+mosip.esignet.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/amr-acr-mapping.json
+
+mosip.esignet.supported-id-regex=\\S*
+mosip.esignet.id-token-expire-seconds=3600
+mosip.esignet.access-token-expire-seconds=3600
+mosip.esignet.link-code-expire-in-secs=60
+
+mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
+  '${server.servlet.path}/authorization/authenticate', \
+  '${server.servlet.path}/authorization/auth-code'}
+
+## ------------------------------------------ e-Signet binding ---------------------------------------------------------
+
+mosip.esignet.binding.salt-length=16
+mosip.esignet.binding.audience-id=esignet-binding
+mosip.esignet.binding.key-expire-days=10
+
+## -------------------------------------- Authentication & Authorization -----------------------------------------------
+
+mosip.esignet.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \
+  \ '${server.servlet.path}/system-info/**' : { 'SCOPE_upload_certificate'},\
+  \ '${server.servlet.path}/binding/wallet-binding' : { 'SCOPE_wallet_binding'}, \
+  \ '${server.servlet.path}/binding/binding-otp' : { 'SCOPE_send_binding_otp'}}
+mosip.esignet.security.auth.put-urls={'${server.servlet.path}/client-mgmt/**' : { 'SCOPE_update_oidc_client'} }
+mosip.esignet.security.auth.get-urls={'${server.servlet.path}/system-info/**' : { 'SCOPE_get_certificate'} }
+
+mosip.esignet.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
+  ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,\
+  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**
+
+mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
+  ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
+  ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
+  ${server.servlet.path}/v3/api-docs/**
+
+spring.security.oauth2.resourceserver.jwt.issuer-uri=https://iam.qa-1201-b2.mosip.net/auth/realms/mosip
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://iam.qa-1201-b2.mosip.net/auth/realms/mosip/protocol/openid-connect/certs
+
+##------------------------------------------ Kafka configurations ------------------------------------------------------
+spring.kafka.bootstrap-servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
+spring.kafka.consumer.group-id=esignet-consumer
+spring.kafka.consumer.enable-auto-commit=true
+#spring.kafka.listener.concurrency=1
+
+mosip.esignet.kafka.linked-session.topic=esignet-linked
+mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
+
+## ------------------------------------------- Integrations ------------------------------------------------------------
+
+mosip.esignet.integration.scan-base-package=io.mosip.idp.authwrapper
+mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
+mosip.esignet.integration.authenticator=IdentityAuthenticationService-temp
+mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
+mosip.esignet.integration.audit-plugin=LoggerAuditService
+mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
+
+# captcha validator
+mosip.esignet.send-otp.captcha-required=true
+mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
+mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
+mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}
+
+# IDA integration props
+mosip.esignet.authenticator.ida-auth-id=mosip.identity.kycauth
+mosip.esignet.authenticator.ida-exchange-id=mosip.identity.kycexchange
+mosip.esignet.authenticator.ida-send-otp-id=mosip.identity.otp
+mosip.esignet.authenticator.ida-version=1.0
+mosip.esignet.authenticator.ida-domainUri=https://${mosip.esignet.host}
+mosip.esignet.authenticator.ida.cert-url=https://${mosip.api.public.host}/mosip-certs/ida-partner.cer
+mosip.esignet.authenticator.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.esignet.misp.license.key}/
+mosip.esignet.binder.ida.key-binding-url=https://api-internal.qa-1201-b2.mosip.net/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida-env=Developer
+mosip.esignet.authenticator.ida.otp-channels=email,phone
+
+# Mock IDA integration props
+mosip.esignet.mock.authenticator.persona-repo=/home/mosip/mockida
+mosip.esignet.mock.authenticator.policy-repo=/home/mosip/mockida
+mosip.esignet.mock.authenticator.claims-mapping-file=/home/mosip/mockida/claims_attributes_mapping.json
+
+## ------------------------------------------ oauth & openid supported values ------------------------------------------
+
+## supported scopes
+mosip.esignet.supported.authorize.scopes={'Manage-Identity-Data','Manage-VID','Manage-Authentication','Manage-Service-Requests','Manage-Credentials'}
+mosip.esignet.supported.openid.scopes={'profile','email','phone'}
+mosip.esignet.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number','locale'},'email' : {'email'}, 'phone' : {'phone_number'}}
+
+## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
+mosip.esignet.supported.response.types={'code'}
+
+## Form of Authorization Grant presented to token endpoint
+mosip.esignet.supported.grant.types={'authorization_code'}
+
+## specifies how the Authorization Server displays the authentication and consent user interface pages to the End-User
+# page-The Authorization Server SHOULD display the authentication and consent UI consistent with a full User Agent page view. If the display parameter is not specified, this is the default display mode.
+# popup-The Authorization Server SHOULD display the authentication and consent UI consistent with a popup User Agent window. The popup User Agent window should be of an appropriate size for a login-focused dialog and should not obscure the entire window that it is popping up over.
+# touch-The Authorization Server SHOULD display the authentication and consent UI consistent with a device that leverages a touch interface.
+# wap-The Authorization Server SHOULD display the authentication and consent UI consistent with a "feature phone" type display.
+mosip.esignet.supported.ui.displays={'page','popup','touch','wap'}
+
+## specifies whether the Authorization Server prompts the End-User for reauthentication and consent
+# none-The Authorization Server MUST NOT display any authentication or consent user interface pages.
+# An error is returned if an End-User is not already authenticated or the Client does not have pre-configured consent
+# for the requested Claims or does not fulfill other conditions for processing the request.
+# The error code will typically be login_required, interaction_required, or another code defined in Section 3.1.2.6.
+# This can be used as a method to check for existing authentication and/or consent.
+# login-The Authorization Server SHOULD prompt the End-User for reauthentication. If it cannot reauthenticate the End-User, \
+#  it MUST return an error, typically login_required.
+# consent-The Authorization Server SHOULD prompt the End-User for consent before returning information to the Client.
+# If it cannot obtain consent, it MUST return an error, typically consent_required.
+# select_account-The Authorization Server SHOULD prompt the End-User to select a user account. This enables an End-User
+# who has multiple accounts at the Authorization Server to select amongst the multiple accounts that they might have current
+# sessions for. If it cannot obtain an account selection choice made by the End-User, it MUST return an error,
+# typically account_selection_required.
+mosip.esignet.supported.ui.prompts={'none','login','consent','select_account'}
+
+## Type of the client assertion
+mosip.esignet.supported.client.assertion.types={'urn:ietf:params:oauth:client-assertion-type:jwt-bearer'}
+
+## Type of the client authentication methods for token endpoint
+mosip.esignet.supported.client.auth.methods={'private_key_jwt'}
+
+
+## ---------------------------------------- Cache configuration --------------------------------------------------------
+
+mosip.esignet.cache.secure.individual-id=true
+mosip.esignet.cache.store.individual-id=true
+mosip.esignet.cache.security.secretkey.reference-id=TRANSACTION_CACHE
+mosip.esignet.cache.security.algorithm-name=AES/ECB/PKCS5Padding
+
+mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented
+
+#spring.cache.type=redis
+#spring.cache.cache-names=${mosip.esignet.cache.names}
+#spring.redis.host=localhost
+#spring.redis.port=6379
+management.health.redis.enabled=false
+
+spring.cache.type=simple
+mosip.esignet.cache.key.hash.algorithm=SHA3-256
+mosip.esignet.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
+   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200 }
+mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 180, 'authenticated': 120, 'authcodegenerated': 60, \
+  'userinfo': ${mosip.esignet.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
+  'linked': 60 , 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : 60, 'consented': 120 }
+
+## ------------------------------------------ Discovery openid-configuration -------------------------------------------
+
+mosip.esignet.domain.url=https://${mosip.api.public.host}
+mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
+
+mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
+  \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
+  \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' ,\
+  \ 'userinfo_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/oidc/userinfo' , \
+  \ 'registration_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/client-mgmt/oidc-client' , \
+  \ 'jwks_uri' : '${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json' , \
+  \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
+  \ 'response_types_supported' : ${mosip.esignet.supported.response.types}, \
+  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
+  \ 'userinfo_signing_alg_values_supported' : {'RS256'}, \
+  \ 'userinfo_encryption_alg_values_supported' : {'RSAXXXXX'},\
+  \ 'userinfo_encryption_enc_values_supported' : {'A128GCM'}, \
+  \ 'response_modes_supported' : { 'query' }, \
+  \ 'token_endpoint_auth_methods_supported' : ${mosip.esignet.supported.client.auth.methods}, \
+  \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, \
+  \ 'id_token_signing_alg_values_supported' : {'RS256'}, \
+  \ 'claim_types_supported': {'normal'}, \
+  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','locale','individual_id'}, \
+  \ 'claims_locales_supported' : {'en'}, \
+  \ 'display_values_supported' : ${mosip.esignet.supported.ui.displays}, \
+  \ 'ui_locales_supported' : {'en'} }
+
+##----------------------------------------- Database properties --------------------------------------------------------
+
+mosip.esignet.database.hostname=postgres-postgresql.postgres
+mosip.esignet.database.port=5432
+spring.datasource.url=jdbc:postgresql://${mosip.esignet.database.hostname}:${mosip.esignet.database.port}/mosip_esignet?currentSchema=esignet
+spring.datasource.username=esignetuser
+spring.datasource.password=${db.dbuser.password}
+
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+#------------------------------------ Key-manager specific properties --------------------------------------------------
+#Crypto asymmetric algorithm name
+mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
+#Crypto symmetric algorithm name
+mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
+#Keygenerator asymmetric algorithm name
+mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
+#Keygenerator symmetric algorithm name
+mosip.kernel.keygenerator.symmetric-algorithm-name=AES
+#Asymmetric algorithm key length
+mosip.kernel.keygenerator.asymmetric-key-length=2048
+#Symmetric algorithm key length
+mosip.kernel.keygenerator.symmetric-key-length=256
+#Encrypted data and encrypted symmetric key separator
+mosip.kernel.data-key-splitter=#KEY_SPLITTER#
+#GCM tag length
+mosip.kernel.crypto.gcm-tag-length=128
+#Hash algo name
+mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
+#Symmtric key length used in hash
+mosip.kernel.crypto.hash-symmetric-key-length=256
+#No of iterations in hash
+mosip.kernel.crypto.hash-iteration=100000
+#Sign algo name
+mosip.kernel.crypto.sign-algorithm-name=RS256
+#Certificate Sign algo name
+mosip.kernel.certificate.sign.algorithm=SHA256withRSA
+
+#mosip.kernel.keymanager.hsm.config-path=local.p12
+#mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+#mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
+
+#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+# For PKCS11 provide Path of config file.
+# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
+# For Offline & JCE property can be left blank, specified value will be ignored.
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+# Passkey of keystore for PKCS11, PKCS12
+# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.esignet.security.pin}
+
+
+mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
+mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
+mosip.kernel.keymanager.certificate.default.organization=IITB
+mosip.kernel.keymanager.certificate.default.location=BANGALORE
+mosip.kernel.keymanager.certificate.default.state=KA
+mosip.kernel.keymanager.certificate.default.country=IN
+
+mosip.kernel.keymanager.softhsm.certificate.common-name=www.mosip.io
+mosip.kernel.keymanager.softhsm.certificate.organizational-unit=MOSIP
+mosip.kernel.keymanager.softhsm.certificate.organization=IITB
+mosip.kernel.keymanager.softhsm.certificate.country=IN
+
+# Application Id for PMS master key.
+mosip.kernel.partner.sign.masterkey.application.id=PMS
+mosip.kernel.partner.allowed.domains=DEVICE
+
+mosip.kernel.keymanager-service-validate-url=https://${mosip.hostname}/keymanager/validate
+mosip.kernel.keymanager.jwtsign.validate.json=false
+mosip.keymanager.dao.enabled=false
+crypto.PrependThumbprint.enable=true
+
+## -------------------------------------------- IDP-UI config ----------------------------------------------------------
+
+mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
+  'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
+  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
+  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}' }
+
+
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 11ce6e01ca8..80db232cbc6 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -491,7 +491,7 @@ keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip.ida.database.port}/mosip_ida
 keymanager_database_username=${mosip.ida.database.user}
 keymanager_database_password=${db.dbuser.password}
-mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id}
+mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING
 mosip.kernel.keymanager.autogen.basekeys.list=${application.id}:${internal.reference.id},${application.id}:${partner.reference.id},${application.id}:${partner.biometric.reference.id},${application.id}:${mosip.kernel.zkcrypto.publickey.reference.id},${application.id}:${ida-auth-partner-id}
 zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida

From daefbcc049fbbd2fe41a6958cf26cbb4b0d4e6cf Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Thu, 16 Feb 2023 12:48:54 +0530
Subject: [PATCH 1083/1358] [DSD-2145] Updated ida allowed domain to esignet

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 80db232cbc6..f0e8e250d27 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -560,7 +560,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.idp.host}
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.esignet.host}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 

From 0242146b40c4194eda251c0d4c10479e8cd37223 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Thu, 16 Feb 2023 14:43:30 +0530
Subject: [PATCH 1084/1358] Corrected IDP URL to esignet URL

---
 resident-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 8b83c46b508..f3c58295624 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -285,11 +285,11 @@ mosip.iam.module.login_flow.name=authorization_code
 ###########################################################
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
-################## MOSIP IdP config
+################## MOSIP ESignet config
 mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
 mosip.iam.module.clientsecret=
-mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
-mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
+mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
+mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize
 mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
 mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
 mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json

From 9e21545a624138f890d8ea6cc24313bce5d97006 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:01:15 +0530
Subject: [PATCH 1085/1358] Added MISP to allowed partner domains (#3368)

## Partner Management Service allowed partner domains
mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ae7b418c4f0..a9912359f08 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -330,7 +330,7 @@ mosip.kernel.partner.sign.masterkey.application.id=PMS
 datastores=ldap_1_DS,db_1_DS,db_2_DS
 
 ## Partner Management Service allowed partner domains
-mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
+mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 
 ## List of keys to auto generate.
 mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES

From 7616fa5846fbff0589ad8f94c269440236d00ff8 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Thu, 16 Feb 2023 16:05:00 +0530
Subject: [PATCH 1086/1358] Updated with new scopes

---
 resident-default.properties | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index f3c58295624..a33591ddb31 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -321,7 +321,7 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
-mosip.iam.module.login_flow.scope=openid profile identity.readonly identity.update vid.readonly vid.manage auth.readonly auth.method.manage auth.history.readonly auth.history.manage card.manage credential.manage notifications.readonly notifications.manage
+mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests Manage-Credentials
 mosip.iam.module.login_flow.response_type=code
 
 mosip.iam.module.admin_realm_id=mosip
@@ -331,28 +331,28 @@ mosip.resident.identity.claim.individual-id=individual_id
 mosip.resident.identity.claim.ida-token=ida_token
 
 #Scopes
-mosip.scope.resident.getinputattributevalues=identity.readonly
-mosip.scope.resident.patchrevokevid=vid.manage
-mosip.scope.resident.postgeneratevid=vid.manage
-mosip.scope.resident.getvids=vid.readonly
-mosip.scope.resident.getAuthTransactions=auth.readonly
-mosip.scope.resident.postAuthTypeUnlock=auth.method.manage
-mosip.scope.resident.postAuthTypeStatus=auth.method.manage
-mosip.scope.resident.getAuthLockStatus=auth.method.manage
-mosip.scope.resident.patchUpdateUin=identity.update
-mosip.scope.resident.getServiceAuthHistoryRoles=auth.history.readonly
-mosip.scope.resident.postSendPhysicalCard=card.manage
-mosip.scope.resident.getUnreadServiceList=notifications.readonly
-mosip.scope.resident.getNotificationCount=notifications.readonly
-mosip.scope.resident.getNotificationClick=notifications.manage
-mosip.scope.resident.getupdatedttimes=notifications.manage
-mosip.scope.resident.postRequestDownloadPersonalizedCard=card.manage
-mosip.scope.resident.postRequestShareCredWithPartner=credential.manage
-mosip.scope.resident.postUnPinStatus=auth.history.manage
-mosip.scope.resident.postPinStatus=auth.history.manage
-mosip.scope.resident.getDownloadCard=card.manage
-mosip.scope.resident.postPersonalizedCard=card.manage
-mosip.scope.resident.getOrderRedirect=card.manage
+mosip.scope.resident.getinputattributevalues=Manage-Identity-Data
+mosip.scope.resident.patchrevokevid=Manage-VID
+mosip.scope.resident.postgeneratevid=Manage-VID
+mosip.scope.resident.getvids=Manage-VID
+mosip.scope.resident.getAuthTransactions=Manage-Service-Requests
+mosip.scope.resident.postAuthTypeUnlock=Manage-Authentication
+mosip.scope.resident.postAuthTypeStatus=Manage-Authentication
+mosip.scope.resident.getAuthLockStatus=Manage-Authentication
+mosip.scope.resident.patchUpdateUin=Manage-Identity-Data
+mosip.scope.resident.getServiceAuthHistoryRoles=Manage-Service-Requests
+mosip.scope.resident.postSendPhysicalCard=Manage-Credentials
+mosip.scope.resident.getUnreadServiceList=Manage-Service-Requests
+mosip.scope.resident.getNotificationCount=Manage-Service-Requests
+mosip.scope.resident.getNotificationClick=Manage-Service-Requests
+mosip.scope.resident.getupdatedttimes=Manage-Service-Requests
+mosip.scope.resident.postRequestDownloadPersonalizedCard=Manage-Credentials
+mosip.scope.resident.postRequestShareCredWithPartner=Manage-Credentials
+mosip.scope.resident.postUnPinStatus=Manage-Service-Requests
+mosip.scope.resident.postPinStatus=Manage-Service-Requests
+mosip.scope.resident.getDownloadCard=Manage-Credentials
+mosip.scope.resident.postPersonalizedCard=Manage-Credentials
+mosip.scope.resident.getOrderRedirect=Manage-Credentials
 
 ## Key manager
 mosip.resident.keymanager.encrypt-uri=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt	

From e56efa0285bd97e6fbf90e30e4398f9af8b15938 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Fri, 17 Feb 2023 11:24:03 +0530
Subject: [PATCH 1087/1358] Swithing to idp ui instead of esignet

---
 id-authentication-default.properties | 2 +-
 resident-default.properties          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f0e8e250d27..728f0f537f3 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -560,7 +560,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.esignet.host}
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.esignet.host},https://${mosip.idp.host}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
diff --git a/resident-default.properties b/resident-default.properties
index a33591ddb31..ab9505613f5 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -288,8 +288,8 @@ mosip.iam.module.login_flow.name=authorization_code
 ################## MOSIP ESignet config
 mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
 mosip.iam.module.clientsecret=
-mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
-mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize
+mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
+mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
 mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
 mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
 mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json

From 7311ea6be0f01568acadf0b04e727df3923a2c1c Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Fri, 17 Feb 2023 12:23:34 +0530
Subject: [PATCH 1088/1358] Revert "Swithing to idp ui instead of esignet"

This reverts commit e56efa0285bd97e6fbf90e30e4398f9af8b15938.
---
 id-authentication-default.properties | 2 +-
 resident-default.properties          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 728f0f537f3..f0e8e250d27 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -560,7 +560,7 @@ mosip.hotlist.cleanup-schedule.fixed-delay-in-hours=24
 mosip.ida.allowed.enviromemnts=Staging,Developer,Pre-Production,Production
 # Allowed domain Uris. This values should be comma separted.
 #Ex. https://dev.mosip.net,https://qa2.mosip.net
-mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.esignet.host},https://${mosip.idp.host}
+mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.esignet.host}
 
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
diff --git a/resident-default.properties b/resident-default.properties
index ab9505613f5..a33591ddb31 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -288,8 +288,8 @@ mosip.iam.module.login_flow.name=authorization_code
 ################## MOSIP ESignet config
 mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
 mosip.iam.module.clientsecret=
-mosip.iam.base.url=https://${mosip.api.public.host}/v1/idp
-mosip.iam.authorization_endpoint=https://${mosip.idp.host}/authorize
+mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
+mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize
 mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
 mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
 mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json

From 1be6c854bdad1625f7e3572ac1e26648587ea8aa Mon Sep 17 00:00:00 2001
From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Date: Fri, 17 Feb 2023 12:25:26 +0530
Subject: [PATCH 1089/1358] Updated MISP license key

---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 805c0898827..a517e9416b5 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -27,7 +27,7 @@
 
 
 ## ------------------------------------------------- e-Signet ----------------------------------------------------------
-mosip.esignet.misp.license.key=IXp6hUchx0oed84ukwpFAbnn3hiioxidzZMv75hchuIgnB0wuD
+mosip.esignet.misp.license.key=elhvf43Uar8ShYra9N2bfTxaM3MaR50Hc9IMol5qazTRtX3FHZ
 mosip.esignet.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/amr-acr-mapping.json
 
 mosip.esignet.supported-id-regex=\\S*
@@ -287,4 +287,4 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}' }
 
 
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file
+logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 63e89f164abcf4746ba5228ef9d9f03d4ee535cb Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 17 Feb 2023 14:11:45 +0530
Subject: [PATCH 1090/1358] [DSD-2160] Updated resident properties in line with
 develop2-v3

---
 resident-default.properties | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index a33591ddb31..0d54a822fe8 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -114,6 +114,7 @@ hibernate.temp.use_jdbc_metadata_defaults=false
 spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 hibernate.jdbc.lob.non_contextual_creation = true
 
+
 ## Auth Services
 KERNELAUTHMANAGER=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
@@ -122,12 +123,14 @@ INTERNALAUTHTRANSACTIONS=${mosip.ida.internal.url}/idauthentication/v1/internal/
 KERNELENCRYPTIONSERVICE=${mosip.ida.internal.url}/idauthentication/v1/internal/getCertificate
 IDAUTHCREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 IDAUTHREVOKEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
+
 ## Notification service
 IDREPOGETIDBYUIN=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 IDREPOGETIDBYRID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 GETUINBYVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 resident.notification.emails=mosiptestuser@gmail.com
 resident.notification.message=Notification has been sent to the provided contact detail(s)
+
 ## templates
 MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
@@ -164,6 +167,7 @@ PACKETRECEIVER=http://regproc-group1.regproc/registrationprocessor/v1/packetrece
 SMSNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/sms/send
 EMAILNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/email/send
 AUTHTYPESTATUSUPDATE=${mosip.idrepo.identity.url}/idrepository/v1/identity/authtypes/status
+
 #Regitstration processor reprint service
 #Registration status service
 REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
@@ -193,6 +197,21 @@ resident.identityjson=identity-mapping.json
 mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
 mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
 
+#Validation properties
+resident.grievance-redressal.alt-email.chars.limit=128
+resident.grievance-redressal.alt-phone.chars.limit=64
+resident.grievance-redressal.comments.chars.limit=1024
+resident.share-credential.purpose.chars.limit=1024
+mosip.resident.eventid.searchtext.length=16
+mosip.kernel.uin.length=10
+mosip.kernel.vid.length=16
+mosip.kernel.rid.length=29
+mosip.resident.eid.length=16
+mosip.kernel.otp.default-length=6
+resident.message.allowed.special.char.regex=[A-Za-z0-9 .,-]+
+resident.purpose.allowed.special.char.regex=[A-Za-z0-9 .,-]+
+resident.id.allowed.special.char.regex=[A-Za-z0-9 -]+
+
 ## Security
 mosip.security.csrf-enable:false
 mosip.security.secure-cookie:false
@@ -225,6 +244,7 @@ mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 mosip.service-context=/resident/v1
 ## The exclusion list of URL patterns that should not be part of authentication and authorization
 mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/status,/**/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registration-centers-list/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user,/**/aid-stage/**
+
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
@@ -254,7 +274,7 @@ resident.view.history.status.filters=all,Success,In Progress,Failed
 
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters,resident.ui.notification.update.interval.seconds,mosip.kernel.otp.expiry-time
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters,resident.ui.notification.update.interval.seconds,mosip.kernel.otp.expiry-time,resident.grievance-redressal.alt-email.chars.limit,resident.grievance-redressal.alt-phone.chars.limit,resident.grievance-redressal.comments.chars.limit,resident.share-credential.purpose.chars.limit,mosip.resident.eventid.searchtext.length,mosip.kernel.uin.length,mosip.kernel.vid.length,mosip.kernel.rid.length,mosip.resident.eid.length,mosip.kernel.otp.default-length,resident.message.allowed.special.char.regex,resident.purpose.allowed.special.char.regex,resident.id.allowed.special.char.regex,resident.version.new,mosip.resident.identity.auth.internal.id
 
 
 
@@ -736,6 +756,7 @@ mosip.digital.card.credential.type=PDFCard
 ## Configure Time limit for OTP Flooding scenario (in minutes)
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=10
+
 mosip.resident.message.code.maximum.length=1024
 
 GET_RID_STATUS=${mosipbox.public.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
@@ -749,11 +770,14 @@ resident.additional.identity.attribute.to.fetch=UIN,email,phone,dateOfBirth,full
 resident.template.ack.authentication.request=acknowledgment-authentication-request
 resident.template.ack.get.my.id=acknowledgment-get-my-id
 resident.template.ack.vid.card.download=acknowledgment-vid-card-download
+
 resident.template.purpose.success.vid-card-download=vid-card-download-positive-purpose
 resident.template.purpose.failure.vid-card-download=vid-card-download-negative-purpose
 resident.template.summary.success.vid-card-download=vid-card-download-positive-summary
+
 resident.ui.datetime.pattern=yyyy-MM-dd HH:mm:ss
 resident.filename.datetime.pattern=yyyy-MM-dd'T'HH_mm_ss
+
 ## The Registration centers will be searched based on the distance value in meters from the Geo location identified
 resident.nearby.centers.distance.meters=2000
 
@@ -767,4 +791,7 @@ resident.ui.notification.update.interval.seconds=30
 mosip.allowed.extension=pdf,jpeg,png,jpg
 
 mosip.resident.schema.attribute-name=attributeName
+
 mosip.max.file.upload.size.in.bytes=2000000
+
+resident.service-history.download.max.count=100
\ No newline at end of file

From 2900f9fd9a9de20df2f1aa5c415104719d1b9705 Mon Sep 17 00:00:00 2001
From: dell <gaganaa10@gmail.com>
Date: Fri, 17 Feb 2023 16:47:03 +0530
Subject: [PATCH 1091/1358] [DSD-2065] Added config changes for including minio
 pretext value

---
 application-default.properties      | 4 +++-
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index a73288893dc..8010256df17 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -359,6 +359,8 @@ provider.packetwriter.mosip=source:REGISTRATION_CLIENT,process:NEW|UPDATE|LOST|B
 provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES_UPDATE|LOST|RES_REPRINT,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
+## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
+object.store.s3.bucket-name-prefix=qa-1201-test
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -375,7 +377,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=packet-manager
+packet.manager.account.name=qa-1201-test-packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ca8efa6d295..b5e0443a99a 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepo
+mosip.idrepo.objectstore.bucket-name=qa-1201-test-idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 92d1e07ab17..47dce0f2150 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=prereg
+mosip.kernel.objectstore.account-name=qa-1201-test-prereg
 
 ## Booking Service
 booking.service.version=v1

From 9602bab8d2db4386d77b4871442a226232d05d4f Mon Sep 17 00:00:00 2001
From: dell <gaganaa10@gmail.com>
Date: Fri, 17 Feb 2023 16:57:10 +0530
Subject: [PATCH 1092/1358] [DSD-2065] Added config changes for including minio
 pretext value

---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 8010256df17..488a2db55da 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -360,7 +360,7 @@ provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
 ## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
-object.store.s3.bucket-name-prefix=qa-1201-test
+object.store.s3.bucket-name-prefix=qa-1201-test-
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl

From e871709d2423134614b23eaea3b22e791f3a8f09 Mon Sep 17 00:00:00 2001
From: dell <gaganaa10@gmail.com>
Date: Tue, 21 Feb 2023 11:53:22 +0530
Subject: [PATCH 1093/1358] [DSD-2166] Disabled Captcha for otp login through
 IdP

---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index a517e9416b5..2f03b6cd0a0 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -85,7 +85,7 @@ mosip.esignet.integration.audit-plugin=LoggerAuditService
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
 # captcha validator
-mosip.esignet.send-otp.captcha-required=true
+mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}

From 005b10f2834796a0fc8731df1950e35e1855a68e Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:43:10 +0530
Subject: [PATCH 1094/1358] mosip.esignet.send-otp.captcha-required=true

Changed mosip.esignet.send-otp.captcha-required=false to mosip.esignet.send-otp.captcha-required=true
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 2f03b6cd0a0..a517e9416b5 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -85,7 +85,7 @@ mosip.esignet.integration.audit-plugin=LoggerAuditService
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
 # captcha validator
-mosip.esignet.send-otp.captcha-required=false
+mosip.esignet.send-otp.captcha-required=true
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}

From 98729d50c663fb21aea4d9581b0ab4bbc8fbc645 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Wed, 22 Feb 2023 14:00:34 +0530
Subject: [PATCH 1095/1358] Added additional attributes.

Added address, individual_id, street_address,locality,region,postal_code and country attributes.
---
 identity-mapping.json | 300 +++++++++++++++++++++++-------------------
 1 file changed, 161 insertions(+), 139 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 42cfe2a4bd9..8dcb600d631 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -1,141 +1,163 @@
 {
-    "identity": {
-        "IDSchemaVersion": {
-            "value": "IDSchemaVersion"
-        },
-        "name": {
-            "value": "fullName"
-        },
-        "gender": {
-            "value": "gender"
-        },
-        "dob": {
-            "value": "dateOfBirth"
-        },
-        "age": {
-            "value": "age"
-        },
-        "introducerRID": {
-            "value": "introducerRID"
-        },
-        "introducerUIN": {
-            "value": "introducerUIN"
-        },
-        "introducerVID": {
-            "value": "introducerVID"
-        },
-        "introducerName": {
-            "value": "introducerName"
-        },
-        "phone": {
-            "value": "phone"
-        },
-        "phoneNumber": {
-            "value": "phone"
-        },
-        "email": {
-            "value": "email"
-        },
-        "emailId": {
-            "value": "email"
-        },
-        "uin": {
-            "value": "UIN"
-        },
-        "vid": {
-            "value": "VID"
-        },
-        "individualBiometrics": {
-            "value": "individualBiometrics"
-        },
-        "introducerBiometrics": {
-            "value": "introducerBiometrics"
-        },
-        "individualAuthBiometrics": {
-            "value": "individualAuthBiometrics"
-        },
-        "officerBiometricFileName": {
-            "value": "officerBiometricFileName"
-        },
-        "supervisorBiometricFileName": {
-            "value": "supervisorBiometricFileName"
-        },
-        "residenceStatus": {
-            "value": "residenceStatus"
-        },
-        "preferredLanguage": {
-            "value": "preferredLang"
-        },
-        "locationHierarchyForProfiling": {
-            "value": "zone,postalCode"
-        },
-        "addressLine1": {
-            "value": "addressLine1"
-        },
-        "addressLine2": {
-            "value": "addressLine2"
-        },
-        "addressLine3": {
-            "value": "addressLine3"
-        },
-        "location1": {
-            "value": "city"
-        },
-        "location2": {
-            "value": "region"
-        },
-        "location3": {
-            "value": "province"
-        },
-        "postalCode": {
-            "value": "postalCode"
-        },
-        "location4": {
-            "value": "zone"
-        },
-        "fullAddress": {
-            "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
-        },
-        "bestTwoFingers": {
-            "value": "bestTwoFingers"
-        },
-        "birthdate": {
-            "value": "dateOfBirth"
-        },
-        "picture": {
-            "value": "face"
-        },
-        "phone_number": {
-            "value": "phone"
-        }
-    },
-    "metaInfo": {
-        "value": "metaInfo"
-    },
-    "audits": {
-        "value": "audits"
-    },
-    "documents": {
-        "poa": {
-            "value": "proofOfAddress"
-        },
-        "poi": {
-            "value": "proofOfIdentity"
-        },
-        "por": {
-            "value": "proofOfRelationship"
-        },
-        "pob": {
-            "value": "proofOfDateOfBirth"
-        },
-        "poe": {
-            "value": "proofOfException"
-        }
-    },
-    "attributeUpdateCountLimit": {
-        "fullName": 2,
-        "gender": 1,
-        "dob": 1,
-        "age": 1
-    }
+	"identity": {
+		"IDSchemaVersion": {
+			"value": "IDSchemaVersion"
+		},
+		"name": {
+			"value": "fullName"
+		},
+		"gender": {
+			"value": "gender"
+		},
+		"dob": {
+			"value": "dateOfBirth"
+		},
+		"age": {
+			"value": "age"
+		},
+		"introducerRID": {
+			"value": "introducerRID"
+		},
+		"introducerUIN": {
+			"value": "introducerUIN"
+		},
+		"introducerVID": {
+			"value": "introducerVID"
+		},
+		"introducerName": {
+			"value": "introducerName"
+		},
+		"phone": {
+			"value": "phone"
+		},
+		"phoneNumber": {
+			"value": "phone"
+		},
+		"email": {
+			"value": "email"
+		},
+		"emailId": {
+			"value": "email"
+		},
+		"uin": {
+			"value": "UIN"
+		},
+		"vid": {
+			"value": "VID"
+		},
+		"individualBiometrics": {
+			"value": "individualBiometrics"
+		},
+		"introducerBiometrics": {
+			"value": "introducerBiometrics"
+		},
+		"individualAuthBiometrics": {
+			"value": "individualAuthBiometrics"
+		},
+		"officerBiometricFileName": {
+			"value": "officerBiometricFileName"
+		},
+		"supervisorBiometricFileName": {
+			"value": "supervisorBiometricFileName"
+		},
+		"residenceStatus": {
+			"value": "residenceStatus"
+		},
+		"preferredLanguage": {
+			"value": "preferredLang"
+		},
+		"locationHierarchyForProfiling": {
+			"value": "zone,postalCode"
+		},
+		"addressLine1": {
+			"value": "addressLine1"
+		},
+		"addressLine2": {
+			"value": "addressLine2"
+		},
+		"addressLine3": {
+			"value": "addressLine3"
+		},
+		"location1": {
+			"value": "city"
+		},
+		"location2": {
+			"value": "region"
+		},
+		"location3": {
+			"value": "province"
+		},
+		"postalCode": {
+			"value": "postalCode"
+		},
+		"location4": {
+			"value": "zone"
+		},
+		"fullAddress": {
+			"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+		},
+		"bestTwoFingers": {
+			"value": "bestTwoFingers"
+		},
+		"birthdate": {
+			"value": "dateOfBirth"
+		},
+		"picture": {
+			"value": "face"
+		},
+		"phone_number": {
+			"value": "phone"
+		}
+	},
+	"metaInfo": {
+		"value": "metaInfo"
+	},
+	"audits": {
+		"value": "audits"
+	},
+	"documents": {
+		"poa": {
+			"value": "proofOfAddress"
+		},
+		"poi": {
+			"value": "proofOfIdentity"
+		},
+		"por": {
+			"value": "proofOfRelationship"
+		},
+		"pob": {
+			"value": "proofOfDateOfBirth"
+		},
+		"poe": {
+			"value": "proofOfException"
+		}
+	},
+	"address": {
+		"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+	},
+
+	"individual_id": {
+		"value": "individual_id"
+	},
+	"street_address": {
+		"value": "addressLine1,addressLine2,addressLine3"
+	},
+	"locality": {
+		"value": "city"
+	},
+	"region": {
+		"value": "region"
+	},
+	"postal_code": {
+		"value": "postalCode"
+	},
+	"country": {
+		"value": "province"
+	},
+	"attributeUpdateCountLimit": {
+		"fullName": 2,
+		"gender": 1,
+		"dob": 1,
+		"age": 1
+	}
 }

From 79770eb0d9ec23c4c12925d997091094fde585ac Mon Sep 17 00:00:00 2001
From: dell <gaganaa10@gmail.com>
Date: Wed, 22 Feb 2023 17:28:08 +0530
Subject: [PATCH 1096/1358] [DSD-2172] Increased 'preauth'seconds to 600
 seconds from 180 seconds

---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 2f03b6cd0a0..214d5310e27 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -171,7 +171,7 @@ spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
 mosip.esignet.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
    'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200 }
-mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 180, 'authenticated': 120, 'authcodegenerated': 60, \
+mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 600, 'authenticated': 120, 'authcodegenerated': 60, \
   'userinfo': ${mosip.esignet.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
   'linked': 60 , 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : 60, 'consented': 120 }
 

From 7b9c27b179110e1042aac5267d82783258bffcd1 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Fri, 24 Feb 2023 14:13:44 +0530
Subject: [PATCH 1097/1358] Updated captcha validator

Updated Captcha validator property from "mosip.esignet.send-otp.captcha-required=true" to "mosip.esignet.send-otp.captcha-required=false"
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index dd03858c5a6..214d5310e27 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -85,7 +85,7 @@ mosip.esignet.integration.audit-plugin=LoggerAuditService
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
 # captcha validator
-mosip.esignet.send-otp.captcha-required=true
+mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}

From 36e9d8bf612a4665066467efbc535570b2f6d503 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Fri, 24 Feb 2023 14:54:21 +0530
Subject: [PATCH 1098/1358] updated config for testing (#3406)

updated mosip.iam.module.login_flow.scope and mosip.iam.module.login_flow.claims for testing purpose will revert back once testing is completed.
---
 resident-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 0d54a822fe8..9f733400dce 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -341,7 +341,7 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
-mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests Manage-Credentials
+mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests
 mosip.iam.module.login_flow.response_type=code
 
 mosip.iam.module.admin_realm_id=mosip
@@ -697,7 +697,7 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":false},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
 #Rectangle coordinates for pfd signataured data
 mosip.resident.service.uincard.lowerleftx=73
@@ -794,4 +794,4 @@ mosip.resident.schema.attribute-name=attributeName
 
 mosip.max.file.upload.size.in.bytes=2000000
 
-resident.service-history.download.max.count=100
\ No newline at end of file
+resident.service-history.download.max.count=100

From 59694e9dca2ef1e2777cccaf325caef4bbfdce29 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:18:51 +0530
Subject: [PATCH 1099/1358] Update partner-management-default.properties
 (#3402)

---
 partner-management-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 5fc6d150434..52a06bd9097 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -318,5 +318,5 @@ mosip.idp.claims-mapping-file-url=${spring_config_url_env}/*/${active_profile_en
 # IDP amr-acr mapping file url
 mosip.idp.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 ## IDP Service apis for create and update
-pmp-idp.oidc.client.create.rest.uri=https://${mosip.api.public.host}/v1/idp/client-mgmt/oidc-client
-pmp-idp.oidc.client.update.rest.uri=https://${mosip.api.public.host}/v1/idp/client-mgmt/oidc-client
+pmp-idp.oidc.client.create.rest.uri=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client
+pmp-idp.oidc.client.update.rest.uri=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client

From 2c4d78ffde1aea54e349bab80da77e8aa5b826f5 Mon Sep 17 00:00:00 2001
From: damodarguru <124761463+damodarguru@users.noreply.github.com>
Date: Fri, 24 Feb 2023 17:21:18 +0530
Subject: [PATCH 1100/1358] Update resident-default.properties (#3409)

updated mosip.iam.module.login_flow.scope and mosip.iam.module.login_flow.claims  revert back all data which are changed for testing.
---
 resident-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 9f733400dce..2b2f72853f3 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -341,7 +341,7 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
-mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests
+mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests Manage-Credentials
 mosip.iam.module.login_flow.response_type=code
 
 mosip.iam.module.admin_realm_id=mosip
@@ -697,7 +697,7 @@ mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
 mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":false},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
 #Rectangle coordinates for pfd signataured data
 mosip.resident.service.uincard.lowerleftx=73

From ed6c334e7ba2d8c50eb1f60c40772748553cebac Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 13:46:45 +0530
Subject: [PATCH 1101/1358] Moved some attributes under Identity JSON object

Moved address,individual_id,street_address,locality,region,postal_code,country under Identity JSON object(line no 111 to 132)
---
 identity-mapping.json | 44 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 8dcb600d631..b45c25a8d46 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -107,6 +107,28 @@
 		},
 		"phone_number": {
 			"value": "phone"
+		},
+		"address": {
+			"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+		},
+
+		"individual_id": {
+			"value": "individual_id"
+		},
+		"street_address": {
+			"value": "addressLine1,addressLine2,addressLine3"
+		},
+		"locality": {
+			"value": "city"
+		},
+		"region": {
+			"value": "region"
+		},
+		"postal_code": {
+			"value": "postalCode"
+		},
+		"country": {
+			"value": "province"
 		}
 	},
 	"metaInfo": {
@@ -132,28 +154,6 @@
 			"value": "proofOfException"
 		}
 	},
-	"address": {
-		"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
-	},
-
-	"individual_id": {
-		"value": "individual_id"
-	},
-	"street_address": {
-		"value": "addressLine1,addressLine2,addressLine3"
-	},
-	"locality": {
-		"value": "city"
-	},
-	"region": {
-		"value": "region"
-	},
-	"postal_code": {
-		"value": "postalCode"
-	},
-	"country": {
-		"value": "province"
-	},
 	"attributeUpdateCountLimit": {
 		"fullName": 2,
 		"gender": 1,

From 5f013097ee54dacc1a139d26b40dd8e377ccda6c Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 14:01:06 +0530
Subject: [PATCH 1102/1358] Added link status deferred timeout in secs

Added mosip.esignet.link-status-deferred-response-timeout-secs=25(line no- 37)
---
 esignet-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esignet-default.properties b/esignet-default.properties
index 214d5310e27..4f643bd22ad 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,6 +34,7 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
+mosip.esignet.link-status-deferred-response-timeout-secs=25
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \

From 12de6f87bfbf23d96ba4b7de668c59b548367c78 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 15:37:43 +0530
Subject: [PATCH 1103/1358] Updated link-status-deferred-response-timeout

Updated mosip.esignet.link-status-deferred-response-timeout-secs=20
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 4f643bd22ad..241d7ca135f 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,7 +34,7 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
-mosip.esignet.link-status-deferred-response-timeout-secs=25
+mosip.esignet.link-status-deferred-response-timeout-secs=20
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \

From 1995eb7839b3f1e29fa427424772306d74a7e7cb Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 17:44:16 +0530
Subject: [PATCH 1104/1358] Updated link-status-deferred-response-timeout

Updated mosip.esignet.link-status-deferred-response-timeout-secs=19
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 241d7ca135f..01d600bc3c7 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,7 +34,7 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
-mosip.esignet.link-status-deferred-response-timeout-secs=20
+mosip.esignet.link-status-deferred-response-timeout-secs=19
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \

From 98b88de6c29ae99a0c84ca699d20de8ac3369809 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 19:29:30 +0530
Subject: [PATCH 1105/1358] Updated link-status-deferred-response-timeout

Updated mosip.esignet.link-status-deferred-response-timeout-secs=17
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 01d600bc3c7..99dd783aa06 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,7 +34,7 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
-mosip.esignet.link-status-deferred-response-timeout-secs=19
+mosip.esignet.link-status-deferred-response-timeout-secs=17
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \

From 651521aebbc9763e839566cd3cfe5bbcbedb5b6f Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 19:41:41 +0530
Subject: [PATCH 1106/1358] updated link status deferred timout in IDP-UI conf

Updated mosip.idp.link-status-deferred-response-timeout-secs':'17' in idp-ui config
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 99dd783aa06..4a9a8dae87a 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -285,7 +285,7 @@ crypto.PrependThumbprint.enable=true
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
-  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}' }
+  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}','mosip.idp.link-status-deferred-response-timeout-secs':'17'}
 
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG

From f54c02f54f04e3333049fa5584a55bb87e4c7c80 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 27 Feb 2023 19:49:14 +0530
Subject: [PATCH 1107/1358] Updated mosip.idp.link-status-deferred-timeout

Updated mosip.idp.link-status-deferred-response-timeout-secs':'19' in idp-ui config
---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 4a9a8dae87a..0c2413188a6 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,7 +34,7 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
-mosip.esignet.link-status-deferred-response-timeout-secs=17
+mosip.esignet.link-status-deferred-response-timeout-secs=19
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
@@ -285,7 +285,7 @@ crypto.PrependThumbprint.enable=true
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
-  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}','mosip.idp.link-status-deferred-response-timeout-secs':'17'}
+  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}','mosip.idp.link-status-deferred-response-timeout-secs':'19'}
 
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 244af90627603623d15026e99aed791245c863a0 Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Tue, 28 Feb 2023 16:41:18 +0530
Subject: [PATCH 1108/1358] [DSD-2182] Removed the hardcoded values

---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 0c2413188a6..93e62f886bc 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -64,8 +64,8 @@ mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
   ${server.servlet.path}/v3/api-docs/**
 
-spring.security.oauth2.resourceserver.jwt.issuer-uri=https://iam.qa-1201-b2.mosip.net/auth/realms/mosip
-spring.security.oauth2.resourceserver.jwt.jwk-set-uri=https://iam.qa-1201-b2.mosip.net/auth/realms/mosip/protocol/openid-connect/certs
+spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
 
 ##------------------------------------------ Kafka configurations ------------------------------------------------------
 spring.kafka.bootstrap-servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}

From 86e367f8cd6b38302ed6da366c98ab9beae77aee Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Tue, 28 Feb 2023 16:57:34 +0530
Subject: [PATCH 1109/1358] [DSD-2182] Removed the hardcoded values

---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 93e62f886bc..967e530bdad 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -101,7 +101,7 @@ mosip.esignet.authenticator.ida.cert-url=https://${mosip.api.public.host}/mosip-
 mosip.esignet.authenticator.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.esignet.misp.license.key}/
-mosip.esignet.binder.ida.key-binding-url=https://api-internal.qa-1201-b2.mosip.net/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.binder.ida.key-binding-url=${keycloak.internal.url}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida-env=Developer
 mosip.esignet.authenticator.ida.otp-channels=email,phone
 

From d7ac8fdf43f24cd1c0dd3702c1e34d49a1ecf653 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 28 Feb 2023 21:34:55 +0530
Subject: [PATCH 1110/1358] [DSD-2199] merged the config from develop2-v3 to
 qa-1201-B2 (#3429)

* [DSD-2199] updated the config from develop2-v3 to qa-1201-B2

* [DSD-2199] updated the pms prop file with esignet changes
---
 esignet-default.properties            |  2 ++
 partner-management-default.properties | 25 +++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 967e530bdad..ff997022dcd 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -63,6 +63,8 @@ mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
   ${server.servlet.path}/v3/api-docs/**
+  ${server.servlet.path}/linked-authorization/link-transaction,${server.servlet.path}/linked-authorization/authenticate,\
+  ${server.servlet.path}/linked-authorization/consent,${server.servlet.path}/binding/**
 
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 52a06bd9097..8cb43d5d473 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -308,15 +308,16 @@ mosip.role.pms.getmisplicense=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.getmisplicensekey=PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.postmispfiltervalues=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 
-
-# query param usd to refer url to redirect after logout
-mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
-# end session endpoint in OIDC
-mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
-# IDP claims mapping file url
-mosip.idp.claims-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/idp-claims-mapping.json
-# IDP amr-acr mapping file url
-mosip.idp.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
-## IDP Service apis for create and update
-pmp-idp.oidc.client.create.rest.uri=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client
-pmp-idp.oidc.client.update.rest.uri=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client
+# query param usd to refer url to redirect after logout	
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri	
+# end session endpoint in OIDC	
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout	
+# esignet claims mapping file url	
+mosip.pms.esignet.claims-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/identity-mapping.json	
+# esignet amr-acr mapping file url		
+mosip.pms.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json	
+## esignet Service apis for create and update	
+mosip.pms.esignet.oidc-client-create-url=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client	
+mosip.pms.esignet.oidc-client-update-url=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client	
+## esignet Service api to fetch the OIDC Client configurations	
+mosip.pms.esignet.config-url=https://${mosip.api.public.host}/v1/esignet/oidc/.well-known/openid-configuration

From f0b0b4882ae31460d5161d391ea14147591c28c2 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 28 Feb 2023 23:16:46 +0530
Subject: [PATCH 1111/1358] Update esignet-default.properties (#3430)

* Update esignet-default.properties

* Update esignet-default.properties

---------

Co-authored-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index ff997022dcd..578eb79ccbe 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -62,8 +62,7 @@ mosip.esignet.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.
 mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**
-  ${server.servlet.path}/linked-authorization/link-transaction,${server.servlet.path}/linked-authorization/authenticate,\
+  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/linked-authorization/link-transaction,${server.servlet.path}/linked-authorization/authenticate,\
   ${server.servlet.path}/linked-authorization/consent,${server.servlet.path}/binding/**
 
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip

From 7aa3e5a6785a800b3849d46b1caf882ffc740935 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Wed, 1 Mar 2023 10:39:59 +0530
Subject: [PATCH 1112/1358] Update esignet-default.properties

---
 esignet-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esignet-default.properties b/esignet-default.properties
index 578eb79ccbe..32b2a670f3e 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -45,6 +45,7 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
 mosip.esignet.binding.salt-length=16
 mosip.esignet.binding.audience-id=esignet-binding
 mosip.esignet.binding.key-expire-days=10
+mosip.esignet.binding.encrypt-binding-id=false
 
 ## -------------------------------------- Authentication & Authorization -----------------------------------------------
 

From 7373bde0a5a92e970e4c450d9bc3d9d4069d2aff Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Wed, 1 Mar 2023 10:49:24 +0530
Subject: [PATCH 1113/1358] Corrected the ignore csrf urls

---
 esignet-default.properties | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 32b2a670f3e..979e06a41cc 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -58,13 +58,14 @@ mosip.esignet.security.auth.get-urls={'${server.servlet.path}/system-info/**' :
 
 mosip.esignet.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,\
-  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**
+  ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,\
+  ${server.servlet.path}/linked-authorization/link-transaction,${server.servlet.path}/linked-authorization/authenticate,\
+  ${server.servlet.path}/linked-authorization/consent,${server.servlet.path}/binding/**
 
 mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/linked-authorization/link-transaction,${server.servlet.path}/linked-authorization/authenticate,\
-  ${server.servlet.path}/linked-authorization/consent,${server.servlet.path}/binding/**
+  ${server.servlet.path}/v3/api-docs/**
 
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs

From 3f73fea34907cf3253a68f95960fd7ab3232e5e3 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Wed, 1 Mar 2023 11:14:52 +0530
Subject: [PATCH 1114/1358] added new props for esignet (#3433)

* Update mimoto-default.properties

* Update inji-default.properties
---
 inji-default.properties   |  4 ++--
 mimoto-default.properties | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/inji-default.properties b/inji-default.properties
index 55da551e13c..3772902ec96 100644
--- a/inji-default.properties
+++ b/inji-default.properties
@@ -9,8 +9,8 @@ mosip.inji.vcDownloadMaxRetry=10
 # pool interval in milli seconds
 mosip.inji.vcDownloadPoolInterval=6000
 # validate binding audience url to be sent in token
-mosip.inji.audience=${mosip.api.internal.url}/v1/idpbinding/validate-binding
+mosip.inji.audience=esignet-binding
 # issuer to be sent in token
 mosip.inji.issuer=residentapp
 # warning screen domain name
-mosip.inji.warningDomainName=https://www.mosiphealthservices.com
\ No newline at end of file
+mosip.inji.warningDomainName=https://${mosip.api.public.host}
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 3fd41fb990f..018185567e0 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -2,8 +2,7 @@
 
 public.url=${mosip.api.internal.url}/residentmobileapp
 mosip.resident.base.url=${mosip.resident.url}/resident/v1
-idp.base.url=https://${mosip.api.public.host}/v1/idp/linked-authorization
-idp.binding.base.url=${mosip.api.internal.url}/v1/idpbinding
+idp.binding.base.url=https://${mosip.api.public.host}/v1/esignet/binding
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp
 RESIDENT_CREDENTIAL_REQUEST=${mosip.resident.base.url}/req/credential
@@ -11,12 +10,8 @@ RESIDENT_CREDENTIAL_REQUEST_STATUS=${RESIDENT_CREDENTIAL_REQUEST}/status
 RESIDENT_VID=${mosip.resident.base.url}/vid
 RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
 RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
-RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/individualId/otp
-RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/status
-IDP_LINK_TRANSACTION=${idp.base.url}/link-transaction
-IDP_AUTHENTICATE=${idp.base.url}/authenticate
-IDP_CONSENT=${idp.base.url}/consent
-IDP_OTP=${idp.base.url}/send-otp
+RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/req/individualId/otp
+RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/get-individual-id
 BINDING_OTP=${idp.binding.base.url}/binding-otp
 WALLET_BINDING=${idp.binding.base.url}/wallet-binding
 
@@ -182,3 +177,4 @@ mosip.auth.filter_disable=false
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 vercred.type.vid=VID
+mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08

From 686b1792ee2da532e83eb01596342a13e015f01d Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 2 Mar 2023 13:50:43 +0530
Subject: [PATCH 1115/1358] Updated link status deferred time

Updated mosip.esignet.link-status-deferred-response-timeout-secs=25
---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 979e06a41cc..d3f156bd420 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,7 +34,7 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
-mosip.esignet.link-status-deferred-response-timeout-secs=19
+mosip.esignet.link-status-deferred-response-timeout-secs=25
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
@@ -288,7 +288,7 @@ crypto.PrependThumbprint.enable=true
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
-  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}','mosip.idp.link-status-deferred-response-timeout-secs':'19'}
+  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}','mosip.esignet.link-status-deferred-response-timeout-secs':'25'}
 
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 53401b0f736f347f560c74f105942711b6c7dfac Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 2 Mar 2023 19:33:56 +0530
Subject: [PATCH 1116/1358] Removed locale from supported claims (#3444)

---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index d3f156bd420..b4793a0d8db 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -118,7 +118,7 @@ mosip.esignet.mock.authenticator.claims-mapping-file=/home/mosip/mockida/claims_
 ## supported scopes
 mosip.esignet.supported.authorize.scopes={'Manage-Identity-Data','Manage-VID','Manage-Authentication','Manage-Service-Requests','Manage-Credentials'}
 mosip.esignet.supported.openid.scopes={'profile','email','phone'}
-mosip.esignet.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number','locale'},'email' : {'email'}, 'phone' : {'phone_number'}}
+mosip.esignet.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number'},'email' : {'email'}, 'phone' : {'phone_number'}}
 
 ## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
 mosip.esignet.supported.response.types={'code'}
@@ -201,7 +201,7 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-
   \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, \
   \ 'id_token_signing_alg_values_supported' : {'RS256'}, \
   \ 'claim_types_supported': {'normal'}, \
-  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','locale','individual_id'}, \
+  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
   \ 'claims_locales_supported' : {'en'}, \
   \ 'display_values_supported' : ${mosip.esignet.supported.ui.displays}, \
   \ 'ui_locales_supported' : {'en'} }

From 51d017cc04db664da7f05099567f8939004f095c Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Mon, 6 Mar 2023 15:37:15 +0530
Subject: [PATCH 1117/1358] added new configs

---
 credential-service-default.properties | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/credential-service-default.properties b/credential-service-default.properties
index 02b710a497a..9c124d85f6d 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -27,3 +27,15 @@ mosip.credential.service.vercred.proof.verificationmethod=https://${mosip.api.pu
 
 KEYMANAGER_VERCRED_SIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwsSign
 credentialType.formatter.VERCRED=VerCredProvider
+
+
+mosip.mask.function.identityAttributes=convertToMaskDataFormat
+mosip.mask.function.date=convertToMaskDate
+mosip.format.function.address=formatAddress
+mosip.format.function.name=formatName
+mosip.format.function.dateTimeFormat=convertDateFormat
+
+credentialType.formatter.PDFCARD=VerCredProvider
+GENERATE_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid
+RETRIEVE_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin
+

From cdd05f289d32b1992c2d84fe6cd451e480f99925 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 6 Mar 2023 19:15:05 +0530
Subject: [PATCH 1118/1358] commented qualitycheck for testing purpose

mosip.toolkit.sbi.qualitycheck.iris.sdk.urls was removed for testing purposes.
---
 compliance-toolkit-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index dc04f971811..9aa8e7b5da3 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -193,4 +193,4 @@ springdoc.swagger-ui.operationsSorter=alpha
 #SBI BiometricsQualityCheckValidator
 mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
 mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
-mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+#mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]

From 1e56c365344b4ac2c58904536a6591c1a6ebb122 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 6 Mar 2023 19:23:33 +0530
Subject: [PATCH 1119/1358] reverting the quality changes and commenting

reverting changes
---
 compliance-toolkit-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 9aa8e7b5da3..dc04f971811 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -193,4 +193,4 @@ springdoc.swagger-ui.operationsSorter=alpha
 #SBI BiometricsQualityCheckValidator
 mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
 mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
-#mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]

From 555539795517e987afef2bdb7e76117a11704288 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 6 Mar 2023 19:25:47 +0530
Subject: [PATCH 1120/1358] commenting for testingpurpose

commented base url and internal url (44 and 46)
---
 compliance-toolkit-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index dc04f971811..7ce7b954019 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -41,9 +41,9 @@ mosip.security.origins=localhost:8099
 mosip.security.secure-cookie=false
 
 #iam
-mosip.api.internal.url=https://${mosip.api.internal.host}
+#mosip.api.internal.url=https://${mosip.api.internal.host}
 #keycloak.external.url=${mosip.api.internal.url}/keycloak
-iam.base.url=${keycloak.external.url}
+#iam.base.url=${keycloak.external.url}
 
 #iam adapter setup
 mosip.service-context=${server.servlet.context-path}

From 80a17998bf8fe10ae69e9a048b8237af15e2060a Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 6 Mar 2023 19:36:15 +0530
Subject: [PATCH 1121/1358] reverting the changes

reverting the previous changes
---
 compliance-toolkit-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index 7ce7b954019..dc04f971811 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -41,9 +41,9 @@ mosip.security.origins=localhost:8099
 mosip.security.secure-cookie=false
 
 #iam
-#mosip.api.internal.url=https://${mosip.api.internal.host}
+mosip.api.internal.url=https://${mosip.api.internal.host}
 #keycloak.external.url=${mosip.api.internal.url}/keycloak
-#iam.base.url=${keycloak.external.url}
+iam.base.url=${keycloak.external.url}
 
 #iam adapter setup
 mosip.service-context=${server.servlet.context-path}

From 933ca4b440250ec4e0413873d643e9eeb3ee9e83 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 6 Mar 2023 19:39:36 +0530
Subject: [PATCH 1122/1358] commenting the DB section properties

commenting the DB section properties for testing purpose
---
 compliance-toolkit-default.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index dc04f971811..d12ee55f90a 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -14,12 +14,12 @@
 # If database is external to production, provide the DNS or ip of the host and port
 
 ##DB properties
-javax.persistence.jdbc.driver=org.postgresql.Driver
-mosip.database.ip=postgres-postgresql.postgres
-mosip.database.port=5432
-javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_toolkit?useSSL=false
-javax.persistence.jdbc.user=toolkituser
-javax.persistence.jdbc.password=${db.dbuser.password}
+#javax.persistence.jdbc.driver=org.postgresql.Driver
+#mosip.database.ip=postgres-postgresql.postgres
+#mosip.database.port=5432
+#javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_toolkit?useSSL=false
+#javax.persistence.jdbc.user=toolkituser
+#javax.persistence.jdbc.password=${db.dbuser.password}
 
 ## Hibernate
 hibernate.hbm2ddl.auto=none

From b9f48b6bc3dd378c691925d0fcd6221a66504ba8 Mon Sep 17 00:00:00 2001
From: ckesiraju <94882008+ckesiraju@users.noreply.github.com>
Date: Mon, 6 Mar 2023 20:11:55 +0530
Subject: [PATCH 1123/1358] reverting back the DB changes

reverting the changes back to default
---
 compliance-toolkit-default.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index d12ee55f90a..dc04f971811 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -14,12 +14,12 @@
 # If database is external to production, provide the DNS or ip of the host and port
 
 ##DB properties
-#javax.persistence.jdbc.driver=org.postgresql.Driver
-#mosip.database.ip=postgres-postgresql.postgres
-#mosip.database.port=5432
-#javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_toolkit?useSSL=false
-#javax.persistence.jdbc.user=toolkituser
-#javax.persistence.jdbc.password=${db.dbuser.password}
+javax.persistence.jdbc.driver=org.postgresql.Driver
+mosip.database.ip=postgres-postgresql.postgres
+mosip.database.port=5432
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.database.ip}:${mosip.database.port}/mosip_toolkit?useSSL=false
+javax.persistence.jdbc.user=toolkituser
+javax.persistence.jdbc.password=${db.dbuser.password}
 
 ## Hibernate
 hibernate.hbm2ddl.auto=none

From 2ff9359251fb927d9daed016b890552d9630a45d Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 7 Mar 2023 10:28:35 +0530
Subject: [PATCH 1124/1358] [DSD-2238] Added config changes for idrepo service

---
 credential-service-default.properties | 10 +--------
 id-repository-default.properties      | 30 +++++++++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/credential-service-default.properties b/credential-service-default.properties
index 9c124d85f6d..c1ca318cd03 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -27,15 +27,7 @@ mosip.credential.service.vercred.proof.verificationmethod=https://${mosip.api.pu
 
 KEYMANAGER_VERCRED_SIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwsSign
 credentialType.formatter.VERCRED=VerCredProvider
-
-
-mosip.mask.function.identityAttributes=convertToMaskDataFormat
-mosip.mask.function.date=convertToMaskDate
-mosip.format.function.address=formatAddress
-mosip.format.function.name=formatName
-mosip.format.function.dateTimeFormat=convertDateFormat
-
 credentialType.formatter.PDFCARD=VerCredProvider
 GENERATE_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 RETRIEVE_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin
-
+credential.service.default.vid.type=PERPETUAL
\ No newline at end of file
diff --git a/id-repository-default.properties b/id-repository-default.properties
index b5e0443a99a..a69c8d488e5 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=qa-1201-test-idrepo
+mosip.idrepo.objectstore.bucket-name=idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
@@ -65,7 +65,7 @@ kernel.retry.exponential.backoff.max.interval.millisecs=1000
 # Whether to traverse to the root cause exception from the exception thrown and use the same root cause to decide whether to retry or not. Default is true.
 kernel.retry.traverse.root.cause.enabled=false
 #Comma separated List of fully qualified Exceptions which are retryable (inclusion list). Their subclasses will also be considered in the evaluation.
-kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException,org.springframework.dao.DataIntegrityViolationException,org.hibernate.exception.ConstraintViolationException,org.springframework.orm.ObjectOptimisticLockingFailureException
+kernel.retry.retryable.exceptions=io.mosip.idrepository.core.exception.IdRepoRetryException
 #Comma separated List of fully qualified Exceptions which are not-retryable (exclusion list). Their subclasses will also be considered in the evaluation.
 kernel.retry.nonretryable.exceptions=
 
@@ -120,6 +120,12 @@ mosip.idrepo.vid.deactive-status=DEACTIVATED
 # VID status value which is stored in database for reactivated VIDs. Used in reactivate-all-vids api.
 mosip.idrepo.vid.reactive-status=ACTIVE
 
+#RID
+# Application version expected in the request
+mosip.idrepo.rid.get.version=1.0
+# Application ids expected in the requests
+mosip.idrepo.rid.get.id=mosip.idrepo.rid.get
+
 # Config server url
 mosip.idrepo.mosip-config-url=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 # VID policy schema against which VID policy is validated
@@ -163,7 +169,7 @@ mosip.iam.adapter.renewal-before-expiry-interval=15
 mosip.iam.adapter.self-token-renewal-enable=true
 mosip.auth.filter_disable=false
 
-mosip.idrepo.bio-extractor-service.rest.uri=${mosip.idrepo.biosdk.url}/biosdk-service/{extractionFormat}/extracttemplates
+mosip.idrepo.bio-extractor-service.rest.uri=${mosip.mock.biosdk.url}/biosdk-service/{extractionFormat}/extracttemplates
 mosip.idrepo.bio-extractor-service.rest.httpMethod=POST
 mosip.idrepo.bio-extractor-service.rest.headers.mediaType=application/json
 mosip.idrepo.bio-extractor-service.rest.timeout=100
@@ -265,17 +271,13 @@ mosip.credential.request.crypto-ref-id=credential_request
 mosip.credential.request.job.timedelay=15000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
-# This property can be set to auth,print or keep it empty so batch will pick up all records#
 credential.request.type=auth
 credential.request.retry.max.count=10
 credential.request.reprocess.statuscodes=FAILED,RETRY
-credential.batch.core.pool.size=10
-credential.batch.max.pool.size=10
-credential.batch.queue.capacity=10
 credential.batch.page.size=10
-credential.batch.chunk.size=10
 credential.request.process.locktimeout=60000
 credential.request.reprocess.locktimeout=60000
+credential.batch.status=NEW
 
 ## Rest services
 CRDENTIALSERVICE=${mosip.idrepo.credential.service.url}/v1/credentialservice/issue
@@ -316,6 +318,8 @@ credentialType.formatter.QRCODE=QrCodeProvider
 credentialType.formatter.MOSIP=CredentialProvider
 credentialType.formatter.EUIN=QrCodeProvider
 credentialType.formatter.REPRINT=QrCodeProvider
+credentialType.formatter.EUIN_WITH_QR=QrCodeProvider
+credentialType.formatter.EUIN_WITH_FACEQR=QrCodeProvider
 mosip.credential.service.format.id=http://mosip.io/credentials/
 mosip.credential.service.format.issuer=https://mosip.io/issuers/
 mosip.credential.service.application.id=PARTNER
@@ -330,7 +334,6 @@ IDREPOGETIDBYID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 mosip.data.share.protocol=http
 mosip.data.share.internal.domain.name=datashare.datashare
 CREATEDATASHARE=/v1/datashare/create
-KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 KEYMANAGER_JWTSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
 KEYMANAGER_ENCRYPT_PIN=${mosip.kernel.keymanager.url}/v1/keymanager/encryptWithPin
 KEYMANAGER_ENCRYPT_ZK=${mosip.kernel.keymanager.url}/v1/keymanager/zkEncrypt
@@ -339,7 +342,7 @@ PARTNER_EXTRACTION_POLICY=${mosip.pms.partnermanager.url}/v1/partnermanager/part
 credential.service.token.request.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 
 # BioSDK service
-mosip.biosdk.default.service.url=${mosip.idrepo.biosdk.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -378,7 +381,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-partner-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
+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
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
@@ -411,6 +414,8 @@ mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESS
 mosip.role.idrepo.identity.draftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.remainingUpdateCountByIndividualId=RESIDENT,ID_REPOSITORY
+mosip.role.idrepo.identity.getRidByIndividualId=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvid=RESIDENT,REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.vid.getvid=REGISTRATION_PROCESSOR,ID_AUTHENTICATION,RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.getviduin=REGISTRATION_PROCESSOR,ID_REPOSITORY,RESIDENT
@@ -419,3 +424,6 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.mask.function.identityAttributes=convertToMaskDataFormat
+
+mosip.role.idrepo.credentialrequest.postv2requestgeneratorrid=CREDENTIAL_REQUEST,ID_REPOSITORY
\ No newline at end of file

From f96c15dac604c5bee955cc4289e3d56db2e3b1d0 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 7 Mar 2023 12:10:49 +0530
Subject: [PATCH 1125/1358] [DSD-2237] Added config changes for digitalcard

---
 digital-card-default.properties           | 122 ++++++++++++++++++++++
 digitalcard-template.properties           |   3 +
 registration-processor-default.properties |   8 ++
 3 files changed, 133 insertions(+)
 create mode 100644 digital-card-default.properties
 create mode 100644 digitalcard-template.properties

diff --git a/digital-card-default.properties b/digital-card-default.properties
new file mode 100644
index 00000000000..cb370131dc3
--- /dev/null
+++ b/digital-card-default.properties
@@ -0,0 +1,122 @@
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port
+mosip.digitalcard.database.hostname=postgres-postgresql.postgres
+mosip.digitalcard.database.port=5432
+
+# Websub
+## webusb properties that used to subscribe and publish event based on specified topic
+mosip.digitalcard.websub.secret=test
+mosip.digitalcard.credential.request.partner.id=mpartner-default-digitalcard
+mosip.digitalcard.websub.publish.topic=CREDENTIAL_STATUS_UPDATE
+mosip.digitalcard.subscription-delay-millisecs=120000
+mosip.digitalcard.resubscription-delay-millisecs=1000000
+mosip.digitalcard.generate.identity.create.websub.topic=IDENTITY_CREATED
+mosip.digitalcard.generate.identity.update.websub.topic=IDENTITY_UPDATED
+mosip.digitalcard.partner.id=mpartner-default-digitalcard
+mosip.digitalcard.generate.credential.websub.topic=${mosip.digitalcard.partner.id}/CREDENTIAL_ISSUED
+mosip.digitalcard.generate.identity.create.callbackurl=${mosipbox.public.url}/v1/digitalcard/idCreateEventHandle/callback/notifyStatus
+mosip.digitalcard.generate.identity.update.callbackurl=${mosipbox.public.url}/v1/digitalcard/idUpdateEventHandle/callback/notifyStatus
+mosip.digitalcard.generate.credential.callbackurl=${mosipbox.public.url}/v1/digitalcard/credential/callback/notifyStatus
+
+# Based on credentialType we are sending credential request
+mosip.digitalcard.credential.type=PDFCard
+
+#Token generator properties Digital Card Service
+digitalcard.token.request.appid=admin
+digitalcard.token.request.clientId=mpartner-default-digitalcard
+digitalcard.token.request.secretKey=${mpartner.default.digitalcard.secret}
+digitalcard.token.request.version=1.0
+digitalcard.token.request.id=io.mosip.digitalcard
+digitalcard.token.request.issuerUrl=${mosip.keycloak.issuerUrl}
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.digitalcard.service.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
+
+#----------------------- DB--------------------------------------------------
+javax.persistence.jdbc.driver=org.postgresql.Driver
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.digitalcard.database.hostname}:${mosip.digitalcard.database.port}/mosip_digitalcard
+javax.persistence.jdbc.user=digitalcarduser
+javax.persistence.jdbc.password=${db.dbuser.password}
+hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
+hibernate.jdbc.lob.non_contextual_creation=true
+hibernate.hbm2ddl.auto=none	
+hibernate.show_sql=false
+hibernate.format_sql=false	
+hibernate.connection.charSet=utf8
+hibernate.cache.use_second_level_cache=false
+hibernate.cache.use_query_cache=false
+hibernate.cache.use_structured_entries=false
+hibernate.generate_statistics=false
+
+
+#----------------------- CBEFF Util--------------------------------------------------
+# Cbeff XSD file name in config server
+mosip.kernel.xsdfile=mosip-cbeff.xsd
+mosip.digitalcard.demographic.identity=identity
+mosip.digitalcard.identityjson=identity-mapping.json
+
+#----------------------- Crypto property for encryption and decryption--------------------------------------------------
+mosip.digitalcard.crypto.partner.id=mpartner-default-digitalcard
+mosip.digitalcard.crypto.application.id=DIGITAL_CARD
+CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
+CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
+
+
+#----------------------- dataShare property to create dataShareUrl--------------------------------------------------
+mosip.digitalcard.datashare.partner.id=mpartner-default-digitalcard
+mosip.digitalcard.datashare.policy.id=mpolicy-default-digitalcard
+CREATEDATASHARE=${mosip.datashare.url}/v1/datashare/create
+
+#header length to be removed from iso image to get actual image
+mosip.digitalcard.uin.header.length=75
+
+#Rectangle coordinates for pfd signataured data
+mosip.digitalcard.service.uincard.lowerleftx=73
+mosip.digitalcard.service.uincard.lowerlefty=100
+mosip.digitalcard.service.uincard.upperrightx=300
+mosip.digitalcard.service.uincard.upperrighty=300
+mosip.digitalcard.service.uincard.signature.reason="signing"
+
+#Digital card template language and templateType code that used to generate pdf card.
+mosip.template-language=eng
+mosip.digitalcard.templateTypeCode=RPR_UIN_CARD_TEMPLATE
+TEMPLATES=${mosip.kernel.masterdata.url}/v1/masterdata/templates
+
+# Credential api that used to created credential and get the credential details
+CREDENTIAL_REQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
+CREDENTIAL_STATUS_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/get
+IDREPOGETIDBYUIN=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
+
+# PDFSIGN to signed the pdf card
+PDFSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/pdf/sign
+
+
+# PDF Digital card is protected with password using below property based on define attribute it will encrypt by taking first 4 character.
+mosip.digitalcard.uincard.password=fullName|dateOfBirth
+mosip.digitalcard.pdf.password.enable.flag=true
+
+#verifiable credential property that used to enable vc check.
+mosip.digitalcard.verify.credentials.flag=true
+
+mosip.digitalcard.credentials.request.initiate.flag=true
+logging.level.io.mosip=INFO
+
+# websub authentication
+mosip.iam.adapter.clientid=mpartner-default-digitalcard
+mosip.iam.adapter.clientsecret=${mpartner.default.digitalcard.secret}
+mosip.iam.adapter.appid=admin
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
+mosip.authmanager.client-token-endpoint=${mosip.authmanager.base-url}/authenticate/clientidsecretkey
+# in minutes
+
+mosip.iam.adapter.validate-expiry-check-rate=1440
+
+# in minutes
+mosip.iam.adapter.renewal-before-expiry-interval=1440
+
+#this should be false if you don?t use this restTemplate true if you do
+
+mosip.iam.adapter.self-token-renewal-enable=true
+mosip.auth.filter_disable=false
+auth.server.admin.allowed.audience=mosip-admin-client,mosip-resident-client
\ No newline at end of file
diff --git a/digitalcard-template.properties b/digitalcard-template.properties
new file mode 100644
index 00000000000..1c1d4a37978
--- /dev/null
+++ b/digitalcard-template.properties
@@ -0,0 +1,3 @@
+RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
+
+vid-card-type=PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PXRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTI+CjxtZXRhIG5hbWU9R2VuZXJhdG9yIGNvbnRlbnQ9TWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkKT4KPHN0eWxlPgo8IS0tCiAvKiBGb250IERlZmluaXRpb25zICovCiBAZm9udC1mYWNlCgl7Zm9udC1mYW1pbHk6Q2FtYnJpYSBNYXRoOwoJcGFub3NlLTE6MiA0IDUgMyA1IDQgNiAzIDIgNDt9CkBmb250LWZhY2UKCXtmb250LWZhbWlseTpDYWxpYnJpOwoJcGFub3NlLTE6MiAxNSA1IDIgMiAyIDQgMyAyIDQ7fQogLyogU3R5bGUgRGVmaW5pdGlvbnMgKi8KIHAuTXNvTm9ybWFsLCBsaS5Nc29Ob3JtYWwsIGRpdi5Nc29Ob3JtYWwKCXttYXJnaW4tdG9wOjBpbjsKCW1hcmdpbi1yaWdodDowaW47CgltYXJnaW4tYm90dG9tOjguMHB0OwoJbWFyZ2luLWxlZnQ6MGluOwoJbGluZS1oZWlnaHQ6MTA3JTsKCWZvbnQtc2l6ZToxMS4wcHQ7Cglmb250LWZhbWlseTpDYWxpYnJpLHNhbnMtc2VyaWY7fQouTXNvQ2hwRGVmYXVsdAoJe2ZvbnQtZmFtaWx5OkNhbGlicmksc2Fucy1zZXJpZjt9Ci5Nc29QYXBEZWZhdWx0Cgl7bWFyZ2luLWJvdHRvbTo4LjBwdDsKCWxpbmUtaGVpZ2h0OjEwNyU7fQogLyogUGFnZSBEZWZpbml0aW9ucyAqLwogQHBhZ2UgV29yZFNlY3Rpb24xCgl7c2l6ZTo1OTUuM3B0IDg0MS45cHQ7CgltYXJnaW46MS4waW4gMS4waW4gMS4waW4gMS4waW47fQpkaXYuV29yZFNlY3Rpb24xCgl7cGFnZTpXb3JkU2VjdGlvbjE7fQotLT4KPC9zdHlsZT4KPC9oZWFkPgo8Ym9keSBsYW5nPUVOLVVTIHN0eWxlPSd3b3JkLXdyYXA6YnJlYWstd29yZCc+CjxkaXYgY2xhc3M9V29yZFNlY3Rpb24xPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J2xpbmUtaGVpZ2h0Om5vcm1hbCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOnJlbGF0aXZlOwp6LWluZGV4OjI1MTY1OTI2NCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOmFic29sdXRlO2xlZnQ6LTNweDt0b3A6LTFweDsKd2lkdGg6MzUycHg7aGVpZ2h0OjE4M3B4Jz48aW1nIHdpZHRoPTM1MiBoZWlnaHQ9MTgzCnNyYz1kYXRhOmltYWdlL3BuZztiYXNlNjQsaVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQVdBQUFBQzNDQU1BQUFBYjgzUmRBQUFBQVhOU1IwSUFyczRjNlFBQUFBUm5RVTFCQUFDeGp3djhZUVVBQUFCalVFeFVSUUFBQUVDQW4wQnduMEIxbjBCd24wQnptVUJ3bWtCeW0wQndtMEJ4bkVCd25FQnhuRUJ3blVCeG1rQndtMEJ4bTBKeW0wSnhuVUp5blVKeG5VSnluVUp4bkVKeW5FRnhuRUZ4bkVGeG5FRnhuRUZ4blVGeG5VRnhuRUZ4bkVGeG5FRnhuR0pBMVBnQUFBQWdkRkpPVXdBSUVCZ2dLREE0UUVoUVdHQm9jSGlBaDQrWG42ZXZ0Ny9IejlmZjUrLzN2K0g0d2dBQUFBbHdTRmx6QUFBT3d3QUFEc01CeDIrb1pBQUFCR3hKUkVGVWVGN3Qyc2xpMmpBVVJtRmpBekh6RUNBR0RPYjluN0s2OHMzVVFEQkIvKzU4QzhCcXVqbFZaY2trdTZGWFRwZXJxanBmY0VkVFZhL0xlVmw0dUU3eXliYnh2NDZ1cWxuZjg5MHozZmxmd1lNTzg5d2IvbUo4OEovR0g1em1QZTk0UTduM243elUyK1Z5VkE1OEhEY1ZaYmxZdm41TXkzcmk0OWZrNzR2RGNUWDBJWFRVbjFjZTczQnpMZTRmMjUvWU1tLy9wRmkyVzROejZRUC9lV24zWkc5TTNqOHIxakZoTS9QcmJ5WXgvLzVHZlhUVDM4YkVhNy84WWhML1lIdm5Kb2k3NWpIa3ExOTlLT1A4WGZnVm5qQ0tTKzNjcjF6ZkJwdXhYK0VwZzlvS2ovd3F5dVArZ2I2SnhPbDYvcm9YZTdPK3JBL0psTmF6L3J5ZmplMTY2eGRJSU43cFBwZGhPK2Z0MlQra3RBbEptL2RIbUhFQ2M3eElxckJkbWUrR2V6YUJkKzFucEdLTGhFL2hHUk5Zb0hjS1ZkdjdtajBGMnNSUFNNam1iV00zdHNJbWNOZHZPOUNkSFRmc2FERU43L3QyQ0NuWmt6VmJHZXlRd1JsRHdFNGJwM0JLdHYwRVQ5Z0ZlblpnTHVOanlxTVBJU2s3YkN6aWZ1M0h3MHVrWVB1SVRiWUtyMHNmUVZLamtIWVg1L0hVUjVEVU1LVGR4MlBHdDJmRFNNVk9HSFZtajlvNUoydUV0SmZNZG1rUC9XWWdPck45V2xzWkVyRXRnWFVJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdBWWdjVUlMRVpnTVFLTEVWaU13R0lFRmlPd0dJSEZDQ3hHWURFQ2l4RllqTUJpQkJZanNCaUJ4UWdzUm1BeEFvc1JXSXpBWWdRV0k3QVlnY1VJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdEWVIrQ2VEeUN0eGdMWDRhWHZBMGdyQnQ2SGw5SUhrRlFlMHA2eVhYaWQrQWlTR29TMHgyd2RYdWMrZ3FUS2tMYktGdUYxNVNOSWFoclNidUxybTQ4Z3FWV2N1N1pRTkxrUElhVmpTQnR1Yi9ZMjlTRWsxUGVwdXd6dld4OURRdk1RdGdydkx4YWFzMXg2VlFnN3N3OTJsbU9qbHR3d1pHM1B5SGF6T3pHRlU3TVQzRDUrS3V6SXZJZ2ZrY3pZSnZDNC9XeUh1YVpvUHlPUlE0aHF0emlUbjhMRjJpK1F4TVFtOE5BdjRvYmlmVG9qaFlFdHV6dS95TEtlVGVIbW96ZWVsZHZPclBueW1QM0ZndGNzdzRuMGJBdjgvWGdjbDR3RGp5VFMyRmpOLzI1cXRobSsxS3dTQ2VSeC92NTRRbW43NGt2RG5lNXBBMXQvTC9XUDFhRDNadU9YSlVlNjUwek9zZSsxNzVIdHZCRU96VHk2ZkVKcDN5R0hFOGIxdTluTTloTGhYamZ5YXp4b0VOZlpYdzV0Wlp6ZUlmRmk0Q1BvckpoNTNpWStvN3l1YUplSm9GNlBTbjRmcGFPOExCZjI3Q0hhL1Q0NSsvN1A0T3lJaDErZC9iOTlhMy8vbDNpRzdYWUNmM0RzdHMwdHBydjJkb2RIN09jUDNMbDY0MlZWMmZmTjZPQlVWZXZwMVNjNVdmWVB3UjMyZ0cxM3VoRUFBQUFBU1VWT1JLNUNZSUk9Pgo8aW1nIHdpZHRoPTQxIGhlaWdodD00NApzcmM9aHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbG9nby5wbmcgYWx0PW1vc2lwIGFsaWduPXJpZ2h0IGhzcGFjZT0xMiBzdHlsZT1tYXJnaW4tdG9wOi0xNzJweDs+PC9zcGFuPjwvc3Bhbj4KPHNwYW4gc3R5bGU9bWFyZ2luLWxlZnQ6IDE2cHg7PjxiPklkIHR5cGU6PC9iPiBWSUQKY2FyZDwvcD48L3NwYW4+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48aW1nIHdpZHRoPTg0IGhlaWdodD04NApzcmM9JGltYWdlIGFsdD11c2VyIGltYWdlIGFsaWduPWxlZnQgaHNwYWNlPTEyPjxiPk5hbWU6PC9iPiAkZnVsbE5hbWU8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5ET0I6PC9iPiAkZGF0ZU9mQmlydGg8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5WSUQ6PC9iPiAkVklEPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47CmxpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VklEIFR5cGU6PC9iPiAkdmlkVHlwZTwvcD4KPHAgY2xhc3M9TXNvTm9ybWFsIHN0eWxlPSdtYXJnaW4tdG9wOjBpbjttYXJnaW4tcmlnaHQ6MGluO21hcmdpbi1ib3R0b206MGluOwpsaW5lLWhlaWdodDpub3JtYWwnPjxiPkdlbmVyYXRlZCBvbjo8L2I+ICRnZW5yYXRlZE9uVGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMTJpbjtsaW5lLWhlaWdodDpub3JtYWwnPjxiPkV4cGlyZXMgb246PC9iPiAkZXhwaXJ5VGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMWluO2xpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VHJhbnNhY3Rpb25zIGxlZnQ6PC9iPiAkdHJhbnNhY3Rpb25zTGVmdENvdW50PC9wPgo8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+ 
\ No newline at end of file
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 568d2056ef0..532356f59ff 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -123,6 +123,7 @@ RETRIEVEIDENTITY=${IDENTITY}/idrepository/v1/identity/idvid
 CREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 GETUINBYVID=${mosip.idrepo.vid.url}/idrepository/v1/idvid
 CREDENTIALREQUEST=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
+CREDENTIALREQUESTV2=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/v2/requestgenerator
 GETVIDSBYUIN=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin
 IDREPOHASDRAFT=${IDENTITY}/idrepository/v1/identity/draft
 IDREPOGETDRAFT=${IDENTITY}/idrepository/v1/identity/draft
@@ -481,6 +482,13 @@ mosip.registration.processor.credentialtype=euin
 mosip.registration.processor.encrypt=false
 mosip.registration.processor.issuer=mpartner-default-print 
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
+mosip.registration.processor.digitalcard.credentialtype=PDFCard
+mosip.registration.processor.print.credentialtype=euin
+mosip.registration.processor.digitalcard.template=RPR_UIN_CARD_TEMPLATE
+mosip.registration.processor.print.template=RPR_UIN_CARD_TEMPLATE
+
+# this property is used to define issuers eg partnerid:credentialType:templateTypeCode
+mosip.registration.processor.issuer=mpartner-default-print:${mosip.registration.processor.print.credentialtype}:${mosip.registration.processor.print.template};mpartner-default-digitalcard:${mosip.registration.processor.digitalcard.credentialtype}:${mosip.registration.processor.digitalcard.template}
 
 ## Stage common
 #After this time intervel, message should be considered as expired (In seconds), 

From 0ae36e24e4e6559b2413bb96fc275eb47c4d4f61 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 7 Mar 2023 13:23:22 +0530
Subject: [PATCH 1126/1358] [DSD-2237] Added digitalcard config changes in
 kernel property file

---
 kernel-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index a9912359f08..94f047cd47c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -333,7 +333,7 @@ datastores=ldap_1_DS,db_1_DS,db_2_DS
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 
 ## List of keys to auto generate.
-mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES
+mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD
 
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
@@ -418,7 +418,8 @@ 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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client,mpartner-default-digitalcard	
+
 
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client

From 270624f7bd2e70f06d5066645fc90cdda83150de Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Tue, 7 Mar 2023 14:04:16 +0530
Subject: [PATCH 1127/1358] [DSD-2237] Updated digitalcard template property
 file

---
 digitalcard-template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalcard-template.properties b/digitalcard-template.properties
index 1c1d4a37978..406b2544cb6 100644
--- a/digitalcard-template.properties
+++ b/digitalcard-template.properties
@@ -1,3 +1,3 @@
 RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
 
-vid-card-type=PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PXRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTI+CjxtZXRhIG5hbWU9R2VuZXJhdG9yIGNvbnRlbnQ9TWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkKT4KPHN0eWxlPgo8IS0tCiAvKiBGb250IERlZmluaXRpb25zICovCiBAZm9udC1mYWNlCgl7Zm9udC1mYW1pbHk6Q2FtYnJpYSBNYXRoOwoJcGFub3NlLTE6MiA0IDUgMyA1IDQgNiAzIDIgNDt9CkBmb250LWZhY2UKCXtmb250LWZhbWlseTpDYWxpYnJpOwoJcGFub3NlLTE6MiAxNSA1IDIgMiAyIDQgMyAyIDQ7fQogLyogU3R5bGUgRGVmaW5pdGlvbnMgKi8KIHAuTXNvTm9ybWFsLCBsaS5Nc29Ob3JtYWwsIGRpdi5Nc29Ob3JtYWwKCXttYXJnaW4tdG9wOjBpbjsKCW1hcmdpbi1yaWdodDowaW47CgltYXJnaW4tYm90dG9tOjguMHB0OwoJbWFyZ2luLWxlZnQ6MGluOwoJbGluZS1oZWlnaHQ6MTA3JTsKCWZvbnQtc2l6ZToxMS4wcHQ7Cglmb250LWZhbWlseTpDYWxpYnJpLHNhbnMtc2VyaWY7fQouTXNvQ2hwRGVmYXVsdAoJe2ZvbnQtZmFtaWx5OkNhbGlicmksc2Fucy1zZXJpZjt9Ci5Nc29QYXBEZWZhdWx0Cgl7bWFyZ2luLWJvdHRvbTo4LjBwdDsKCWxpbmUtaGVpZ2h0OjEwNyU7fQogLyogUGFnZSBEZWZpbml0aW9ucyAqLwogQHBhZ2UgV29yZFNlY3Rpb24xCgl7c2l6ZTo1OTUuM3B0IDg0MS45cHQ7CgltYXJnaW46MS4waW4gMS4waW4gMS4waW4gMS4waW47fQpkaXYuV29yZFNlY3Rpb24xCgl7cGFnZTpXb3JkU2VjdGlvbjE7fQotLT4KPC9zdHlsZT4KPC9oZWFkPgo8Ym9keSBsYW5nPUVOLVVTIHN0eWxlPSd3b3JkLXdyYXA6YnJlYWstd29yZCc+CjxkaXYgY2xhc3M9V29yZFNlY3Rpb24xPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J2xpbmUtaGVpZ2h0Om5vcm1hbCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOnJlbGF0aXZlOwp6LWluZGV4OjI1MTY1OTI2NCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOmFic29sdXRlO2xlZnQ6LTNweDt0b3A6LTFweDsKd2lkdGg6MzUycHg7aGVpZ2h0OjE4M3B4Jz48aW1nIHdpZHRoPTM1MiBoZWlnaHQ9MTgzCnNyYz1kYXRhOmltYWdlL3BuZztiYXNlNjQsaVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQVdBQUFBQzNDQU1BQUFBYjgzUmRBQUFBQVhOU1IwSUFyczRjNlFBQUFBUm5RVTFCQUFDeGp3djhZUVVBQUFCalVFeFVSUUFBQUVDQW4wQnduMEIxbjBCd24wQnptVUJ3bWtCeW0wQndtMEJ4bkVCd25FQnhuRUJ3blVCeG1rQndtMEJ4bTBKeW0wSnhuVUp5blVKeG5VSnluVUp4bkVKeW5FRnhuRUZ4bkVGeG5FRnhuRUZ4blVGeG5VRnhuRUZ4bkVGeG5FRnhuR0pBMVBnQUFBQWdkRkpPVXdBSUVCZ2dLREE0UUVoUVdHQm9jSGlBaDQrWG42ZXZ0Ny9IejlmZjUrLzN2K0g0d2dBQUFBbHdTRmx6QUFBT3d3QUFEc01CeDIrb1pBQUFCR3hKUkVGVWVGN3Qyc2xpMmpBVVJtRmpBekh6RUNBR0RPYjluN0s2OHMzVVFEQkIvKzU4QzhCcXVqbFZaY2trdTZGWFRwZXJxanBmY0VkVFZhL0xlVmw0dUU3eXliYnh2NDZ1cWxuZjg5MHozZmxmd1lNTzg5d2IvbUo4OEovR0g1em1QZTk0UTduM243elUyK1Z5VkE1OEhEY1ZaYmxZdm41TXkzcmk0OWZrNzR2RGNUWDBJWFRVbjFjZTczQnpMZTRmMjUvWU1tLy9wRmkyVzROejZRUC9lV24zWkc5TTNqOHIxakZoTS9QcmJ5WXgvLzVHZlhUVDM4YkVhNy84WWhML1lIdm5Kb2k3NWpIa3ExOTlLT1A4WGZnVm5qQ0tTKzNjcjF6ZkJwdXhYK0VwZzlvS2ovd3F5dVArZ2I2SnhPbDYvcm9YZTdPK3JBL0psTmF6L3J5ZmplMTY2eGRJSU43cFBwZGhPK2Z0MlQra3RBbEptL2RIbUhFQ2M3eElxckJkbWUrR2V6YUJkKzFucEdLTGhFL2hHUk5Zb0hjS1ZkdjdtajBGMnNSUFNNam1iV00zdHNJbWNOZHZPOUNkSFRmc2FERU43L3QyQ0NuWmt6VmJHZXlRd1JsRHdFNGJwM0JLdHYwRVQ5Z0ZlblpnTHVOanlxTVBJU2s3YkN6aWZ1M0h3MHVrWVB1SVRiWUtyMHNmUVZLamtIWVg1L0hVUjVEVU1LVGR4MlBHdDJmRFNNVk9HSFZtajlvNUoydUV0SmZNZG1rUC9XWWdPck45V2xzWkVyRXRnWFVJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdBWWdjVUlMRVpnTVFLTEVWaU13R0lFRmlPd0dJSEZDQ3hHWURFQ2l4RllqTUJpQkJZanNCaUJ4UWdzUm1BeEFvc1JXSXpBWWdRV0k3QVlnY1VJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdEWVIrQ2VEeUN0eGdMWDRhWHZBMGdyQnQ2SGw5SUhrRlFlMHA2eVhYaWQrQWlTR29TMHgyd2RYdWMrZ3FUS2tMYktGdUYxNVNOSWFoclNidUxybTQ4Z3FWV2N1N1pRTkxrUElhVmpTQnR1Yi9ZMjlTRWsxUGVwdXd6dld4OURRdk1RdGdydkx4YWFzMXg2VlFnN3N3OTJsbU9qbHR3d1pHM1B5SGF6T3pHRlU3TVQzRDUrS3V6SXZJZ2ZrY3pZSnZDNC9XeUh1YVpvUHlPUlE0aHF0emlUbjhMRjJpK1F4TVFtOE5BdjRvYmlmVG9qaFlFdHV6dS95TEtlVGVIbW96ZWVsZHZPclBueW1QM0ZndGNzdzRuMGJBdjgvWGdjbDR3RGp5VFMyRmpOLzI1cXRobSsxS3dTQ2VSeC92NTRRbW43NGt2RG5lNXBBMXQvTC9XUDFhRDNadU9YSlVlNjUwek9zZSsxNzVIdHZCRU96VHk2ZkVKcDN5R0hFOGIxdTluTTloTGhYamZ5YXp4b0VOZlpYdzV0Wlp6ZUlmRmk0Q1BvckpoNTNpWStvN3l1YUplSm9GNlBTbjRmcGFPOExCZjI3Q0hhL1Q0NSsvN1A0T3lJaDErZC9iOTlhMy8vbDNpRzdYWUNmM0RzdHMwdHBydjJkb2RIN09jUDNMbDY0MlZWMmZmTjZPQlVWZXZwMVNjNVdmWVB3UjMyZ0cxM3VoRUFBQUFBU1VWT1JLNUNZSUk9Pgo8aW1nIHdpZHRoPTQxIGhlaWdodD00NApzcmM9aHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbG9nby5wbmcgYWx0PW1vc2lwIGFsaWduPXJpZ2h0IGhzcGFjZT0xMiBzdHlsZT1tYXJnaW4tdG9wOi0xNzJweDs+PC9zcGFuPjwvc3Bhbj4KPHNwYW4gc3R5bGU9bWFyZ2luLWxlZnQ6IDE2cHg7PjxiPklkIHR5cGU6PC9iPiBWSUQKY2FyZDwvcD48L3NwYW4+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48aW1nIHdpZHRoPTg0IGhlaWdodD04NApzcmM9JGltYWdlIGFsdD11c2VyIGltYWdlIGFsaWduPWxlZnQgaHNwYWNlPTEyPjxiPk5hbWU6PC9iPiAkZnVsbE5hbWU8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5ET0I6PC9iPiAkZGF0ZU9mQmlydGg8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5WSUQ6PC9iPiAkVklEPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47CmxpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VklEIFR5cGU6PC9iPiAkdmlkVHlwZTwvcD4KPHAgY2xhc3M9TXNvTm9ybWFsIHN0eWxlPSdtYXJnaW4tdG9wOjBpbjttYXJnaW4tcmlnaHQ6MGluO21hcmdpbi1ib3R0b206MGluOwpsaW5lLWhlaWdodDpub3JtYWwnPjxiPkdlbmVyYXRlZCBvbjo8L2I+ICRnZW5yYXRlZE9uVGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMTJpbjtsaW5lLWhlaWdodDpub3JtYWwnPjxiPkV4cGlyZXMgb246PC9iPiAkZXhwaXJ5VGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMWluO2xpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VHJhbnNhY3Rpb25zIGxlZnQ6PC9iPiAkdHJhbnNhY3Rpb25zTGVmdENvdW50PC9wPgo8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+ 
\ No newline at end of file
+vid-card-type=PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PXRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTI+CjxtZXRhIG5hbWU9R2VuZXJhdG9yIGNvbnRlbnQ9TWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkKT4KPHN0eWxlPgp0YWJsZSB7CiAgYm9yZGVyOjVweCBzb2xpZCBsaWdodGJsdWU7CiAgYm9yZGVyLXJhZGl1czo4cHg7CiAgd2lkdGg6IDM1MnB4OwogIGhlaWdodDoxODNweDsKfQo8L3N0eWxlPgo8Ym9keSBsYW5nPUVOLVVTPgo8dGFibGU+CiAgPHRyPgogIAkjaWYoJGlzUGhvdG9TZXQpCiAgICA8dGQ+PGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTYwcHg7IGhlaWdodDogMjEwcHgiPjwvdGQ+CiAgICAjZW5kCiAgICA8dGQ+CiAgICA8dGFibGUgc3R5bGU9ImJvcmRlcjpub25lIj4KICAgICAgPHRyPgogICAgICAgIDx0ZCBjb2xzcGFuPTI+PGltZyB3aWR0aD04MSBoZWlnaHQ9NDQgc3JjPWh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL2xvZ28ucG5nIGFsdD1tb3NpcCBhbGlnbj1yaWdodD48L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPk5hbWU6PC9iPjwvdGQ+CiAgICAgICAgPHRkPiRuYW1lPC90ZD4KICAgICAgPC90cj4KICAgICAgPHRyPgogICAgICAgIDx0ZD48Yj5ET0I6PC9iPjwvdGQ+CiAgICAgICAgPHRkPiRkYXRlT2ZCaXJ0aDwvdGQ+CiAgICAgIDwvdHI+CiAgICAgIDx0cj4KICAgICAgICA8dGQ+PGI+VklEOjwvYj48L3RkPgogICAgICAgIDx0ZD4kdmlkPC90ZD4KICAgICAgPC90cj4KICAgICAgPHRyPgogICAgICAgIDx0ZD48Yj5WSUQgVHlwZTo8L2I+PC90ZD4KICAgICAgICA8dGQ+JHZpZFR5cGU8L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPkdlbmVyYXRlZCBvbjo8L2I+PC90ZD4KICAgICAgICA8dGQ+JGdlbnJhdGVkT25UaW1lc3RhbXA8L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPkV4cGlyZXMgb246PC9iPjwvdGQ+CiAgICAgICAgPHRkPiRleHBpcnlUaW1lc3RhbXA8L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPlRyYW5zYWN0aW9ucyBhbGxvd2VkOjwvYj48L3RkPgogICAgICAgIDx0ZD4kdHJhbnNhY3Rpb25zTGVmdENvdW50PC90ZD4KICAgICAgPC90cj4KICAgIDwvdGFibGU+CiAgICA8L3RkPgogIDwvdHI+CjwvdGFibGU+CjwvYm9keT4KPC9odG1sPg==
\ No newline at end of file

From 96aefb165acce4fe5ee623cfccbae8d42c6da16f Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 7 Mar 2023 14:09:58 +0530
Subject: [PATCH 1128/1358] Revert "[DSD-2237] Updated digitalcard template
 property file"

---
 digitalcard-template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalcard-template.properties b/digitalcard-template.properties
index 406b2544cb6..1c1d4a37978 100644
--- a/digitalcard-template.properties
+++ b/digitalcard-template.properties
@@ -1,3 +1,3 @@
 RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
 
-vid-card-type=PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PXRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTI+CjxtZXRhIG5hbWU9R2VuZXJhdG9yIGNvbnRlbnQ9TWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkKT4KPHN0eWxlPgp0YWJsZSB7CiAgYm9yZGVyOjVweCBzb2xpZCBsaWdodGJsdWU7CiAgYm9yZGVyLXJhZGl1czo4cHg7CiAgd2lkdGg6IDM1MnB4OwogIGhlaWdodDoxODNweDsKfQo8L3N0eWxlPgo8Ym9keSBsYW5nPUVOLVVTPgo8dGFibGU+CiAgPHRyPgogIAkjaWYoJGlzUGhvdG9TZXQpCiAgICA8dGQ+PGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTYwcHg7IGhlaWdodDogMjEwcHgiPjwvdGQ+CiAgICAjZW5kCiAgICA8dGQ+CiAgICA8dGFibGUgc3R5bGU9ImJvcmRlcjpub25lIj4KICAgICAgPHRyPgogICAgICAgIDx0ZCBjb2xzcGFuPTI+PGltZyB3aWR0aD04MSBoZWlnaHQ9NDQgc3JjPWh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL2xvZ28ucG5nIGFsdD1tb3NpcCBhbGlnbj1yaWdodD48L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPk5hbWU6PC9iPjwvdGQ+CiAgICAgICAgPHRkPiRuYW1lPC90ZD4KICAgICAgPC90cj4KICAgICAgPHRyPgogICAgICAgIDx0ZD48Yj5ET0I6PC9iPjwvdGQ+CiAgICAgICAgPHRkPiRkYXRlT2ZCaXJ0aDwvdGQ+CiAgICAgIDwvdHI+CiAgICAgIDx0cj4KICAgICAgICA8dGQ+PGI+VklEOjwvYj48L3RkPgogICAgICAgIDx0ZD4kdmlkPC90ZD4KICAgICAgPC90cj4KICAgICAgPHRyPgogICAgICAgIDx0ZD48Yj5WSUQgVHlwZTo8L2I+PC90ZD4KICAgICAgICA8dGQ+JHZpZFR5cGU8L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPkdlbmVyYXRlZCBvbjo8L2I+PC90ZD4KICAgICAgICA8dGQ+JGdlbnJhdGVkT25UaW1lc3RhbXA8L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPkV4cGlyZXMgb246PC9iPjwvdGQ+CiAgICAgICAgPHRkPiRleHBpcnlUaW1lc3RhbXA8L3RkPgogICAgICA8L3RyPgogICAgICA8dHI+CiAgICAgICAgPHRkPjxiPlRyYW5zYWN0aW9ucyBhbGxvd2VkOjwvYj48L3RkPgogICAgICAgIDx0ZD4kdHJhbnNhY3Rpb25zTGVmdENvdW50PC90ZD4KICAgICAgPC90cj4KICAgIDwvdGFibGU+CiAgICA8L3RkPgogIDwvdHI+CjwvdGFibGU+CjwvYm9keT4KPC9odG1sPg==
\ No newline at end of file
+vid-card-type=PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PXRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTI+CjxtZXRhIG5hbWU9R2VuZXJhdG9yIGNvbnRlbnQ9TWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkKT4KPHN0eWxlPgo8IS0tCiAvKiBGb250IERlZmluaXRpb25zICovCiBAZm9udC1mYWNlCgl7Zm9udC1mYW1pbHk6Q2FtYnJpYSBNYXRoOwoJcGFub3NlLTE6MiA0IDUgMyA1IDQgNiAzIDIgNDt9CkBmb250LWZhY2UKCXtmb250LWZhbWlseTpDYWxpYnJpOwoJcGFub3NlLTE6MiAxNSA1IDIgMiAyIDQgMyAyIDQ7fQogLyogU3R5bGUgRGVmaW5pdGlvbnMgKi8KIHAuTXNvTm9ybWFsLCBsaS5Nc29Ob3JtYWwsIGRpdi5Nc29Ob3JtYWwKCXttYXJnaW4tdG9wOjBpbjsKCW1hcmdpbi1yaWdodDowaW47CgltYXJnaW4tYm90dG9tOjguMHB0OwoJbWFyZ2luLWxlZnQ6MGluOwoJbGluZS1oZWlnaHQ6MTA3JTsKCWZvbnQtc2l6ZToxMS4wcHQ7Cglmb250LWZhbWlseTpDYWxpYnJpLHNhbnMtc2VyaWY7fQouTXNvQ2hwRGVmYXVsdAoJe2ZvbnQtZmFtaWx5OkNhbGlicmksc2Fucy1zZXJpZjt9Ci5Nc29QYXBEZWZhdWx0Cgl7bWFyZ2luLWJvdHRvbTo4LjBwdDsKCWxpbmUtaGVpZ2h0OjEwNyU7fQogLyogUGFnZSBEZWZpbml0aW9ucyAqLwogQHBhZ2UgV29yZFNlY3Rpb24xCgl7c2l6ZTo1OTUuM3B0IDg0MS45cHQ7CgltYXJnaW46MS4waW4gMS4waW4gMS4waW4gMS4waW47fQpkaXYuV29yZFNlY3Rpb24xCgl7cGFnZTpXb3JkU2VjdGlvbjE7fQotLT4KPC9zdHlsZT4KPC9oZWFkPgo8Ym9keSBsYW5nPUVOLVVTIHN0eWxlPSd3b3JkLXdyYXA6YnJlYWstd29yZCc+CjxkaXYgY2xhc3M9V29yZFNlY3Rpb24xPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J2xpbmUtaGVpZ2h0Om5vcm1hbCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOnJlbGF0aXZlOwp6LWluZGV4OjI1MTY1OTI2NCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOmFic29sdXRlO2xlZnQ6LTNweDt0b3A6LTFweDsKd2lkdGg6MzUycHg7aGVpZ2h0OjE4M3B4Jz48aW1nIHdpZHRoPTM1MiBoZWlnaHQ9MTgzCnNyYz1kYXRhOmltYWdlL3BuZztiYXNlNjQsaVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQVdBQUFBQzNDQU1BQUFBYjgzUmRBQUFBQVhOU1IwSUFyczRjNlFBQUFBUm5RVTFCQUFDeGp3djhZUVVBQUFCalVFeFVSUUFBQUVDQW4wQnduMEIxbjBCd24wQnptVUJ3bWtCeW0wQndtMEJ4bkVCd25FQnhuRUJ3blVCeG1rQndtMEJ4bTBKeW0wSnhuVUp5blVKeG5VSnluVUp4bkVKeW5FRnhuRUZ4bkVGeG5FRnhuRUZ4blVGeG5VRnhuRUZ4bkVGeG5FRnhuR0pBMVBnQUFBQWdkRkpPVXdBSUVCZ2dLREE0UUVoUVdHQm9jSGlBaDQrWG42ZXZ0Ny9IejlmZjUrLzN2K0g0d2dBQUFBbHdTRmx6QUFBT3d3QUFEc01CeDIrb1pBQUFCR3hKUkVGVWVGN3Qyc2xpMmpBVVJtRmpBekh6RUNBR0RPYjluN0s2OHMzVVFEQkIvKzU4QzhCcXVqbFZaY2trdTZGWFRwZXJxanBmY0VkVFZhL0xlVmw0dUU3eXliYnh2NDZ1cWxuZjg5MHozZmxmd1lNTzg5d2IvbUo4OEovR0g1em1QZTk0UTduM243elUyK1Z5VkE1OEhEY1ZaYmxZdm41TXkzcmk0OWZrNzR2RGNUWDBJWFRVbjFjZTczQnpMZTRmMjUvWU1tLy9wRmkyVzROejZRUC9lV24zWkc5TTNqOHIxakZoTS9QcmJ5WXgvLzVHZlhUVDM4YkVhNy84WWhML1lIdm5Kb2k3NWpIa3ExOTlLT1A4WGZnVm5qQ0tTKzNjcjF6ZkJwdXhYK0VwZzlvS2ovd3F5dVArZ2I2SnhPbDYvcm9YZTdPK3JBL0psTmF6L3J5ZmplMTY2eGRJSU43cFBwZGhPK2Z0MlQra3RBbEptL2RIbUhFQ2M3eElxckJkbWUrR2V6YUJkKzFucEdLTGhFL2hHUk5Zb0hjS1ZkdjdtajBGMnNSUFNNam1iV00zdHNJbWNOZHZPOUNkSFRmc2FERU43L3QyQ0NuWmt6VmJHZXlRd1JsRHdFNGJwM0JLdHYwRVQ5Z0ZlblpnTHVOanlxTVBJU2s3YkN6aWZ1M0h3MHVrWVB1SVRiWUtyMHNmUVZLamtIWVg1L0hVUjVEVU1LVGR4MlBHdDJmRFNNVk9HSFZtajlvNUoydUV0SmZNZG1rUC9XWWdPck45V2xzWkVyRXRnWFVJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdBWWdjVUlMRVpnTVFLTEVWaU13R0lFRmlPd0dJSEZDQ3hHWURFQ2l4RllqTUJpQkJZanNCaUJ4UWdzUm1BeEFvc1JXSXpBWWdRV0k3QVlnY1VJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdEWVIrQ2VEeUN0eGdMWDRhWHZBMGdyQnQ2SGw5SUhrRlFlMHA2eVhYaWQrQWlTR29TMHgyd2RYdWMrZ3FUS2tMYktGdUYxNVNOSWFoclNidUxybTQ4Z3FWV2N1N1pRTkxrUElhVmpTQnR1Yi9ZMjlTRWsxUGVwdXd6dld4OURRdk1RdGdydkx4YWFzMXg2VlFnN3N3OTJsbU9qbHR3d1pHM1B5SGF6T3pHRlU3TVQzRDUrS3V6SXZJZ2ZrY3pZSnZDNC9XeUh1YVpvUHlPUlE0aHF0emlUbjhMRjJpK1F4TVFtOE5BdjRvYmlmVG9qaFlFdHV6dS95TEtlVGVIbW96ZWVsZHZPclBueW1QM0ZndGNzdzRuMGJBdjgvWGdjbDR3RGp5VFMyRmpOLzI1cXRobSsxS3dTQ2VSeC92NTRRbW43NGt2RG5lNXBBMXQvTC9XUDFhRDNadU9YSlVlNjUwek9zZSsxNzVIdHZCRU96VHk2ZkVKcDN5R0hFOGIxdTluTTloTGhYamZ5YXp4b0VOZlpYdzV0Wlp6ZUlmRmk0Q1BvckpoNTNpWStvN3l1YUplSm9GNlBTbjRmcGFPOExCZjI3Q0hhL1Q0NSsvN1A0T3lJaDErZC9iOTlhMy8vbDNpRzdYWUNmM0RzdHMwdHBydjJkb2RIN09jUDNMbDY0MlZWMmZmTjZPQlVWZXZwMVNjNVdmWVB3UjMyZ0cxM3VoRUFBQUFBU1VWT1JLNUNZSUk9Pgo8aW1nIHdpZHRoPTQxIGhlaWdodD00NApzcmM9aHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbG9nby5wbmcgYWx0PW1vc2lwIGFsaWduPXJpZ2h0IGhzcGFjZT0xMiBzdHlsZT1tYXJnaW4tdG9wOi0xNzJweDs+PC9zcGFuPjwvc3Bhbj4KPHNwYW4gc3R5bGU9bWFyZ2luLWxlZnQ6IDE2cHg7PjxiPklkIHR5cGU6PC9iPiBWSUQKY2FyZDwvcD48L3NwYW4+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48aW1nIHdpZHRoPTg0IGhlaWdodD04NApzcmM9JGltYWdlIGFsdD11c2VyIGltYWdlIGFsaWduPWxlZnQgaHNwYWNlPTEyPjxiPk5hbWU6PC9iPiAkZnVsbE5hbWU8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5ET0I6PC9iPiAkZGF0ZU9mQmlydGg8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5WSUQ6PC9iPiAkVklEPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47CmxpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VklEIFR5cGU6PC9iPiAkdmlkVHlwZTwvcD4KPHAgY2xhc3M9TXNvTm9ybWFsIHN0eWxlPSdtYXJnaW4tdG9wOjBpbjttYXJnaW4tcmlnaHQ6MGluO21hcmdpbi1ib3R0b206MGluOwpsaW5lLWhlaWdodDpub3JtYWwnPjxiPkdlbmVyYXRlZCBvbjo8L2I+ICRnZW5yYXRlZE9uVGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMTJpbjtsaW5lLWhlaWdodDpub3JtYWwnPjxiPkV4cGlyZXMgb246PC9iPiAkZXhwaXJ5VGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMWluO2xpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VHJhbnNhY3Rpb25zIGxlZnQ6PC9iPiAkdHJhbnNhY3Rpb25zTGVmdENvdW50PC9wPgo8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+ 
\ No newline at end of file

From 941ff17267d192b94d62168e6881321cf0663b5d Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Tue, 7 Mar 2023 20:01:37 +0530
Subject: [PATCH 1129/1358] updated config

---
 mimoto-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 018185567e0..af5913fc6c3 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -10,8 +10,8 @@ RESIDENT_CREDENTIAL_REQUEST_STATUS=${RESIDENT_CREDENTIAL_REQUEST}/status
 RESIDENT_VID=${mosip.resident.base.url}/vid
 RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
 RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
-RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/req/individualId/otp
-RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/get-individual-id
+RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/individualId/otp
+RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/status
 BINDING_OTP=${idp.binding.base.url}/binding-otp
 WALLET_BINDING=${idp.binding.base.url}/wallet-binding
 

From e13ee5d69f7dae8f05f96eabab6faa23fe1b5f71 Mon Sep 17 00:00:00 2001
From: Anushree09-N <79500509+Anushree09-N@users.noreply.github.com>
Date: Thu, 9 Mar 2023 15:36:39 +0530
Subject: [PATCH 1130/1358] Added new property (#3477)

resident.flag.use-vid-only=true to retrieve VID when requested using Application ID
---
 resident-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resident-default.properties b/resident-default.properties
index 2b2f72853f3..bb1c19daf00 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -795,3 +795,6 @@ mosip.resident.schema.attribute-name=attributeName
 mosip.max.file.upload.size.in.bytes=2000000
 
 resident.service-history.download.max.count=100
+
+# Below property will retrieve VID when requested.
+resident.flag.use-vid-only=true

From a11e3904e4df0e0e4cae16986402ac6fc544551c Mon Sep 17 00:00:00 2001
From: syed salman <72004356+syedsalman3753@users.noreply.github.com>
Date: Thu, 9 Mar 2023 19:23:36 +0530
Subject: [PATCH 1131/1358] [ DSD-2260 ] updated inji properties (#3484)

---
 inji-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/inji-default.properties b/inji-default.properties
index 3772902ec96..fd41a03f3d3 100644
--- a/inji-default.properties
+++ b/inji-default.properties
@@ -3,7 +3,9 @@
 mosip.inji.allowedAuthType=demo,otp,bio-Finger,bio-Iris,bio-Face
 mosip.inji.allowedEkycAuthType=demo,otp,bio-Finger,bio-Iris,bio-Face
 mosip.inji.allowedInternalAuthType=otp,bio-Finger,bio-Iris,bio-Face
-mosip.inji.faceSdkModelUrl=https://drive.google.com/u/0/uc?id=1Z8Puici9alcmH-oU-VoXlHXCagAe1ago&export=download
+mosip.inji.faceSdkModelUrl=https://${mosip.api.public.host}/inji
+# model download maximum retry
+mosip.inji.modelDownloadMaxRetry=10
 # maximum number of retry for downloading vc
 mosip.inji.vcDownloadMaxRetry=10
 # pool interval in milli seconds

From aae54914ffb3825a78a12ffcc632776b1c567bbd Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 10 Mar 2023 17:17:47 +0530
Subject: [PATCH 1132/1358] [DSD-2263] Added config changes for esginet and ida
 services

---
 esignet-default.properties           | 20 +++++++++++++++-----
 id-authentication-default.properties |  5 +++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index b4793a0d8db..22ee0e004f1 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -81,6 +81,12 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 ## ------------------------------------------- Integrations ------------------------------------------------------------
 
+mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
+mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
+mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
+mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
+mosip.esignet.integration.audit-plugin=LoggerAuditService
+mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.scan-base-package=io.mosip.idp.authwrapper
 mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
 mosip.esignet.integration.authenticator=IdentityAuthenticationService-temp
@@ -105,6 +111,11 @@ mosip.esignet.authenticator.ida.kyc-auth-url=https://${mosip.api.internal.host}/
 mosip.esignet.authenticator.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.esignet.misp.license.key}/
 mosip.esignet.binder.ida.key-binding-url=${keycloak.internal.url}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida.get-certificates-url=https://${mosip.api.internal.host}/idauthentication/v1/internal/getAllCertificates
+mosip.esignet.authenticator.ida.auth-token-url=https://${mosip.api.internal.host}/v1/authmanager/authenticate/clientidsecretkey
+mosip.esignet.authenticator.ida.client-id=mosip-ida-client
+mosip.esignet.authenticator.ida.secret-key=${mosip.ida.client.secret}
+mosip.esignet.authenticator.ida.app-id=ida
 mosip.esignet.authenticator.ida-env=Developer
 mosip.esignet.authenticator.ida.otp-channels=email,phone
 
@@ -112,6 +123,9 @@ mosip.esignet.authenticator.ida.otp-channels=email,phone
 mosip.esignet.mock.authenticator.persona-repo=/home/mosip/mockida
 mosip.esignet.mock.authenticator.policy-repo=/home/mosip/mockida
 mosip.esignet.mock.authenticator.claims-mapping-file=/home/mosip/mockida/claims_attributes_mapping.json
+mosip.esignet.mock.authenticator.get-identity-url=https://${mosip.api.public.host}/v1/mock-identity-system/identity
+mosip.esignet.mock.authenticator.kyc-auth-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-auth
+mosip.esignet.mock.authenticator.kyc-exchange-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-exchange
 
 ## ------------------------------------------ oauth & openid supported values ------------------------------------------
 
@@ -285,10 +299,6 @@ crypto.PrependThumbprint.enable=true
 
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
 
-mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
-  'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
-  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
-  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}','mosip.esignet.link-status-deferred-response-timeout-secs':'25'}
-
+mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \  'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \  'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f0e8e250d27..2c79f7980a2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -619,8 +619,9 @@ mosip.role.keymanager.postjwtverify=INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_SU
 
 # Secret will be used during kyc token generation.
 mosip.ida.kyc.token.secret=${mosip.ida.kyc.token.secret}
-kyc.token.expire.time.adjustment.seconds=300
-kyc.exchange.default.lang=eng
+mosip.ida.kyc.token.expire.time.adjustment.seconds=3000
+mosip.ida.kyc.exchange.default.lang=eng
+mosip.ida.idp.consented.address.subset.attributes=street_address,locality,region,postal_code,country
 
 idp.amr-acr.mapping.json.filename=amr-acr-mapping.json
 mosip.idp.amr-acr.mapping.json-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/${idp.amr-acr.mapping.json.filename} 

From 754e90aea3a10eca49e90052cc25dd3089578942 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 10 Mar 2023 17:25:44 +0530
Subject: [PATCH 1133/1358] [DSD-2263] Updated esignet properties

---
 esignet-default.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 22ee0e004f1..095f7bd693a 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -88,11 +88,7 @@ mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
 mosip.esignet.integration.audit-plugin=LoggerAuditService
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.scan-base-package=io.mosip.idp.authwrapper
-mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
 mosip.esignet.integration.authenticator=IdentityAuthenticationService-temp
-mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-mosip.esignet.integration.audit-plugin=LoggerAuditService
-mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false

From 6f4f63f8f17b6f9c87347239617c82a0d3cf9e7e Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 10 Mar 2023 22:41:21 +0530
Subject: [PATCH 1134/1358] [DSD-2263] Updated esignet properties

---
 esignet-default.properties | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 095f7bd693a..527261fc219 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -87,8 +87,7 @@ mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
 mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
 mosip.esignet.integration.audit-plugin=LoggerAuditService
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
-mosip.esignet.integration.scan-base-package=io.mosip.idp.authwrapper
-mosip.esignet.integration.authenticator=IdentityAuthenticationService-temp
+
 
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false
@@ -295,6 +294,10 @@ crypto.PrependThumbprint.enable=true
 
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
 
-mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \  'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \  'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
+mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \ 
+'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \ 
+'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \  
+'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \  
+'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 7db78864002324a6c724fa70de60d9894e07e354 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 10 Mar 2023 22:45:40 +0530
Subject: [PATCH 1135/1358] [DSD-2263] Updated esignet properties

---
 esignet-default.properties | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 527261fc219..1510c9345b6 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -294,10 +294,10 @@ crypto.PrependThumbprint.enable=true
 
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
 
-mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \ 
-'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \ 
-'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \  
-'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \  
-'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
+mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
+  'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
+  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
+  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \
+  'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 6fa9c17a8ed94f0cdf10529b606c5d81697d306e Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 10 Mar 2023 22:50:14 +0530
Subject: [PATCH 1136/1358] [DSD-2263] Updated esignet properties

---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 1510c9345b6..8da86b4183e 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -29,7 +29,7 @@
 ## ------------------------------------------------- e-Signet ----------------------------------------------------------
 mosip.esignet.misp.license.key=elhvf43Uar8ShYra9N2bfTxaM3MaR50Hc9IMol5qazTRtX3FHZ
 mosip.esignet.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/amr-acr-mapping.json
-
+mosip.esignet.auth-txn-id-length=10
 mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600

From ddb7d76f2b668dd092d3f68586b458bee9968c69 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Wed, 15 Mar 2023 12:41:01 +0530
Subject: [PATCH 1137/1358] Disabled mosip.kernel.auth.proxy-otp

---
 kernel-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 94f047cd47c..649a4eb5cca 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -290,9 +290,11 @@ auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/au
 
 
 ## Proxy otp
+mosip.kernel.auth.proxy-otp=false
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
+
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
 

From 8c155d5d801ac199a6a25b598be36341df18cfe4 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Wed, 15 Mar 2023 17:16:02 +0530
Subject: [PATCH 1138/1358] Update identity-data-formatter.mvel

---
 identity-data-formatter.mvel | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/identity-data-formatter.mvel b/identity-data-formatter.mvel
index 0c9b0ea7b7d..bdb36811299 100644
--- a/identity-data-formatter.mvel
+++ b/identity-data-formatter.mvel
@@ -30,7 +30,7 @@ def getPassword(attributeValues) {
         attribute = getFormattedPasswordAttribute(attribute);
         pdfPwd = pdfPwd.concat(attribute.substring(0, 4));
     }
-    return pdfPwd;
+     return pdfPwd.toUpperCase();
 };
 
 def getFormattedPasswordAttribute(password){
@@ -41,6 +41,6 @@ def getFormattedPasswordAttribute(password){
     }else if(password.length()==1) {
         return password=password.repeat(4);
     }else {
-        return password;
+         return password.toUpperCase();
     }
-};
\ No newline at end of file
+};

From f59e2b54f9e76450e045c8b5f192c0e9f26f454c Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Wed, 15 Mar 2023 17:17:27 +0530
Subject: [PATCH 1139/1358] Update digitalcard-template.properties

---
 digitalcard-template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalcard-template.properties b/digitalcard-template.properties
index 1c1d4a37978..7306ffc62ef 100644
--- a/digitalcard-template.properties
+++ b/digitalcard-template.properties
@@ -1,3 +1,3 @@
 RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
 
-vid-card-type=PGh0bWw+CjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PUNvbnRlbnQtVHlwZSBjb250ZW50PXRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTI+CjxtZXRhIG5hbWU9R2VuZXJhdG9yIGNvbnRlbnQ9TWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkKT4KPHN0eWxlPgo8IS0tCiAvKiBGb250IERlZmluaXRpb25zICovCiBAZm9udC1mYWNlCgl7Zm9udC1mYW1pbHk6Q2FtYnJpYSBNYXRoOwoJcGFub3NlLTE6MiA0IDUgMyA1IDQgNiAzIDIgNDt9CkBmb250LWZhY2UKCXtmb250LWZhbWlseTpDYWxpYnJpOwoJcGFub3NlLTE6MiAxNSA1IDIgMiAyIDQgMyAyIDQ7fQogLyogU3R5bGUgRGVmaW5pdGlvbnMgKi8KIHAuTXNvTm9ybWFsLCBsaS5Nc29Ob3JtYWwsIGRpdi5Nc29Ob3JtYWwKCXttYXJnaW4tdG9wOjBpbjsKCW1hcmdpbi1yaWdodDowaW47CgltYXJnaW4tYm90dG9tOjguMHB0OwoJbWFyZ2luLWxlZnQ6MGluOwoJbGluZS1oZWlnaHQ6MTA3JTsKCWZvbnQtc2l6ZToxMS4wcHQ7Cglmb250LWZhbWlseTpDYWxpYnJpLHNhbnMtc2VyaWY7fQouTXNvQ2hwRGVmYXVsdAoJe2ZvbnQtZmFtaWx5OkNhbGlicmksc2Fucy1zZXJpZjt9Ci5Nc29QYXBEZWZhdWx0Cgl7bWFyZ2luLWJvdHRvbTo4LjBwdDsKCWxpbmUtaGVpZ2h0OjEwNyU7fQogLyogUGFnZSBEZWZpbml0aW9ucyAqLwogQHBhZ2UgV29yZFNlY3Rpb24xCgl7c2l6ZTo1OTUuM3B0IDg0MS45cHQ7CgltYXJnaW46MS4waW4gMS4waW4gMS4waW4gMS4waW47fQpkaXYuV29yZFNlY3Rpb24xCgl7cGFnZTpXb3JkU2VjdGlvbjE7fQotLT4KPC9zdHlsZT4KPC9oZWFkPgo8Ym9keSBsYW5nPUVOLVVTIHN0eWxlPSd3b3JkLXdyYXA6YnJlYWstd29yZCc+CjxkaXYgY2xhc3M9V29yZFNlY3Rpb24xPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J2xpbmUtaGVpZ2h0Om5vcm1hbCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOnJlbGF0aXZlOwp6LWluZGV4OjI1MTY1OTI2NCc+PHNwYW4gc3R5bGU9J3Bvc2l0aW9uOmFic29sdXRlO2xlZnQ6LTNweDt0b3A6LTFweDsKd2lkdGg6MzUycHg7aGVpZ2h0OjE4M3B4Jz48aW1nIHdpZHRoPTM1MiBoZWlnaHQ9MTgzCnNyYz1kYXRhOmltYWdlL3BuZztiYXNlNjQsaVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQVdBQUFBQzNDQU1BQUFBYjgzUmRBQUFBQVhOU1IwSUFyczRjNlFBQUFBUm5RVTFCQUFDeGp3djhZUVVBQUFCalVFeFVSUUFBQUVDQW4wQnduMEIxbjBCd24wQnptVUJ3bWtCeW0wQndtMEJ4bkVCd25FQnhuRUJ3blVCeG1rQndtMEJ4bTBKeW0wSnhuVUp5blVKeG5VSnluVUp4bkVKeW5FRnhuRUZ4bkVGeG5FRnhuRUZ4blVGeG5VRnhuRUZ4bkVGeG5FRnhuR0pBMVBnQUFBQWdkRkpPVXdBSUVCZ2dLREE0UUVoUVdHQm9jSGlBaDQrWG42ZXZ0Ny9IejlmZjUrLzN2K0g0d2dBQUFBbHdTRmx6QUFBT3d3QUFEc01CeDIrb1pBQUFCR3hKUkVGVWVGN3Qyc2xpMmpBVVJtRmpBekh6RUNBR0RPYjluN0s2OHMzVVFEQkIvKzU4QzhCcXVqbFZaY2trdTZGWFRwZXJxanBmY0VkVFZhL0xlVmw0dUU3eXliYnh2NDZ1cWxuZjg5MHozZmxmd1lNTzg5d2IvbUo4OEovR0g1em1QZTk0UTduM243elUyK1Z5VkE1OEhEY1ZaYmxZdm41TXkzcmk0OWZrNzR2RGNUWDBJWFRVbjFjZTczQnpMZTRmMjUvWU1tLy9wRmkyVzROejZRUC9lV24zWkc5TTNqOHIxakZoTS9QcmJ5WXgvLzVHZlhUVDM4YkVhNy84WWhML1lIdm5Kb2k3NWpIa3ExOTlLT1A4WGZnVm5qQ0tTKzNjcjF6ZkJwdXhYK0VwZzlvS2ovd3F5dVArZ2I2SnhPbDYvcm9YZTdPK3JBL0psTmF6L3J5ZmplMTY2eGRJSU43cFBwZGhPK2Z0MlQra3RBbEptL2RIbUhFQ2M3eElxckJkbWUrR2V6YUJkKzFucEdLTGhFL2hHUk5Zb0hjS1ZkdjdtajBGMnNSUFNNam1iV00zdHNJbWNOZHZPOUNkSFRmc2FERU43L3QyQ0NuWmt6VmJHZXlRd1JsRHdFNGJwM0JLdHYwRVQ5Z0ZlblpnTHVOanlxTVBJU2s3YkN6aWZ1M0h3MHVrWVB1SVRiWUtyMHNmUVZLamtIWVg1L0hVUjVEVU1LVGR4MlBHdDJmRFNNVk9HSFZtajlvNUoydUV0SmZNZG1rUC9XWWdPck45V2xzWkVyRXRnWFVJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdBWWdjVUlMRVpnTVFLTEVWaU13R0lFRmlPd0dJSEZDQ3hHWURFQ2l4RllqTUJpQkJZanNCaUJ4UWdzUm1BeEFvc1JXSXpBWWdRV0k3QVlnY1VJTEVaZ01RS0xFVmlNd0dJRUZpT3dHSUhGQ0N4R1lERUNpeEZZak1CaUJCWWpzQmlCeFFnc1JtQXhBb3NSV0l6QVlnUVdJN0FZZ2NVSUxFWmdNUUtMRVZpTXdHSUVGaU93R0lIRkNDeEdZREVDaXhGWWpNQmlCQllqc0JpQnhRZ3NSbUF4QW9zUldJekFZZ1FXSTdEWVIrQ2VEeUN0eGdMWDRhWHZBMGdyQnQ2SGw5SUhrRlFlMHA2eVhYaWQrQWlTR29TMHgyd2RYdWMrZ3FUS2tMYktGdUYxNVNOSWFoclNidUxybTQ4Z3FWV2N1N1pRTkxrUElhVmpTQnR1Yi9ZMjlTRWsxUGVwdXd6dld4OURRdk1RdGdydkx4YWFzMXg2VlFnN3N3OTJsbU9qbHR3d1pHM1B5SGF6T3pHRlU3TVQzRDUrS3V6SXZJZ2ZrY3pZSnZDNC9XeUh1YVpvUHlPUlE0aHF0emlUbjhMRjJpK1F4TVFtOE5BdjRvYmlmVG9qaFlFdHV6dS95TEtlVGVIbW96ZWVsZHZPclBueW1QM0ZndGNzdzRuMGJBdjgvWGdjbDR3RGp5VFMyRmpOLzI1cXRobSsxS3dTQ2VSeC92NTRRbW43NGt2RG5lNXBBMXQvTC9XUDFhRDNadU9YSlVlNjUwek9zZSsxNzVIdHZCRU96VHk2ZkVKcDN5R0hFOGIxdTluTTloTGhYamZ5YXp4b0VOZlpYdzV0Wlp6ZUlmRmk0Q1BvckpoNTNpWStvN3l1YUplSm9GNlBTbjRmcGFPOExCZjI3Q0hhL1Q0NSsvN1A0T3lJaDErZC9iOTlhMy8vbDNpRzdYWUNmM0RzdHMwdHBydjJkb2RIN09jUDNMbDY0MlZWMmZmTjZPQlVWZXZwMVNjNVdmWVB3UjMyZ0cxM3VoRUFBQUFBU1VWT1JLNUNZSUk9Pgo8aW1nIHdpZHRoPTQxIGhlaWdodD00NApzcmM9aHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbG9nby5wbmcgYWx0PW1vc2lwIGFsaWduPXJpZ2h0IGhzcGFjZT0xMiBzdHlsZT1tYXJnaW4tdG9wOi0xNzJweDs+PC9zcGFuPjwvc3Bhbj4KPHNwYW4gc3R5bGU9bWFyZ2luLWxlZnQ6IDE2cHg7PjxiPklkIHR5cGU6PC9iPiBWSUQKY2FyZDwvcD48L3NwYW4+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48aW1nIHdpZHRoPTg0IGhlaWdodD04NApzcmM9JGltYWdlIGFsdD11c2VyIGltYWdlIGFsaWduPWxlZnQgaHNwYWNlPTEyPjxiPk5hbWU6PC9iPiAkZnVsbE5hbWU8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5ET0I6PC9iPiAkZGF0ZU9mQmlydGg8L3A+CjxwIGNsYXNzPU1zb05vcm1hbCBzdHlsZT0nbWFyZ2luLXRvcDowaW47bWFyZ2luLXJpZ2h0OjBpbjttYXJnaW4tYm90dG9tOjBpbjsKbGluZS1oZWlnaHQ6bm9ybWFsJz48Yj5WSUQ6PC9iPiAkVklEPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47CmxpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VklEIFR5cGU6PC9iPiAkdmlkVHlwZTwvcD4KPHAgY2xhc3M9TXNvTm9ybWFsIHN0eWxlPSdtYXJnaW4tdG9wOjBpbjttYXJnaW4tcmlnaHQ6MGluO21hcmdpbi1ib3R0b206MGluOwpsaW5lLWhlaWdodDpub3JtYWwnPjxiPkdlbmVyYXRlZCBvbjo8L2I+ICRnZW5yYXRlZE9uVGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMTJpbjtsaW5lLWhlaWdodDpub3JtYWwnPjxiPkV4cGlyZXMgb246PC9iPiAkZXhwaXJ5VGltZXN0YW1wPC9wPgo8cCBjbGFzcz1Nc29Ob3JtYWwgc3R5bGU9J21hcmdpbi10b3A6MGluO21hcmdpbi1yaWdodDowaW47bWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0OjEuMWluO2xpbmUtaGVpZ2h0Om5vcm1hbCc+PGI+VHJhbnNhY3Rpb25zIGxlZnQ6PC9iPiAkdHJhbnNhY3Rpb25zTGVmdENvdW50PC9wPgo8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+ 
\ No newline at end of file
+vid-card-type=PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD10ZXh0L2h0bWw7IGNoYXJzZXQ9d2luZG93cy0xMjUyPgo8bWV0YSBuYW1lPUdlbmVyYXRvciBjb250ZW50PU1pY3Jvc29mdCBXb3JkIDE1IChmaWx0ZXJlZCk+Cgo8Ym9keSBsYW5nPSJFTi1VUyIgPgo8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiAjRjJGNEY3O21hcmdpbjoxMHB4O3BhZGRpbmc6MTBweDt3aWR0aDoxMDAlO2hlaWdodDoxMDAlOyI+Cjx0YWJsZSBzdHlsZT0id2lkdGg6IDMzOXB4O21hcmdpbjogNSUgYXV0byA1JSBhdXRvO2JhY2tncm91bmQ6ICNGRkZGRkYgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O2JveC1zaGFkb3c6IDBweCAzcHggMTVweCAjMDAwMDAwMEY7Ym9yZGVyLXJhZGl1czogMTBweDtvcGFjaXR5OiAxO2JvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7Ij4KPHRyPgoJI2lmKCRpc1Bob3RvU2V0KQoJPHRkIHN0eWxlPSJ3aWR0aDoyNSU7dmVydGljYWwtYWxpZ246IHRvcDtwYWRkaW5nOjVweDsiPjxpbWcgc3R5bGU9InRvcDogNTFweDtsZWZ0OiA0NXB4O3dpZHRoOiA4MHB4O2hlaWdodDogOTNweDtvcGFjaXR5OiAxO2JvcmRlcjoxcHggc29saWQgI0UyRTJFMjtib3JkZXItcmFkaXVzOjVweDsiIHNyYyA9ICQhQXBwbGljYW50UGhvdG8+PC90ZD4KCSNlbmQKCTx0ZCBzdHlsZT0id2lkdGg6NjUlIj4KCQk8dGFibGUgc3R5bGU9ImJvcmRlcjpub25lO2JvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7d2lkdGg6IDEwMCU7Ij4KCQkgIDx0cj4KCQkJPHRkIGNvbHNwYW49MiBzdHlsZT0icGFkZGluZzo1cHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkZ1bGwgTmFtZTwvbGFiZWw+PC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBjb2xzcGFuPTIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtwYWRkaW5nOjVweDsiPiRuYW1lPC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0icGFkZGluZzo1cHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTtwYWRkaW5nOjVweDsiPkRvQjwvbGFiZWw+PC90ZD4KCQkJPHRkIHN0eWxlPSJwYWRkaW5nOjVweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxO3BhZGRpbmc6NXB4OyI+SUQgVHlwZTwvbGFiZWw+PC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6NXB4OyI+JGRhdGVPZkJpcnRoPC90ZD4KCQkJPHRkIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7cGFkZGluZzo1cHg7Ij5WSUQ8L3RkPgoJCSAgPC90cj4KCQk8L3RhYmxlPgoJPC90ZD4KCTx0ZCBzdHlsZT0id2lkdGg6MTAlO3ZlcnRpY2FsLWFsaWduOnRvcDsiPjxpbWcgc3R5bGU9InRvcDogNDZweDtsZWZ0OiAzMjRweDt3aWR0aDogMzVweDtoZWlnaHQ6IDM3cHg7YmFja2dyb3VuZDogdHJhbnNwYXJlbnQgdXJsKCdpbWcvbG9nbyAoMikucG5nJykgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O29wYWNpdHk6IDE7IiBzcmM9Imh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL2xvZ28ucG5nIiBhbHQ9Im1vc2lwIj48L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iMiI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJCTx0cj4KCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOjVweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+VklEPC9sYWJlbD48L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5WSUQgVHlwZTwvbGFiZWw+PC90ZD4KCQkJPC90cj4KCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiR2aWQ8L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiR2aWRUeXBlPC90ZD4KCQkJPC90cj4KCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5HZW5lcmF0ZWQgb248L2xhYmVsPjwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzo1cHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkV4cGlyZXMgb248L2xhYmVsPjwvdGQ+CgkJCTwvdHI+CgkJCTx0cj4KCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOjVweDsiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kZ2VucmF0ZWRPblRpbWVzdGFtcDwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzo1cHg7IiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxOyI+JGV4cGlyeVRpbWVzdGFtcDwvdGQ+CgkJCTwvdHI+CgkJPC90YWJsZT4KCTwvdGQ+CjwvdHI+Cjx0cj4KCTx0ZCBjb2xzcGFuPSIyIiAgc3R5bGU9InBhZGRpbmc6NXB4O3RleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtoZWlnaHQ6IDQ1cHg7dGV4dC1hbGlnbjogY2VudGVyO2JvcmRlci10b3A6MXB4IHNvbGlkICNFMkUyRTI7Ij5UcmFuc2FjdGlvbnMgYWxsb3dlZCA6ICR0cmFuc2FjdGlvbnNMZWZ0Q291bnQ8L3RkPgo8L3RyPgo8L3RhYmxlPgo8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+

From 99eb8d4af9445292b5fb709aceb47655d7ede212 Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Wed, 15 Mar 2023 17:20:56 +0530
Subject: [PATCH 1140/1358] Enabled kernel.auth.proxy-otp

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 649a4eb5cca..95c3bd67540 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -290,7 +290,7 @@ auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/au
 
 
 ## Proxy otp
-mosip.kernel.auth.proxy-otp=false
+mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 

From 0c15d9d1fb1d5f6d629a7c0e7f18fadda31fe156 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Thu, 16 Mar 2023 15:07:20 +0530
Subject: [PATCH 1141/1358] Update digitalcard-template.properties

---
 digitalcard-template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalcard-template.properties b/digitalcard-template.properties
index 7306ffc62ef..fac26f3d6b8 100644
--- a/digitalcard-template.properties
+++ b/digitalcard-template.properties
@@ -1,3 +1,3 @@
 RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
 
-vid-card-type=PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD10ZXh0L2h0bWw7IGNoYXJzZXQ9d2luZG93cy0xMjUyPgo8bWV0YSBuYW1lPUdlbmVyYXRvciBjb250ZW50PU1pY3Jvc29mdCBXb3JkIDE1IChmaWx0ZXJlZCk+Cgo8Ym9keSBsYW5nPSJFTi1VUyIgPgo8ZGl2IHN0eWxlPSJiYWNrZ3JvdW5kOiAjRjJGNEY3O21hcmdpbjoxMHB4O3BhZGRpbmc6MTBweDt3aWR0aDoxMDAlO2hlaWdodDoxMDAlOyI+Cjx0YWJsZSBzdHlsZT0id2lkdGg6IDMzOXB4O21hcmdpbjogNSUgYXV0byA1JSBhdXRvO2JhY2tncm91bmQ6ICNGRkZGRkYgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O2JveC1zaGFkb3c6IDBweCAzcHggMTVweCAjMDAwMDAwMEY7Ym9yZGVyLXJhZGl1czogMTBweDtvcGFjaXR5OiAxO2JvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7Ij4KPHRyPgoJI2lmKCRpc1Bob3RvU2V0KQoJPHRkIHN0eWxlPSJ3aWR0aDoyNSU7dmVydGljYWwtYWxpZ246IHRvcDtwYWRkaW5nOjVweDsiPjxpbWcgc3R5bGU9InRvcDogNTFweDtsZWZ0OiA0NXB4O3dpZHRoOiA4MHB4O2hlaWdodDogOTNweDtvcGFjaXR5OiAxO2JvcmRlcjoxcHggc29saWQgI0UyRTJFMjtib3JkZXItcmFkaXVzOjVweDsiIHNyYyA9ICQhQXBwbGljYW50UGhvdG8+PC90ZD4KCSNlbmQKCTx0ZCBzdHlsZT0id2lkdGg6NjUlIj4KCQk8dGFibGUgc3R5bGU9ImJvcmRlcjpub25lO2JvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7d2lkdGg6IDEwMCU7Ij4KCQkgIDx0cj4KCQkJPHRkIGNvbHNwYW49MiBzdHlsZT0icGFkZGluZzo1cHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkZ1bGwgTmFtZTwvbGFiZWw+PC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBjb2xzcGFuPTIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtwYWRkaW5nOjVweDsiPiRuYW1lPC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0icGFkZGluZzo1cHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTtwYWRkaW5nOjVweDsiPkRvQjwvbGFiZWw+PC90ZD4KCQkJPHRkIHN0eWxlPSJwYWRkaW5nOjVweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxO3BhZGRpbmc6NXB4OyI+SUQgVHlwZTwvbGFiZWw+PC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6NXB4OyI+JGRhdGVPZkJpcnRoPC90ZD4KCQkJPHRkIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7cGFkZGluZzo1cHg7Ij5WSUQ8L3RkPgoJCSAgPC90cj4KCQk8L3RhYmxlPgoJPC90ZD4KCTx0ZCBzdHlsZT0id2lkdGg6MTAlO3ZlcnRpY2FsLWFsaWduOnRvcDsiPjxpbWcgc3R5bGU9InRvcDogNDZweDtsZWZ0OiAzMjRweDt3aWR0aDogMzVweDtoZWlnaHQ6IDM3cHg7YmFja2dyb3VuZDogdHJhbnNwYXJlbnQgdXJsKCdpbWcvbG9nbyAoMikucG5nJykgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O29wYWNpdHk6IDE7IiBzcmM9Imh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL2xvZ28ucG5nIiBhbHQ9Im1vc2lwIj48L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iMiI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJCTx0cj4KCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOjVweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+VklEPC9sYWJlbD48L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5WSUQgVHlwZTwvbGFiZWw+PC90ZD4KCQkJPC90cj4KCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiR2aWQ8L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiR2aWRUeXBlPC90ZD4KCQkJPC90cj4KCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6NXB4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5HZW5lcmF0ZWQgb248L2xhYmVsPjwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzo1cHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkV4cGlyZXMgb248L2xhYmVsPjwvdGQ+CgkJCTwvdHI+CgkJCTx0cj4KCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOjVweDsiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kZ2VucmF0ZWRPblRpbWVzdGFtcDwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzo1cHg7IiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxOyI+JGV4cGlyeVRpbWVzdGFtcDwvdGQ+CgkJCTwvdHI+CgkJPC90YWJsZT4KCTwvdGQ+CjwvdHI+Cjx0cj4KCTx0ZCBjb2xzcGFuPSIyIiAgc3R5bGU9InBhZGRpbmc6NXB4O3RleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtoZWlnaHQ6IDQ1cHg7dGV4dC1hbGlnbjogY2VudGVyO2JvcmRlci10b3A6MXB4IHNvbGlkICNFMkUyRTI7Ij5UcmFuc2FjdGlvbnMgYWxsb3dlZCA6ICR0cmFuc2FjdGlvbnNMZWZ0Q291bnQ8L3RkPgo8L3RyPgo8L3RhYmxlPgo8L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+
+vid-card-type=PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD10ZXh0L2h0bWw7IGNoYXJzZXQ9d2luZG93cy0xMjUyPgo8bWV0YSBuYW1lPUdlbmVyYXRvciBjb250ZW50PU1pY3Jvc29mdCBXb3JkIDE1IChmaWx0ZXJlZCk+Cjxib2R5IGxhbmc9IkVOLVVTIj4KPGRpdiBzdHlsZT0id2lkdGg6MTAwJTtoZWlnaHQ6MTAwdmg7Ij4KPHRhYmxlIHN0eWxlPSJ3aWR0aDogMzM5cHg7bWFyZ2luOiAwIGF1dG87YmFja2dyb3VuZDogI0ZGRkZGRjtib3JkZXI6MXB4IHNvbGlkICM4NzdlN2U7Ym9yZGVyLXJhZGl1czogMTBweDtvcGFjaXR5OiAxO2JvcmRlci1jb2xsYXBzZTogc2VwYXJhdGUgIWltcG9ydGFudDsiPgo8dHI+CgkjaWYoJGlzUGhvdG9TZXQpCgk8dGQgc3R5bGU9IndpZHRoOjI1JTt2ZXJ0aWNhbC1hbGlnbjogdG9wO3BhZGRpbmc6NXB4OyI+PGltZyBzdHlsZT0idG9wOiA1MXB4O2xlZnQ6IDQ1cHg7d2lkdGg6IDgwcHg7aGVpZ2h0OiA5M3B4O29wYWNpdHk6IDE7Ym9yZGVyOjFweCBzb2xpZCAjRTJFMkUyO2JvcmRlci1yYWRpdXM6NXB4OyIgc3JjID0gJCFBcHBsaWNhbnRQaG90bz48L3RkPgoJI2VuZAoJPHRkIHN0eWxlPSJ3aWR0aDo2NSUiPgoJCTx0YWJsZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTt3aWR0aDogMTAwJTsiPgoJCSAgPHRyPgoJCQk8dGQgY29sc3Bhbj0yIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+RnVsbCBOYW1lPC9sYWJlbD48L3RkPgoJCSAgPC90cj4KCQkgIDx0cj4KCQkJPHRkIGNvbHNwYW49MiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRuYW1lPC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0icGFkZGluZzozcHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkRvQjwvbGFiZWw+PC90ZD4KCQkJPHRkIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+SUQgVHlwZTwvbGFiZWw+PC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRkYXRlT2ZCaXJ0aDwvdGQ+CgkJCTx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPlZJRDwvdGQ+CgkJICA8L3RyPgoJCTwvdGFibGU+Cgk8L3RkPgoJPHRkIHN0eWxlPSJ3aWR0aDoxMCU7dmVydGljYWwtYWxpZ246dG9wOyI+PGltZyBzdHlsZT0idG9wOiA0NnB4O2xlZnQ6IDMyNHB4O3dpZHRoOiAzNXB4O2hlaWdodDogMzdweDtiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudCB1cmwoJ2ltZy9sb2dvICgyKS5wbmcnKSAwJSAwJSBuby1yZXBlYXQgcGFkZGluZy1ib3g7b3BhY2l0eTogMTsiIHNyYz0iaHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbG9nby5wbmciIGFsdD0ibW9zaXAiPjwvdGQ+CjwvdHI+Cjx0cj4KCTx0ZCBjb2xzcGFuPSIzIj4KCQk8dGFibGUgc3R5bGU9ImJvcmRlcjpub25lO2JvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7d2lkdGg6IDEwMCU7Ij4KCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5WSUQ8L2xhYmVsPjwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzozcHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPlZJRCBUeXBlPC9sYWJlbD48L3RkPgoJCQk8L3RyPgoJCQk8dHI+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzowcHggM3B4O3RleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiR2aWQ8L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6MHB4IDNweDt0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kdmlkVHlwZTwvdGQ+CgkJCTwvdHI+CgkJCTx0cj4KCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+R2VuZXJhdGVkIG9uPC9sYWJlbD48L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5FeHBpcmVzIG9uPC9sYWJlbD48L3RkPgoJCQk8L3RyPgoJCQk8dHI+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzozcHg7dGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxOyI+JGdlbnJhdGVkT25UaW1lc3RhbXA8L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6M3B4O3RleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiRleHBpcnlUaW1lc3RhbXA8L3RkPgoJCQk8L3RyPgoJCTwvdGFibGU+Cgk8L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iMyIgIHN0eWxlPSJwYWRkaW5nOjNweDt0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7aGVpZ2h0OiA0MHB4O3RleHQtYWxpZ246IGNlbnRlcjtib3JkZXItdG9wOjFweCBzb2xpZCAjODc3ZTdlOyIgPlRyYW5zYWN0aW9ucyBhbGxvd2VkIDogJHRyYW5zYWN0aW9uc0xlZnRDb3VudDwvdGQ+CjwvdHI+CjwvdGFibGU+CjwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4=

From 32b0cf5c1ab7fb52d9e19324f11cb4e6e275ae23 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Thu, 16 Mar 2023 15:28:05 +0530
Subject: [PATCH 1142/1358] Update digitalcard-template.properties

---
 digitalcard-template.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalcard-template.properties b/digitalcard-template.properties
index fac26f3d6b8..4adc8fbe396 100644
--- a/digitalcard-template.properties
+++ b/digitalcard-template.properties
@@ -1,3 +1,3 @@
 RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
 
-vid-card-type=PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1lcXVpdj1Db250ZW50LVR5cGUgY29udGVudD10ZXh0L2h0bWw7IGNoYXJzZXQ9d2luZG93cy0xMjUyPgo8bWV0YSBuYW1lPUdlbmVyYXRvciBjb250ZW50PU1pY3Jvc29mdCBXb3JkIDE1IChmaWx0ZXJlZCk+Cjxib2R5IGxhbmc9IkVOLVVTIj4KPGRpdiBzdHlsZT0id2lkdGg6MTAwJTtoZWlnaHQ6MTAwdmg7Ij4KPHRhYmxlIHN0eWxlPSJ3aWR0aDogMzM5cHg7bWFyZ2luOiAwIGF1dG87YmFja2dyb3VuZDogI0ZGRkZGRjtib3JkZXI6MXB4IHNvbGlkICM4NzdlN2U7Ym9yZGVyLXJhZGl1czogMTBweDtvcGFjaXR5OiAxO2JvcmRlci1jb2xsYXBzZTogc2VwYXJhdGUgIWltcG9ydGFudDsiPgo8dHI+CgkjaWYoJGlzUGhvdG9TZXQpCgk8dGQgc3R5bGU9IndpZHRoOjI1JTt2ZXJ0aWNhbC1hbGlnbjogdG9wO3BhZGRpbmc6NXB4OyI+PGltZyBzdHlsZT0idG9wOiA1MXB4O2xlZnQ6IDQ1cHg7d2lkdGg6IDgwcHg7aGVpZ2h0OiA5M3B4O29wYWNpdHk6IDE7Ym9yZGVyOjFweCBzb2xpZCAjRTJFMkUyO2JvcmRlci1yYWRpdXM6NXB4OyIgc3JjID0gJCFBcHBsaWNhbnRQaG90bz48L3RkPgoJI2VuZAoJPHRkIHN0eWxlPSJ3aWR0aDo2NSUiPgoJCTx0YWJsZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTt3aWR0aDogMTAwJTsiPgoJCSAgPHRyPgoJCQk8dGQgY29sc3Bhbj0yIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+RnVsbCBOYW1lPC9sYWJlbD48L3RkPgoJCSAgPC90cj4KCQkgIDx0cj4KCQkJPHRkIGNvbHNwYW49MiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRuYW1lPC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0icGFkZGluZzozcHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkRvQjwvbGFiZWw+PC90ZD4KCQkJPHRkIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+SUQgVHlwZTwvbGFiZWw+PC90ZD4KCQkgIDwvdHI+CgkJICA8dHI+CgkJCTx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRkYXRlT2ZCaXJ0aDwvdGQ+CgkJCTx0ZCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPlZJRDwvdGQ+CgkJICA8L3RyPgoJCTwvdGFibGU+Cgk8L3RkPgoJPHRkIHN0eWxlPSJ3aWR0aDoxMCU7dmVydGljYWwtYWxpZ246dG9wOyI+PGltZyBzdHlsZT0idG9wOiA0NnB4O2xlZnQ6IDMyNHB4O3dpZHRoOiAzNXB4O2hlaWdodDogMzdweDtiYWNrZ3JvdW5kOiB0cmFuc3BhcmVudCB1cmwoJ2ltZy9sb2dvICgyKS5wbmcnKSAwJSAwJSBuby1yZXBlYXQgcGFkZGluZy1ib3g7b3BhY2l0eTogMTsiIHNyYz0iaHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbG9nby5wbmciIGFsdD0ibW9zaXAiPjwvdGQ+CjwvdHI+Cjx0cj4KCTx0ZCBjb2xzcGFuPSIzIj4KCQk8dGFibGUgc3R5bGU9ImJvcmRlcjpub25lO2JvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7d2lkdGg6IDEwMCU7Ij4KCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5WSUQ8L2xhYmVsPjwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzozcHg7Ij48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPlZJRCBUeXBlPC9sYWJlbD48L3RkPgoJCQk8L3RyPgoJCQk8dHI+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzowcHggM3B4O3RleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiR2aWQ8L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6MHB4IDNweDt0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kdmlkVHlwZTwvdGQ+CgkJCTwvdHI+CgkJCTx0cj4KCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+R2VuZXJhdGVkIG9uPC9sYWJlbD48L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5FeHBpcmVzIG9uPC9sYWJlbD48L3RkPgoJCQk8L3RyPgoJCQk8dHI+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzozcHg7dGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxOyI+JGdlbnJhdGVkT25UaW1lc3RhbXA8L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6M3B4O3RleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTsiPiRleHBpcnlUaW1lc3RhbXA8L3RkPgoJCQk8L3RyPgoJCTwvdGFibGU+Cgk8L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iMyIgIHN0eWxlPSJwYWRkaW5nOjNweDt0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7aGVpZ2h0OiA0MHB4O3RleHQtYWxpZ246IGNlbnRlcjtib3JkZXItdG9wOjFweCBzb2xpZCAjODc3ZTdlOyIgPlRyYW5zYWN0aW9ucyBhbGxvd2VkIDogJHRyYW5zYWN0aW9uc0xlZnRDb3VudDwvdGQ+CjwvdHI+CjwvdGFibGU+CjwvZGl2Pgo8L2JvZHk+CjwvaHRtbD4=
+vid-card-type=PGh0bWw+PGhlYWQ+CjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyIgY2hhcnNldD0id2luZG93cy0xMjUyIj4KPG1ldGEgbmFtZT0iR2VuZXJhdG9yIiBjb250ZW50PSJNaWNyb3NvZnQiIHdvcmQ9IiIgMTU9IiIgKGZpbHRlcmVkKT0iIj4KPC9oZWFkPjxib2R5IGxhbmc9IkVOLVVTIj4KCjxkaXYgc3R5bGU9IndpZHRoOjEwMCU7aGVpZ2h0OjEwMHZoOyI+Cgk8dGFibGUgc3R5bGU9IndpZHRoOiAzMzlweDttYXJnaW46IDAgYXV0bztiYWNrZ3JvdW5kOiAjRkZGRkZGO2JvcmRlci1yYWRpdXM6IDEwcHg7b3BhY2l0eTogMTtib3JkZXI6MXB4IHNvbGlkICNFMkUyRTI7Ij4KPHRib2R5Pjx0cj4KI2lmKCRpc1Bob3RvU2V0KQo8dGQgc3R5bGU9IndpZHRoOjI1JTt2ZXJ0aWNhbC1hbGlnbjogdG9wO3BhZGRpbmc6NXB4OyI+PGltZyBzdHlsZT0idG9wOiA1MXB4O2xlZnQ6IDQ1cHg7d2lkdGg6IDgwcHg7aGVpZ2h0OiA5M3B4O29wYWNpdHk6IDE7Ym9yZGVyOjFweCBzb2xpZCAjRTJFMkUyO2JvcmRlci1yYWRpdXM6NXB4OyIgc3JjPSQhQXBwbGljYW50UGhvdG8+PC90ZD4KI2VuZAo8dGQgc3R5bGU9IndpZHRoOjY1JSI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJICA8dGJvZHk+PHRyPgoJCQk8dGQgY29sc3Bhbj0iMiIgc3R5bGU9InBhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7cGFkZGluZzogM3B4OyI+RnVsbCBOYW1lPC9sYWJlbD4KICAgICAgICAgICAgPGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0iLyogZm9udC13ZWlnaHQ6IGJvbGQ7ICovdGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRuYW1lPC9kaXY+PC90ZD4KCQkgIDwvdHI+CgkJICAKCQkgIDx0cj4KCQkJPHRkIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxO3BhZGRpbmc6IDNweDsiPkRvQjwvbGFiZWw+CiAgICAgICAgICAgIDxkaXYgY29sc3Bhbj0iMiIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtwYWRkaW5nOjBweCAzcHg7Ij4kZGF0ZU9mQmlydGg8L2Rpdj48L3RkPgoJCQk8dGQgc3R5bGU9InBhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5JRCBUeXBlPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7LyogcGFkZGluZzogMHB4IDBweDsgKi8iPlZJRDwvZGl2PjwvdGQ+CgkJICA8L3RyPgoJCQoJCTwvdGJvZHk+PC90YWJsZT4KCTwvdGQ+Cgk8dGQgc3R5bGU9IndpZHRoOiAxNSU7dmVydGljYWwtYWxpZ246dG9wOy8qIG1hcmdpbi10b3A6IDEwJTsgKi8iPjxpbWcgc3R5bGU9Ii8qIHRvcDogNDZweDsgKi8vKiBsZWZ0OiAzMjRweDsgKi93aWR0aDogMzVweDtoZWlnaHQ6IDM4cHg7YmFja2dyb3VuZDogdHJhbnNwYXJlbnQgdXJsKCdpbWcvbG9nbyAoMikucG5nJykgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O29wYWNpdHk6IDE7IiBzcmM9Imh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL2xvZ28ucG5nIiBhbHQ9Im1vc2lwIj48L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iNiI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJCTx0Ym9keT48dHI+CgkJCQoKCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOiA1cHg7Ij4KCQkJCTxkaXYgY29sc3Bhbj0iMTIiPgoJCQkJCQk8ZGl2IGNvbHNwYW49IjYiID4KCQkJCTxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+VklEPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kdmlkPC9kaXY+PC9kaXY+PC90ZD4KCQkJCQoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6IDVweDsiPjxkaXYgY29sc3Bhbj0iNiIgc3R5bGU9InBhZGRpbmctbGVmdDogMzJweDsiID48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPlZJRCBUeXBlPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kdmlkVHlwZTwvZGl2PjwvZGl2PjwvdGQ+CgkJCQk8L2Rpdj4KCQkJCQoJCQk8L3RyPgoJCQoJCQk8dHI+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7Ij4KCQkJCTxkaXYgY29sc3Bhbj0iMTIiPgoJCQkJPGRpdiBjb2xzcGFuPSI2IiA+CgkJCQk8bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkdlbmVyYXRlZCBvbjwvbGFiZWw+PGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6IDJweCAxcHg7Ij4kZ2VucmF0ZWRPblRpbWVzdGFtcDwvZGl2PjwvZGl2PjwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7Ij48ZGl2IGNvbHNwYW49IjYiIHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDMycHg7IiA+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5FeHBpcmVzIG9uPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7cGFkZGluZzogMnB4IDJweDsiPiRleHBpcnlUaW1lc3RhbXA8L2Rpdj48L2Rpdj48L3RkPgoJCQkJPC9kaXY+CgkJCTwvdHI+CgoJCTwvdGJvZHk+PC90YWJsZT4KCTwvdGQ+CjwvdHI+Cjx0cj4KCTx0ZCBjb2xzcGFuPSIzIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtoZWlnaHQ6IDQwcHg7dGV4dC1hbGlnbjogY2VudGVyO2JvcmRlci10b3A6MXB4IHNvbGlkICNFMkUyRTI7Ij48aW1nIHN0eWxlPSJ0b3A6IDUxcHg7bGVmdDogNDVweDsgbWFyZ2luLWJvdHRvbTogLTRweDsiIHNyYz0iZGF0YTppbWFnZS9wbmc7YmFzZTY0LCBpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQTRBQUFBT0NBWUFBQUFmU0MzUkFBQUFCbUpMUjBRQS93RC9BUCtndmFlVEFBQUFnRWxFUVZRb2tjM1J3UTJDWUF5RzRZZEVqZ1JoQTJQaWdUR2NRNWRoQUhhQkFUdzdnUWRQTHVBTWV1QTNLbEZUYjN4SkQwM3p0bDliNXFvY0xjcC93UUxIRkcvd0RyZGdESkFsc01icXg4UU1IVGJZNGhTMXVzUUJ6YWRpazRwVnBOTmlBcDJ4TnU3eVRSZGNIMGt2ZnB6OWE1ZlM4OXhGeE9vVWJvM1BucUh1bmdrak5HQ3JWVWNBQUFBQVNVVk9SSzVDWUlJPSI+PHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA1cHg7Ij4gPC9zcGFuPlRyYW5zYWN0aW9ucyBhbGxvd2VkIDogJHRyYW5zYWN0aW9uc0xlZnRDb3VudDwvdGQ+CjwvdHI+CjwvdGJvZHk+PC90YWJsZT4KPC9kaXY+CjwvYm9keT48L2h0bWw+

From 7d8bdd6e8b8729ba4ef5885e8f4b7e79120b81c2 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 17 Mar 2023 12:50:18 +0530
Subject: [PATCH 1143/1358] updated pretext value test changes (#3525)

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 707a1d296fe..aac33f9a12c 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -360,7 +360,7 @@ provider.packetwriter.resident=source:RESIDENT,process:ACTIVATED|DEACTIVATED|RES
 provider.packetwriter.opencrvs=source:OPENCRVS,process:OPENCRVS_NEW,classname:io.mosip.commons.packet.impl.PacketWriterImpl
 objectstore.adapter.name=S3Adapter
 ## When we use AWS as an object store, we see that buckets with the same name across deployments cannot be created.so use the prefix with bucket name
-object.store.s3.bucket-name-prefix=${s3.pretext.value}
+object.store.s3.bucket-name-prefix=${s3.pretext.value:}
 # the idschema is double by default. If country wish to change it to string then make this property false
 mosip.commons.packet.manager.schema.validator.convertIdSchemaToDouble=true
 ## can be OnlinePacketCryptoServiceImpl OR OfflinePacketCryptoServiceImpl
@@ -377,7 +377,7 @@ object.store.swift.username=test
 object.store.swift.password=test
 object.store.swift.url=http://localhost:8080
 
-packet.manager.account.name=${s3.pretext.value}packet-manager
+packet.manager.account.name=${s3.pretext.value:}packet-manager
 CRYPTOMANAGER_DECRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 CRYPTOMANAGER_ENCRYPT=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
 IDSCHEMAURL=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest

From a83b9c96875dedd311bd40cb38a3b01264e112a4 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 17 Mar 2023 17:22:02 +0530
Subject: [PATCH 1144/1358] [MOSIP-26544] Updated s3 pretext value property
 with colon

---
 id-repository-default.properties    | 2 +-
 pre-registration-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 067d71c16d3..7e0f502e9c5 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=${s3.pretext.value}idrepo
+mosip.idrepo.objectstore.bucket-name=${s3.pretext.value:}idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 07d4af0b4f9..e5b5264a904 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=${s3.pretext.value}prereg
+mosip.kernel.objectstore.account-name=${s3.pretext.value:}prereg
 
 ## Booking Service
 booking.service.version=v1

From 49dcebb349215dc3d83ea970acba9da1fbf9e1aa Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:04:02 +0530
Subject: [PATCH 1145/1358] Enable CORS and access to
 mosip-toolkit-android-client

Enable CORS and allow access to mosip-toolkit-android-client
---
 compliance-toolkit-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index dc04f971811..9ff374e60b6 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -36,8 +36,8 @@ server.servlet.context-path=/v1/toolkit
 
 ## Security properties
 mosip.security.csrf-enable=false
-mosip.security.cors-enable=false
-mosip.security.origins=localhost:8099
+mosip.security.cors-enable=true
+mosip.security.origins=http://localhost
 mosip.security.secure-cookie=false
 
 #iam
@@ -62,7 +62,7 @@ mosip.iam.adapter.clientid=mosip-toolkit-client
 mosip.iam.adapter.clientsecret=${mosip.toolkit.client.secret}
 
 auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
-auth.server.admin.allowed.audience=mosip-toolkit-client
+auth.server.admin.allowed.audience=mosip-toolkit-client,mosip-toolkit-android-client
 auth.allowed.urls=https://${mosip.compliance.host}/
 mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
 

From cf1e4e7bd2e9c20a72d5aab62cb56a7906fa333d Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:08:27 +0530
Subject: [PATCH 1146/1358] mosip-toolkit-android-client is added
 auth.server.admin.allowed.audience

mosip-toolkit-android-client is added under auth.server.admin.allowed.audience
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 95c3bd67540..55f20d34085 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -420,7 +420,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client,mpartner-default-digitalcard	
+auth.server.admin.allowed.audience=mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client,mosip-toolkit-android-client,mpartner-default-digitalcard	
 
 
 mosip.iam.adapter.appid=admin

From 07e6febbbeb77c297431aefbd8bf550a115f7301 Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Fri, 24 Mar 2023 12:00:52 +0530
Subject: [PATCH 1147/1358] Move dev2 config to qa config for resident

---
 resident-default.properties | 55 +++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index bb1c19daf00..0e24e22259c 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -207,10 +207,17 @@ mosip.kernel.uin.length=10
 mosip.kernel.vid.length=16
 mosip.kernel.rid.length=29
 mosip.resident.eid.length=16
+
+
 mosip.kernel.otp.default-length=6
-resident.message.allowed.special.char.regex=[A-Za-z0-9 .,-]+
-resident.purpose.allowed.special.char.regex=[A-Za-z0-9 .,-]+
-resident.id.allowed.special.char.regex=[A-Za-z0-9 -]+
+resident.message.allowed.special.char.regex=^[A-Za-z0-9 .,-]+$
+resident.purpose.allowed.special.char.regex=^[A-Za-z0-9 .,-]+$
+resident.id.allowed.special.char.regex=^[0-9]+$
+resident.document.validation.transaction-id.regex=^[0-9]{10}$
+resident.document.validation.document-id.regex=^[A-Za-z0-9-]{20,}$
+resident.validation.is-numeric.regex=^[0-9]+$
+resident.otp.validation.transaction-id.regex=^[0-9]{10}$
+resident.validation.event-id.regex=^[0-9]{16}$
 
 ## Security
 mosip.security.csrf-enable:false
@@ -723,13 +730,14 @@ resident.create.password.method.name=getPassword
 mosip.resident.download.registration.centre.file.name.convention=Registration_centers_{timestamp}
 mosip.resident.download.supporting.document.file.name.convention=Supporting_documents_{timestamp}
 mosip.resident.download.personalized.card.naming.convention=Personalised_card_{eventId}_{timestamp}
-mosip.resident.ack.manage_my_vid.name.convention=Ack_Manage_my_VID_{eventId}_{timestamp}
-mosip.resident.ack.secure_my_id.name.convention=Ack_secure_my_ID_{eventId}_{timestamp}
-mosip.resident.ack.personalised_card.name.convention=Ack_personalised_card_{eventId}_{timestamp}
-mosip.resident.ack.update_my_data.name.convention=Ack_update_my_data_{eventId}_{timestamp}
-mosip.resident.ack.share_credential.name.convention=Ack_share_credential_{eventId}_{timestamp}
-mosip.resident.ack.order_physical_card.name.convention=Ack_order_physical_card_{eventId}_{timestamp}
-mosip.resident.ack.name.convention=Ack_{eventId}_{timestamp}
+mosip.resident.ack.manage_my_vid.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+mosip.resident.ack.secure_my_id.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+mosip.resident.ack.personalised_card.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+mosip.resident.ack.update_my_data.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+mosip.resident.ack.share_credential.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+mosip.resident.ack.order_physical_card.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+mosip.resident.ack.name.convention=Ack_{featureName}_{eventId}_{timestamp}
+
 mosip.resident.uin.card.name.convention=UIN_{eventId}_{timestamp}
 mosip.resident.vid.card.name.convention=VID_{eventId}_{timestamp}
 mosip.resident.download.service.history.file.name.convention=View_history_{timestamp}
@@ -755,16 +763,13 @@ mosip.digital.card.credential.type=PDFCard
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes)
 otp.request.flooding.duration=1
-otp.request.flooding.max-count=10
+otp.request.flooding.max-count=100
 
 mosip.resident.message.code.maximum.length=1024
 
 GET_RID_STATUS=${mosipbox.public.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
 sequence-order=Request received, Validation stage, Verification stage, Uin generation stage, Card ready to download
 
-mosip.resident.checkstatus.individualid.id=mosip.resident.check-stage-status
-mosip.resident.checkstatus.individualid.version=1.0
-
 resident.additional.identity.attribute.to.fetch=UIN,email,phone,dateOfBirth,fullName,photo
 
 resident.template.ack.authentication.request=acknowledgment-authentication-request
@@ -798,3 +803,25 @@ resident.service-history.download.max.count=100
 
 # Below property will retrieve VID when requested.
 resident.flag.use-vid-only=true
+
+mosip.idp.otp.template.property=mosip.idp.otp.template.property
+# Below property will retrieve VID when requested.
+mosip.idp.biometrics.template.property=mosip.idp.biometrics.template.property
+mosip.idp.unknown.authentication.template.property=mosip.idp.unknown.authentication.template.property
+mosip.full.name.template.property=mosip.full.name.template.property
+mosip.date.of.birth.template.property=mosip.date.of.birth.template.property
+mosip.uin.template.property=mosip.uin.template.property
+mosip.perpetual.vid.template.property=mosip.perpetual.vid.template.property
+mosip.phone.template.property=mosip.phone.template.property
+mosip.email.template.property=mosip.email.template.property
+mosip.address.template.property=mosip.address.template.property
+mosip.gender.template.property=mosip.gender.template.property
+mosip.defualt.template.property=mosip.defualt.template.property
+mosip.idp.acr.generated.code=mosip:idp:acr:generated-code
+mosip.idp.acr.biometrics=mosip:idp:acr:biometrics
+mosip.idp.unknown.authentication=unknown
+auth.token.header=Authorization
+# Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
+mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
+mosip.resident.vid.card.template.property=vid-card-type
+mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}

From ebf57c833f2683b6c50ce938b39bac2d3c091b53 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 12:34:31 +0530
Subject: [PATCH 1148/1358] [DSD-2336] Added config changes for esignet latest
 fixes

---
 esignet-default.properties | 31 ++++++++++++++++--------------
 misp-policy-schema.json    | 39 ++++++++++++++++++++------------------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 8da86b4183e..45a7a9eebed 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,7 +34,6 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
-mosip.esignet.link-status-deferred-response-timeout-secs=25
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
@@ -47,12 +46,11 @@ mosip.esignet.binding.audience-id=esignet-binding
 mosip.esignet.binding.key-expire-days=10
 mosip.esignet.binding.encrypt-binding-id=false
 
+
 ## -------------------------------------- Authentication & Authorization -----------------------------------------------
 
 mosip.esignet.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \
-  \ '${server.servlet.path}/system-info/**' : { 'SCOPE_upload_certificate'},\
-  \ '${server.servlet.path}/binding/wallet-binding' : { 'SCOPE_wallet_binding'}, \
-  \ '${server.servlet.path}/binding/binding-otp' : { 'SCOPE_send_binding_otp'}}
+  \ '${server.servlet.path}/system-info/**' : { 'SCOPE_upload_certificate'}}
 mosip.esignet.security.auth.put-urls={'${server.servlet.path}/client-mgmt/**' : { 'SCOPE_update_oidc_client'} }
 mosip.esignet.security.auth.get-urls={'${server.servlet.path}/system-info/**' : { 'SCOPE_get_certificate'} }
 
@@ -65,7 +63,7 @@ mosip.esignet.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.
 mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**
+  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/binding/**
 
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
@@ -84,11 +82,11 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
 mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
 mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
-mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-mosip.esignet.integration.audit-plugin=LoggerAuditService
+mosip.esignet.integration.key-binder=IdaKeyBinderImpl
+#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
+mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
-
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
@@ -105,9 +103,10 @@ mosip.esignet.authenticator.ida.cert-url=https://${mosip.api.public.host}/mosip-
 mosip.esignet.authenticator.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.esignet.misp.license.key}/
-mosip.esignet.binder.ida.key-binding-url=${keycloak.internal.url}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.binder.ida.key-binding-url=https://${mosip.api.internal.host}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
 mosip.esignet.authenticator.ida.get-certificates-url=https://${mosip.api.internal.host}/idauthentication/v1/internal/getAllCertificates
 mosip.esignet.authenticator.ida.auth-token-url=https://${mosip.api.internal.host}/v1/authmanager/authenticate/clientidsecretkey
+mosip.esignet.authenticator.ida.audit-manager-url=https://${mosip.api.internal.host}/v1/auditmanager/audits
 mosip.esignet.authenticator.ida.client-id=mosip-ida-client
 mosip.esignet.authenticator.ida.secret-key=${mosip.ida.client.secret}
 mosip.esignet.authenticator.ida.app-id=ida
@@ -121,6 +120,8 @@ mosip.esignet.mock.authenticator.claims-mapping-file=/home/mosip/mockida/claims_
 mosip.esignet.mock.authenticator.get-identity-url=https://${mosip.api.public.host}/v1/mock-identity-system/identity
 mosip.esignet.mock.authenticator.kyc-auth-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-auth
 mosip.esignet.mock.authenticator.kyc-exchange-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-exchange
+mosip.esignet.mock.authenticator.ida.otp-channels=${mosip.esignet.authenticator.ida.otp-channels}
+mosip.esignet.mock.authenticator.send-otp=https://${mosip.api.public.host}/v1/mock-identity-system/send-otp
 
 ## ------------------------------------------ oauth & openid supported values ------------------------------------------
 
@@ -172,7 +173,7 @@ mosip.esignet.cache.store.individual-id=true
 mosip.esignet.cache.security.secretkey.reference-id=TRANSACTION_CACHE
 mosip.esignet.cache.security.algorithm-name=AES/ECB/PKCS5Padding
 
-mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented
+mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction
 
 #spring.cache.type=redis
 #spring.cache.cache-names=${mosip.esignet.cache.names}
@@ -183,10 +184,10 @@ management.health.redis.enabled=false
 spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
 mosip.esignet.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
-   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200 }
+   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200, 'authtokens': 2, 'bindingtransaction': 1500 }
 mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 600, 'authenticated': 120, 'authcodegenerated': 60, \
   'userinfo': ${mosip.esignet.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
-  'linked': 60 , 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : 60, 'consented': 120 }
+  'linked': 60 , 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : 60, 'consented': 120, 'authtokens': 28800, 'bindingtransaction': 300 }
 
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 
@@ -197,7 +198,6 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' ,\
   \ 'userinfo_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/oidc/userinfo' , \
-  \ 'registration_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/client-mgmt/oidc-client' , \
   \ 'jwks_uri' : '${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json' , \
   \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
   \ 'response_types_supported' : ${mosip.esignet.supported.response.types}, \
@@ -296,8 +296,11 @@ crypto.PrependThumbprint.enable=true
 
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
-  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, 'resend.otp.delay.secs': 30, \
+  'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
+  'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, \
   'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
 
+
 logging.level.org.springframework.web.client.RestTemplate=DEBUG
+logging.level.io.mosip.esignet=DEBUG
diff --git a/misp-policy-schema.json b/misp-policy-schema.json
index 60d4ce19fc4..0795acb0de2 100644
--- a/misp-policy-schema.json
+++ b/misp-policy-schema.json
@@ -1,20 +1,23 @@
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "type": "object",
-    "properties": {
-      "allowAuthRequestDelegation": {
-        "type": "boolean"
-      },
-      "allowKycRequestDelegation": {
-        "type": "boolean"
-      },
-      "trustBindedAuthVerificationToken": {
-        "type": "boolean"
-      }
-
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "allowAuthRequestDelegation": {
+      "type": "boolean"
     },
-    "required": [
-      "allowAuthRequestDelegation",
-      "allowKycRequestDelegation"
-    ]
-  }
+    "allowKycRequestDelegation": {
+      "type": "boolean"
+    },
+    "trustBindedAuthVerificationToken": {
+      "type": "boolean"
+    },
+    "allowKeyBindingDelegation": {
+      "type": "boolean"
+    }
+  },
+  "required": [
+    "allowAuthRequestDelegation",
+    "allowKycRequestDelegation",
+    "allowKeyBindingDelegation"
+  ]
+}
\ No newline at end of file

From 3c859f83799992bdcd265b263a761f2a0843e9dd Mon Sep 17 00:00:00 2001
From: kameshsr <47484458+kameshsr@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:09:45 +0530
Subject: [PATCH 1149/1358] Update digitalcard-template.properties


From 23ea649fab8d6fd0a4ac55d25de12b7abd6323d6 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:38:00 +0530
Subject: [PATCH 1150/1358] [DSD-2336] Updated misp license key

---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 45a7a9eebed..ba0679009e3 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -27,7 +27,7 @@
 
 
 ## ------------------------------------------------- e-Signet ----------------------------------------------------------
-mosip.esignet.misp.license.key=elhvf43Uar8ShYra9N2bfTxaM3MaR50Hc9IMol5qazTRtX3FHZ
+mosip.esignet.misp.license.key=nuKJ6FmTjLdj0jIO90HPy06oIv5jFtosInJhszifrPUi8Qge4b
 mosip.esignet.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/amr-acr-mapping.json
 mosip.esignet.auth-txn-id-length=10
 mosip.esignet.supported-id-regex=\\S*

From 1f7fafbff4b61f1e55a4e7485965ed4bf3e7485e Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Fri, 24 Mar 2023 16:53:13 +0530
Subject: [PATCH 1151/1358] [DSD-2342] updated resident-default.properties

---
 resident-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resident-default.properties b/resident-default.properties
index 0e24e22259c..0389ef40bba 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -825,3 +825,4 @@ auth.token.header=Authorization
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 mosip.resident.vid.card.template.property=vid-card-type
 mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
+mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}

From 785cccb00f1e52ad81c9ade12c7375e1b3c8a06e Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Fri, 24 Mar 2023 17:02:46 +0530
Subject: [PATCH 1152/1358] [DSD-2342] updated resident-default.properties

---
 resident-default.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 0389ef40bba..0e24e22259c 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -825,4 +825,3 @@ auth.token.header=Authorization
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 mosip.resident.vid.card.template.property=vid-card-type
 mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
-mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}

From bb07f733239122b7a902895ab17a15448dac5643 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 24 Mar 2023 17:23:36 +0530
Subject: [PATCH 1153/1358] Revert "[DSD-2342] updated
 resident-default.properties"

---
 resident-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resident-default.properties b/resident-default.properties
index 0e24e22259c..0389ef40bba 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -825,3 +825,4 @@ auth.token.header=Authorization
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 mosip.resident.vid.card.template.property=vid-card-type
 mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
+mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}

From bd6309f82ccc513f5b27cd973d8b9d88714ff4e1 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 24 Mar 2023 17:25:03 +0530
Subject: [PATCH 1154/1358] [DSD-2342]

---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 488a2db55da..2f390393308 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -17,6 +17,7 @@ mosip.recommended.centers.locCode=5
 ## Common properties used across different modules
 mosipbox.public.url=${mosip.api.internal.url}
 mosip.api.internal.url=https://${mosip.api.internal.host}
+mosip.api.public.url=https://${mosip.api.public.host}
 mosip.kernel.authmanager.url=http://authmanager.kernel
 mosip.kernel.masterdata.url=http://masterdata.kernel
 mosip.kernel.keymanager.url=http://keymanager.keymanager

From 498e6878304b8f8458519f90dc200f6c32ecabe3 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 24 Mar 2023 17:36:23 +0530
Subject: [PATCH 1155/1358] [DSD-2342]

---
 application-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 2f390393308..2a0725c73a5 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -442,3 +442,6 @@ mosip.auth.filter_disable=false
 mosip.digitalcard.uincard.password=fullName|dateOfBirth
 mosip.digitalcard.pdf.password.enable.flag=true
 mosip.access_token.subject.claim-name=sub
+
+# It is used as a suffix for creating credential request ID using the RID.
+mosip.registration.processor.rid.delimiter=-PDF

From 277ae8962396b650556a609dc0000a7ad557b786 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 18:15:00 +0530
Subject: [PATCH 1156/1358] [DSD-2336] Updated clientid

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 0389ef40bba..c96a7ce22f6 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -313,7 +313,7 @@ mosip.iam.module.login_flow.name=authorization_code
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
 ################## MOSIP ESignet config
-mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
+mosip.iam.module.clientID=pyrfprht1Y7UAZKYX6PwOeB1w2h7Gv0k3omqkGJmSV0
 mosip.iam.module.clientsecret=
 mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
 mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize

From ffeb288af3521a6d16677babb4cee04351e240c7 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Fri, 24 Mar 2023 18:48:24 +0530
Subject: [PATCH 1157/1358] Revert "[DSD-2336] Updated clientid for esignet"

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index c96a7ce22f6..0389ef40bba 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -313,7 +313,7 @@ mosip.iam.module.login_flow.name=authorization_code
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
 ################## MOSIP ESignet config
-mosip.iam.module.clientID=pyrfprht1Y7UAZKYX6PwOeB1w2h7Gv0k3omqkGJmSV0
+mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
 mosip.iam.module.clientsecret=
 mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
 mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize

From 6c59039ca97f67d703b909560a6cd394c220f214 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Fri, 24 Mar 2023 20:25:39 +0530
Subject: [PATCH 1158/1358] Taking missing properties

---
 resident-default.properties | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/resident-default.properties b/resident-default.properties
index 0389ef40bba..cd0168b6b98 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -520,6 +520,10 @@ resident.template.email.subject.request-received.gen-or-revoke-vid=gen-or-revoke
 resident.template.email.subject.success.gen-or-revoke-vid=gen-or-revoke-vid-success-email-subject
 resident.template.email.subject.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure-email-subject
 
+resident.template.email.subject.request-received.vid-card-download=vid-card-download-request-received-email-subject
+resident.template.email.subject.success.vid-card-download=vid-card-download-success-email-subject
+resident.template.email.subject.failure.vid-card-download=vid-card-download-failure-email-subject
+
 resident.template.email.subject.request-received.get-my-uin-card=get-my-uin-card-request-received-email-subject
 resident.template.email.subject.success.get-my-uin-card=get-my-uin-card-success-email-subject
 resident.template.email.subject.failure.get-my-uin-card=get-my-uin-card-failure-email-subject
@@ -553,6 +557,10 @@ resident.template.email.content.request-received.gen-or-revoke-vid=gen-or-revoke
 resident.template.email.content.success.gen-or-revoke-vid=gen-or-revoke-vid-success-email-content
 resident.template.email.content.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure-email-content
 
+resident.template.email.content.request-received.vid-card-download=vid-card-download-request-received-email-content
+resident.template.email.content.success.vid-card-download=vid-card-download-success-email-content
+resident.template.email.content.failure.vid-card-download=vid-card-download-failure-email-content
+
 resident.template.email.content.request-received.get-my-uin-card=get-my-uin-card-request-received-email-content
 resident.template.email.content.success.get-my-uin-card=get-my-uin-card-success-email-content
 resident.template.email.content.failure.get-my-uin-card=get-my-uin-card-failure-email-content
@@ -586,6 +594,10 @@ resident.template.sms.request-received.gen-or-revoke-vid=gen-or-revoke-vid-reque
 resident.template.sms.success.gen-or-revoke-vid=gen-or-revoke-vid-success_SMS
 resident.template.sms.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure_SMS
 
+resident.template.sms.request-received.vid-card-download=vid-card-download-request-received_SMS
+resident.template.sms.success.vid-card-download=vid-card-download-success_SMS
+resident.template.sms.failure.vid-card-download=vid-card-download-failure_SMS
+
 resident.template.sms.request-received.get-my-uin-card=get-my-uin-card-request-received_SMS
 resident.template.sms.success.get-my-uin-card=get-my-uin-card-success_SMS
 resident.template.sms.failure.get-my-uin-card=get-my-uin-card-failure_SMS
@@ -770,6 +782,9 @@ mosip.resident.message.code.maximum.length=1024
 GET_RID_STATUS=${mosipbox.public.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
 sequence-order=Request received, Validation stage, Verification stage, Uin generation stage, Card ready to download
 
+mosip.resident.checkstatus.individualid.id=mosip.resident.check-stage-status
+mosip.resident.checkstatus.individualid.version=1.0
+
 resident.additional.identity.attribute.to.fetch=UIN,email,phone,dateOfBirth,fullName,photo
 
 resident.template.ack.authentication.request=acknowledgment-authentication-request
@@ -790,7 +805,7 @@ mosip.idrepo.vid.reactive-status=ACTIVE
 
 # Asyc Request Types
 resident.async.request.types=VID_CARD_DOWNLOAD,ORDER_PHYSICAL_CARD,SHARE_CRED_WITH_PARTNER,UPDATE_MY_UIN
-resident.batchjob.process.status.list=NEW,ISSUED,RECEIVED,PRINTING,FAILED,DELIVERED,PAYMENT_CONFIRMED,IN_TRANSIT
+resident.batchjob.process.status.list=NEW,ISSUED,RECEIVED,PRINTING,CARD_DELIVERED,PAYMENT_CONFIRMED,IN_TRANSIT
 resident.ui.notification.update.interval.seconds=30
 
 mosip.allowed.extension=pdf,jpeg,png,jpg
@@ -825,4 +840,5 @@ auth.token.header=Authorization
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
 mosip.resident.vid.card.template.property=vid-card-type
 mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
-mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
+spring.servlet.multipart.max-file-size=10MB
+

From 4fc5c9d9b7e03e27a1c4fa04abcf69226996e6f5 Mon Sep 17 00:00:00 2001
From: damodarguru <124761463+damodarguru@users.noreply.github.com>
Date: Fri, 24 Mar 2023 22:17:20 +0530
Subject: [PATCH 1159/1358] Update resident-default.properties (#3553)

Updated resident.service-history.download.max.count=115 for testing purpose will revert back once testing is completed.
---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 0389ef40bba..dc97310ac54 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -799,7 +799,7 @@ mosip.resident.schema.attribute-name=attributeName
 
 mosip.max.file.upload.size.in.bytes=2000000
 
-resident.service-history.download.max.count=100
+resident.service-history.download.max.count=115
 
 # Below property will retrieve VID when requested.
 resident.flag.use-vid-only=true

From 4355b3f2f0e8a9a9ee519862cdc058a60e6eee42 Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Mon, 27 Mar 2023 19:26:49 +0530
Subject: [PATCH 1160/1358] language and compliance updated (#3581)

---
 application-default.properties        | 4 ++--
 compliance-toolkit-default.properties | 6 +++---
 mimoto-default.properties             | 4 ++--
 print-default.properties              | 4 ++--
 resident-app-default.properties       | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index aac33f9a12c..d91e188bfdd 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -92,7 +92,7 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara,kan
 mosip.right_to_left_orientation=ara
 mosip.left_to_right_orientation=eng
 
@@ -418,7 +418,7 @@ mosip.min-languages.count=2
 mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara,fra
+mosip.default.template-languages=eng,ara,kan
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index de33b3134c5..62075072e4f 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -192,6 +192,6 @@ springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
 #SBI BiometricsQualityCheckValidator
-mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
\ No newline at end of file
+mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":true}]
\ No newline at end of file
diff --git a/mimoto-default.properties b/mimoto-default.properties
index b29c75cb8f2..1dc536dea54 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara,kan
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara,kan
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
diff --git a/print-default.properties b/print-default.properties
index f2c1f7fbb0c..fa713038692 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -55,9 +55,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara,kan
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara,kan
 mosip.mandatory-languages=eng
 
 ## CBEFF util
diff --git a/resident-app-default.properties b/resident-app-default.properties
index 8c45381053b..76e83c91e09 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara,kan
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=ara,kan
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 93cab2bf50ea4cbac270fcb7201382fe902f768d Mon Sep 17 00:00:00 2001
From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Date: Mon, 27 Mar 2023 19:27:38 +0530
Subject: [PATCH 1161/1358] [dsd-2359]Added wallet-binding partner id and
 apikey (#3582)

---
 mimoto-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index af5913fc6c3..a36c85b8d3b 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -178,3 +178,5 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
+wallet.binding.partner.id=mpartner-default-mimotobinding
+wallet.binding.partner.api.key=801450

From 7d3552f26697437dfe5c0e2cda99a0f4b3430c96 Mon Sep 17 00:00:00 2001
From: gaganamadival <94885434+gaganamadival@users.noreply.github.com>
Date: Mon, 27 Mar 2023 20:04:29 +0530
Subject: [PATCH 1162/1358] [DSD-2362] updated mimoto-default.properties
 (#3583)

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index a36c85b8d3b..d55855f76ec 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -179,4 +179,4 @@ mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclien
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotobinding
-wallet.binding.partner.api.key=801450
+wallet.binding.partner.api.key=14378
\ No newline at end of file

From 2bcf92bfac62f37817481d808bd8365dda6393a0 Mon Sep 17 00:00:00 2001
From: Mohan E <mohanraj1715@gmail.com>
Date: Tue, 28 Mar 2023 10:38:05 +0530
Subject: [PATCH 1163/1358] [DSD-2362] Updated mimoto-default.properties

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index d55855f76ec..a36c85b8d3b 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -179,4 +179,4 @@ mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclien
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotobinding
-wallet.binding.partner.api.key=14378
\ No newline at end of file
+wallet.binding.partner.api.key=801450

From 828758e6989edec6d0acf7c3e89d7863b1a5b955 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 28 Mar 2023 13:03:43 +0530
Subject: [PATCH 1164/1358] added the missing fields

---
 identity-mapping.json | 300 +++++++++++++++++++++++-------------------
 1 file changed, 161 insertions(+), 139 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 42cfe2a4bd9..b45c25a8d46 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -1,141 +1,163 @@
 {
-    "identity": {
-        "IDSchemaVersion": {
-            "value": "IDSchemaVersion"
-        },
-        "name": {
-            "value": "fullName"
-        },
-        "gender": {
-            "value": "gender"
-        },
-        "dob": {
-            "value": "dateOfBirth"
-        },
-        "age": {
-            "value": "age"
-        },
-        "introducerRID": {
-            "value": "introducerRID"
-        },
-        "introducerUIN": {
-            "value": "introducerUIN"
-        },
-        "introducerVID": {
-            "value": "introducerVID"
-        },
-        "introducerName": {
-            "value": "introducerName"
-        },
-        "phone": {
-            "value": "phone"
-        },
-        "phoneNumber": {
-            "value": "phone"
-        },
-        "email": {
-            "value": "email"
-        },
-        "emailId": {
-            "value": "email"
-        },
-        "uin": {
-            "value": "UIN"
-        },
-        "vid": {
-            "value": "VID"
-        },
-        "individualBiometrics": {
-            "value": "individualBiometrics"
-        },
-        "introducerBiometrics": {
-            "value": "introducerBiometrics"
-        },
-        "individualAuthBiometrics": {
-            "value": "individualAuthBiometrics"
-        },
-        "officerBiometricFileName": {
-            "value": "officerBiometricFileName"
-        },
-        "supervisorBiometricFileName": {
-            "value": "supervisorBiometricFileName"
-        },
-        "residenceStatus": {
-            "value": "residenceStatus"
-        },
-        "preferredLanguage": {
-            "value": "preferredLang"
-        },
-        "locationHierarchyForProfiling": {
-            "value": "zone,postalCode"
-        },
-        "addressLine1": {
-            "value": "addressLine1"
-        },
-        "addressLine2": {
-            "value": "addressLine2"
-        },
-        "addressLine3": {
-            "value": "addressLine3"
-        },
-        "location1": {
-            "value": "city"
-        },
-        "location2": {
-            "value": "region"
-        },
-        "location3": {
-            "value": "province"
-        },
-        "postalCode": {
-            "value": "postalCode"
-        },
-        "location4": {
-            "value": "zone"
-        },
-        "fullAddress": {
-            "value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
-        },
-        "bestTwoFingers": {
-            "value": "bestTwoFingers"
-        },
-        "birthdate": {
-            "value": "dateOfBirth"
-        },
-        "picture": {
-            "value": "face"
-        },
-        "phone_number": {
-            "value": "phone"
-        }
-    },
-    "metaInfo": {
-        "value": "metaInfo"
-    },
-    "audits": {
-        "value": "audits"
-    },
-    "documents": {
-        "poa": {
-            "value": "proofOfAddress"
-        },
-        "poi": {
-            "value": "proofOfIdentity"
-        },
-        "por": {
-            "value": "proofOfRelationship"
-        },
-        "pob": {
-            "value": "proofOfDateOfBirth"
-        },
-        "poe": {
-            "value": "proofOfException"
-        }
-    },
-    "attributeUpdateCountLimit": {
-        "fullName": 2,
-        "gender": 1,
-        "dob": 1,
-        "age": 1
-    }
+	"identity": {
+		"IDSchemaVersion": {
+			"value": "IDSchemaVersion"
+		},
+		"name": {
+			"value": "fullName"
+		},
+		"gender": {
+			"value": "gender"
+		},
+		"dob": {
+			"value": "dateOfBirth"
+		},
+		"age": {
+			"value": "age"
+		},
+		"introducerRID": {
+			"value": "introducerRID"
+		},
+		"introducerUIN": {
+			"value": "introducerUIN"
+		},
+		"introducerVID": {
+			"value": "introducerVID"
+		},
+		"introducerName": {
+			"value": "introducerName"
+		},
+		"phone": {
+			"value": "phone"
+		},
+		"phoneNumber": {
+			"value": "phone"
+		},
+		"email": {
+			"value": "email"
+		},
+		"emailId": {
+			"value": "email"
+		},
+		"uin": {
+			"value": "UIN"
+		},
+		"vid": {
+			"value": "VID"
+		},
+		"individualBiometrics": {
+			"value": "individualBiometrics"
+		},
+		"introducerBiometrics": {
+			"value": "introducerBiometrics"
+		},
+		"individualAuthBiometrics": {
+			"value": "individualAuthBiometrics"
+		},
+		"officerBiometricFileName": {
+			"value": "officerBiometricFileName"
+		},
+		"supervisorBiometricFileName": {
+			"value": "supervisorBiometricFileName"
+		},
+		"residenceStatus": {
+			"value": "residenceStatus"
+		},
+		"preferredLanguage": {
+			"value": "preferredLang"
+		},
+		"locationHierarchyForProfiling": {
+			"value": "zone,postalCode"
+		},
+		"addressLine1": {
+			"value": "addressLine1"
+		},
+		"addressLine2": {
+			"value": "addressLine2"
+		},
+		"addressLine3": {
+			"value": "addressLine3"
+		},
+		"location1": {
+			"value": "city"
+		},
+		"location2": {
+			"value": "region"
+		},
+		"location3": {
+			"value": "province"
+		},
+		"postalCode": {
+			"value": "postalCode"
+		},
+		"location4": {
+			"value": "zone"
+		},
+		"fullAddress": {
+			"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+		},
+		"bestTwoFingers": {
+			"value": "bestTwoFingers"
+		},
+		"birthdate": {
+			"value": "dateOfBirth"
+		},
+		"picture": {
+			"value": "face"
+		},
+		"phone_number": {
+			"value": "phone"
+		},
+		"address": {
+			"value": "addressLine1,addressLine2,addressLine3,city,region,province,postalCode"
+		},
+
+		"individual_id": {
+			"value": "individual_id"
+		},
+		"street_address": {
+			"value": "addressLine1,addressLine2,addressLine3"
+		},
+		"locality": {
+			"value": "city"
+		},
+		"region": {
+			"value": "region"
+		},
+		"postal_code": {
+			"value": "postalCode"
+		},
+		"country": {
+			"value": "province"
+		}
+	},
+	"metaInfo": {
+		"value": "metaInfo"
+	},
+	"audits": {
+		"value": "audits"
+	},
+	"documents": {
+		"poa": {
+			"value": "proofOfAddress"
+		},
+		"poi": {
+			"value": "proofOfIdentity"
+		},
+		"por": {
+			"value": "proofOfRelationship"
+		},
+		"pob": {
+			"value": "proofOfDateOfBirth"
+		},
+		"poe": {
+			"value": "proofOfException"
+		}
+	},
+	"attributeUpdateCountLimit": {
+		"fullName": 2,
+		"gender": 1,
+		"dob": 1,
+		"age": 1
+	}
 }

From ced243947d2c9a13f82a4c06a93996f133d09689 Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Tue, 28 Mar 2023 15:12:28 +0530
Subject: [PATCH 1165/1358] changed audience for ida

---
 inji-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inji-default.properties b/inji-default.properties
index fd41a03f3d3..f72a31e110a 100644
--- a/inji-default.properties
+++ b/inji-default.properties
@@ -11,7 +11,7 @@ mosip.inji.vcDownloadMaxRetry=10
 # pool interval in milli seconds
 mosip.inji.vcDownloadPoolInterval=6000
 # validate binding audience url to be sent in token
-mosip.inji.audience=esignet-binding
+mosip.inji.audience=ida-binding
 # issuer to be sent in token
 mosip.inji.issuer=residentapp
 # warning screen domain name

From 99ba7233254d11ab8f7f3697fe5479670c31aadf Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Tue, 28 Mar 2023 16:05:48 +0530
Subject: [PATCH 1166/1358] Update pre-registration-default.properties

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index e5b5264a904..d200225b120 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=${s3.pretext.value:}prereg
+mosip.kernel.objectstore.account-name=prereg
 
 ## Booking Service
 booking.service.version=v1

From 640bdb6efa9bee825576fe284102c626a55c9cc2 Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Wed, 29 Mar 2023 09:56:38 +0530
Subject: [PATCH 1167/1358] [DSD-2374] Added
 mock-identity-system-default.properties

---
 mock-identity-system-default.properties | 39 +++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 mock-identity-system-default.properties

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
new file mode 100644
index 00000000000..52ae60d59e3
--- /dev/null
+++ b/mock-identity-system-default.properties
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
+# keycloak.admin.password
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
+# softhsm.kernel.pin
+# softhsm-security-pin
+# email.smtp.host
+# email.smtp.username
+# email.smtp.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
+# mosip.api.internal.url
+# mosip.api.public.url
+
+##----------------------------------------- Database properties --------------------------------------------------------
+
+mosip.mockidentitysystem.database.hostname=postgres-postgresql.postgres
+mosip.mockidentitysystem.database.port=5432
+spring.datasource.url=jdbc:postgresql://${mosip.mockidentitysystem.database.hostname}:${mosip.mockidentitysystem.database.port}/mosip_mockidentitysystem?currentSchema=mockidentitysystem
+spring.datasource.username=mockidsystemuser
+spring.datasource.password=${db.dbuser.password}
+
+spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
\ No newline at end of file

From 90cea9334832294ae4eb8019dd500fd8955dcd5f Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Wed, 29 Mar 2023 13:18:35 +0530
Subject: [PATCH 1168/1358] [DSD-2374] Added
 mock-identity-system-default.properties

---
 mock-identity-system-default.properties | 63 +++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
index 52ae60d59e3..8329cf0abca 100644
--- a/mock-identity-system-default.properties
+++ b/mock-identity-system-default.properties
@@ -33,6 +33,69 @@ spring.datasource.url=jdbc:postgresql://${mosip.mockidentitysystem.database.host
 spring.datasource.username=mockidsystemuser
 spring.datasource.password=${db.dbuser.password}
 
+#------------------------------------ Key-manager specific properties --------------------------------------------------
+#Crypto asymmetric algorithm name
+mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
+#Crypto symmetric algorithm name
+mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
+#Keygenerator asymmetric algorithm name
+mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
+#Keygenerator symmetric algorithm name
+mosip.kernel.keygenerator.symmetric-algorithm-name=AES
+#Asymmetric algorithm key length
+mosip.kernel.keygenerator.asymmetric-key-length=2048
+#Symmetric algorithm key length
+mosip.kernel.keygenerator.symmetric-key-length=256
+#Encrypted data and encrypted symmetric key separator
+mosip.kernel.data-key-splitter=#KEY_SPLITTER#
+#GCM tag length
+mosip.kernel.crypto.gcm-tag-length=128
+#Hash algo name
+mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
+#Symmtric key length used in hash
+mosip.kernel.crypto.hash-symmetric-key-length=256
+#No of iterations in hash
+mosip.kernel.crypto.hash-iteration=100000
+#Sign algo name
+mosip.kernel.crypto.sign-algorithm-name=RS256
+#Certificate Sign algo name
+mosip.kernel.certificate.sign.algorithm=SHA256withRSA
+
+#mosip.kernel.keymanager.hsm.config-path=local.p12
+#mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+#mosip.kernel.keymanager.hsm.keystore-pass=local
+
+#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+# For PKCS11 provide Path of config file.
+# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
+# For Offline & JCE property can be left blank, specified value will be ignored.
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+# Passkey of keystore for PKCS11, PKCS12
+# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.mock.identity.system.security.pin}
+
+mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
+mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
+mosip.kernel.keymanager.certificate.default.organization=IITB
+mosip.kernel.keymanager.certificate.default.location=BANGALORE
+mosip.kernel.keymanager.certificate.default.state=KA
+mosip.kernel.keymanager.certificate.default.country=IN
+
+mosip.kernel.keymanager.softhsm.certificate.common-name=www.mosip.io
+mosip.kernel.keymanager.softhsm.certificate.organizational-unit=MOSIP
+mosip.kernel.keymanager.softhsm.certificate.organization=IITB
+mosip.kernel.keymanager.softhsm.certificate.country=IN
+
+# Application Id for PMS master key.
+mosip.kernel.partner.sign.masterkey.application.id=PMS
+mosip.kernel.partner.allowed.domains=DEVICE
+
+mosip.kernel.keymanager-service-validate-url=https://${mosip.hostname}/keymanager/validate
+mosip.kernel.keymanager.jwtsign.validate.json=false
+mosip.keymanager.dao.enabled=false
+crypto.PrependThumbprint.enable=true
+
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=none

From 36e56d68d6136a2839e870df686061976cd27a8f Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Wed, 29 Mar 2023 14:30:39 +0530
Subject: [PATCH 1169/1358] [DSD-2374] updated
 mock-identity-system-default.properties

---
 mock-identity-system-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
index 8329cf0abca..bd75f144d7d 100644
--- a/mock-identity-system-default.properties
+++ b/mock-identity-system-default.properties
@@ -99,4 +99,5 @@ crypto.PrependThumbprint.enable=true
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=none
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
\ No newline at end of file
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+mosip.esignet.mock.authenticator.ida.otp-channels=email,phone
\ No newline at end of file

From f46e26a9559288a99f65844e2ad7a5ba017c1e22 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Wed, 29 Mar 2023 15:23:18 +0530
Subject: [PATCH 1170/1358] Added missing authorization properties

---
 partner-management-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/partner-management-default.properties b/partner-management-default.properties
index 8cb43d5d473..386a5fce360 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -259,6 +259,7 @@ mosip.role.pms.patchdevicedetail=PARTNER_ADMIN
 mosip.role.pms.postdevicedetailsearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
 mosip.role.pms.postdevicedetaildevicetypesearch=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
 mosip.role.pms.postdevicedetailfiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
+mosip.role.pms.postdevicedetaildevicetypefiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
 mosip.role.pms.postdevicedetaildevicesubtypefiltervalues=PARTNER_ADMIN,DEVICE_PROVIDER,FTM_PROVIDER
 mosip.role.pms.postftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
 mosip.role.pms.putftpchipdetail=PARTNER_ADMIN,FTM_PROVIDER
@@ -307,6 +308,7 @@ mosip.role.pms.putmisplicense=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.getmisplicense=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.getmisplicensekey=PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.postmispfiltervalues=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
+mosip.role.pms.postmispsearch=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 
 # query param usd to refer url to redirect after logout	
 mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri	

From 47fb7da3e8ba2ac915ff250e17974cdfcb59113c Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 29 Mar 2023 16:15:52 +0530
Subject: [PATCH 1171/1358] [ DSD-2299 ] updated configuration for kan language

---
 application-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index d91e188bfdd..54dcea8ea8b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -94,7 +94,7 @@ mosip.country.code=MOR
 ## Language supported by platform
 mosip.supported-languages=eng,ara,kan
 mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng
+mosip.left_to_right_orientation=eng,kan
 
 ## Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
@@ -413,7 +413,7 @@ websub.publish.url=${mosip.websub.url}/hub/
 
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=ara
+mosip.optional-languages=ara,kan
 mosip.min-languages.count=2
 mosip.max-languages.count=3
 

From d2eeb575edf57d7671161ea88e2bab7c40d1ce80 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 10:50:39 +0530
Subject: [PATCH 1172/1358] Updated "instancesAllowed": 2

Updated perpetual vid "instancesAllowed": 2
---
 mosip-vid-policy.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index 21f619be932..af3eecc2322 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -4,7 +4,7 @@
             "vidPolicy": {
                 "validForInMinutes": null,
                 "transactionsAllowed": null,
-                "instancesAllowed": 1,
+                "instancesAllowed": 2,
                 "autoRestoreAllowed": true,
                 "restoreOnAction": "REVOKED"
             }

From decdb355dce6f3d1d2eca0868080c6f1fb0f8473 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 12:02:47 +0530
Subject: [PATCH 1173/1358] Updated perpetual policy

Updated "autoRestoreAllowed": false, "restoreOnAction": "REGENERATE"
---
 mosip-vid-policy.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index af3eecc2322..8b1c65aac8e 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -5,8 +5,8 @@
                 "validForInMinutes": null,
                 "transactionsAllowed": null,
                 "instancesAllowed": 2,
-                "autoRestoreAllowed": true,
-                "restoreOnAction": "REVOKED"
+                "autoRestoreAllowed": false,
+                "restoreOnAction": "REGENERATE"
             }
         },
         {

From 44d4e61d2f8fdefd25712f03a008a5629c78dd7e Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 12:43:58 +0530
Subject: [PATCH 1174/1358] Updated perpetual vid policy

Updated to "autoRestoreAllowed": true,
                "restoreOnAction": "REVOKED"
---
 mosip-vid-policy.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index 8b1c65aac8e..af3eecc2322 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -5,8 +5,8 @@
                 "validForInMinutes": null,
                 "transactionsAllowed": null,
                 "instancesAllowed": 2,
-                "autoRestoreAllowed": false,
-                "restoreOnAction": "REGENERATE"
+                "autoRestoreAllowed": true,
+                "restoreOnAction": "REVOKED"
             }
         },
         {

From 57a8771770aa3435708c7140464a8cf351975f20 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 19:18:17 +0530
Subject: [PATCH 1175/1358] Added properties in Integration section

Added below properties under integration section for integrating Mock Authentication Service of esignet with mock-identity-system:

mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
mosip.esignet.integration.authenticator=MockAuthenticationService
mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
mosip.esignet.integration.audit-plugin=LoggerAuditService
mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService

and commented below properties:
mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
mosip.esignet.integration.key-binder=IdaKeyBinderImpl
#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
---
 esignet-default.properties | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index ba0679009e3..a8224196dd0 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -81,12 +81,20 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
 mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
-mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
-mosip.esignet.integration.key-binder=IdaKeyBinderImpl
-#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
+mosip.esignet.integration.authenticator=MockAuthenticationService
+mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
+mosip.esignet.integration.audit-plugin=LoggerAuditService
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
+
+#mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
+#mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
+#mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
+#mosip.esignet.integration.key-binder=IdaKeyBinderImpl
+#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
+#mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
+#mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
+
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify

From 0bfe560c343107986e16f24911937f71d864d034 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 19:32:50 +0530
Subject: [PATCH 1176/1358] Updated allowedId type

Updated request.idtypes.allowed=VID,UIN
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 2c79f7980a2..6c6120bc442 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -398,7 +398,7 @@ ida.api.version.kycexchange=1.0
 static.token.enable=true
 
 ## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
-request.idtypes.allowed=VID
+request.idtypes.allowed=VID,UIN
 ## The ID types to be supported for Internal Authentication/OTP Requests
 request.idtypes.allowed.internalauth=UIN,VID
 

From 2a51ffc6c11f16ede252ca3eea59bbef40eb71b0 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 19:49:23 +0530
Subject: [PATCH 1177/1358] Added mock ida integration properties

Added below properties under integration section for integrating Mock Authentication Service of esignet with mock-identity-system:

mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
mosip.esignet.integration.authenticator=MockAuthenticationService
mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
mosip.esignet.integration.audit-plugin=LoggerAuditService
mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService

and commented below properties:
mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
mosip.esignet.integration.key-binder=IdaKeyBinderImpl
#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
---
 esignet-default.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index a8224196dd0..86d967f254d 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -122,14 +122,12 @@ mosip.esignet.authenticator.ida-env=Developer
 mosip.esignet.authenticator.ida.otp-channels=email,phone
 
 # Mock IDA integration props
-mosip.esignet.mock.authenticator.persona-repo=/home/mosip/mockida
-mosip.esignet.mock.authenticator.policy-repo=/home/mosip/mockida
-mosip.esignet.mock.authenticator.claims-mapping-file=/home/mosip/mockida/claims_attributes_mapping.json
 mosip.esignet.mock.authenticator.get-identity-url=https://${mosip.api.public.host}/v1/mock-identity-system/identity
 mosip.esignet.mock.authenticator.kyc-auth-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-auth
 mosip.esignet.mock.authenticator.kyc-exchange-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-exchange
 mosip.esignet.mock.authenticator.ida.otp-channels=${mosip.esignet.authenticator.ida.otp-channels}
 mosip.esignet.mock.authenticator.send-otp=https://${mosip.api.public.host}/v1/mock-identity-system/send-otp
+mosip.esignet.mock.supported.bind-auth-factor-types={'WLA'}
 
 ## ------------------------------------------ oauth & openid supported values ------------------------------------------
 

From 050d1869647d22b22453b30e07b090ba9014f55c Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 30 Mar 2023 21:14:18 +0530
Subject: [PATCH 1178/1358] Reverted the changes made in integration section

Reverted the changes made in integration section
---
 esignet-default.properties | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 86d967f254d..0825c073e72 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -79,22 +79,21 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 ## ------------------------------------------- Integrations ------------------------------------------------------------
 
-mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
-mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
-mosip.esignet.integration.authenticator=MockAuthenticationService
-mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-mosip.esignet.integration.audit-plugin=LoggerAuditService
-mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
-
-
 #mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
 #mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
-#mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
-#mosip.esignet.integration.key-binder=IdaKeyBinderImpl
+#mosip.esignet.integration.authenticator=MockAuthenticationService
 #mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-#mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
+#mosip.esignet.integration.audit-plugin=LoggerAuditService
 #mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 
+
+mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
+mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
+mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
+mosip.esignet.integration.key-binder=IdaKeyBinderImpl
+mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
+mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
+
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify

From b19f63629ec45034e5b1b6e68787ef6942adf511 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:37:51 +0530
Subject: [PATCH 1179/1358] updated the misp-licence key

---
 idp-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/idp-default.properties b/idp-default.properties
index 7c96dc6083b..b7630d62a09 100644
--- a/idp-default.properties
+++ b/idp-default.properties
@@ -26,7 +26,7 @@
 # mosip.api.public.url
 
 ## IdP MISP License key
-mosip.idp.misp.license.key=znBeKylIcyPFqFcu3wVrtzzgMn93q64L02Tkh2bijY9G8nGeAh
+mosip.idp.misp.license.key=jj8n2cZww2dzZfszKgxyaOWOzq7hPx2snT52MPMA6k5Z5fZ2X3
 
 # Secure endpoints with required authority
 mosip.idp.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \

From 7bec268986eee4a5a10260ec7107b1e88bafa776 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 31 Mar 2023 16:57:15 +0530
Subject: [PATCH 1180/1358] [ DSD-2389 ] updated
 compliance-toolkit-default.properties

---
 compliance-toolkit-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compliance-toolkit-default.properties b/compliance-toolkit-default.properties
index b9bd46baba1..bc8520a2430 100644
--- a/compliance-toolkit-default.properties
+++ b/compliance-toolkit-default.properties
@@ -192,6 +192,6 @@ springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
 
 #SBI BiometricsQualityCheckValidator
-mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK Dev Env","url": "https://api-internal.dev.mosip.net/biosdk-service","healthUrl": "https://api-internal.dev.mosip.net/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
-mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":false}]
-mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK qa-1201-b2 Env","url": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service","healthUrl": "https://api-internal.qa-1201-b2.mosip.net/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.finger.sdk.urls=[{"name": "Mock SDK","url": "http://localhost:9099/biosdk-service","healthUrl": "http://localhost:9099/biosdk-service/actuator/health", "includeInResults":false},{"name": "Mock SDK ${mosip.api.internal.host} Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":true},{"name": "Mock SDK ${mosip.api.internal.host} Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":true}]
+mosip.toolkit.sbi.qualitycheck.face.sdk.urls=[{"name": "Mock SDK ${mosip.api.internal.host} Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":false}]
+mosip.toolkit.sbi.qualitycheck.iris.sdk.urls=[{"name": "Mock SDK ${mosip.api.internal.host} Env","url": "${mosip.api.internal.url}/biosdk-service","healthUrl": "${mosip.api.internal.url}/biosdk-service/actuator/health", "includeInResults":true}]

From f1b369e115761b4e8b4bbf5df1befb9799155f7f Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Fri, 31 Mar 2023 17:42:31 +0530
Subject: [PATCH 1181/1358] Updated wallet binding api key for mimoto

---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 5c9475d8ea5..a938adbf1d9 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -179,4 +179,4 @@ mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclien
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotobinding
-wallet.binding.partner.api.key=801450
+wallet.binding.partner.api.key=925065

From 891000d80056316ad7c43f0de3fd2a12c8c4a8d3 Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Fri, 31 Mar 2023 23:16:45 +0530
Subject: [PATCH 1182/1358] [ DSD-2389 ] added misp license key

---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 0825c073e72..d90e917a064 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -27,8 +27,8 @@
 
 
 ## ------------------------------------------------- e-Signet ----------------------------------------------------------
-mosip.esignet.misp.license.key=nuKJ6FmTjLdj0jIO90HPy06oIv5jFtosInJhszifrPUi8Qge4b
-mosip.esignet.amr-acr-mapping-file-url=https://raw.githubusercontent.com/mosip/mosip-config/develop2-v3/amr-acr-mapping.json
+mosip.esignet.misp.license.key=RI5ybJrbQo6K7XAB6RBIT9CC8IKaNVbNkpNaYJjbpwU0ywlw46
+mosip.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 mosip.esignet.auth-txn-id-length=10
 mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600

From 3ce324ab2a53601d994f9cde493136770223e102 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 5 Apr 2023 17:26:55 +0530
Subject: [PATCH 1183/1358] updated clientid

---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 0ebb084f8e4..ea4a66533de 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -313,7 +313,7 @@ mosip.iam.module.login_flow.name=authorization_code
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
 ################## MOSIP ESignet config
-mosip.iam.module.clientID=U0Ip-je0CJWOtaUo9JOlkf7XVq_KRvRPKeVGw8b6N2c
+mosip.iam.module.clientID=NmInTk1sLelALVynkNWWpRxQAEIy6PaQw98_Ia9GM_I
 mosip.iam.module.clientsecret=
 mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
 mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize

From f80a901a72ca3474a5b9a716a68b98afdcd8cba7 Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Wed, 5 Apr 2023 18:15:58 +0530
Subject: [PATCH 1184/1358] [MOSIP-26822] updated security_pin

---
 syncdata-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index e15c4ddd7a0..71cb770c200 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -11,7 +11,7 @@
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
 # mosip.syncdata.client.secret
-# softhsm.kernel.pin
+# softhsm.kernel.security.pin
 
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
@@ -62,7 +62,7 @@ mosip.kernel.keymanager.hsm.keystore-type=OFFLINE
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.pin}
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
 
 ## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log

From 1702203ec19d6e9922826bb3e859e65f2e621e3e Mon Sep 17 00:00:00 2001
From: techno-243 <gaganaa10@gmail.com>
Date: Wed, 5 Apr 2023 19:28:28 +0530
Subject: [PATCH 1185/1358] [MOSIP-26822] updated security_pin

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 06453355fa8..4bacefd55d1 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -10,7 +10,7 @@
 # mosip.kernel.tokenid.uin.salt
 # mpartner.default.auth.secret
 # mosip.kernel.tokenid.partnercode.salt
-# softhsm.ida.pin
+# softhsm.ida.security.pin
 # ida.websub.masterdata.templates.callback.secret
 # ida.websub.masterdata.titles.callback.secret
 
@@ -443,7 +443,7 @@ ida.credential.store.retry.backoff.exponential.max.interval.millisecs=120000
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 mosip.kernel.keymanager.hsm.keystore-type=PKCS11
-mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.ida.pin}
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.ida.security.pin}
 
 ## Security - used in Internal Authentication Services by default Kernel Auth Adapter
 mosip.security.csrf-enable=false

From df9ab280a2bf7ab317e3fb8e8f25ddead8e353ab Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Wed, 5 Apr 2023 19:57:38 +0530
Subject: [PATCH 1186/1358] updated the missing properties

---
 mimoto-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index a938adbf1d9..c2a00e6d5b4 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -180,3 +180,6 @@ vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotobinding
 wallet.binding.partner.api.key=925065
+
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 

From 5a4853d389470abbe6fe876223256bc81a06c9bd Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Wed, 5 Apr 2023 20:13:56 +0530
Subject: [PATCH 1187/1358] [ DSD-2389 ] updated softhsm security changes for
 ida & kernel

---
 kernel-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index dced0879224..202e4223bfa 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -11,8 +11,8 @@
 # mosip.admin.client.secret
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
-# softhsm.kernel.pin
-# softhsm-security-pin
+# softhsm.kernel.security.pin
+# softhsm.ida.security.pin
 # email.smtp.host
 # email.smtp.username
 # email.smtp.secret
@@ -20,7 +20,7 @@
 # mosip.kernel.tokenid.partnercode.salt
 # mosip.api.internal.url
 
-softhsm.kernel.pin=${softhsm.security.pin}
+softhsm.kernel.pin=${softhsm.kernel.security.pin}
 
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager

From 8b58817d8a7545fb1eff329add112968e6831bd8 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Thu, 6 Apr 2023 11:40:06 +0530
Subject: [PATCH 1188/1358] [DSD-2414]

---
 id-authentication-default.properties | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4bacefd55d1..16696e3cde7 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -286,7 +286,15 @@ mosip.auth.filter_disable=false
 ida-cache-ttl-in-days=1
 ## To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
 ## Value is based on CacheType enum provided by Spring Boot
-spring.cache.type=SIMPLE
+
+## spring.cache.type=SIMPLE
+
+## Redis cache related configurations
+spring.cache.type=redis
+spring.cache.cache-names=uin_hash_salt,masterdata/titles,masterdata/templates
+spring.redis.host=redis-master.redis
+spring.redis.port=6379
+spring.redis.password=${redis.password}
 
 ## Function configs
 #The modulo value to be calculated for a UIN/VID used to get salt value to be used in UIN/VID hashing

From 3021123f15572a3611d7b93e8fb285d022c46772 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Thu, 6 Apr 2023 12:01:39 +0530
Subject: [PATCH 1189/1358] [DSD-2414]

---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 16696e3cde7..35e370ce0eb 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -291,7 +291,7 @@ ida-cache-ttl-in-days=1
 
 ## Redis cache related configurations
 spring.cache.type=redis
-spring.cache.cache-names=uin_hash_salt,masterdata/titles,masterdata/templates
+## spring.cache.cache-names=uin_hash_salt,masterdata/titles,masterdata/templates
 spring.redis.host=redis-master.redis
 spring.redis.port=6379
 spring.redis.password=${redis.password}

From 94eb4d820ceaf4a8c2fbc183a027cfc95f391ee7 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Thu, 6 Apr 2023 12:17:32 +0530
Subject: [PATCH 1190/1358] [DSD-2414]

---
 id-authentication-default.properties | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 35e370ce0eb..9d9d3ad551d 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -287,14 +287,14 @@ ida-cache-ttl-in-days=1
 ## To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
 ## Value is based on CacheType enum provided by Spring Boot
 
-## spring.cache.type=SIMPLE
-
+##spring.cache.type=SIMPLE
+spring.cache.type=NONE
 ## Redis cache related configurations
-spring.cache.type=redis
+## spring.cache.type=redis
 ## spring.cache.cache-names=uin_hash_salt,masterdata/titles,masterdata/templates
-spring.redis.host=redis-master.redis
-spring.redis.port=6379
-spring.redis.password=${redis.password}
+## spring.redis.host=redis-master.redis
+## spring.redis.port=6379
+## spring.redis.password=${redis.password}
 
 ## Function configs
 #The modulo value to be calculated for a UIN/VID used to get salt value to be used in UIN/VID hashing

From 1e7b91dbdcc686969fb8118b22697a074f75b9d1 Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Thu, 6 Apr 2023 13:23:12 +0530
Subject: [PATCH 1191/1358] [DSD-2414] revert all config changes

---
 id-authentication-default.properties | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 9d9d3ad551d..5bb427abc44 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -286,15 +286,8 @@ mosip.auth.filter_disable=false
 ida-cache-ttl-in-days=1
 ## To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
 ## Value is based on CacheType enum provided by Spring Boot
+spring.cache.type=SIMPLE
 
-##spring.cache.type=SIMPLE
-spring.cache.type=NONE
-## Redis cache related configurations
-## spring.cache.type=redis
-## spring.cache.cache-names=uin_hash_salt,masterdata/titles,masterdata/templates
-## spring.redis.host=redis-master.redis
-## spring.redis.port=6379
-## spring.redis.password=${redis.password}
 
 ## Function configs
 #The modulo value to be calculated for a UIN/VID used to get salt value to be used in UIN/VID hashing

From b41ab70a92c76426c99a2a55f2f6347ac76ed3ce Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Thu, 6 Apr 2023 13:43:35 +0530
Subject: [PATCH 1192/1358] [DSD-1414] disabling cache for IDA

---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 5bb427abc44..8a9d841fda6 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -286,8 +286,8 @@ mosip.auth.filter_disable=false
 ida-cache-ttl-in-days=1
 ## To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
 ## Value is based on CacheType enum provided by Spring Boot
-spring.cache.type=SIMPLE
-
+## spring.cache.type=SIMPLE
+spring.cache.type=NONE
 
 ## Function configs
 #The modulo value to be calculated for a UIN/VID used to get salt value to be used in UIN/VID hashing

From 06119c694d7e8929746c67ba7a9ed4ddb1b083ed Mon Sep 17 00:00:00 2001
From: yashmsonkusare <yashmsonkusare@gmail.com>
Date: Mon, 10 Apr 2023 11:22:39 +0530
Subject: [PATCH 1193/1358] Update kernel-default.properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 202e4223bfa..7425ab6b9ff 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -737,7 +737,7 @@ auth.allowed.urls=http://localhost:5000/
 #For example, Arabic needs to be added along with english
 #the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
 #the final value in this case might look like [^a-z\u0600-\u06FF]
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF]
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF]
 
 management.health.mail.enabled=true

From 9b76e9f3f56abcde1e2907e018d1e48ceac75def Mon Sep 17 00:00:00 2001
From: Yash S <119652212+yashmsonkusare@users.noreply.github.com>
Date: Mon, 10 Apr 2023 11:56:10 +0530
Subject: [PATCH 1194/1358] Updated the properties

---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 7425ab6b9ff..5d3c01d437c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -738,7 +738,7 @@ auth.allowed.urls=http://localhost:5000/
 #the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
 #the final value in this case might look like [^a-z\u0600-\u06FF]
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
-mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF]
+mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF]
 
 management.health.mail.enabled=true
 

From 0d293d9f0567cd2870700f206589126a6c11cf16 Mon Sep 17 00:00:00 2001
From: Mohanraj209 <mohanraj1715@gmail.com>
Date: Mon, 10 Apr 2023 16:15:09 +0530
Subject: [PATCH 1195/1358] [DSD-2452]Updated config
 pre-registration-default.properties

---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 907062bd78c..92d1e07ab17 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -92,7 +92,7 @@ preregistration.document.extention=PDF,JPEG,PNG,JPG
 mosip.preregistration.document.scan=true
 
 ## To store documents
-mosip.kernel.objectstore.account-name=${s3.pretext.value:}-prereg
+mosip.kernel.objectstore.account-name=prereg
 
 ## Booking Service
 booking.service.version=v1

From 661e6f83a5135fd406f74b9434221e38c875279e Mon Sep 17 00:00:00 2001
From: syed-salman-technoforte <syed.salman@technoforte.co.in>
Date: Tue, 11 Apr 2023 14:51:03 +0530
Subject: [PATCH 1196/1358] [ DSD-2455 ] updated language from kan to fra

---
 application-default.properties  | 8 ++++----
 mimoto-default.properties       | 4 ++--
 print-default.properties        | 4 ++--
 resident-app-default.properties | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 3825d87d823..bb74cf439a8 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -93,9 +93,9 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara,kan
+mosip.supported-languages=eng,ara,fra
 mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng,kan
+mosip.left_to_right_orientation=eng,fra
 
 ## Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
@@ -414,12 +414,12 @@ websub.publish.url=${mosip.websub.url}/hub/
 
 mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=ara,kan
+mosip.optional-languages=ara,fra
 mosip.min-languages.count=2
 mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
-mosip.default.template-languages=eng,ara,kan
+mosip.default.template-languages=eng,ara,fra
 
 # Config key to pick the preferred language for communicating to the Resident
 mosip.default.user-preferred-language-attribute=preferredLang
diff --git a/mimoto-default.properties b/mimoto-default.properties
index c2a00e6d5b4..e7b8c0e347b 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -99,10 +99,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,kan
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara,kan
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
diff --git a/print-default.properties b/print-default.properties
index fa713038692..f2c1f7fbb0c 100644
--- a/print-default.properties
+++ b/print-default.properties
@@ -55,9 +55,9 @@ registration.processor.signature.isEnabled=true
 
 ## Country specific
 mosip.country.code=MOR
-mosip.supported-languages=eng,ara,kan
+mosip.supported-languages=eng,ara,fra
 mosip.template-language=eng
-mosip.optional-languages=ara,kan
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 ## CBEFF util
diff --git a/resident-app-default.properties b/resident-app-default.properties
index 76e83c91e09..8c45381053b 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -96,10 +96,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,kan
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara,kan
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng

From 0dbf2bd445c43844c5cf8a32461176bf08d8530d Mon Sep 17 00:00:00 2001
From: Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Sat, 15 Apr 2023 16:26:35 +0530
Subject: [PATCH 1197/1358] [DSD-2478] updated config from qa1201b3 (#3699)

* [DSD-2545] updated client ID for esignet

* Update mimoto-default.properties

---------

Co-authored-by: syed-salman-technoforte <syed.salman@technoforte.co.in>
Co-authored-by: syed salman <72004356+syedsalman3753@users.noreply.github.com>
---
 esignet-default.properties  | 2 +-
 mimoto-default.properties   | 4 ++--
 resident-default.properties | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index d90e917a064..248c1205e85 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -27,7 +27,7 @@
 
 
 ## ------------------------------------------------- e-Signet ----------------------------------------------------------
-mosip.esignet.misp.license.key=RI5ybJrbQo6K7XAB6RBIT9CC8IKaNVbNkpNaYJjbpwU0ywlw46
+mosip.esignet.misp.license.key=bmftkJ8LfUQE98eE1FWud68IwaflbqHXcf3px0SJHPxMcqMRP5
 mosip.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 mosip.esignet.auth-txn-id-length=10
 mosip.esignet.supported-id-regex=\\S*
diff --git a/mimoto-default.properties b/mimoto-default.properties
index e7b8c0e347b..af41465715d 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -178,8 +178,8 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
-wallet.binding.partner.id=mpartner-default-mimotobinding
-wallet.binding.partner.api.key=925065
+wallet.binding.partner.id=mpartner-default-mimotokeybinding
+wallet.binding.partner.api.key=289564
 
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 
diff --git a/resident-default.properties b/resident-default.properties
index ea4a66533de..91faa70cd34 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -313,7 +313,7 @@ mosip.iam.module.login_flow.name=authorization_code
 # IdP config
 # Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
 ################## MOSIP ESignet config
-mosip.iam.module.clientID=NmInTk1sLelALVynkNWWpRxQAEIy6PaQw98_Ia9GM_I
+mosip.iam.module.clientID=sK-zOe1Ke6X-f83yRpR4sOHxuPAWNZ5vzEpOjCyKWMk
 mosip.iam.module.clientsecret=
 mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
 mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize

From 229b7495991f09e7743032b6e6ad68ed1c1ae161 Mon Sep 17 00:00:00 2001
From: Monobikash Das <monobikash.das@mindtree.com>
Date: Fri, 14 Apr 2023 18:04:38 +0530
Subject: [PATCH 1198/1358] MOSIP-23678 : kafka support for securezone

---
 ...on-processor-camel-routes-activate-default.xml | 15 +--------------
 ...-camel-routes-biometric-correction-default.xml | 15 +--------------
 ...-processor-camel-routes-deactivate-default.xml | 15 +--------------
 ...ration-processor-camel-routes-lost-default.xml | 15 +--------------
 ...rocessor-camel-routes-opencrvs_new-default.xml | 15 +--------------
 ...processor-camel-routes-res-reprint-default.xml | 15 +--------------
 ...-processor-camel-routes-res-update-default.xml | 15 +--------------
 ...tion-processor-camel-routes-update-default.xml | 15 +--------------
 8 files changed, 8 insertions(+), 112 deletions(-)

diff --git a/registration-processor-camel-routes-activate-default.xml b/registration-processor-camel-routes-activate-default.xml
index 72af7fa8757..e1bff6ebd07 100644
--- a/registration-processor-camel-routes-activate-default.xml
+++ b/registration-processor-camel-routes-activate-default.xml
@@ -17,20 +17,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-biometric-correction-default.xml b/registration-processor-camel-routes-biometric-correction-default.xml
index 62786cd8b7a..fbb873032e0 100644
--- a/registration-processor-camel-routes-biometric-correction-default.xml
+++ b/registration-processor-camel-routes-biometric-correction-default.xml
@@ -16,20 +16,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-deactivate-default.xml b/registration-processor-camel-routes-deactivate-default.xml
index d4d48e2fc4c..b77486c607b 100644
--- a/registration-processor-camel-routes-deactivate-default.xml
+++ b/registration-processor-camel-routes-deactivate-default.xml
@@ -17,20 +17,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index 686bd0d8437..a4fa59adb38 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -17,20 +17,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
index ec4fbf3b448..8f579740cf4 100644
--- a/registration-processor-camel-routes-opencrvs_new-default.xml
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -16,20 +16,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-reprint-default.xml b/registration-processor-camel-routes-res-reprint-default.xml
index f7d633d8d99..3f449f06fed 100644
--- a/registration-processor-camel-routes-res-reprint-default.xml
+++ b/registration-processor-camel-routes-res-reprint-default.xml
@@ -17,20 +17,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-res-update-default.xml b/registration-processor-camel-routes-res-update-default.xml
index 0874a31a1a9..660ebc1e0c2 100644
--- a/registration-processor-camel-routes-res-update-default.xml
+++ b/registration-processor-camel-routes-res-update-default.xml
@@ -17,20 +17,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 085b9b78f6b..f562625cbbc 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -17,20 +17,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>

From 397e62008daa20f767f3bb9f68d3b0f26d4fb44c Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Fri, 14 Apr 2023 17:54:41 +0530
Subject: [PATCH 1199/1358] MOSIP-23678 : kafka support for securezone

---
 ...tration-processor-camel-routes-new-default.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 16d8c55baea..4f98e21d8e9 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -16,20 +16,7 @@
             <to uri="workflow-cmd://complete-as-failed" />
          </when>
          <otherwise>
-            <process ref="tokenGenerationProcessor" />
-            <setHeader headerName="CamelHttpMethod">
-               <constant>POST</constant>
-            </setHeader>
-            <setHeader headerName="Content-Type">
-               <constant>application/json</constant>
-            </setHeader>
-            <setHeader headerName="Cookie">
-               <simple>${header.Cookie}</simple>
-            </setHeader>
-            <setBody>
-               <simple>${bodyAs(String)}</simple>
-            </setBody>
-            <to uri="http://regproc-group2.regproc/registrationprocessor/v1/securezone/notification" />
+            <to uri="eventbus://securezone-notification-bus-in" />
          </otherwise>
       </choice>
    </route>

From b01785141ae03bb364ab01182416597809c8b898 Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Wed, 17 May 2023 11:52:01 +0530
Subject: [PATCH 1200/1358] MOSIP-26730 updated mimoto.default property

${wallet.binding.partner.api.key} is updated

Signed-off-by: bhumi46 <111699703+bhumi46@users.noreply.github.com>
---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index af41465715d..710bae45cca 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -179,7 +179,7 @@ mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclien
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotokeybinding
-wallet.binding.partner.api.key=289564
+wallet.binding.partner.api.key=${wallet.binding.partner.api.key}
 
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 

From f794b0c5b9dbd91cb2ff83f316b953e404dc68fa Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Thu, 18 May 2023 12:09:51 +0530
Subject: [PATCH 1201/1358] Update mimoto-default.properties

Signed-off-by: bhumi46 <111699703+bhumi46@users.noreply.github.com>
---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 710bae45cca..b2e399b4118 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -179,7 +179,7 @@ mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclien
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotokeybinding
-wallet.binding.partner.api.key=${wallet.binding.partner.api.key}
+mimoto.wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
 
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 

From 7f13cc7c8a04477a1e9e7ebce571b5284fecdfaf Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Thu, 18 May 2023 12:34:08 +0530
Subject: [PATCH 1202/1358] MOSIP-26730 updated mimoto.default property

Signed-off-by: bhumi46 <111699703+bhumi46@users.noreply.github.com>
---
 mimoto-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index b2e399b4118..300b8de2d6d 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -179,7 +179,7 @@ mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclien
 vercred.type.vid=VID
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotokeybinding
-mimoto.wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
+wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
 
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 

From 0dcfad132d60f06b7bfc0642cfeff8d1ec16cb02 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Wed, 31 May 2023 14:05:33 +0530
Subject: [PATCH 1203/1358] Added changes from develop

---
 application-default.properties            |  1 -
 registration-processor-default.properties | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index bb74cf439a8..85d3e953907 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -40,7 +40,6 @@ mosip.idrepo.credrequest.generator.url=http://credentialrequest.idrepo
 mosip.idrepo.credential.service.url=http://credential.idrepo
 mosip.datashare.url=http://datashare.datashare
 mosip.mock.biosdk.url=http://biosdk-service.biosdk
-mosip.regproc.biosdk.url=http://biosdk-service.biosdk
 mosip.idrepo.biosdk.url=http://biosdk-service.biosdk
 mosip.regproc.workflow.url=http://regproc-workflow.regproc
 mosip.regproc.status.service.url=http://regproc-status.regproc
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 8e6e7ef9d0b..a9c84ba9cae 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -235,8 +235,6 @@ registration.processor.id.repo.vidVersion=v1
 
 ## Virus scanner
 registration.processor.packet.ext=.zip
-mosip.kernel.virus-scanner.host=clamav.clamav
-mosip.kernel.virus-scanner.port=3310
 registration.processor.application.id=REGISTRATION
 registration.processor.rid.machineidsubstring=10
 mosip.regproc.virusscanner.provider=io.mosip.kernel.virusscanner.clamav.impl.VirusScannerImpl
@@ -450,7 +448,7 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
 #mosip.biosdk.default.host=${mosip.regproc.biosdk.url}
-mosip.biosdk.default.service.url=${mosip.regproc.biosdk.url}/biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}//biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -479,7 +477,6 @@ mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.mock-1.1
 ## Printing
 mosip.registration.processor.credentialtype=euin
 mosip.registration.processor.encrypt=false
-mosip.registration.processor.issuer=mpartner-default-print 
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
 mosip.registration.processor.digitalcard.credentialtype=PDFCard
 mosip.registration.processor.print.credentialtype=euin
@@ -924,6 +921,9 @@ regproc.packet.validator.notification.template.code.resident.update.sub=RPR_RUPV
 regproc.packet.validator.notification.template.code.technical.issue.email=RPR_TEC_ISSUE_EMAIL
 regproc.packet.validator.notification.template.code.technical.issue.sms=RPR_TEC_ISSUE_SMS
 regproc.packet.validator.notification.template.code.technical.issue.sub=RPR_TEC_ISSUE_EMAIL_SUB
+regproc.packet.validator.notification.template.code.supervisor.reject.email=RPR_SUP_REJECT_EMAIL
+regproc.packet.validator.notification.template.code.supervisor.reject.sms=RPR_SUP_REJECT_SMS
+regproc.packet.validator.notification.template.code.supervisor.reject.sub=RPR_SUP_REJECT_EMAIL_SUBJECT
 
 ## TODO: these are not needed. Check.
 #openapi.registrationProcessor.servers[0].url=${mosip.api.internal.url}/registrationprocessor/v1/registrationtransaction
@@ -978,7 +978,13 @@ mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RE
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
+landing.zone.account.name=landing-zone
+landing.zone.type=DMZServer
+mosip.regproc.landing.zone.fixed.delay.millisecs=86400000
+mosip.regproc.landing.zone.inital.delay.millisecs=300000
 
 registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
+##Ability to update contact information as part of LOST UIN
+uingenerator.lost.packet.allowed.update.fields=phone,email,permanentAddress
 logging.level.org.apache.activemq.ActiveMQConnectionFactory=DEBUG

From 9d55d2f3fa7af8a74319e447933d3cad4e3f596b Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Wed, 31 May 2023 15:01:46 +0530
Subject: [PATCH 1204/1358] code review comments fixed

---
 registration-processor-default.properties | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index a9c84ba9cae..107228c71c5 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -448,7 +448,7 @@ mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
 # BioSDK 
 #mosip.biosdk.default.host=${mosip.regproc.biosdk.url}
-mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}//biosdk-service
+mosip.biosdk.default.service.url=${mosip.mock.biosdk.url}/biosdk-service
 # The fully qualified Class Name of the BIO SDK API implemented for Finger modality 
 # This class will be loaded in runtime, the containing jar should be available in classpath
 mosip.biometric.sdk.providers.finger.mosip-ref-impl-sdk-client.classname=io.mosip.biosdk.client.impl.spec_1_0.Client_V_1_0
@@ -988,3 +988,12 @@ mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
 ##Ability to update contact information as part of LOST UIN
 uingenerator.lost.packet.allowed.update.fields=phone,email,permanentAddress
 logging.level.org.apache.activemq.ActiveMQConnectionFactory=DEBUG
+CREDENTIALREQUESTV2=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/v2/requestgenerator
+
+mosip.registration.processor.digitalcard.credentialtype=PDFCard
+mosip.registration.processor.print.credentialtype=euin
+mosip.registration.processor.digitalcard.template=RPR_UIN_CARD_TEMPLATE
+mosip.registration.processor.print.template=RPR_UIN_CARD_TEMPLATE
+
+# this property is used to define issuers eg partnerid:credentialType:templateTypeCode
+mosip.registration.processor.issuer=mpartner-default-print:${mosip.registration.processor.print.credentialtype}:${mosip.registration.processor.print.template};mpartner-default-digitalcard:${mosip.registration.processor.digitalcard.credentialtype}:${mosip.registration.processor.digitalcard.template}
\ No newline at end of file

From ad05261c8c79353706d1f0dea8ccf4427cc911ee Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:03:50 +0530
Subject: [PATCH 1205/1358] Create partner-migration-default.properties

---
 partner-migration-default.properties | 77 ++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 partner-migration-default.properties

diff --git a/partner-migration-default.properties b/partner-migration-default.properties
new file mode 100644
index 00000000000..b5ad0cffa2b
--- /dev/null
+++ b/partner-migration-default.properties
@@ -0,0 +1,77 @@
+## Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+## DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+## helm chart:
+## db.dbuser.password 
+## mosip.partner.client.secret
+## mosip.pms.client.secret
+## keycloak.internal.url
+## keycloak.admin.password
+## mosip.api.public.url
+
+spring.main.allow-circular-references=true
+service.token.request.clientId=mosip-pms-client
+service.token.request.issuerUrl=${mosip.kernel.keymanager.url}/v1/authmanager/authenticate/clientidsecretkey
+
+mosip.pms.appId=partner
+mosip.pms.clientId=mosip-pms-client
+mosip.pms.secretKey=mosip.pms.client.secret
+
+#Auth token generation
+mosip.iam.adapter.clientid=${mosip.pms.clientId}
+mosip.iam.adapter.clientsecret=${mosip.pms.secretKey}
+mosip.iam.adapter.appid=${mosip.pms.appId}
+
+pmp.certificate.get.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate
+pmp.partner.certificate.get.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanager/getPartnerCertificate/{partnerCertId}
+
+## Database
+## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+## If database is external to production, provide the DNS or ip of the host and port 
+mosip.pmp.database.hostname=postgres-postgresql.postgres
+mosip.pmp.database.port=5432
+mosip.pmp.database.user=pmsuser
+mosip.pmp.database.password=${db.dbuser.password}
+
+## Hibernate
+javax.persistence.jdbc.driverClassName=org.postgresql.Driver
+javax.persistence.jdbc.driver=org.postgresql.Driver
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.pmp.database.hostname}:${mosip.pmp.database.port}/mosip_pms
+javax.persistence.jdbc.user=${mosip.pmp.database.user}
+javax.persistence.jdbc.username=${mosip.pmp.database.user}
+javax.persistence.jdbc.password=${mosip.pmp.database.password}
+javax.persistence.jdbc.schema = pms
+javax.persistence.jdbc.uinHashTable=uin_hash_salt
+javax.persistence.jdbc.uinEncryptTable=uin_encrypt_salt
+
+
+hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
+hibernate.jdbc.lob.non_contextual_creation=true
+hibernate.hbm2ddl.auto=none
+hibernate.show_sql=false
+hibernate.format_sql=false
+hibernate.connection.charSet=utf8
+hibernate.cache.use_second_level_cache=false
+hibernate.cache.use_query_cache=false
+hibernate.cache.use_structured_entries=false
+hibernate.generate_statistics=false
+spring.datasource.initialization-mode=never
+
+# websub related properties
+websub.publish.url=https://api-internal.dev.mosip.net/hub/
+mosip.auth.filter_disable=false
+
+# Used for generating the datashare url
+pms.certs.datashare.policyId=mpolicy-default-cert
+pms.certs.datashare.subscriberId=mpartner-default-cert
+
+# Used to get data share url to publish to websub
+pmp.certificaticate.datashare.rest.uri=${mosip.datashare.url}/v1/datashare/create
+
+mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip'}
+
+## Auth adapter
+auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client,mosip-deployment-client
+auth.jwt.secret=authjwtsecret
+auth.jwt.base=Mosip-Token

From 0bdc9fe144afc158f867611ee7369587091d2b7b Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:24:13 +0530
Subject: [PATCH 1206/1358] Update partner-migration-default.properties

---
 partner-migration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/partner-migration-default.properties b/partner-migration-default.properties
index b5ad0cffa2b..5870af8ddc6 100644
--- a/partner-migration-default.properties
+++ b/partner-migration-default.properties
@@ -57,7 +57,7 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 # websub related properties
-websub.publish.url=https://api-internal.dev.mosip.net/hub/
+websub.publish.url=mosip.websub.url
 mosip.auth.filter_disable=false
 
 # Used for generating the datashare url

From 334ae6cccced586cad26306247eb6f3486c65c63 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 9 Jun 2023 10:50:12 +0530
Subject: [PATCH 1207/1358] renamed the partner-migration-utility-default
 properties

---
 ...ult.properties => partner-migration-utility-default.properties | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename partner-migration-default.properties => partner-migration-utility-default.properties (100%)

diff --git a/partner-migration-default.properties b/partner-migration-utility-default.properties
similarity index 100%
rename from partner-migration-default.properties
rename to partner-migration-utility-default.properties

From 53056d8c493b1c5a3e9cd853335c341d89abee28 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 9 Jun 2023 10:57:23 +0530
Subject: [PATCH 1208/1358] renamed pms-migration-utility-default-properties

---
 ...default.properties => pms-migration-utility-default.properties | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename partner-migration-utility-default.properties => pms-migration-utility-default.properties (100%)

diff --git a/partner-migration-utility-default.properties b/pms-migration-utility-default.properties
similarity index 100%
rename from partner-migration-utility-default.properties
rename to pms-migration-utility-default.properties

From afd5e4e83f480092ec4cea41afe7a06069739a28 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:08:13 +0530
Subject: [PATCH 1209/1358] Update pms-migration-utility-default.properties

---
 pms-migration-utility-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pms-migration-utility-default.properties b/pms-migration-utility-default.properties
index 5870af8ddc6..3ffc7f28ddd 100644
--- a/pms-migration-utility-default.properties
+++ b/pms-migration-utility-default.properties
@@ -71,6 +71,7 @@ mosip.kernel.auth.appids.realm.map={prereg:'preregistration',ida:'mosip',registr
 
 ## Auth adapter
 auth.server.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
 auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
 auth.server.admin.allowed.audience=mosip-creser-client,mosip-datsha-client,mosip-ida-client,mosip-regproc-client,mosip-admin-client,mosip-reg-client,mosip-pms-client,mosip-resident-client,mosip-idrepo-client,mosip-partner-client,mosip-deployment-client
 auth.jwt.secret=authjwtsecret

From bfee1dad0c7a8e42579a5ad4068acdd8608dd9b4 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:53:45 +0530
Subject: [PATCH 1210/1358] Update pms-migration-utility-default.properties

---
 pms-migration-utility-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pms-migration-utility-default.properties b/pms-migration-utility-default.properties
index 3ffc7f28ddd..f2e23be4698 100644
--- a/pms-migration-utility-default.properties
+++ b/pms-migration-utility-default.properties
@@ -11,6 +11,7 @@
 spring.main.allow-circular-references=true
 service.token.request.clientId=mosip-pms-client
 service.token.request.issuerUrl=${mosip.kernel.keymanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.pms.utility.run.mode=upgrade
 
 mosip.pms.appId=partner
 mosip.pms.clientId=mosip-pms-client

From 9bc7df0b6ab807d66bee0fc0630ca6e79fb927a0 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 9 Jun 2023 15:32:15 +0530
Subject: [PATCH 1211/1358] Update pms-migration-utility-default.properties

---
 pms-migration-utility-default.properties | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pms-migration-utility-default.properties b/pms-migration-utility-default.properties
index f2e23be4698..db766f021ca 100644
--- a/pms-migration-utility-default.properties
+++ b/pms-migration-utility-default.properties
@@ -1,21 +1,27 @@
 ## Follow properites have their values assigned via 'overrides' environment variables of config server docker.
 ## DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
 ## helm chart:
+## keycloak.external.url
 ## db.dbuser.password 
-## mosip.partner.client.secret
 ## mosip.pms.client.secret
 ## keycloak.internal.url
 ## keycloak.admin.password
 ## mosip.api.public.url
+##mosip.api.internal.host
+
+mosip.api.internal.url=https://${mosip.api.internal.host}
+mosip.kernel.keymanager.url=http://keymanager.keymanager
+mosip.datashare.url=http://datashare.datashare
+mosip.kernel.authmanager.url=http://authmanager.kernel
 
 spring.main.allow-circular-references=true
 service.token.request.clientId=mosip-pms-client
-service.token.request.issuerUrl=${mosip.kernel.keymanager.url}/v1/authmanager/authenticate/clientidsecretkey
+service.token.request.issuerUrl=${mosip.api.internal.url}/v1/authmanager/authenticate/clientidsecretkey
 mosip.pms.utility.run.mode=upgrade
 
 mosip.pms.appId=partner
 mosip.pms.clientId=mosip-pms-client
-mosip.pms.secretKey=mosip.pms.client.secret
+mosip.pms.secretKey=${mosip.pms.client.secret}
 
 #Auth token generation
 mosip.iam.adapter.clientid=${mosip.pms.clientId}

From 51750db3a3c080089f09dc66b93672e7f6971821 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Fri, 23 Jun 2023 16:57:39 +0530
Subject: [PATCH 1212/1358] regproc config changes

---
 registration-processor-abis.json          | 2 +-
 registration-processor-default.properties | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/registration-processor-abis.json b/registration-processor-abis.json
index b2404a8656f..2f0c1476faf 100644
--- a/registration-processor-abis.json
+++ b/registration-processor-abis.json
@@ -3,7 +3,7 @@
         "name": "ABIS",
         "host": "",
         "port": "",
-        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}?reconnectSupported=true&startupMaxReconnectAttempts=100&warnAfterReconnectAttempts=2&maxReconnectDelay=30000&maxReconnectAttempts=1000",
+        "brokerUrl": "tcp://${activemq.host}:${activemq.core.port}",
         "inboundQueueName": "mosip-to-abis",
         "outboundQueueName": "abis-to-mosip",
         "pingInboundQueueName": "",
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 107228c71c5..39cea9f9f04 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -274,6 +274,7 @@ registration.processor.queue.password=${activemq.password}
 registration.processor.queue.url=tcp://${activemq.host}:${activemq.core.port}
 registration.processor.queue.typeOfQueue=ACTIVEMQ
 registration.processor.queue.connection.retry.count=100
+registration.processor.queue.trusted.packages=io.mosip.*
 
 registration.processor.queue.manualverification.request=mosip-to-mv
 # queue name where mosip will receive response from external mv system
@@ -322,6 +323,7 @@ registration.processor.queue.verification.request.messageTTL=5400
 mosip.regproc.verification.eventbus.port=5730
 mosip.regproc.verification.server.port=8101
 mosip.regproc.verification.server.servlet.path=/registrationprocessor/v1/verification
+registration.processor.verification.queue.trusted.packages=io.mosip.*
 
 # Manual adjudication
 mosip.regproc.manual.adjudication.eventbus.kafka.commit.type=single
@@ -353,6 +355,7 @@ registration.processor.manual.adjudication.queue.username=${registration.process
 registration.processor.manual.adjudication.queue.password=${registration.processor.queue.password}
 registration.processor.manual.adjudication.queue.url=${registration.processor.queue.url}
 registration.processor.manual.adjudication.queue.typeOfQueue=${registration.processor.queue.typeOfQueue}
+registration.processor.manual.adjudication.queue.trusted.packages=io.mosip.*
 
 #WorkflowAction service  websub topic name
 mosip.regproc.workflow.complete.topic=REGISTRATION_PROCESSOR_WORKFLOW_COMPLETED_EVENT

From f3cae21c89df5518cd7f1e5bbafc2ba9880958af Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Fri, 23 Jun 2023 16:57:57 +0530
Subject: [PATCH 1213/1358] regproc config changes

---
 registration-processor-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 39cea9f9f04..bb0a85734ba 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -999,4 +999,6 @@ mosip.registration.processor.digitalcard.template=RPR_UIN_CARD_TEMPLATE
 mosip.registration.processor.print.template=RPR_UIN_CARD_TEMPLATE
 
 # this property is used to define issuers eg partnerid:credentialType:templateTypeCode
-mosip.registration.processor.issuer=mpartner-default-print:${mosip.registration.processor.print.credentialtype}:${mosip.registration.processor.print.template};mpartner-default-digitalcard:${mosip.registration.processor.digitalcard.credentialtype}:${mosip.registration.processor.digitalcard.template}
\ No newline at end of file
+mosip.registration.processor.issuer=mpartner-default-print:${mosip.registration.processor.print.credentialtype}:${mosip.registration.processor.print.template};mpartner-default-digitalcard:${mosip.registration.processor.digitalcard.credentialtype}:${mosip.registration.processor.digitalcard.template}
+##timeout in milliseconds for health check registrer
+mosip.regproc.health-check.handler-timeout=2000
\ No newline at end of file

From 05f6528af919ba75ccd275f0b90093a73feb3f6a Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Fri, 7 Jul 2023 16:32:46 +0530
Subject: [PATCH 1214/1358] MOSIP-28305 config changes

---
 registration-processor-default.properties | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index bb0a85734ba..db15a583210 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -481,13 +481,10 @@ mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.mock-1.1
 mosip.registration.processor.credentialtype=euin
 mosip.registration.processor.encrypt=false
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
-mosip.registration.processor.digitalcard.credentialtype=PDFCard
-mosip.registration.processor.print.credentialtype=euin
-mosip.registration.processor.digitalcard.template=RPR_UIN_CARD_TEMPLATE
-mosip.registration.processor.print.template=RPR_UIN_CARD_TEMPLATE
 
-# this property is used to define issuers eg partnerid:credentialType:templateTypeCode
-mosip.registration.processor.issuer=mpartner-default-print:${mosip.registration.processor.print.credentialtype}:${mosip.registration.processor.print.template};mpartner-default-digitalcard:${mosip.registration.processor.digitalcard.credentialtype}:${mosip.registration.processor.digitalcard.template}
+
+# this property is used to define issuers eg partnerid
+mosip.registration.processor.issuer=mpartner-default-print
 
 ## Stage common
 #After this time intervel, message should be considered as expired (In seconds), 
@@ -991,14 +988,6 @@ mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
 ##Ability to update contact information as part of LOST UIN
 uingenerator.lost.packet.allowed.update.fields=phone,email,permanentAddress
 logging.level.org.apache.activemq.ActiveMQConnectionFactory=DEBUG
-CREDENTIALREQUESTV2=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/v2/requestgenerator
-
-mosip.registration.processor.digitalcard.credentialtype=PDFCard
-mosip.registration.processor.print.credentialtype=euin
-mosip.registration.processor.digitalcard.template=RPR_UIN_CARD_TEMPLATE
-mosip.registration.processor.print.template=RPR_UIN_CARD_TEMPLATE
 
-# this property is used to define issuers eg partnerid:credentialType:templateTypeCode
-mosip.registration.processor.issuer=mpartner-default-print:${mosip.registration.processor.print.credentialtype}:${mosip.registration.processor.print.template};mpartner-default-digitalcard:${mosip.registration.processor.digitalcard.credentialtype}:${mosip.registration.processor.digitalcard.template}
 ##timeout in milliseconds for health check registrer
 mosip.regproc.health-check.handler-timeout=2000
\ No newline at end of file

From fa250deb3f9345b1188dabea672163ba9b25695a Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Fri, 14 Jul 2023 14:07:27 +0530
Subject: [PATCH 1215/1358] Biometric signature validation backward
 compatibility version update

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index db15a583210..ce2f1a474fc 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -867,7 +867,7 @@ mosip.kernel.salt-generator.schemaName=regprc
 mosip.kernel.salt-generator.tableName=crypto_salt
 
 # List of old reg client versions with others attribute not present but currently supported for registration, this is required to take care of the backward compatibility checks
-mosip.regproc.common.before-cbeff-others-attibute.reg-client-versions=1.1.3,1.1.4,1.1.5
+mosip.regproc.common.before-cbeff-others-attibute.reg-client-versions=1.1.3,1.1.4,1.1.5,1.1.5.5
 
 regproc.notification.template.code.lost.uin.email=RPR_LOST_UIN_EMAIL
 regproc.notification.template.code.lost.uin.sms=RPR_LOST_UIN_SMS

From 3a5fd9841bbe480a29597bdaea52597ef3eaf1f1 Mon Sep 17 00:00:00 2001
From: M1044292 <M1044292@C1ML54597.mindtree.com>
Date: Fri, 14 Jul 2023 17:26:02 +0530
Subject: [PATCH 1216/1358] MOSIP-28008: Added property to support 114
 regclient

---
 syncdata-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 71cb770c200..5cfbbe67e6a 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -419,6 +419,9 @@ mosip.kernel.keymanager-service-publickey-url=${mosip.kernel.keymanager.url}/v1/
 
 mosip.kernel.keymanager.unique.identifier.autoupdate=false
 
+## for 1.1.4 reg-client testing
+mosip.syncdata.regclient.support114=false
+
 ## Roles
 mosip.role.admin.syncdata.getclientsettings=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default
 mosip.role.admin.syncdata.getpublickeyapplicationid=REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_ADMIN,default

From af42a073091a1c0af6d9c64c0ebdcb01f816e92e Mon Sep 17 00:00:00 2001
From: M1044292 <M1044292@C1ML54597.mindtree.com>
Date: Fri, 14 Jul 2023 18:05:51 +0530
Subject: [PATCH 1217/1358] MOSIP-28008: Modified comments

---
 syncdata-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/syncdata-default.properties b/syncdata-default.properties
index 5cfbbe67e6a..1d569abfd22 100644
--- a/syncdata-default.properties
+++ b/syncdata-default.properties
@@ -419,7 +419,9 @@ mosip.kernel.keymanager-service-publickey-url=${mosip.kernel.keymanager.url}/v1/
 
 mosip.kernel.keymanager.unique.identifier.autoupdate=false
 
-## for 1.1.4 reg-client testing
+# This property needs to be set to true if 1.1.4 version of regclient is running. 
+# If set to true, in clientsettings sync, the values for tables Gender and IndividualType will be fetched from their individual tables.
+# If false, they will be fetched from dynamic_field table, which is not supported by 1.1.4 version of regclient.
 mosip.syncdata.regclient.support114=false
 
 ## Roles

From cb3e6f3ac0252b2183662a449546165783eda7f5 Mon Sep 17 00:00:00 2001
From: M1044292 <M1044292@C1ML54597.mindtree.com>
Date: Tue, 18 Jul 2023 11:16:34 +0530
Subject: [PATCH 1218/1358] MOSIP-28165: Added missing property for
 transliteration

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index 85d3e953907..18cf3459e70 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -278,6 +278,8 @@ mosip.kernel.virus-scanner.port=3310
 mosip.kernel.transliteration.arabic-language-code=ara
 mosip.kernel.transliteration.english-language-code=eng
 mosip.kernel.transliteration.french-language-code=fra
+# Added this property for backward compatibility as it is misspelled in <1.2.0 versions of kernel-transliteration library
+mosip.kernel.transliteration.franch-language-code=fra
 
 ## DOB
 mosip.default.dob.month=01

From a005fd4c4451a34838c2517d51a6ceca0315a2cc Mon Sep 17 00:00:00 2001
From: VSIVAKALYAN <103260988+VSIVAKALYAN@users.noreply.github.com>
Date: Tue, 18 Jul 2023 13:31:28 +0530
Subject: [PATCH 1219/1358] [DSD-3069] Update inji-default.properties

Signed-off-by: VSIVAKALYAN <103260988+VSIVAKALYAN@users.noreply.github.com>
---
 inji-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/inji-default.properties b/inji-default.properties
index f72a31e110a..953cd3b81a2 100644
--- a/inji-default.properties
+++ b/inji-default.properties
@@ -16,3 +16,5 @@ mosip.inji.audience=ida-binding
 mosip.inji.issuer=residentapp
 # warning screen domain name
 mosip.inji.warningDomainName=https://${mosip.api.public.host}
+# minimum storage space required for downloading / receiving vc in MB
+mosip.inji.minStorageRequired=5

From 88b2fc537e6cb4afa146adb0d34b38caa8d8a450 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Thu, 20 Jul 2023 12:26:00 +0530
Subject: [PATCH 1220/1358] [MOSIP-28491]Update kernel-default.properties
 (#4138)

Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
---
 kernel-default.properties | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 5d3c01d437c..3b60ce9f1f6 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -42,18 +42,28 @@ mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
-mosip.kernel.sms.api=smsapi
-mosip.kernel.sms.authkey=authkey
-mosip.kernel.sms.route=route
-mosip.kernel.sms.sender=sender
-mosip.kernel.sms.unicode=unicode
+#mosip.kernel.sms.api=smsapi
+#mosip.kernel.sms.authkey=authkey
+#mosip.kernel.sms.route=route
+#mosip.kernel.sms.sender=sender
+#mosip.kernel.sms.unicode=unicode
+
+## --msg91 gateway--
+mosip.kernel.sms.enabled:true
+mosip.kernel.sms.country.code: +91
+mosip.kernel.sms.number.length: 10
+mosip.kernel.sms.api:http://${sms-host}:${sms-port}/sendsms
+mosip.kernel.sms.sender:AD-MOSIP
+mosip.kernel.sms.password:dummy
+mosip.kernel.sms.route:mock
+mosip.kernel.sms.authkey:dummy
 
 ## Email notification
 mosip.kernel.notification.email.from=do-not-reply@mosip.io
-spring.mail.host=${email.smtp.host}
-spring.mail.username=${email.smtp.username}
-spring.mail.password=${email.smtp.secret}
-spring.mail.port=${email.smtp.port}
+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=false
 spring.mail.properties.mail.smtp.starttls.enable=false

From 9f4899acb90ffebf9bff5a26b5f98b7323e8440d Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Thu, 20 Jul 2023 12:29:07 +0530
Subject: [PATCH 1221/1358] Update pre-registration-default.properties (#4137)

Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 92d1e07ab17..15aacbb3697 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -273,7 +273,7 @@ datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
 mail-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/email/send
 sms-notification.rest.uri=${mosip.kernel.notification.url}/v1/notifier/sms/send
 otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
-pre.reg.login.otp.sms.template=pre-reg-login-otp-sms-template
+pre.reg.login.otp.sms.template=otp-sms-template
 pre.reg.login.otp.mail.subject.template=OTP-email-subject-template
 pre.reg.login.otp.mail.content.template=OTP-email-content-template
 pre.reg.login.otp.validation-attempt-threshold=10

From c17ecf7c8cd8c72240b9bbc9bf5294f7d0ba17f0 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
Date: Thu, 20 Jul 2023 15:47:55 +0530
Subject: [PATCH 1222/1358] MOSIP-28206 config fix

Signed-off-by: Sowmya Ujjappa Banakar <43202851+sowmya695@users.noreply.github.com>
---
 id-authentication-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 8a9d841fda6..dc2cdc7e5dc 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -627,3 +627,4 @@ mosip.ida.kyc.token.secret=${mosip.ida.kyc.token.secret}
 mosip.ida.kyc.token.expire.time.adjustment.seconds=3000
 mosip.ida.kyc.exchange.default.lang=eng
 mosip.ida.idp.consented.address.subset.attributes=street_address,locality,region,postal_code,country
+mosip.kernel.keymgr.hsm.health.key.app-id=IDA

From bc4103f3aa2fe6771a9d236f387992c4056877c7 Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Fri, 21 Jul 2023 12:30:38 +0530
Subject: [PATCH 1223/1358] [MOSIP-28491]Update kernel-default.properties
 (#4144)

* [MOSIP-28491]Update kernel-default.properties

Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>

* [MOSIP-28491]replaced : with = for sms props

Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>

---------

Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
---
 kernel-default.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 3b60ce9f1f6..4151ae11a41 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -49,14 +49,14 @@ mosip.kernel.sms.gateway=${sms.gateway.provider}
 #mosip.kernel.sms.unicode=unicode
 
 ## --msg91 gateway--
-mosip.kernel.sms.enabled:true
-mosip.kernel.sms.country.code: +91
-mosip.kernel.sms.number.length: 10
-mosip.kernel.sms.api:http://${sms-host}:${sms-port}/sendsms
-mosip.kernel.sms.sender:AD-MOSIP
-mosip.kernel.sms.password:dummy
-mosip.kernel.sms.route:mock
-mosip.kernel.sms.authkey:dummy
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+91
+mosip.kernel.sms.number.length=10
+mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
+mosip.kernel.sms.sender=AD-MOSIP
+mosip.kernel.sms.password=dummy
+mosip.kernel.sms.route=mock
+mosip.kernel.sms.authkey=dummy
 
 ## Email notification
 mosip.kernel.notification.email.from=do-not-reply@mosip.io

From ec7565fafc76863b5a20a897f13e5c5e4910dbdc Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Mon, 24 Jul 2023 11:35:17 +0530
Subject: [PATCH 1224/1358] MOSIP-28555 config changes

---
 admin-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-default.properties b/admin-default.properties
index 4174179c65a..2ac545f5a79 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -208,7 +208,7 @@ mosip.iam.module.login_flow.response_type=code
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/auth
 mosip.iam.module.admin_realm_id=mosip
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
-
+mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
 regproc.token.request.secretKey=${mosip.regproc.client.secret}

From f0f348205bde3f40c13534b603f43a9057fb706b Mon Sep 17 00:00:00 2001
From: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
Date: Mon, 24 Jul 2023 20:32:09 +0530
Subject: [PATCH 1225/1358] [MOSIP-28491]Updated sms props

Signed-off-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com>
---
 application-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 18cf3459e70..a027fbb98c5 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -289,7 +289,7 @@ mosip.login.mode= email,mobile
 ## Notification
 mosip.registration.processor.notification.types=EMAIL
 mosip.notificationtype=SMS|EMAIL
-mosip.kernel.sms.proxy-sms=true
+mosip.kernel.sms.proxy-sms=false
 mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-email=true
 ## Notification lanugage types: either PRIMARY or BOTH 

From cd50f5f8ac619d23d593bc237213e4b92776db3d Mon Sep 17 00:00:00 2001
From: Himaja Dhanyamraju
 <43470317+HimajaDhanyamraju2@users.noreply.github.com>
Date: Thu, 27 Jul 2023 12:56:19 +0530
Subject: [PATCH 1226/1358] Updated backward compatibility fields

Signed-off-by: Himaja Dhanyamraju <43470317+HimajaDhanyamraju2@users.noreply.github.com>
---
 registration-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 7be2b150fda..583b6d8ef32 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -475,8 +475,8 @@ mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
 
 ## backward compatibility fields	
 mosip.registration.uin.update.configured.fields=test	
-mosip.primary-language=${mosip.primary-language}	
-mosip.secondary-language=${mosip.secondary-language}	
+mosip.primary-language=eng
+mosip.secondary-language=ara
 mosip.registration.ideal_time=900	
 mosip.kernel.applicant.type.age.limit=0	
 mosip.registration.max_age=200

From 39a78b69e0fb8162be4696375db050c2bb40f279 Mon Sep 17 00:00:00 2001
From: Himaja Dhanyamraju
 <43470317+HimajaDhanyamraju2@users.noreply.github.com>
Date: Mon, 31 Jul 2023 11:01:27 +0530
Subject: [PATCH 1227/1358] MOSIP-27529: Added version-mappings property

Signed-off-by: Himaja Dhanyamraju <43470317+HimajaDhanyamraju2@users.noreply.github.com>
---
 registration-default.properties | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/registration-default.properties b/registration-default.properties
index 583b6d8ef32..7c9b4fe0d27 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -471,6 +471,11 @@ mosip.kernel.rid.sequence-length=${mosip.kernel.rid.sequence-length}
 mosip.kernel.virus-scanner.host=${mosip.kernel.virus-scanner.host}
 mosip.kernel.virus-scanner.port=${mosip.kernel.virus-scanner.port}
 mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
+
+#Property to support version upgrade. Version upgrade includes software upgrade and DB upgrade. During the DB upgrade, the DB scripts execution will be done based on the order of versions mentioned here.
+#In versions < 1.2.0, the name of the backup folder which is created during software upgrade will be used as the previously installed version.
+mosip.registration.verion.upgrade.version-mappings={ "1.1.4":{ "dbVersion":"1.1.4", "releaseOrder":1}, "1.1.5":{ "dbVersion":"1.1.5", "releaseOrder":2}, "1.1.5.5":{ "dbVersion":"1.1.5.5", "releaseOrder":3}, "1.2.0.1-SNAPSHOT":{ "dbVersion":"1.2.0.1", "releaseOrder":4} }
+
 ## end of global properties
 
 ## backward compatibility fields	

From 6e98db17f51aa91606cdd467577698fe5e861902 Mon Sep 17 00:00:00 2001
From: Himaja Dhanyamraju
 <43470317+HimajaDhanyamraju2@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:05:12 +0530
Subject: [PATCH 1228/1358] MOSIP-28705: Removed version-mappings property

Signed-off-by: Himaja Dhanyamraju <43470317+HimajaDhanyamraju2@users.noreply.github.com>
---
 registration-default.properties | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/registration-default.properties b/registration-default.properties
index 7c9b4fe0d27..583b6d8ef32 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -471,11 +471,6 @@ mosip.kernel.rid.sequence-length=${mosip.kernel.rid.sequence-length}
 mosip.kernel.virus-scanner.host=${mosip.kernel.virus-scanner.host}
 mosip.kernel.virus-scanner.port=${mosip.kernel.virus-scanner.port}
 mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
-
-#Property to support version upgrade. Version upgrade includes software upgrade and DB upgrade. During the DB upgrade, the DB scripts execution will be done based on the order of versions mentioned here.
-#In versions < 1.2.0, the name of the backup folder which is created during software upgrade will be used as the previously installed version.
-mosip.registration.verion.upgrade.version-mappings={ "1.1.4":{ "dbVersion":"1.1.4", "releaseOrder":1}, "1.1.5":{ "dbVersion":"1.1.5", "releaseOrder":2}, "1.1.5.5":{ "dbVersion":"1.1.5.5", "releaseOrder":3}, "1.2.0.1-SNAPSHOT":{ "dbVersion":"1.2.0.1", "releaseOrder":4} }
-
 ## end of global properties
 
 ## backward compatibility fields	

From 0fbe64fddd7fb8b7eb4e466c34a7f396e6fdf2fb Mon Sep 17 00:00:00 2001
From: Aiham Hasan <89243555+aihamh@users.noreply.github.com>
Date: Wed, 2 Aug 2023 19:37:11 +0530
Subject: [PATCH 1229/1358] Updated pre-registration-default.properties

Signed-off-by: Aiham Hasan <89243555+aihamh@users.noreply.github.com>
---
 pre-registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index 15aacbb3697..a19823852ef 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -256,7 +256,7 @@ kernel.prid.contextpath=pridgenerator
 mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid.contextpath}/prid
 
 ## Syncdata service
-latestidschema.service.contextpath=latestidschemafetch the latest ID Schema for the ID object validator
+latestidschema.service.contextpath=latestidschema
 mosip.preregistration.id-schema=${mosip.kernel.syncdata.url}/v1/syncdata/latestidschema
 syncdata.resource.url=${mosip.kernel.syncdata.url}/v1/syncdata
 

From 3ea8a38c62bbbf9c85f76a8942b39fa651ce1c9c Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Tue, 8 Aug 2023 10:11:39 +0530
Subject: [PATCH 1230/1358] Update pms-migration-utility-default.properties

---
 pms-migration-utility-default.properties | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pms-migration-utility-default.properties b/pms-migration-utility-default.properties
index db766f021ca..920cf24a190 100644
--- a/pms-migration-utility-default.properties
+++ b/pms-migration-utility-default.properties
@@ -16,9 +16,13 @@ mosip.kernel.authmanager.url=http://authmanager.kernel
 
 spring.main.allow-circular-references=true
 service.token.request.clientId=mosip-pms-client
-service.token.request.issuerUrl=${mosip.api.internal.url}/v1/authmanager/authenticate/clientidsecretkey
+service.token.request.issuerUrl=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+
+## allowed values for mosip.pms.utility.run.mode are 'upgrade' for migration and 'cronjob' for running it as cronjob. 
 mosip.pms.utility.run.mode=upgrade
 
+mosip.pms.allowed.partner.types=Online_Verification_Partner,Auth_Partner,Device_Provider,MISP_Partner,FTM_Partner
+
 mosip.pms.appId=partner
 mosip.pms.clientId=mosip-pms-client
 mosip.pms.secretKey=${mosip.pms.client.secret}
@@ -34,7 +38,7 @@ pmp.partner.certificate.get.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanage
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 ## If database is external to production, provide the DNS or ip of the host and port 
-mosip.pmp.database.hostname=postgres-postgresql.postgres
+mosip.pmp.database.hostname=10.3.148.106
 mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}
@@ -64,7 +68,7 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 # websub related properties
-websub.publish.url=mosip.websub.url
+websub.publish.url=${mosip.api.internal.url}/hub/
 mosip.auth.filter_disable=false
 
 # Used for generating the datashare url

From 6417ba8ce38f7d93911e92165008d6a1f6edf5a6 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Tue, 8 Aug 2023 10:14:31 +0530
Subject: [PATCH 1231/1358] Update pms-migration-utility-default.properties

---
 pms-migration-utility-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pms-migration-utility-default.properties b/pms-migration-utility-default.properties
index 920cf24a190..c8f1cb28cf0 100644
--- a/pms-migration-utility-default.properties
+++ b/pms-migration-utility-default.properties
@@ -38,7 +38,7 @@ pmp.partner.certificate.get.rest.uri=${mosip.kernel.keymanager.url}/v1/keymanage
 ## Database
 ## Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
 ## If database is external to production, provide the DNS or ip of the host and port 
-mosip.pmp.database.hostname=10.3.148.106
+mosip.pmp.database.hostname=postgres-postgresql.postgres
 mosip.pmp.database.port=5432
 mosip.pmp.database.user=pmsuser
 mosip.pmp.database.password=${db.dbuser.password}

From 9fa6b0a521ea70211de68d924851b8943bf98a5c Mon Sep 17 00:00:00 2001
From: M1044292 <M1044292@C1ML54597.mindtree.com>
Date: Thu, 17 Aug 2023 18:55:43 +0530
Subject: [PATCH 1232/1358] MOSIP-28887: Added placeholder to point to the
 value specified in application-default.properties

---
 registration-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-default.properties b/registration-default.properties
index 583b6d8ef32..1eb975382f9 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -478,7 +478,7 @@ mosip.registration.uin.update.configured.fields=test
 mosip.primary-language=eng
 mosip.secondary-language=ara
 mosip.registration.ideal_time=900	
-mosip.kernel.applicant.type.age.limit=0	
+mosip.kernel.applicant.type.age.limit=${mosip.kernel.applicant.type.age.limit}
 mosip.registration.max_age=200
 
 # Parameters required for Backward Compatibility

From e9273e6f57b4d2eb29d87b140948320c073e0b05 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Wed, 23 Aug 2023 18:09:58 +0530
Subject: [PATCH 1233/1358] Update pms-migration-utility-default.properties

---
 pms-migration-utility-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pms-migration-utility-default.properties b/pms-migration-utility-default.properties
index c8f1cb28cf0..5b4c199932f 100644
--- a/pms-migration-utility-default.properties
+++ b/pms-migration-utility-default.properties
@@ -68,7 +68,8 @@ hibernate.generate_statistics=false
 spring.datasource.initialization-mode=never
 
 # websub related properties
-websub.publish.url=${mosip.api.internal.url}/hub/
+mosip.websub.url=http://websub.websub
+websub.publish.url=${mosip.websub.url}/hub/
 mosip.auth.filter_disable=false
 
 # Used for generating the datashare url

From 3f84a19dbac7a12c2e213913f88bf79ffdcc82e2 Mon Sep 17 00:00:00 2001
From: Akila Lakshmanan <77330852+akilalakshmanan@users.noreply.github.com>
Date: Mon, 4 Sep 2023 12:37:50 +0530
Subject: [PATCH 1234/1358] [MOSIP-24626] Added missing biosdk property urls
 (#4395)

---
 application-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application-default.properties b/application-default.properties
index a027fbb98c5..f76c018be24 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -46,6 +46,8 @@ mosip.regproc.status.service.url=http://regproc-status.regproc
 mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
+mosip.regproc.biosdk.url=http://biosdk-service.biosdk
+mosip.idrepo.biosdk.url=http://biosdk-service.biosdk
 mosip.consolidator.url=http://websub-consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida

From 52822b11a2964dc020d6d042897df0e43d5775d3 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Wed, 13 Sep 2023 12:01:25 +0530
Subject: [PATCH 1235/1358] MOSIP-28646 config changes

---
 registration-processor-default.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index ce2f1a474fc..3bcbed4710e 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -643,9 +643,7 @@ mosip.regproc.abis.handler.message.expiry-time-limit=${mosip.regproc.common.stag
 mosip.regproc.abis.handler.server.port=9071
 mosip.regproc.abis.handler.eventbus.port=5726
 mosip.regproc.abis.handler.server.servlet.path=/registrationprocessor/v1/abishandler
-mosip.regproc.abis.handler.biometric-modalities-segments-mapping.INFANT={'Face':{'Face'}}
-mosip.regproc.abis.handler.biometric-modalities-segments-mapping.MINOR={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'}}
-mosip.regproc.abis.handler.biometric-modalities-segments-mapping.ADULT={'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris':{'Left','Right'}}
+mosip.regproc.abis.handler.biometric-modalities-segments-mapping-for-age-group={'MINOR' : {'Finger' : {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris' : {'Left', 'Right'}}, 'INFANT' : {'Face': {'Face'}}, 'ADULT': {'Finger': {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris' : {'Left', 'Right'}}, 'DEFAULT' : {'Finger' : {'Left Thumb','Left LittleFinger','Left IndexFinger','Left MiddleFinger','Left RingFinger','Right Thumb','Right LittleFinger','Right IndexFinger','Right MiddleFinger','Right RingFinger'},'Iris' : {'Left', 'Right'}}}
 mosip.regproc.abis.handler.biometric-segments-exceptions-mapping={'Left Thumb' : 'leftThumb','Right Thumb' : 'rightThumb','Left MiddleFinger' : 'leftMiddle','Left RingFinger' : 'leftRing','Left LittleFinger' : 'leftLittle','Left IndexFinger' : 'leftIndex','Right MiddleFinger' : 'rightMiddle','Right RingFinger' : 'rightRing','Right LittleFinger' : 'rightLittle','Right IndexFinger' : 'rightIndex','Left' : 'leftEye','Right' : 'rightEye'}
 
 #bio-dedupe-stage

From aa35039b4270e3e0a732377ceb66c3d30568ddaf Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <m1022006@mindtree.com>
Date: Fri, 15 Sep 2023 11:14:42 +0530
Subject: [PATCH 1236/1358] MOSIP-29420 config fix

---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index ce2f1a474fc..86ad7fe4994 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -292,7 +292,7 @@ registration.processor.pause.packets.for.backpressure=true
 # The elapse time (in sec) beyond which the rids will be considered for reprocessing
 registration.processor.reprocess.elapse.time=900
 # The maximum reprocess count. Beyond this the rid will not be considered for reprocessing.
-registration.processor.reprocess.attempt.count=300
+registration.processor.reprocess.attempt.count=20
 registration.processor.reprocess.type=cron
 registration.processor.reprocess.seconds=0
 # TODO: time reduced for testing.  Revert for production.

From fde2b95b254475df56bd1311c1fba531baa05e0b Mon Sep 17 00:00:00 2001
From: anshulv1401 <31562315+anshulv1401@users.noreply.github.com>
Date: Thu, 5 Oct 2023 17:07:31 +0530
Subject: [PATCH 1237/1358] esignet config updated for esignet-1.1.0 release
 (#4618)

---
 esignet-default.properties | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 248c1205e85..0538499a7a2 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -27,7 +27,7 @@
 
 
 ## ------------------------------------------------- e-Signet ----------------------------------------------------------
-mosip.esignet.misp.license.key=bmftkJ8LfUQE98eE1FWud68IwaflbqHXcf3px0SJHPxMcqMRP5
+mosip.esignet.misp.license.key=${mosip.esignet.misp.key}
 mosip.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 mosip.esignet.auth-txn-id-length=10
 mosip.esignet.supported-id-regex=\\S*
@@ -35,6 +35,9 @@ mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 mosip.esignet.link-code-expire-in-secs=60
 
+mosip.esignet.generate-link-code.limit-per-transaction=10
+mosip.esignet.authentication-expire-in-secs=50
+
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
   '${server.servlet.path}/authorization/auth-code'}
@@ -50,7 +53,9 @@ mosip.esignet.binding.encrypt-binding-id=false
 ## -------------------------------------- Authentication & Authorization -----------------------------------------------
 
 mosip.esignet.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \
-  \ '${server.servlet.path}/system-info/**' : { 'SCOPE_upload_certificate'}}
+  \ '${server.servlet.path}/system-info/**' : { 'SCOPE_upload_certificate'},\
+  \ '${server.servlet.path}/binding/wallet-binding' : { 'SCOPE_wallet_binding'}, \
+  \ '${server.servlet.path}/binding/binding-otp' : { 'SCOPE_send_binding_otp'}}
 mosip.esignet.security.auth.put-urls={'${server.servlet.path}/client-mgmt/**' : { 'SCOPE_update_oidc_client'} }
 mosip.esignet.security.auth.get-urls={'${server.servlet.path}/system-info/**' : { 'SCOPE_get_certificate'} }
 
@@ -79,14 +84,6 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 ## ------------------------------------------- Integrations ------------------------------------------------------------
 
-#mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
-#mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
-#mosip.esignet.integration.authenticator=MockAuthenticationService
-#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-#mosip.esignet.integration.audit-plugin=LoggerAuditService
-#mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
-
-
 mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
 mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
 mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
@@ -196,7 +193,7 @@ mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 600,
 
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 
-mosip.esignet.domain.url=https://${mosip.api.public.host}
+mosip.esignet.domain.url=https://${mosip.esignet.host}
 mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
 
 mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
@@ -297,14 +294,20 @@ mosip.kernel.keymanager.jwtsign.validate.json=false
 mosip.keymanager.dao.enabled=false
 crypto.PrependThumbprint.enable=true
 
+mosip.kernel.keymgr.hsm.health.check.enabled=true	
+mosip.kernel.keymgr.hsm.health.key.app-id=OIDC_SERVICE	
+mosip.kernel.keymgr.hsm.healthkey.ref-id=TRANSACTION_CACHE
+mosip.kernel.keymgr.hsm.health.check.encrypt=true
+
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
 
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
   'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, \
-  'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', \
-  'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
+   'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'wallet.logo-url': 'inji_logo.png', \
+  'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, 'consent.screen.timeout-buffer-in-secs': 10, \
+  'mosip.esignet.link-auth-code-expire-in-secs': 120, 'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
 
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 46720aed3e29fcfbc38666a2a3f6884d9d9cfbbc Mon Sep 17 00:00:00 2001
From: Khuddus shariff <Khuddusshariff0022@gmail.com>
Date: Fri, 6 Oct 2023 15:32:30 +0530
Subject: [PATCH 1238/1358] quality checker level tags more specific
 MOSIP-29419

---
 registration-processor-camel-routes-lost-default.xml   | 4 ++--
 registration-processor-camel-routes-new-default.xml    | 4 ++--
 registration-processor-camel-routes-update-default.xml | 4 ++--
 registration-processor-default.properties              | 7 +++++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/registration-processor-camel-routes-lost-default.xml b/registration-processor-camel-routes-lost-default.xml
index a4fa59adb38..6c0a7b79b61 100644
--- a/registration-processor-camel-routes-lost-default.xml
+++ b/registration-processor-camel-routes-lost-default.xml
@@ -247,11 +247,11 @@
             <to uri="workflow-cmd://pause-and-request-additional-info" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://bio-dedupe-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['level-1','level-2','level-3'] || @['tags']['Biometric_Quality-Finger'] in ['level-1','level-2','level-3'] || @['tags']['Biometric_Quality-Face'] in ['level-1','level-2','level-3'])]</jsonpath>
             <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
             <!-- PAUSE_FOR is in seconds -->
             <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index 4f98e21d8e9..ef3fe0ba7ee 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -250,11 +250,11 @@
             <to uri="workflow-cmd://pause-and-request-additional-info" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://demo-dedupe-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['level-1','level-2','level-3'] || @['tags']['Biometric_Quality-Finger'] in ['level-1','level-2','level-3'] || @['tags']['Biometric_Quality-Face'] in ['level-1','level-2','level-3'])]</jsonpath>
             <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
             <!-- PAUSE_FOR is in seconds -->
             <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index f562625cbbc..73544fdc53c 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -250,11 +250,11 @@
             <to uri="workflow-cmd://pause-and-request-additional-info" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Average', 'Good','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['Average', 'Good', '--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['Average', 'Good', '--Biometrics-Not-Available--'])]</jsonpath>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Finger'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'] &amp;&amp; @['tags']['Biometric_Quality-Face'] in ['level-4','level-5','level-6','level-7','level-8','level-9','level-10','--Biometrics-Not-Available--'])]</jsonpath>
             <to uri="eventbus://biometric-authentication-bus-in" />
          </when>
          <when>
-            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['Poor'] || @['tags']['Biometric_Quality-Finger'] in ['Poor'] || @['tags']['Biometric_Quality-Face'] in ['Poor'])]</jsonpath>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['Biometric_Quality-Iris'] in ['level-1','level-2','level-3'] || @['tags']['Biometric_Quality-Finger'] in ['level-1','level-2','level-3'] || @['tags']['Biometric_Quality-Face'] in ['level-1','level-2','level-3'])]</jsonpath>
             <setProperty propertyName="ADDITIONAL_INFO_PROCESS"><constant>BIOMETRIC_CORRECTION</constant></setProperty>
             <!-- PAUSE_FOR is in seconds -->
             <setProperty propertyName="PAUSE_FOR"><constant>1296000</constant></setProperty>
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 468c894bd6f..f77940dd4ce 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -605,8 +605,11 @@ mosip.regproc.quality.classifier.server.port=9072
 mosip.regproc.quality.classifier.eventbus.port=5727
 mosip.regproc.quality.classifier.server.servlet.path=/registrationprocessor/v1/qualityclassifier
 # Below quality ranges map should contain proper quality group name and quality range, any overlap of the quality 
-# range will result in a random behaviour of tagging. In range, upper and lower values are inclusive.
-mosip.regproc.quality.classifier.tagging.quality.ranges={'Poor':'0-29','Average':'30-69','Good':'70-100'}
+# range will result in a random behaviour of tagging. In range, Lower value is inclusive and Upper value is Exclusive.
+# Example : When the Biometric score is 39.9. this will be included in level-4 which ranges between 30-40. 
+# Example : when the Biometric score is 40. this will be included in level-5 which ranges between 40-50.  
+mosip.regproc.quality.classifier.tagging.quality.ranges={'level-1':'0-10','level-2':'10-20','level-3':'20-30','level-4':'30-40','level-5':'40-50','level-6':'50-60','level-7':'60-70','level-8':'70-80','level-9':'80-90','level-10':'90-101'}
+
 # Quality Tag Prefix
 mosip.regproc.quality.classifier.tagging.quality.prefix=Biometric_Quality-
 # The tag value that will be used by default when the packet does not have biometrics

From 554c93b1b96061d116c8372b8c20e566cfa4ae14 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Fri, 13 Oct 2023 14:22:55 +0530
Subject: [PATCH 1239/1358] MOSIP-29287 added biosdk logger

Signed-off-by: Loganathan Sekar <m1047627@mindtree.com>
---
 biosdk-service-default.properties | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 biosdk-service-default.properties

diff --git a/biosdk-service-default.properties b/biosdk-service-default.properties
new file mode 100644
index 00000000000..bf202460333
--- /dev/null
+++ b/biosdk-service-default.properties
@@ -0,0 +1,16 @@
+#iam mock-sdk config
+sdk_check_iso_timestamp_format=true
+mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
+biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2
+
+
+logging.level.root=INFO
+
+mosip.biosdk.log-request-response-enabled=false
+# Uncomment below when mosip.biosdk.log-request-response-enabled is set to true.
+#logging.level.io.mosip.biosdk.services.impl.spec_1_0.BioSdkServiceProviderImpl_V_1_0=DEBUG
+
+#iam image-compressor config
+mosip.bio.image.compressor.resize.factor.fx=0.25
+mosip.bio.image.compressor.resize.factor.fy=0.25
+mosip.bio.image.compressor.compression.ratio=50

From a32d82217d90df0113f743175b01885f6702abc2 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Thu, 12 Oct 2023 20:13:43 +0530
Subject: [PATCH 1240/1358] MOSIP-29287 Added biosdk-service cloud config

Signed-off-by: Loganathan Sekar <m1047627@mindtree.com>
---
 sandbox/biosdk-service-mz.properties | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 sandbox/biosdk-service-mz.properties

diff --git a/sandbox/biosdk-service-mz.properties b/sandbox/biosdk-service-mz.properties
new file mode 100644
index 00000000000..e04d508e269
--- /dev/null
+++ b/sandbox/biosdk-service-mz.properties
@@ -0,0 +1,14 @@
+#iam mock-sdk config
+sdk_check_iso_timestamp_format=true
+mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
+biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2
+
+mosip.biosdk.log-request-response-enabled=true
+
+logging.level.root=INFO
+logging.level.io.mosip.biosdk.services.impl.spec_1_0.BioSdkServiceProviderImpl_V_1_0=DEBUG
+
+#iam image-compressor config
+mosip.bio.image.compressor.resize.factor.fx=0.25
+mosip.bio.image.compressor.resize.factor.fy=0.25
+mosip.bio.image.compressor.compression.ratio=50

From 293b73d4c8e43cfa108c6e60b59d009758e927be Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <m1047627@mindtree.com>
Date: Fri, 13 Oct 2023 17:50:57 +0530
Subject: [PATCH 1241/1358] Resolved conflict issue

Signed-off-by: Loganathan Sekar <m1047627@mindtree.com>
---
 sandbox/biosdk-service-mz.properties | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 sandbox/biosdk-service-mz.properties

diff --git a/sandbox/biosdk-service-mz.properties b/sandbox/biosdk-service-mz.properties
deleted file mode 100644
index e04d508e269..00000000000
--- a/sandbox/biosdk-service-mz.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#iam mock-sdk config
-sdk_check_iso_timestamp_format=true
-mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
-biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2
-
-mosip.biosdk.log-request-response-enabled=true
-
-logging.level.root=INFO
-logging.level.io.mosip.biosdk.services.impl.spec_1_0.BioSdkServiceProviderImpl_V_1_0=DEBUG
-
-#iam image-compressor config
-mosip.bio.image.compressor.resize.factor.fx=0.25
-mosip.bio.image.compressor.resize.factor.fy=0.25
-mosip.bio.image.compressor.compression.ratio=50

From 86ea111c82481238f0433c17d63ebd7926088061 Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Wed, 18 Oct 2023 08:16:17 +0530
Subject: [PATCH 1242/1358] [DSD-3548]Update
 id-authentication-default.properties (#4712)

Signed-off-by: bhumi46 <111699703+bhumi46@users.noreply.github.com>
---
 id-authentication-default.properties | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index dc2cdc7e5dc..33a59b28377 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -496,7 +496,7 @@ keymanager.persistence.jdbc.driver=org.postgresql.Driver
 keymanager_database_url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip.ida.database.port}/mosip_ida
 keymanager_database_username=${mosip.ida.database.user}
 keymanager_database_password=${db.dbuser.password}
-mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING
+mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING,IDA_VCI_EXCHANGE
 mosip.kernel.keymanager.autogen.basekeys.list=${application.id}:${internal.reference.id},${application.id}:${partner.reference.id},${application.id}:${partner.biometric.reference.id},${application.id}:${mosip.kernel.zkcrypto.publickey.reference.id},${application.id}:${ida-auth-partner-id}
 zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
@@ -628,3 +628,13 @@ mosip.ida.kyc.token.expire.time.adjustment.seconds=3000
 mosip.ida.kyc.exchange.default.lang=eng
 mosip.ida.idp.consented.address.subset.attributes=street_address,locality,region,postal_code,country
 mosip.kernel.keymgr.hsm.health.key.app-id=IDA
+
+mosip.ida.config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
+mosip.ida.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "https://${mosip.api.public.host}/.well-known/mosip-ida-context.json" : "mosip-ida-context.json"}
+mosip.ida.vercred.context.uri=vccontext-ida.jsonld
+mosip.ida.vercred.id.url=https://ida.mosip.net/credentials/
+mosip.ida.vercred.issuer.url=https://${mosip.api.public.host}/.well-known/ida-controller.json
+mosip.ida.vercred.proof.purpose=assertionMethod
+mosip.ida.vercred.proof.type=RsaSignature2018
+mosip.ida.vercred.proof.verificationmethod=https://${mosip.api.public.host}/.well-known/ida-public-key.json
+mosip.ida.vci.supported.cred.types=VerifiableCredential,MOSIPVerifiableCredential

From f9e00206c3aeaf9560cb2305547d32e630c28725 Mon Sep 17 00:00:00 2001
From: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
Date: Thu, 26 Oct 2023 11:31:21 +0530
Subject: [PATCH 1243/1358] [MOSIP-29942]Update misp-policy-schema.json

Signed-off-by: Mahesh-Binayak <76687012+Mahesh-Binayak@users.noreply.github.com>
---
 misp-policy-schema.json | 46 ++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/misp-policy-schema.json b/misp-policy-schema.json
index 0795acb0de2..bae8f033c51 100644
--- a/misp-policy-schema.json
+++ b/misp-policy-schema.json
@@ -1,23 +1,27 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "properties": {
-    "allowAuthRequestDelegation": {
-      "type": "boolean"
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+      "allowAuthRequestDelegation": {
+        "type": "boolean"
+      },
+      "allowKycRequestDelegation": {
+        "type": "boolean"
+      },
+      "trustBindedAuthVerificationToken": {
+        "type": "boolean"
+      },
+      "allowKeyBindingDelegation": {
+        "type": "boolean"
+      },
+      "allowVciRequestDelegation": {
+        "type": "boolean"
+      }
     },
-    "allowKycRequestDelegation": {
-      "type": "boolean"
-    },
-    "trustBindedAuthVerificationToken": {
-      "type": "boolean"
-    },
-    "allowKeyBindingDelegation": {
-      "type": "boolean"
-    }
-  },
-  "required": [
-    "allowAuthRequestDelegation",
-    "allowKycRequestDelegation",
-    "allowKeyBindingDelegation"
-  ]
-}
\ No newline at end of file
+    "required": [
+      "allowAuthRequestDelegation",
+      "allowKycRequestDelegation",
+      "allowKeyBindingDelegation"
+    ],
+    "additionalProperties": false
+  }

From b49841702c71acadd29feedf40e2061ba32ec9c8 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Thu, 9 Nov 2023 08:37:34 +0530
Subject: [PATCH 1244/1358] ES-4 ES-19 (#4787)

* ES-4 ES-19

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>

* Update esignet-default.properties

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>

---------

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 154 ++++++++++++++++++++++++++++++-------
 1 file changed, 126 insertions(+), 28 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 0538499a7a2..b0504aad51d 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -31,15 +31,19 @@ mosip.esignet.misp.license.key=${mosip.esignet.misp.key}
 mosip.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
 mosip.esignet.auth-txn-id-length=10
 mosip.esignet.supported-id-regex=\\S*
+# Generated ID and access tokens 'exp' depends on the below properties, default value is 1-hour
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
-mosip.esignet.link-code-expire-in-secs=60
-
+# By default, only 2 link codes can be active, and the time period it can be active is defined here, default value is 5 minutes
+mosip.esignet.link-code-expire-in-secs=300
+# Number of link code allowed to be generated in a transaction, the default value is 10
 mosip.esignet.generate-link-code.limit-per-transaction=10
-mosip.esignet.authentication-expire-in-secs=50
+# Time to complete consent after successful authentication, the default value is 120
+mosip.esignet.authentication-expire-in-secs=120
 
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
+  '${server.servlet.path}/authorization/v2/authenticate', \
   '${server.servlet.path}/authorization/auth-code'}
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
@@ -49,7 +53,6 @@ mosip.esignet.binding.audience-id=esignet-binding
 mosip.esignet.binding.key-expire-days=10
 mosip.esignet.binding.encrypt-binding-id=false
 
-
 ## -------------------------------------- Authentication & Authorization -----------------------------------------------
 
 mosip.esignet.security.auth.post-urls={'${server.servlet.path}/client-mgmt/**' : {'SCOPE_add_oidc_client'} , \
@@ -63,12 +66,14 @@ mosip.esignet.security.ignore-csrf-urls=${server.servlet.path}/oidc/**,${server.
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,\
   ${server.servlet.path}/swagger-ui/**,${server.servlet.path}/v3/api-docs/**,\
   ${server.servlet.path}/linked-authorization/link-transaction,${server.servlet.path}/linked-authorization/authenticate,\
-  ${server.servlet.path}/linked-authorization/consent,${server.servlet.path}/binding/**
+  ${server.servlet.path}/linked-authorization/consent,${server.servlet.path}/binding/**,${server.servlet.path}/client-mgmt/**,\
+  ${server.servlet.path}/vci/**,${server.servlet.path}/system-info/**,${server.servlet.path}/linked-authorization/v2/link-transaction,\
+  ${server.servlet.path}/linked-authorization/v2/authenticate,${server.servlet.path}/linked-authorization/v2/consent
 
 mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server.servlet.path}/authorization/**,\
   ${server.servlet.path}/linked-authorization/**,${server.servlet.path}/oidc/**,${server.servlet.path}/oauth/**,\
   ${server.servlet.path}/actuator/**,/favicon.ico,${server.servlet.path}/error,${server.servlet.path}/swagger-ui/**,\
-  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/binding/**
+  ${server.servlet.path}/v3/api-docs/**,${server.servlet.path}/binding/**,${server.servlet.path}/vci/**
 
 spring.security.oauth2.resourceserver.jwt.issuer-uri=${keycloak.external.url}/auth/realms/mosip
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
@@ -90,6 +95,7 @@ mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
 mosip.esignet.integration.key-binder=IdaKeyBinderImpl
 mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
+mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false
@@ -117,6 +123,11 @@ mosip.esignet.authenticator.ida.app-id=ida
 mosip.esignet.authenticator.ida-env=Developer
 mosip.esignet.authenticator.ida.otp-channels=email,phone
 
+mosip.esignet.ida.vci-user-info-cache=userinfo
+mosip.esignet.ida.vci-exchange-id=mosip.identity.vciexchange
+mosip.esignet.ida.vci-exchange-version=1.0
+mosip.esignet.ida.vci-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/vci-exchange/delegated/${mosip.esignet.misp.license.key}/
+
 # Mock IDA integration props
 mosip.esignet.mock.authenticator.get-identity-url=https://${mosip.api.public.host}/v1/mock-identity-system/identity
 mosip.esignet.mock.authenticator.kyc-auth-url=https://${mosip.api.public.host}/v1/mock-identity-system/kyc-auth
@@ -124,6 +135,7 @@ mosip.esignet.mock.authenticator.kyc-exchange-url=https://${mosip.api.public.hos
 mosip.esignet.mock.authenticator.ida.otp-channels=${mosip.esignet.authenticator.ida.otp-channels}
 mosip.esignet.mock.authenticator.send-otp=https://${mosip.api.public.host}/v1/mock-identity-system/send-otp
 mosip.esignet.mock.supported.bind-auth-factor-types={'WLA'}
+mosip.esignet.mock.vciplugin.verification-method=${mosip.esignet.vci.authn.jwk-set-uri}
 
 ## ------------------------------------------ oauth & openid supported values ------------------------------------------
 
@@ -131,6 +143,8 @@ mosip.esignet.mock.supported.bind-auth-factor-types={'WLA'}
 mosip.esignet.supported.authorize.scopes={'Manage-Identity-Data','Manage-VID','Manage-Authentication','Manage-Service-Requests','Manage-Credentials'}
 mosip.esignet.supported.openid.scopes={'profile','email','phone'}
 mosip.esignet.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number'},'email' : {'email'}, 'phone' : {'phone_number'}}
+mosip.esignet.supported.credential.scopes={'mock_identity_vc_ldp', 'mosip_identity_vc_ldp'}
+mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'mosip_identity_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential'}
 
 ## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
 mosip.esignet.supported.response.types={'code'}
@@ -167,6 +181,8 @@ mosip.esignet.supported.client.assertion.types={'urn:ietf:params:oauth:client-as
 ## Type of the client authentication methods for token endpoint
 mosip.esignet.supported.client.auth.methods={'private_key_jwt'}
 
+## Only S256 method supported
+mosip.esignet.supported-pkce-methods={'S256'}
 
 ## ---------------------------------------- Cache configuration --------------------------------------------------------
 
@@ -175,7 +191,7 @@ mosip.esignet.cache.store.individual-id=true
 mosip.esignet.cache.security.secretkey.reference-id=TRANSACTION_CACHE
 mosip.esignet.cache.security.algorithm-name=AES/ECB/PKCS5Padding
 
-mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction
+mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction,vcissuance
 
 #spring.cache.type=redis
 #spring.cache.cache-names=${mosip.esignet.cache.names}
@@ -186,36 +202,48 @@ management.health.redis.enabled=false
 spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
 mosip.esignet.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
-   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200, 'authtokens': 2, 'bindingtransaction': 1500 }
-mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 600, 'authenticated': 120, 'authcodegenerated': 60, \
+   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200, 'authtokens': 2, 'bindingtransaction': 200, 'vcissuance' : 200 }
+mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300,'authenticated': ${mosip.esignet.authentication-expire-in-secs}, 'authcodegenerated': 300, \
   'userinfo': ${mosip.esignet.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
-  'linked': 60 , 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : 60, 'consented': 120, 'authtokens': 28800, 'bindingtransaction': 300 }
+  'linked': 600, 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, 'consented': 300, \
+  'authtokens': 86400, 'bindingtransaction': 600, 'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
 
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 
 mosip.esignet.domain.url=https://${mosip.esignet.host}
 mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
 
-mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer-id}' ,\
+mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
+  \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
+  \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' , \
+  \ 'jwks_uri' : '${mosip.esignet.domain.url}${server.servlet.path}/oauth/jwks.json' , \
+  \ 'token_endpoint_auth_methods_supported' : ${mosip.esignet.supported.client.auth.methods}, \
+  \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'},\
+  \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
+  \ 'response_modes_supported' : { 'query' }, \
+  \ 'grant_types_supported' : ${mosip.esignet.supported.grant.types},\
+  \ 'response_types_supported' : ${mosip.esignet.supported.response.types}}
+
+mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' ,\
-  \ 'userinfo_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/oidc/userinfo' , \
-  \ 'jwks_uri' : '${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json' , \
+  \ 'userinfo_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/oidc/userinfo' ,\
   \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
   \ 'response_types_supported' : ${mosip.esignet.supported.response.types}, \
-  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
-  \ 'userinfo_signing_alg_values_supported' : {'RS256'}, \
-  \ 'userinfo_encryption_alg_values_supported' : {'RSAXXXXX'},\
-  \ 'userinfo_encryption_enc_values_supported' : {'A128GCM'}, \
   \ 'response_modes_supported' : { 'query' }, \
   \ 'token_endpoint_auth_methods_supported' : ${mosip.esignet.supported.client.auth.methods}, \
   \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'}, \
+  \ 'userinfo_signing_alg_values_supported' : {'RS256'}, \
+  \ 'userinfo_encryption_alg_values_supported' : {'RSAXXXXX'},\
+  \ 'userinfo_encryption_enc_values_supported' : {'A128GCM'}, \
   \ 'id_token_signing_alg_values_supported' : {'RS256'}, \
   \ 'claim_types_supported': {'normal'}, \
-  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
-  \ 'claims_locales_supported' : {'en'}, \
+  \ 'claims_parameter_supported' : true, \
   \ 'display_values_supported' : ${mosip.esignet.supported.ui.displays}, \
-  \ 'ui_locales_supported' : {'en'} }
+  \ 'subject_types_supported' : { 'pairwise' }, \
+  \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
+  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
+  \ 'request_parameter_supported' : false }
 
 ##----------------------------------------- Database properties --------------------------------------------------------
 
@@ -300,15 +328,85 @@ mosip.kernel.keymgr.hsm.healthkey.ref-id=TRANSACTION_CACHE
 mosip.kernel.keymgr.hsm.health.check.encrypt=true
 
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
+# NOTE:
+# 1. linked-transaction-expire-in-secs value should be a sum of mosip.esignet.authentication-expire-in-secs and linked cache expire in seconds under mosip.esignet.cache.expire-in-seconds property
+# 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property
+
+mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
+ 'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' },{'wallet.name': 'Inji Mobile App1', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
+ 'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}
 
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
-  'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, \
-   'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', 'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'wallet.logo-url': 'inji_logo.png', \
-  'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, 'consent.screen.timeout-buffer-in-secs': 10, \
-  'mosip.esignet.link-auth-code-expire-in-secs': 120, 'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}'}
-
-
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
-logging.level.io.mosip.esignet=DEBUG
+  'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
+  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : '', \
+  'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
+  'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 420, 'sbi.port.range': 4501-4600, \
+  'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \
+  'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config} }
+
+##  ---------------------------------------------- VCI ------------------------------------------------------------------
+mosip.esignet.vci.identifier=${mosip.esignet.domain.url}${server.servlet.path}
+mosip.esignet.vci.authn.filter-urls={ '${server.servlet.path}/vci/credential' }
+mosip.esignet.vci.authn.issuer-uri=${mosip.esignet.domain.url}${server.servlet.path}
+mosip.esignet.vci.authn.jwk-set-uri=${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
+mosip.esignet.vci.authn.allowed-audiences={ '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential' }
+
+mosip.esignet.cnonce-expire-seconds=40
+mosip.esignet.vci.supported.jwt-proof-alg={'RS256'}
+mosip.esignet.vci.key-values={ 'credential_issuer': '${mosip.esignet.domain.url}',         \
+  'credential_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', \
+  'credentials_supported': {{\
+  'format': 'ldp_vc',\
+  'id': 'MockVerifiableCredential', \
+  'scope' : 'mock_identity_vc_ldp',\
+  'cryptographic_binding_methods_supported': {'did:jwk'},\
+  'cryptographic_suites_supported': {'RsaSignature2018'},\
+  'proof_types_supported': {'jwt'},\
+  'credential_definition': {\
+  'type': {'VerifiableCredential'},\
+  'credentialSubject': {\
+  'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \
+  'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\
+   }},\
+  'display': {{'name': 'Mock Verifiable Credential by e-Signet', \
+                'locale': 'en', \
+                'logo': {'url': '${mosip.esignet.domain.url}/logo.png',\
+                'alt_text': 'a square logo of a MOSIP'},\
+                'background_color': '#12107c',\
+                'text_color': '#FFFFFF'}}\
+     \ },{\
+  'format': 'ldp_vc',\
+  'id': 'MOSIPVerifiableCredential', \
+  'scope' : 'mosip_identity_vc_ldp',\
+  'cryptographic_binding_methods_supported': {'did:jwk'},\
+  'cryptographic_suites_supported': {'RsaSignature2018'},\
+  'proof_types_supported': {'jwt'},\
+  'credential_definition': {\
+  'type': {'VerifiableCredential'},\
+  'credentialSubject': {\
+  'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\
+  'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\
+  'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\
+  'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\
+  'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\
+  'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\
+  'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\
+  'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\
+  'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\
+  'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\
+   }},\
+  'display': {{'name': 'MOSIP Identity Verifiable Credential', \
+                'locale': 'en', \
+                'logo': {'url': '${mosip.esignet.domain.url}/logo.png',\
+                'alt_text': 'a square logo of a MOSIP'},\
+                'background_color': '#12107c',\
+                'text_color': '#FFFFFF'}}\
+  \ }},\
+  'display': {{'name': 'MOSIP', 'locale': 'en'}}\
+  }
+## -------------------------------------------- Others ----------------------------------------------------------
+
+#logging.level.org.springframework.web.client.RestTemplate=DEBUG
+#logging.level.io.mosip.esignet=DEBUG

From b7be6e3d93d9e6185032ce08492d6c8e0fd16276 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Tue, 14 Nov 2023 12:43:13 +0530
Subject: [PATCH 1245/1358] Update esignet-default.properties

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index b0504aad51d..f95a6b80aaa 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -34,8 +34,8 @@ mosip.esignet.supported-id-regex=\\S*
 # Generated ID and access tokens 'exp' depends on the below properties, default value is 1-hour
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
-# By default, only 2 link codes can be active, and the time period it can be active is defined here, default value is 5 minutes
-mosip.esignet.link-code-expire-in-secs=300
+# By default, only 2 link codes can be active, and the time period it can be active is defined here, default value is 1 minute
+mosip.esignet.link-code-expire-in-secs=60
 # Number of link code allowed to be generated in a transaction, the default value is 10
 mosip.esignet.generate-link-code.limit-per-transaction=10
 # Time to complete consent after successful authentication, the default value is 120
@@ -199,13 +199,17 @@ mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,
 #spring.redis.port=6379
 management.health.redis.enabled=false
 
+# 'simple' cache type is only applicable only for Non-Production setup
 spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
+# Cache size setup is applicable only for 'simple' cache type.
 mosip.esignet.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
    'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200, 'authtokens': 2, 'bindingtransaction': 200, 'vcissuance' : 200 }
-mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300,'authenticated': ${mosip.esignet.authentication-expire-in-secs}, 'authcodegenerated': 300, \
+
+# Cache expire in seconds is applicable for both 'simple' and 'Redis' cache type
+mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300,'authenticated': ${mosip.esignet.authentication-expire-in-secs}, 'authcodegenerated': 60, \
   'userinfo': ${mosip.esignet.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
-  'linked': 600, 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, 'consented': 300, \
+  'linked': 120, 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, 'consented': 60, \
   'authtokens': 86400, 'bindingtransaction': 600, 'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
 
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
@@ -329,8 +333,9 @@ mosip.kernel.keymgr.hsm.health.check.encrypt=true
 
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
 # NOTE:
-# 1. linked-transaction-expire-in-secs value should be a sum of mosip.esignet.authentication-expire-in-secs and linked cache expire in seconds under mosip.esignet.cache.expire-in-seconds property
+# 1. linked-transaction-expire-in-secs value should be a sum of 'mosip.esignet.authentication-expire-in-secs' and 'linked' cache expire in seconds under mosip.esignet.cache.expire-in-seconds property
 # 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property
+# 3. If esignet is deployed with MOSIP IDA, then 'resend.otp.delay.secs' must be the same as 'mosip.kernel.otp.expiry-time'
 
 mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
  'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' },{'wallet.name': 'Inji Mobile App1', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
@@ -339,10 +344,10 @@ mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
-  'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
+  'resend.otp.delay.secs': 180, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
   'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : '', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
-  'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 420, 'sbi.port.range': 4501-4600, \
+  'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': 4501-4600, \
   'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \
   'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config} }
 

From 353c031896789619c45277730ccaf576ec950252 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Tue, 14 Nov 2023 17:24:39 +0530
Subject: [PATCH 1246/1358] Create ida-controller.json

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 ida-controller.json | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 ida-controller.json

diff --git a/ida-controller.json b/ida-controller.json
new file mode 100644
index 00000000000..0ede3d98626
--- /dev/null
+++ b/ida-controller.json
@@ -0,0 +1,7 @@
+{
+  "@context": "https://w3id.org/security/v2",
+  "id": "https://${mosip.api.public.host}/.well-known/ida-controller.json",
+  "assertionMethod": [
+    "https://${mosip.api.public.host}/.well-known/ida-public-key.json"
+  ]
+}

From adaeea677d09b3649f8748714bae2689ee1f3046 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Tue, 14 Nov 2023 17:32:29 +0530
Subject: [PATCH 1247/1358] Create mosip-ida-context.json

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 mosip-ida-context.json | 54 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 mosip-ida-context.json

diff --git a/mosip-ida-context.json b/mosip-ida-context.json
new file mode 100644
index 00000000000..66a61871c43
--- /dev/null
+++ b/mosip-ida-context.json
@@ -0,0 +1,54 @@
+{
+  "@context": [{
+    "@version": 1.1
+  },"https://www.w3.org/ns/odrl.jsonld", {
+    "mosip": "https://${mosip.api.public.host}/mosip#",
+    "schema": "http://schema.org/",
+    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "vcVer": "mosip:vcVer",
+    "UIN": "mosip:UIN",
+    "VID": "mosip:VID",
+    "addressLine1": {
+      "@id": "https://${mosip.api.public.host}/mosip#addressLine1",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "addressLine2": {
+      "@id": "https://${mosip.api.public.host}/mosip#addressLine2",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "addressLine3": {
+      "@id": "https://${mosip.api.public.host}/mosip#addressLine3",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "city": {
+      "@id": "https://${mosip.api.public.host}/mosip#city",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "gender": {
+      "@id": "https://${mosip.api.public.host}/mosip#gender",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "residenceStatus": {
+      "@id": "https://${mosip.api.public.host}/mosip#residenceStatus",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+
+    "dateOfBirth": "mosip:dateOfBirth",
+    "email": "mosip:email",
+    "fullName": {
+      "@id": "https://${mosip.api.public.host}/mosip#fullName",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "phone": "mosip:phone",
+    "postalCode": "mosip:postalCode",
+    "province": {
+      "@id": "https://${mosip.api.public.host}/mosip#province",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "region": {
+      "@id": "https://${mosip.api.public.host}/mosip#region",
+      "@context": {"value": "rdf:value", "lang": "@language"}
+    },
+    "face": "mosip:face"
+  }]
+}

From bcff60a334c82a3c5bc3a066eb8e3458fb4e73cd Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Tue, 14 Nov 2023 17:34:39 +0530
Subject: [PATCH 1248/1358] Create vccontext-ida.jsonld

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 vccontext-ida.jsonld | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 vccontext-ida.jsonld

diff --git a/vccontext-ida.jsonld b/vccontext-ida.jsonld
new file mode 100644
index 00000000000..f9169381912
--- /dev/null
+++ b/vccontext-ida.jsonld
@@ -0,0 +1,9 @@
+{
+   "context" : [
+    "https://www.w3.org/2018/credentials/v1",
+    "https://${mosip.api.public.host}/.well-known/mosip-ida-context.json",
+    {
+       "sec": "https://w3id.org/security#"
+    }
+]
+}

From c11beef3e1841f218fd1d36a8e5b4329bdfeb0d5 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Tue, 14 Nov 2023 19:58:04 +0530
Subject: [PATCH 1249/1358] Update esignet-default.properties

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 51 ++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index f95a6b80aaa..1987148ee1b 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -202,25 +202,48 @@ management.health.redis.enabled=false
 # 'simple' cache type is only applicable only for Non-Production setup
 spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
-# Cache size setup is applicable only for 'simple' cache type.
-mosip.esignet.cache.size={'clientdetails' : 200, 'preauth': 200, 'authenticated': 200, 'authcodegenerated': 200, 'userinfo': 200, \
-   'linkcodegenerated' : 500, 'linked': 200 , 'linkedcode': 200, 'linkedauth' : 200 , 'consented' :200, 'authtokens': 2, 'bindingtransaction': 200, 'vcissuance' : 200 }
+
+# Cache size setup is applicable only for 'simple' cache type. 
+# Cache size configuration will not be considered with 'Redis' cache type
+mosip.esignet.cache.size={'clientdetails' : 200, \
+'preauth': 200, \
+'authenticated': 200, \
+'authcodegenerated': 200, \
+'userinfo': 200, \
+'linkcodegenerated' : 500, \
+'linked': 200 , \
+'linkedcode': 200, \
+'linkedauth' : 200 , \
+'consented' :200, \
+'authtokens': 2, \
+'bindingtransaction': 200, \
+'vcissuance' : 200 }
 
 # Cache expire in seconds is applicable for both 'simple' and 'Redis' cache type
-mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, 'preauth': 300,'authenticated': ${mosip.esignet.authentication-expire-in-secs}, 'authcodegenerated': 60, \
-  'userinfo': ${mosip.esignet.access-token-expire-seconds}, 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
-  'linked': 120, 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, 'consented': 60, \
-  'authtokens': 86400, 'bindingtransaction': 600, 'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
+mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
+'preauth': 300,\
+'authenticated': ${mosip.esignet.authentication-expire-in-secs}, \
+'authcodegenerated': 60, \
+'userinfo': ${mosip.esignet.access-token-expire-seconds}, \
+'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
+'linked': 120, \
+'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, \
+'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, \
+'consented': 60, \
+'authtokens': 86400, \
+'bindingtransaction': 600, \
+'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
 
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 
 mosip.esignet.domain.url=https://${mosip.esignet.host}
 mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
+mosip.esignet.jwks-uri=${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
 
 mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' , \
-  \ 'jwks_uri' : '${mosip.esignet.domain.url}${server.servlet.path}/oauth/jwks.json' , \
+  \ 'jwks_uri' : '${mosip.esignet.jwks-uri}' , \
   \ 'token_endpoint_auth_methods_supported' : ${mosip.esignet.supported.client.auth.methods}, \
   \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'},\
   \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
@@ -232,6 +255,7 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' ,\
   \ 'userinfo_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/oidc/userinfo' ,\
+  \ 'jwks_uri' : '${mosip.esignet.jwks-uri}' , \
   \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
   \ 'response_types_supported' : ${mosip.esignet.supported.response.types}, \
   \ 'response_modes_supported' : { 'query' }, \
@@ -247,7 +271,9 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'subject_types_supported' : { 'pairwise' }, \
   \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
   \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
-  \ 'request_parameter_supported' : false }
+  \ 'request_parameter_supported' : false, \
+  \ 'claims_locales_supported' : {'en'}, \
+  \ 'ui_locales_supported' : {'en'} }
 
 ##----------------------------------------- Database properties --------------------------------------------------------
 
@@ -352,10 +378,13 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config} }
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
+# Used to verify audience in the PoP JWT
 mosip.esignet.vci.identifier=${mosip.esignet.domain.url}${server.servlet.path}
 mosip.esignet.vci.authn.filter-urls={ '${server.servlet.path}/vci/credential' }
-mosip.esignet.vci.authn.issuer-uri=${mosip.esignet.domain.url}${server.servlet.path}
-mosip.esignet.vci.authn.jwk-set-uri=${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
+# Change this if the VCI is used with different OAUTH2.0 server
+mosip.esignet.vci.authn.issuer-uri=${mosip.esignet.discovery.issuer-id}
+mosip.esignet.vci.authn.jwk-set-uri=${mosip.esignet.jwks-uri}
+
 mosip.esignet.vci.authn.allowed-audiences={ '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential' }
 
 mosip.esignet.cnonce-expire-seconds=40

From 08532fc625e88f2d069b7baf66cbfcc6fa9a79c4 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Tue, 14 Nov 2023 22:25:09 +0530
Subject: [PATCH 1250/1358] Update esignet-default.properties

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 1987148ee1b..bd51e030b6e 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -238,7 +238,10 @@ mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
 
 mosip.esignet.domain.url=https://${mosip.esignet.host}
 mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
-mosip.esignet.jwks-uri=${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
+
+# This property holds ./wellknown/jwks.json URL, 
+# for local deployments without esignet-ui nginx change the value to ${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
+mosip.esignet.jwks-uri=${mosip.esignet.domain.url}/.well-known/jwks.json
 
 mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \

From 225baf069b752463ee884f7a335606a4276da1a8 Mon Sep 17 00:00:00 2001
From: Anusha Sunkada <sunkadaeanusha@gmail.com>
Date: Wed, 15 Nov 2023 08:49:58 +0530
Subject: [PATCH 1251/1358] Update id-authentication-default.properties

Signed-off-by: Anusha Sunkada <sunkadaeanusha@gmail.com>
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 33a59b28377..f1009e30dce 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -632,7 +632,7 @@ mosip.kernel.keymgr.hsm.health.key.app-id=IDA
 mosip.ida.config.server.file.storage.uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/
 mosip.ida.vercred.context.url.map={"https://www.w3.org/ns/odrl.jsonld" : "odrl.jsonld", "https://www.w3.org/2018/credentials/v1" : "cred-v1.jsonld", "https://${mosip.api.public.host}/.well-known/mosip-ida-context.json" : "mosip-ida-context.json"}
 mosip.ida.vercred.context.uri=vccontext-ida.jsonld
-mosip.ida.vercred.id.url=https://ida.mosip.net/credentials/
+mosip.ida.vercred.id.url=https://${mosip.api.public.host}/credentials/
 mosip.ida.vercred.issuer.url=https://${mosip.api.public.host}/.well-known/ida-controller.json
 mosip.ida.vercred.proof.purpose=assertionMethod
 mosip.ida.vercred.proof.type=RsaSignature2018

From 795886f96b11bd99b64b4994fdcd8d53b34794ae Mon Sep 17 00:00:00 2001
From: bhumi46 <111699703+bhumi46@users.noreply.github.com>
Date: Wed, 29 Nov 2023 14:55:27 +0530
Subject: [PATCH 1252/1358] [DSD-3906]Updated
 mock-identity-system-default.properties

Signed-off-by: bhumi46 <111699703+bhumi46@users.noreply.github.com>
---
 mock-identity-system-default.properties | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
index bd75f144d7d..c0c57a255b7 100644
--- a/mock-identity-system-default.properties
+++ b/mock-identity-system-default.properties
@@ -100,4 +100,8 @@ spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
 spring.jpa.show-sql=false
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-mosip.esignet.mock.authenticator.ida.otp-channels=email,phone
\ No newline at end of file
+mosip.esignet.mock.authenticator.ida.otp-channels=email,phone
+
+mosip.kernel.keymgr.hsm.health.check.enabled=false
+mosip.kernel.keymgr.hsm.health.key.app-id=MOCK_AUTHENTICATION_SERVICE
+mosip.kernel.keymgr.hsm.healthkey.ref-id=HEALTH_KEY

From 914e342c3bad40fc64d8badf0db2ebff0c1a6c2a Mon Sep 17 00:00:00 2001
From: Swati Goel <meet2swati@gmail.com>
Date: Fri, 15 Dec 2023 11:41:26 +0530
Subject: [PATCH 1253/1358] [DSD-3960]: Update mimoto and inji configuration

Signed-off-by: Swati Goel <meet2swati@gmail.com>
---
 inji-default.properties    |  6 ++++++
 mimoto-default.properties  | 25 ++++++++++++++++++++---
 mimoto-issuers-config.json | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 mimoto-issuers-config.json

diff --git a/inji-default.properties b/inji-default.properties
index 953cd3b81a2..b55cb175bf2 100644
--- a/inji-default.properties
+++ b/inji-default.properties
@@ -16,5 +16,11 @@ mosip.inji.audience=ida-binding
 mosip.inji.issuer=residentapp
 # warning screen domain name
 mosip.inji.warningDomainName=https://${mosip.api.public.host}
+# inji documentation url
+mosip.inji.aboutInjiUrl=https://docs.mosip.io/inji
+# minimum storage space required for making audit entry in MB
+mosip.inji.minStorageRequiredForAuditEntry=2
 # minimum storage space required for downloading / receiving vc in MB
 mosip.inji.minStorageRequired=5
+#timeout for vc download api via openid4vci flow in milliseconds
+mosip.inji.openId4VCIDownloadVCTimeout=30000
\ No newline at end of file
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 300b8de2d6d..564acfb0096 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -2,6 +2,7 @@
 
 public.url=${mosip.api.internal.url}/residentmobileapp
 mosip.resident.base.url=${mosip.resident.url}/resident/v1
+mosip.esignet.base.url=${mosip.esignet.host}/v1/esignet
 idp.binding.base.url=https://${mosip.api.public.host}/v1/esignet/binding
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp
@@ -12,6 +13,7 @@ RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
 RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
 RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/individualId/otp
 RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/status
+
 BINDING_OTP=${idp.binding.base.url}/binding-otp
 WALLET_BINDING=${idp.binding.base.url}/wallet-binding
 
@@ -99,10 +101,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara,kan,hin,tam,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=kan,ara,fra,tam,hin
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
@@ -126,7 +128,7 @@ mosip.kernel.tokenid.length=36
 
 # log level
 logging.level.root=WARN
-logging.level.io.mosip=DEBUG
+logging.level.io.mosip=INFO
 # logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
 logging.level.org.springframework.http.client=DEBUG
@@ -183,3 +185,20 @@ wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
 
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 
+
+#mosip notification otp channel config
+mosip.notificationtype=SMS|EMAIL|PHONE
+
+# OpenID
+# Configurations related to openid4vc
+mosip.openid.issuers=mimoto-issuers-config.json
+GET_TOKEN=${public.internet.url}/v1/esignet/login/oauth/token
+mosip.oidc.esignet.token.endpoint=https://${mosip.esignet.base.url}/oauth/v2/token
+mosip.oidc.esignet.aud=https://${mosip.esignet.base.url}/oauth/v2/token
+mosip.oidc.client.id=${mimoto.oidc.partner.clientid}
+mosip.oidc.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
+mosip.oidc.p12.filename=oidckeystore.p12
+mosip.oidc.p12.password=${mimoto.oidc.keystore.password}
+mosip.oidc.p12.alias=mpartner-default-mimotooidc
+#Property to test the mounted p12 file extraction of openid4vci flow.
+mosip.oidc.p12.path=certs/
\ No newline at end of file
diff --git a/mimoto-issuers-config.json b/mimoto-issuers-config.json
new file mode 100644
index 00000000000..ef317989e4d
--- /dev/null
+++ b/mimoto-issuers-config.json
@@ -0,0 +1,41 @@
+{
+  "issuers": [
+    {
+      "credential_issuer": "Mosip",
+      "display": [
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "digits-icon"
+          },
+          "language": "en"
+        }
+      ],
+      "protocol": "OTP"
+    },
+    {
+      "credential_issuer": "ESignet",
+      "display": [
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "esignet-logo"
+          },
+          "language": "en"
+        }
+      ],
+      "protocol": "OpenId4VCI",
+      "client_id": "${mimoto.oidc.partner.clientid}",
+      "scopes_supported": ["mosip_identity_vc_ldp"],
+      "additional_headers": { "Accept": "application/json" },
+      ".well-known": null,
+      "redirect_uri": "io.mosip.residentapp.inji://oauthredirect",
+      "authorization_endpoint": "https://${mosip.esignet.host}/authorize",
+      "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token",
+      "credential_endpoint": "https://${mosip.esignet.host}/v1/esignet/vci/credential",
+      "credential_audience": "https://${mosip.esignet.host}/v1/esignet"
+    }
+  ]
+}
\ No newline at end of file

From 8daf0b59cc4570f79aa1d499eb08e448491ba0bf Mon Sep 17 00:00:00 2001
From: Swati Goel <meet2swati@gmail.com>
Date: Fri, 15 Dec 2023 16:13:51 +0530
Subject: [PATCH 1254/1358] [DSD-3960]: Update mimoto and inji configuration
 (#4957)

Signed-off-by: Swati Goel <meet2swati@gmail.com>
---
 inji-default.properties    |  6 ++++++
 mimoto-default.properties  | 25 ++++++++++++++++++++---
 mimoto-issuers-config.json | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 mimoto-issuers-config.json

diff --git a/inji-default.properties b/inji-default.properties
index 953cd3b81a2..b55cb175bf2 100644
--- a/inji-default.properties
+++ b/inji-default.properties
@@ -16,5 +16,11 @@ mosip.inji.audience=ida-binding
 mosip.inji.issuer=residentapp
 # warning screen domain name
 mosip.inji.warningDomainName=https://${mosip.api.public.host}
+# inji documentation url
+mosip.inji.aboutInjiUrl=https://docs.mosip.io/inji
+# minimum storage space required for making audit entry in MB
+mosip.inji.minStorageRequiredForAuditEntry=2
 # minimum storage space required for downloading / receiving vc in MB
 mosip.inji.minStorageRequired=5
+#timeout for vc download api via openid4vci flow in milliseconds
+mosip.inji.openId4VCIDownloadVCTimeout=30000
\ No newline at end of file
diff --git a/mimoto-default.properties b/mimoto-default.properties
index 300b8de2d6d..564acfb0096 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -2,6 +2,7 @@
 
 public.url=${mosip.api.internal.url}/residentmobileapp
 mosip.resident.base.url=${mosip.resident.url}/resident/v1
+mosip.esignet.base.url=${mosip.esignet.host}/v1/esignet
 idp.binding.base.url=https://${mosip.api.public.host}/v1/esignet/binding
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp
@@ -12,6 +13,7 @@ RESIDENT_AUTH_LOCK=${mosip.resident.base.url}/req/auth-lock
 RESIDENT_AUTH_UNLOCK=${mosip.resident.base.url}/req/auth-unlock
 RESIDENT_INDIVIDUALID_OTP=${mosip.resident.base.url}/individualId/otp
 RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/status
+
 BINDING_OTP=${idp.binding.base.url}/binding-otp
 WALLET_BINDING=${idp.binding.base.url}/wallet-binding
 
@@ -99,10 +101,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,fra
+mosip.supported-languages=eng,ara,kan,hin,tam,fra
 
 mosip.template-language=eng
-mosip.optional-languages=ara,fra
+mosip.optional-languages=kan,ara,fra,tam,hin
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
@@ -126,7 +128,7 @@ mosip.kernel.tokenid.length=36
 
 # log level
 logging.level.root=WARN
-logging.level.io.mosip=DEBUG
+logging.level.io.mosip=INFO
 # logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
 logging.level.org.springframework.http.client=DEBUG
@@ -183,3 +185,20 @@ wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
 
 mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
 mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF] 
+
+#mosip notification otp channel config
+mosip.notificationtype=SMS|EMAIL|PHONE
+
+# OpenID
+# Configurations related to openid4vc
+mosip.openid.issuers=mimoto-issuers-config.json
+GET_TOKEN=${public.internet.url}/v1/esignet/login/oauth/token
+mosip.oidc.esignet.token.endpoint=https://${mosip.esignet.base.url}/oauth/v2/token
+mosip.oidc.esignet.aud=https://${mosip.esignet.base.url}/oauth/v2/token
+mosip.oidc.client.id=${mimoto.oidc.partner.clientid}
+mosip.oidc.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
+mosip.oidc.p12.filename=oidckeystore.p12
+mosip.oidc.p12.password=${mimoto.oidc.keystore.password}
+mosip.oidc.p12.alias=mpartner-default-mimotooidc
+#Property to test the mounted p12 file extraction of openid4vci flow.
+mosip.oidc.p12.path=certs/
\ No newline at end of file
diff --git a/mimoto-issuers-config.json b/mimoto-issuers-config.json
new file mode 100644
index 00000000000..ef317989e4d
--- /dev/null
+++ b/mimoto-issuers-config.json
@@ -0,0 +1,41 @@
+{
+  "issuers": [
+    {
+      "credential_issuer": "Mosip",
+      "display": [
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "digits-icon"
+          },
+          "language": "en"
+        }
+      ],
+      "protocol": "OTP"
+    },
+    {
+      "credential_issuer": "ESignet",
+      "display": [
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "esignet-logo"
+          },
+          "language": "en"
+        }
+      ],
+      "protocol": "OpenId4VCI",
+      "client_id": "${mimoto.oidc.partner.clientid}",
+      "scopes_supported": ["mosip_identity_vc_ldp"],
+      "additional_headers": { "Accept": "application/json" },
+      ".well-known": null,
+      "redirect_uri": "io.mosip.residentapp.inji://oauthredirect",
+      "authorization_endpoint": "https://${mosip.esignet.host}/authorize",
+      "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token",
+      "credential_endpoint": "https://${mosip.esignet.host}/v1/esignet/vci/credential",
+      "credential_audience": "https://${mosip.esignet.host}/v1/esignet"
+    }
+  ]
+}
\ No newline at end of file

From 18b44841fc73a435094b3417c33a0bcba0d755bb Mon Sep 17 00:00:00 2001
From: Aiham Hasan <89243555+aihamh@users.noreply.github.com>
Date: Wed, 3 Jan 2024 20:11:13 +0530
Subject: [PATCH 1255/1358] [MOSIP-29805] Update
 pre-registration-default.properties

Signed-off-by: Aiham Hasan <89243555+aihamh@users.noreply.github.com>
---
 pre-registration-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pre-registration-default.properties b/pre-registration-default.properties
index a19823852ef..347f92e848a 100644
--- a/pre-registration-default.properties
+++ b/pre-registration-default.properties
@@ -373,6 +373,8 @@ preregistration.ui.version=1.2.0
 preregistration.contact.email=contact@dev.mosip.net
 preregistration.contact.phone=9999999999
 
+mosip.preregistration.anonymous-profile-username=admin
+
 # Determines to maintain iternal cycle & make sure value is not null (any value greater than zero)
 mosip.preregistration.auto.logout.ping=30
 

From 7fbf12d77ad73026b7c7fd34e859df37f74558dc Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
Date: Mon, 8 Jan 2024 16:58:59 +0530
Subject: [PATCH 1256/1358] MOSIP-29935 and MOSIP-27210 config changes

Signed-off-by: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
---
 registration-processor-camel-routes-new-default.xml          | 4 ++++
 registration-processor-camel-routes-opencrvs_new-default.xml | 4 ++++
 registration-processor-camel-routes-update-default.xml       | 4 ++++
 registration-processor-default.properties                    | 5 +++++
 4 files changed, 17 insertions(+)

diff --git a/registration-processor-camel-routes-new-default.xml b/registration-processor-camel-routes-new-default.xml
index ef3fe0ba7ee..ac92bf762e8 100644
--- a/registration-processor-camel-routes-new-default.xml
+++ b/registration-processor-camel-routes-new-default.xml
@@ -292,6 +292,10 @@
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
             <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+		 <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://bio-dedupe-bus-in" />
diff --git a/registration-processor-camel-routes-opencrvs_new-default.xml b/registration-processor-camel-routes-opencrvs_new-default.xml
index 8f579740cf4..7eecb7fdad0 100644
--- a/registration-processor-camel-routes-opencrvs_new-default.xml
+++ b/registration-processor-camel-routes-opencrvs_new-default.xml
@@ -152,6 +152,10 @@
             <jsonpath>$.[?(@['isValid'] == false &amp;&amp; @['internalError'] == false)]</jsonpath>
             <to uri="workflow-cmd://complete-as-rejected" />
             <to uri="workflow-cmd://anonymous-profile" />
+         </when>
+		 <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 73544fdc53c..733b5f8c969 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -314,6 +314,10 @@
          <when>
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
             <to uri="eventbus://manual-adjudication-bus-in" />
+         </when>
+		 <when>
+            <jsonpath suppressExceptions="true">$.[?(@['tags']['AGE_GROUP'] == 'INFANT')]</jsonpath>
+            <to uri="eventbus://verification-bus-in" />
          </when>
          <otherwise>
             <to uri="eventbus://bio-dedupe-bus-in" />
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f77940dd4ce..dbcf46e0170 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -395,6 +395,11 @@ mosip.regproc.workflow-manager.action.job.days_of_month=*
 mosip.regproc.workflow-manager.action.job.months=*
 #schedular weeks configuration
 mosip.regproc.workflow-manager.action.job.days_of_week=*
+# The packets which are satisfied below filter will restart from  restart-from-stage 
+# For example BioDedupeStage:SUCCESS is given in filter and stage is SecurezoneNotificationStage then packet which latest transaction status code is SUCCESS and its in  in BioDedupeStage then it will restart processing from SecurezoneNotificationStage. 
+registration.processor.reprocess.restart-from-stage=SecurezoneNotificationStage
+# * means it will consider SUCCESS,REPROCESS,IN_PROGRESS latest transaction status codes, any stage having both * and another status, it will be considered to have all the statuses for that stage
+registration.processor.reprocess.restart-trigger-filter=DemodedupStage:SUCCESS,BioDedupeStage:*,UinGeneratorStage:REPROCESS
 
 
 mosip.regproc.workflow.manager.eventbus.kafka.commit.type=single

From cf6648b471e5700d03ca5a10d81b321a5072a51f Mon Sep 17 00:00:00 2001
From: Monobikash Das <43202165+MonobikashDas@users.noreply.github.com>
Date: Thu, 23 Nov 2023 19:32:04 +0530
Subject: [PATCH 1257/1358] Merge pull request #4811 from
 MonobikashDas/develop1-v3 (#4820) (#4843)

MOSIP-28121 : rename print stage

Co-authored-by: Vishwa <visu.vs1@gmail.com>
Signed-off-by: Monobikash Das <monobikash.das@mindtree.com>
---
 ...tration-processor-credential-partners.json | 30 +++++++++++++++++++
 registration-processor-default.properties     | 29 +++++++++---------
 2 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 registration-processor-credential-partners.json

diff --git a/registration-processor-credential-partners.json b/registration-processor-credential-partners.json
new file mode 100644
index 00000000000..1c74ee4d6c2
--- /dev/null
+++ b/registration-processor-credential-partners.json
@@ -0,0 +1,30 @@
+{
+  "partners": [
+    {
+      "id": "digitalcardPartner",
+      "partnerId": "mpartner-default-digitalcard",
+      "credentialType": "PDFCard",
+      "template": "RPR_UIN_CARD_TEMPLATE",
+      "appIdBasedCredentialIdSuffix": ".pdf",
+      "process": null,
+      "metaInfoFields": null
+    },
+    {
+      "id": "printPartner",
+      "partnerId": "mpartner-default-print",
+      "credentialType": "euin",
+      "template": "RPR_UIN_CARD_TEMPLATE",
+      "appIdBasedCredentialIdSuffix": null,
+      "process": null,
+      "metaInfoFields": null
+    },
+    {
+      "id": "opencrvsPartner",
+	  "partnerId": "opencrvs-partner",
+      "type": "opencrvs",
+      "template": "RPR_UIN_CARD_TEMPLATE",
+      "process": ["OPENCRVS_NEW"],
+      "metaInfoFields": ["opencrvsBRN"]
+    }
+  ]
+}
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index f77940dd4ce..1fde777caf1 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -477,14 +477,15 @@ mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.classname=io.mosip.
 mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.version=0.9
 mosip.biometric.sdk.providers.face.mosip-ref-impl-sdk-client.format.url.mock-1.1=${mosip.biosdk.default.service.url}
 
-## Printing
+## Credential requestor
 mosip.registration.processor.credentialtype=euin
 mosip.registration.processor.encrypt=false
 mosip.registration.processor.credential.request.service.id=mosip.credential.request.generator 
 
-
-# this property is used to define issuers eg partnerid
-mosip.registration.processor.issuer=mpartner-default-print
+mosip.registration.processor.credential.partner-profiles=registration-processor-credential-partners.json
+mosip.registration.processor.credential.default.partner-ids=digitalcardPartner,opencrvsPartner
+mosip.registration.processor.credential.conditional.partner-id-map={'printPartner':'{"14023"} contains postalCode'}
+mosip.registration.processor.credential.conditional.no-match-partner-ids=printPartner
 
 ## Stage common
 #After this time intervel, message should be considered as expired (In seconds), 
@@ -607,7 +608,7 @@ mosip.regproc.quality.classifier.server.servlet.path=/registrationprocessor/v1/q
 # Below quality ranges map should contain proper quality group name and quality range, any overlap of the quality 
 # range will result in a random behaviour of tagging. In range, Lower value is inclusive and Upper value is Exclusive.
 # Example : When the Biometric score is 39.9. this will be included in level-4 which ranges between 30-40. 
-# Example : when the Biometric score is 40. this will be included in level-5 which ranges between 40-50.  
+# Example : when the Biometric score is 40. this will be included in level-5 which ranges between 40-50.
 mosip.regproc.quality.classifier.tagging.quality.ranges={'level-1':'0-10','level-2':'10-20','level-3':'20-30','level-4':'30-40','level-5':'40-50','level-6':'50-60','level-7':'60-70','level-8':'70-80','level-9':'80-90','level-10':'90-101'}
 
 # Quality Tag Prefix
@@ -739,15 +740,15 @@ mosip.regproc.message.sender.server.port=8088
 mosip.regproc.message.sender.eventbus.port=5721
 mosip.regproc.message.sender.server.servlet.path=/registrationprocessor/v1/sender-stage
 
-#printing-stage
-mosip.regproc.printing.eventbus.kafka.commit.type=single
-mosip.regproc.printing.eventbus.kafka.max.poll.records=5
-mosip.regproc.printing.eventbus.kafka.poll.frequency=100
-mosip.regproc.printing.eventbus.kafka.group.id=printing-stage
-mosip.regproc.printing.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
-mosip.regproc.printing.server.port=8097
-mosip.regproc.printing.server.servlet.path=/registrationprocessor/v1/print-stage
-mosip.regproc.printing.eventbus.port=5722
+#credential-requestor-stage
+mosip.regproc.credentialrequestor.eventbus.kafka.commit.type=single
+mosip.regproc.credentialrequestor.eventbus.kafka.max.poll.records=100
+mosip.regproc.credentialrequestor.eventbus.kafka.poll.frequency=100
+mosip.regproc.credentialrequestor.eventbus.kafka.group.id=credential-requestor-stage
+mosip.regproc.credentialrequestor.message.expiry-time-limit=${mosip.regproc.common.stage.message.expiry-time-limit}
+mosip.regproc.credentialrequestor.server.port=8097
+mosip.regproc.credentialrequestor.server.servlet.path=/registrationprocessor/v1/credentialrequestor-stage
+mosip.regproc.credentialrequestor.eventbus.port=5722
 
 #opencrvs-stage
 mosip.regproc.opencrvs.eventbus.kafka.commit.type=single

From 4a27ab5f8eaf013e4768438d521f39af13034cd7 Mon Sep 17 00:00:00 2001
From: "Ritik Jain (IN74108)" <ritik.61074108@ltimindtree.com>
Date: Wed, 17 Jan 2024 11:37:22 +0530
Subject: [PATCH 1258/1358] updated config

Signed-off-by: Ritik Jain (IN74108) <ritik.61074108@ltimindtree.com>
---
 id-repository-default.properties | 13 ++++++++++---
 identity-mapping.json            |  3 +++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 91f7b0ef5d9..f27ae584b64 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -382,7 +382,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
+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-pms-client,mosip-hotlist-client,opencrvs-partner,mpartner-default-digitalcard,mpartner-default-mobile
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
@@ -398,6 +398,7 @@ object.store.s3.readlimit=10000000
 
 # Roles
 mosip.role.idrepo.credentialrequest.postrequestgenerator=CREDENTIAL_REQUEST,ID_REPOSITORY
+mosip.role.idrepo.credentialrequest.postv2requestgeneratorrid=CREDENTIAL_REQUEST,ID_REPOSITORY
 mosip.role.idrepo.credentialrequest.getcancelrequestid=CREDENTIAL_REQUEST,ID_REPOSITORY
 mosip.role.idrepo.credentialrequest.getgetrequestid=CREDENTIAL_REQUEST
 mosip.role.idrepo.credentialrequest.getgetrequestids=CREDENTIAL_REQUEST
@@ -426,5 +427,11 @@ mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.mask.function.identityAttributes=convertToMaskDataFormat
-
-mosip.role.idrepo.credentialrequest.postv2requestgeneratorrid=CREDENTIAL_REQUEST,ID_REPOSITORY
\ No newline at end of file
+mosip.credential.service.fetch-identity.type=bio
+
+mosip.idrepo.credential.request.enable-convention-based-id=false
+mosip.idrepo.credential-request-v2.rest.uri=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/v2/requestgenerator/{rid}
+mosip.idrepo.credential-request-v2.rest.httpMethod=POST
+mosip.idrepo.credential-request-v2.rest.headers.mediaType=application/json
+mosip.idrepo.credential-request-v2.rest.timeout=100
+mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
\ No newline at end of file
diff --git a/identity-mapping.json b/identity-mapping.json
index b45c25a8d46..cac73092025 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -3,6 +3,9 @@
 		"IDSchemaVersion": {
 			"value": "IDSchemaVersion"
 		},
+		"selectedHandles" : {
+			"value" : "selectedHandles"
+		},
 		"name": {
 			"value": "fullName"
 		},

From 3f80ae8e3acce980eddba4bc8912e29d22133e62 Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Thu, 18 Jan 2024 13:43:57 +0530
Subject: [PATCH 1259/1358] added config changes from camdgc-v3

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 amr-acr-mapping.json                 |   2 +
 application-default.properties       |   2 +-
 esignet-default.properties           |  22 ++++-
 id-authentication-default.properties |   1 +
 id-repository-default.properties     |  11 ++-
 identity-mapping.json                |   6 +-
 signup-default.properties.properties | 132 +++++++++++++++++++++++++++
 7 files changed, 170 insertions(+), 6 deletions(-)
 create mode 100644 signup-default.properties.properties

diff --git a/amr-acr-mapping.json b/amr-acr-mapping.json
index e6802646629..367cea85b3c 100644
--- a/amr-acr-mapping.json
+++ b/amr-acr-mapping.json
@@ -1,11 +1,13 @@
 {
   "amr" : {
+    "PWD" : [{"type" : "PWD" }],
     "PIN" :  [{ "type": "PIN" }],
     "OTP" :  [{ "type": "OTP" }],
     "Wallet" :  [{ "type": "WLA" }],
     "L1-bio-device" :  [{ "type": "BIO", "count": 1 }]
   },
   "acr_amr" : {
+    "mosip:idp:acr:password" : ["PWD"],
     "mosip:idp:acr:static-code" : ["PIN"],
     "mosip:idp:acr:generated-code" : ["OTP"],
     "mosip:idp:acr:linked-wallet" : [ "Wallet" ],
diff --git a/application-default.properties b/application-default.properties
index f76c018be24..4a12b37b443 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -47,7 +47,6 @@ mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
 mosip.regproc.biosdk.url=http://biosdk-service.biosdk
-mosip.idrepo.biosdk.url=http://biosdk-service.biosdk
 mosip.consolidator.url=http://websub-consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
@@ -55,6 +54,7 @@ mosip.ida.auth.url=http://ida-auth.ida
 mosip.ida.otp.url=http://ida-otp.ida
 mosip.resident.url=http://resident.resident
 mosip.artifactory.url=http://artifactory.artifactory
+mosip.esignet.service.url=http://esignet.esignet
 kafka.profile=kafka.svc.cluster.local
 kafka.port=9092
 mosip.digitalcard.service.url=http://digitalcard.digitalcard
diff --git a/esignet-default.properties b/esignet-default.properties
index bd51e030b6e..75350c53a98 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -44,8 +44,11 @@ mosip.esignet.authentication-expire-in-secs=120
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
   '${server.servlet.path}/authorization/v2/authenticate', \
+  '${server.servlet.path}/authorization/v3/authenticate', \
   '${server.servlet.path}/authorization/auth-code'}
 
+mosip.esignet.captcha.required.auth-factors={'PWD'}
+
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 
 mosip.esignet.binding.salt-length=16
@@ -243,6 +246,8 @@ mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.pa
 # for local deployments without esignet-ui nginx change the value to ${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
 mosip.esignet.jwks-uri=${mosip.esignet.domain.url}/.well-known/jwks.json
 
+mosip.esignet.token.endpoint=${mosip.esignet.domain.url}${server.servlet.path}/oauth/v2/token
+
 mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
   \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' , \
@@ -370,15 +375,26 @@ mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-
  'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' },{'wallet.name': 'Inji Mobile App1', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
  'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}
 
+mosip.esignet.ui.signup.config={'signup.banner': true, 'signup.url': 'https://${mosip.signup.host}/signup'}
+
+mosip.esignet.ui.forgot-password.config={'forgot-password': true, 'forgot-password.url': 'https://${mosip.signup.host}/reset-password'}
+
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
   'resend.otp.delay.secs': 180, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
-  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : '', \
+  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'otp,pwd', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': 4501-4600, \
-  'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \
-  'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config} }
+  'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \
+  'password.max-length': 20, \
+  'username.regex': '^[1-9][0-9]{7,8}$',\
+  'username.prefix': '+855', \
+  'username.postfix': '@phone', \
+  'username.max-length': 9, \
+  '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 \ }
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
 # Used to verify audience in the PoP JWT
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f1009e30dce..0f558f3627b 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -638,3 +638,4 @@ mosip.ida.vercred.proof.purpose=assertionMethod
 mosip.ida.vercred.proof.type=RsaSignature2018
 mosip.ida.vercred.proof.verificationmethod=https://${mosip.api.public.host}/.well-known/ida-public-key.json
 mosip.ida.vci.supported.cred.types=VerifiableCredential,MOSIPVerifiableCredential
+mosip.ida.handle-types.regex={ '@phone' : '^\\+855[1-9][0-9]{7,9}@phone$' }
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 91f7b0ef5d9..77e8fe21c31 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -427,4 +427,13 @@ mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.mask.function.identityAttributes=convertToMaskDataFormat
 
-mosip.role.idrepo.credentialrequest.postv2requestgeneratorrid=CREDENTIAL_REQUEST,ID_REPOSITORY
\ No newline at end of file
+mosip.role.idrepo.credentialrequest.postv2requestgeneratorrid=CREDENTIAL_REQUEST,ID_REPOSITORY
+
+mosip.idrepo.credential.request.enable-convention-based-id=true
+mosip.idrepo.credential-request-v2.rest.uri=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/v2/requestgenerator/{rid}
+mosip.idrepo.credential-request-v2.rest.httpMethod=POST
+mosip.idrepo.credential-request-v2.rest.headers.mediaType=application/json
+mosip.idrepo.credential-request-v2.rest.timeout=100
+
+mosip.idrepo.identity.disable-uin-based-credential-request=false
+mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
\ No newline at end of file
diff --git a/identity-mapping.json b/identity-mapping.json
index b45c25a8d46..47e3e9e7e6f 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -3,6 +3,9 @@
 		"IDSchemaVersion": {
 			"value": "IDSchemaVersion"
 		},
+		"selectedHandles" : {
+			"value" : "selectedHandles"
+		},
 		"name": {
 			"value": "fullName"
 		},
@@ -129,7 +132,8 @@
 		},
 		"country": {
 			"value": "province"
-		}
+		},
+		"password" : { "value" : "password" }
 	},
 	"metaInfo": {
 		"value": "metaInfo"
diff --git a/signup-default.properties.properties b/signup-default.properties.properties
new file mode 100644
index 00000000000..99d63d080f2
--- /dev/null
+++ b/signup-default.properties.properties
@@ -0,0 +1,132 @@
+#----------------------------------------------------------------------------------------------------------------------------
+
+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=^(?=.*[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.password.min-length=8
+mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]{1,30}$
+
+## Time given to generate and verify the challenge in seconds.
+## Default resend delay is 60 seconds, with 3 attempts, so 60*3=180 seconds.
+## Adding 10 seconds buffer to default 180 seconds = 190 seconds.
+## so 190 seconds is the Generate and verify cookie max age.
+mosip.signup.unauthenticated.txn.timeout=7200
+mosip.signup.challenge.resend-attempt=3
+mosip.signup.challenge.resend-delay=60
+
+## Time given to complete registration and get back the status of the registration in seconds.
+## Considering 5 minutes(300 seconds) to complete registration form and submit.
+## Default status request limit is 10 with 20 seconds request delay, 10*20=200 seconds
+## so 300+200=500 seconds is the authentication cookie max age.
+mosip.signup.register.txn.timeout=7200
+mosip.signup.status-check.txn.timeout=200
+mosip.signup.status.request.delay=20
+mosip.signup.status.request.limit=10
+
+## ------------------------------------- challenge configuration -------------------------------------------------------
+mosip.signup.supported.generate-challenge-type=OTP
+mosip.signup.supported.challenge-format-types={'alpha-numeric', 'base64url-encoded-json'}
+mosip.signup.supported.challenge-types={'OTP', 'KBA'}
+mosip.signup.supported.challenge.otp.length=6
+
+## ------------------------------------- Cache configuration -----------------------------------------------------------
+
+spring.cache.type=simple
+
+#spring.cache.type=redis
+#spring.cache.cache-names=${mosip.esignet.cache.names}
+#spring.redis.host=localhost
+#spring.redis.port=6379
+management.health.redis.enabled=false
+
+mosip.esignet.cache.names=challenge-generated,challenge-verified,status-check,blocked_identifier
+mosip.esignet.cache.size={'challenge-generated': 2000,'challenge-verified': 2000,'status-check': 2000,'blocked_identifier':2000}
+mosip.esignet.cache.expire-in-seconds={'challenge-generated': ${mosip.signup.unauthenticated.txn.timeout},\
+  'challenge-verified': ${mosip.signup.register.txn.timeout},\
+  'status-check': ${mosip.signup.status-check.txn.timeout},\
+  'blocked_identifier': 300 }
+
+## ------------------------------------- Auth adapter ------------------------------------------------------------------
+
+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
+mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+mosip.kernel.auth.adapter.ssl-bypass=true
+mosip.kernel.auth.appid-realm-map={admin:'mosip',crereq:'mosip',creser:'mosip',idrepo:'mosip', signup:'mosip'}
+mosip.kernel.auth.appids.realm.map={admin:'mosip',crereq:'mosip',creser:'mosip',idrepo:'mosip','regproc':'mosip', signup:'mosip'}
+
+mosip.iam.adapter.clientid=mosip-signup-client
+#mosip.iam.adapter.clientsecret=${mosip.signup.client.secret}
+mosip.iam.adapter.clientsecret=LBIZwf0IGrFlkuXi
+mosip.iam.adapter.appid=signup
+mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
+mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.iam.adapter.validate-expiry-check-rate=15
+mosip.iam.adapter.renewal-before-expiry-interval=15
+mosip.iam.adapter.self-token-renewal-enable=true
+
+mosip.service-context=${server.servlet.context-path}
+mosip.service.end-points=/**/*
+mosip.service.exclude.auth.allowed.method=GET,POST
+
+mosip.security.csrf-enable=true
+mosip.security.cors-enable=true
+
+## -------------------------- External endpoints -----------------------------------------------------------------------
+mosip.signup.generate-challenge.endpoint=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+mosip.signup.add-identity.endpoint=${mosip.idrepo.identity.url}/idrepository/v1/identity/
+mosip.signup.generate-hash.endpoint=${mosip.kernel.keymanager.url}/v1/keymanager/generateArgon2Hash
+mosip.signup.get-uin.endpoint=${mosip.kernel.idgenerator.url}/v1/idgenerator/uin
+mosip.signup.send-notification.endpoint=https://api-internal.camdgc-dev.mosip.net/v1/notifier/sms/send
+mosip.signup.add-identity.request.id=mosip.id.create
+mosip.signup.add-identity.request.version=v1
+
+## --------------------------------- captcha validator------------------------------------------------------------------
+mosip.signup.send-challenge.captcha-required=false
+mosip.signup.integration.captcha-validator=GoogleRecaptchaValidatorService
+mosip.signup.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
+mosip.signup.captcha-validator.site-key=${signup.captcha.site.key}
+mosip.signup.captcha-validator.secret=${signup.captcha.secret.key}
+
+## ----------------------------- UI-Config -----------------------------------------------------------------------------
+mosip.signup.ui.config.key-values={\
+'identifier.pattern': '${mosip.signup.identifier.regex}', \
+'identifier.prefix': '${mosip.signup.identifier.prefix}', \
+'captcha.site.key': '${mosip.signup.captcha-validator.site-key}', \
+'otp.length': ${mosip.signup.supported.challenge.otp.length}, \
+'otp.secret': true, \
+'password.pattern': '${mosip.signup.password.pattern}', \
+'password.length.max': ${mosip.signup.password.max-length}, \
+'password.length.min': ${mosip.signup.password.min-length}, \
+'challenge.timeout': ${mosip.signup.challenge.resend-delay}, \
+'resend.attempts': ${mosip.signup.challenge.resend-attempt}, \
+'resend.delay': ${mosip.signup.challenge.resend-delay}, \
+'fullname.pattern': '${mosip.signup.fullname.pattern}', \
+'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', \
+'identifier.allowed.characters': '^[0-9]+', \
+'identifier.length.min': 8, \
+'identifier.length.max': 9, \
+'fullname.allowed.characters': '^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]', \
+'fullname.length.min': 1, \
+'fullname.length.max': 30 \
+}
+## ----------------------------- SMS-message -----------------------------------------------------------------------------
+
+mosip.signup.sms-notification-template.send-otp.khm=???? {challenge} ????????????????????? KhID ?????????
+mosip.signup.sms-notification-template.send-otp.eng=Use {challenge} to verify your KhID account.
+mosip.signup.sms-notification-template.success-registration.khm=??????????????????? KhID ??????????
+mosip.signup.sms-notification-template.success-registration.eng=You successfully registered to KhID account.
+mosip.signup.sms-notification-template.forgot-passsword.khm=\u17a2\u17d2\u1793\u1780\u1794\u17b6\u1793\u1795\u17d2\u179b\u17b6\u179f\u17cb\u1794\u17d2\u178a\u17bc\u179a\u1796\u17b6\u1780\u17d2\u1799\u179f\u1798\u17d2\u1784\u17b6\u178f\u17cb KhID \u178a\u17c4\u1799\u1787\u17c4\u1782\u1787\u17d0\u1799\u17d4
+mosip.signup.sms-notification-template.forgot-passsword.eng=You successfully changed KhID password. 
+
+#------------------------------------------ Others ---------------------------------------------------------------------
+logging.level.io.mosip.signup=DEBUG
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file

From 262522f4a90e13969991c546736e644aa27d6809 Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Thu, 18 Jan 2024 16:15:08 +0530
Subject: [PATCH 1260/1358] added config changes from camdgc-v3

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 application-default.properties       | 16 ++++++++--------
 esignet-default.properties           | 16 ++++++++--------
 id-authentication-default.properties |  6 +++---
 id-repository-default.properties     |  6 +++---
 kernel-default.properties            | 15 ++++++++-------
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 4a12b37b443..9ccc9ecae5d 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -94,9 +94,9 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,ara,fra
-mosip.right_to_left_orientation=ara
-mosip.left_to_right_orientation=eng,fra
+mosip.supported-languages=eng,khm
+mosip.right_to_left_orientation=
+mosip.left_to_right_orientation=eng,khm
 
 ## Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
@@ -216,8 +216,8 @@ mosip.keycloak.issuerUrl=${keycloak.internal.url}/auth/realms/mosip
 ## iam adapter
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.adapter.ssl-bypass=true
-mosip.kernel.auth.appid-realm-map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
-mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip'}
+mosip.kernel.auth.appid-realm-map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip',digitalcard:'mosip',signup:'mosip'}
+mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip',hotlist:'mosip',digitalcard:'mosip',signup:'mosip'}
 
 ## Crypto
 mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
@@ -415,11 +415,11 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.hub.url=${mosip.websub.url}/hub/
 websub.publish.url=${mosip.websub.url}/hub/
 
-mosip.mandatory-languages=eng
+mosip.mandatory-languages=eng,khm
 ## Leave blank if no optional langauges
-mosip.optional-languages=ara,fra
+mosip.optional-languages=
 mosip.min-languages.count=2
-mosip.max-languages.count=3
+mosip.max-languages.count=2
 
 # These are default languages used for sending notifications
 mosip.default.template-languages=eng,ara,fra
diff --git a/esignet-default.properties b/esignet-default.properties
index 75350c53a98..ccc1e10ea38 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -209,7 +209,7 @@ mosip.esignet.cache.key.hash.algorithm=SHA3-256
 # Cache size setup is applicable only for 'simple' cache type. 
 # Cache size configuration will not be considered with 'Redis' cache type
 mosip.esignet.cache.size={'clientdetails' : 200, \
-'preauth': 200, \
+'preauth': 7200, \
 'authenticated': 200, \
 'authcodegenerated': 200, \
 'userinfo': 200, \
@@ -246,11 +246,11 @@ mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.pa
 # for local deployments without esignet-ui nginx change the value to ${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
 mosip.esignet.jwks-uri=${mosip.esignet.domain.url}/.well-known/jwks.json
 
-mosip.esignet.token.endpoint=${mosip.esignet.domain.url}${server.servlet.path}/oauth/v2/token
+mosip.esignet.token.endpoint=${mosip.esignet.token.endpoint}
 
 mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
-  \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
-  \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' , \
+  \ 'authorization_endpoint': '${mosip.esignet.domain.url}/authorize' , \
+  \ 'token_endpoint': '${mosip.esignet.token.endpoint}' , \
   \ 'jwks_uri' : '${mosip.esignet.jwks-uri}' , \
   \ 'token_endpoint_auth_methods_supported' : ${mosip.esignet.supported.client.auth.methods}, \
   \ 'token_endpoint_auth_signing_alg_values_supported' : {'RS256'},\
@@ -260,8 +260,8 @@ mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'response_types_supported' : ${mosip.esignet.supported.response.types}}
 
 mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
-  \ 'authorization_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/authorize' , \
-  \ 'token_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/oauth/token' ,\
+  \ 'authorization_endpoint': '${mosip.esignet.domain.url}/authorize' , \
+  \ 'token_endpoint': '${mosip.esignet.token.endpoint}' ,\
   \ 'userinfo_endpoint' : '${mosip.esignet.domain.url}${server.servlet.path}/oidc/userinfo' ,\
   \ 'jwks_uri' : '${mosip.esignet.jwks-uri}' , \
   \ 'scopes_supported' : ${mosip.esignet.supported.openid.scopes}, \
@@ -382,7 +382,7 @@ mosip.esignet.ui.forgot-password.config={'forgot-password': true, 'forgot-passwo
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
-  'resend.otp.delay.secs': 180, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
+  'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
   'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'otp,pwd', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': 4501-4600, \
@@ -462,4 +462,4 @@ mosip.esignet.vci.key-values={ 'credential_issuer': '${mosip.esignet.domain.url}
 ## -------------------------------------------- Others ----------------------------------------------------------
 
 #logging.level.org.springframework.web.client.RestTemplate=DEBUG
-#logging.level.io.mosip.esignet=DEBUG
+#logging.level.io.mosip.esignet=INFO
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 0f558f3627b..eac8af7d822 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -287,7 +287,7 @@ ida-cache-ttl-in-days=1
 ## To disable cache, set value to NONE, otherwise SIMPLE to enable cache.
 ## Value is based on CacheType enum provided by Spring Boot
 ## spring.cache.type=SIMPLE
-spring.cache.type=NONE
+spring.cache.type=SIMPLE
 
 ## Function configs
 #The modulo value to be calculated for a UIN/VID used to get salt value to be used in UIN/VID hashing
@@ -403,9 +403,9 @@ ida.api.version.kycexchange=1.0
 static.token.enable=true
 
 ## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
-request.idtypes.allowed=VID,UIN
+request.idtypes.allowed=UIN,HANDLE
 ## The ID types to be supported for Internal Authentication/OTP Requests
-request.idtypes.allowed.internalauth=UIN,VID
+request.idtypes.allowed.internalauth=UIN
 
 ## Cryptograpic/Signature verificate related configurations
 mosip.ida.internal.thumbprint-validation-required=false
diff --git a/id-repository-default.properties b/id-repository-default.properties
index 77e8fe21c31..f14b0d51e00 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=${s3.pretext.value:}idrepo
+mosip.idrepo.objectstore.bucket-name=idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
@@ -248,7 +248,7 @@ mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.d
 mosip.credential.service.jdbc.user=credentialuser
 mosip.credential.service.jdbc.password=${db.dbuser.password}
 mosip.credential.service.jdbc.driver=org.postgresql.Driver
-hibernate.hbm2ddl.auto=none
+hibernate.hbm2ddl.auto=update
 spring.jpa.hibernate.ddl-auto=none
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
@@ -269,7 +269,7 @@ mosip.credential.request.crypto-ref-id=credential_request
 
 	## Batch job
 # batch job time intervel in miliseconds
-mosip.credential.request.job.timedelay=15000
+mosip.credential.request.job.timedelay=1
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
 credential.request.type=auth
diff --git a/kernel-default.properties b/kernel-default.properties
index 4151ae11a41..4482e510ef7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -21,6 +21,7 @@
 # mosip.api.internal.url
 
 softhsm.kernel.pin=${softhsm.kernel.security.pin}
+softhsm.kernel.security.pin=${softhsm.security.pin}
 
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
@@ -36,9 +37,9 @@ mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/s
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
-mosip.kernel.sms.enabled=false
-mosip.kernel.sms.country.code=91
-mosip.kernel.sms.number.length=10
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+855
+mosip.kernel.sms.number.length=9
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
@@ -50,8 +51,8 @@ mosip.kernel.sms.gateway=${sms.gateway.provider}
 
 ## --msg91 gateway--
 mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+91
-mosip.kernel.sms.number.length=10
+mosip.kernel.sms.country.code=+855
+mosip.kernel.sms.number.length=9
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
@@ -82,7 +83,7 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.pin}
+mosip.kernel.keymanager.hsm.keystore-pass==${softhsm.kernel.security.pin}
 # Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
 mosip.kernel.client.crypto.use-resident-service-module-key=true
 
@@ -430,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-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mosip-toolkit-client,mosip-toolkit-android-client,mpartner-default-digitalcard	
+auth.server.admin.allowed.audience=mosip-toolkit-client,mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mpartner-default-digitalcard,mosip-signup-client	
 
 
 mosip.iam.adapter.appid=admin

From 1e80afdc0d0876b53592afde5653fddfbe0dd923 Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Thu, 18 Jan 2024 22:12:26 +0530
Subject: [PATCH 1261/1358] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 application-default.properties                       | 12 ++++++------
 esignet-default.properties                           |  2 +-
 id-authentication-default.properties                 |  4 ++--
 id-repository-default.properties                     | 11 +++++++----
 kernel-default.properties                            | 11 ++++-------
 ...roperties.properties => signup-default.properties |  0
 6 files changed, 20 insertions(+), 20 deletions(-)
 rename signup-default.properties.properties => signup-default.properties (100%)

diff --git a/application-default.properties b/application-default.properties
index 9ccc9ecae5d..92d55b06a60 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -94,9 +94,9 @@ mosip.idrepo.identity.bioAttributes=individualBiometrics,parentOrGuardianBiometr
 mosip.country.code=MOR
 
 ## Language supported by platform
-mosip.supported-languages=eng,khm
-mosip.right_to_left_orientation=
-mosip.left_to_right_orientation=eng,khm
+mosip.supported-languages=eng,ara,fra
+mosip.right_to_left_orientation=ara
+mosip.left_to_right_orientation=eng,fra
 
 ## Application IDs
 mosip.prereg.app-id=PRE_REGISTRATION
@@ -415,11 +415,11 @@ server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 websub.hub.url=${mosip.websub.url}/hub/
 websub.publish.url=${mosip.websub.url}/hub/
 
-mosip.mandatory-languages=eng,khm
+mosip.mandatory-languages=eng
 ## Leave blank if no optional langauges
-mosip.optional-languages=
+mosip.optional-languages=ara,fra
 mosip.min-languages.count=2
-mosip.max-languages.count=2
+mosip.max-languages.count=3
 
 # These are default languages used for sending notifications
 mosip.default.template-languages=eng,ara,fra
diff --git a/esignet-default.properties b/esignet-default.properties
index ccc1e10ea38..5cfda92be18 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -209,7 +209,7 @@ mosip.esignet.cache.key.hash.algorithm=SHA3-256
 # Cache size setup is applicable only for 'simple' cache type. 
 # Cache size configuration will not be considered with 'Redis' cache type
 mosip.esignet.cache.size={'clientdetails' : 200, \
-'preauth': 7200, \
+'preauth': 200, \
 'authenticated': 200, \
 'authcodegenerated': 200, \
 'userinfo': 200, \
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index eac8af7d822..719afe2e6b1 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -403,9 +403,9 @@ ida.api.version.kycexchange=1.0
 static.token.enable=true
 
 ## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
-request.idtypes.allowed=UIN,HANDLE
+request.idtypes.allowed=VID,HANDLE
 ## The ID types to be supported for Internal Authentication/OTP Requests
-request.idtypes.allowed.internalauth=UIN
+request.idtypes.allowed.internalauth=VID
 
 ## Cryptograpic/Signature verificate related configurations
 mosip.ida.internal.thumbprint-validation-required=false
diff --git a/id-repository-default.properties b/id-repository-default.properties
index f14b0d51e00..402291e2ca0 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -26,7 +26,7 @@ mosip.idrepo.db.vid.db-name=mosip_idmap
 mosip.idrepo.db.vid.username=idmapuser
 mosip.idrepo.db.vid.password=${db.dbuser.password}
 mosip.idrepo.objectstore.account-name=idrepo
-mosip.idrepo.objectstore.bucket-name=idrepo
+mosip.idrepo.objectstore.bucket-name=${s3.pretext.value:}idrepo
 mosip.idrepo.objectstore.adapter-name=s3Adapter
 
 #IDRepo identity/vid service authentication details
@@ -248,7 +248,7 @@ mosip.credential.service.jdbc.url=jdbc:postgresql://${mosip.credential.service.d
 mosip.credential.service.jdbc.user=credentialuser
 mosip.credential.service.jdbc.password=${db.dbuser.password}
 mosip.credential.service.jdbc.driver=org.postgresql.Driver
-hibernate.hbm2ddl.auto=update
+hibernate.hbm2ddl.auto=none
 spring.jpa.hibernate.ddl-auto=none
 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 hibernate.jdbc.lob.non_contextual_creation=true
@@ -269,7 +269,7 @@ mosip.credential.request.crypto-ref-id=credential_request
 
 	## Batch job
 # batch job time intervel in miliseconds
-mosip.credential.request.job.timedelay=1
+mosip.credential.request.job.timedelay=15000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
 credential.request.type=auth
@@ -434,6 +434,9 @@ mosip.idrepo.credential-request-v2.rest.uri=${mosip.idrepo.credrequest.generator
 mosip.idrepo.credential-request-v2.rest.httpMethod=POST
 mosip.idrepo.credential-request-v2.rest.headers.mediaType=application/json
 mosip.idrepo.credential-request-v2.rest.timeout=100
-
+# It is recommended to not support UIN based authentication (both external & internal)
+# To stop issuing UIN+credential to IDA set flag to true otherwise set the flag to false to issue UIN+credential to IDA.
 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'}
\ No newline at end of file
diff --git a/kernel-default.properties b/kernel-default.properties
index 4482e510ef7..92be6bfbb76 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -37,9 +37,9 @@ mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/s
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
-mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+855
-mosip.kernel.sms.number.length=9
+mosip.kernel.sms.enabled=false
+mosip.kernel.sms.country.code=91
+mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
@@ -50,9 +50,6 @@ mosip.kernel.sms.gateway=${sms.gateway.provider}
 #mosip.kernel.sms.unicode=unicode
 
 ## --msg91 gateway--
-mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+855
-mosip.kernel.sms.number.length=9
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
@@ -431,7 +428,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-client,mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mpartner-default-digitalcard,mosip-signup-client	
+auth.server.admin.allowed.audience=mosip-toolkit-client,mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mpartner-default-digitalcard,mosip-signup-client,mosip-toolkit-android-client
 
 
 mosip.iam.adapter.appid=admin
diff --git a/signup-default.properties.properties b/signup-default.properties
similarity index 100%
rename from signup-default.properties.properties
rename to signup-default.properties

From 1fa72c0e1d13631f681201951f6e1b52e4c868fd Mon Sep 17 00:00:00 2001
From: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com>
Date: Thu, 18 Jan 2024 23:27:54 +0530
Subject: [PATCH 1262/1358] Update signup-default.properties

Signed-off-by: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com>
---
 signup-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/signup-default.properties b/signup-default.properties
index 99d63d080f2..36b36c73429 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -120,13 +120,13 @@ mosip.signup.ui.config.key-values={\
 }
 ## ----------------------------- SMS-message -----------------------------------------------------------------------------
 
-mosip.signup.sms-notification-template.send-otp.khm=???? {challenge} ????????????????????? KhID ?????????
+mosip.signup.sms-notification-template.send-otp.khm=ប្រើ {challenge} ដើម្បីផ្ទៀងផ្ទាត់គណនី KhID របស់អ្នក។
 mosip.signup.sms-notification-template.send-otp.eng=Use {challenge} to verify your KhID account.
-mosip.signup.sms-notification-template.success-registration.khm=??????????????????? KhID ??????????
+mosip.signup.sms-notification-template.success-registration.khm=អ្នកបានចុះឈ្មោះគណនី KhID ដោយជោគជ័យ។
 mosip.signup.sms-notification-template.success-registration.eng=You successfully registered to KhID account.
 mosip.signup.sms-notification-template.forgot-passsword.khm=\u17a2\u17d2\u1793\u1780\u1794\u17b6\u1793\u1795\u17d2\u179b\u17b6\u179f\u17cb\u1794\u17d2\u178a\u17bc\u179a\u1796\u17b6\u1780\u17d2\u1799\u179f\u1798\u17d2\u1784\u17b6\u178f\u17cb KhID \u178a\u17c4\u1799\u1787\u17c4\u1782\u1787\u17d0\u1799\u17d4
 mosip.signup.sms-notification-template.forgot-passsword.eng=You successfully changed KhID password. 
 
 #------------------------------------------ Others ---------------------------------------------------------------------
 logging.level.io.mosip.signup=DEBUG
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file
+logging.level.org.springframework.web.client.RestTemplate=DEBUG

From 7aad76cc080a0c4f616512c0b9796daa32af9a8b Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Fri, 19 Jan 2024 11:25:02 +0530
Subject: [PATCH 1263/1358] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 kernel-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel-default.properties b/kernel-default.properties
index 92be6bfbb76..5fdb08aa272 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -50,6 +50,7 @@ mosip.kernel.sms.gateway=${sms.gateway.provider}
 #mosip.kernel.sms.unicode=unicode
 
 ## --msg91 gateway--
+# Removing duplicate properties
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy

From 5b1a71db5e615d5a4b1f5d3d3902b7ca420857fd Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Fri, 19 Jan 2024 11:28:59 +0530
Subject: [PATCH 1264/1358] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 application-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application-default.properties b/application-default.properties
index 92d55b06a60..8ad849b95da 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -47,6 +47,7 @@ mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
 mosip.regproc.biosdk.url=http://biosdk-service.biosdk
+# Removing duplicate property
 mosip.consolidator.url=http://websub-consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida

From 0eb622b61c06fe41efd915df7072ebc8197d7996 Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Fri, 19 Jan 2024 17:14:49 +0530
Subject: [PATCH 1265/1358] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 application-default.properties | 1 -
 esignet-default.properties     | 2 +-
 kernel-default.properties      | 3 +--
 signup-default.properties      | 6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 8ad849b95da..92d55b06a60 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -47,7 +47,6 @@ mosip.regproc.transaction.service.url=http://regproc-trans.regproc
 mosip.packet.receiver.url=http://regproc-group1.regproc
 mosip.websub.url=http://websub.websub
 mosip.regproc.biosdk.url=http://biosdk-service.biosdk
-# Removing duplicate property
 mosip.consolidator.url=http://websub-consolidator.websub
 mosip.file.server.url=http://mosip-file-server.mosip-file-server
 mosip.ida.internal.url=http://ida-internal.ida
diff --git a/esignet-default.properties b/esignet-default.properties
index 5cfda92be18..bbe162abeae 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -246,7 +246,7 @@ mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.pa
 # for local deployments without esignet-ui nginx change the value to ${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
 mosip.esignet.jwks-uri=${mosip.esignet.domain.url}/.well-known/jwks.json
 
-mosip.esignet.token.endpoint=${mosip.esignet.token.endpoint}
+mosip.esignet.token.endpoint=${mosip.esignet.domain.url}${server.servlet.path}/oauth/v2/token
 
 mosip.esignet.oauth.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'authorization_endpoint': '${mosip.esignet.domain.url}/authorize' , \
diff --git a/kernel-default.properties b/kernel-default.properties
index 5fdb08aa272..2694c8278f1 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -38,7 +38,7 @@ mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/mas
 
 ## SMS notification
 mosip.kernel.sms.enabled=false
-mosip.kernel.sms.country.code=91
+mosip.kernel.sms.country.code=+91
 mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
@@ -50,7 +50,6 @@ mosip.kernel.sms.gateway=${sms.gateway.provider}
 #mosip.kernel.sms.unicode=unicode
 
 ## --msg91 gateway--
-# Removing duplicate properties
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
diff --git a/signup-default.properties b/signup-default.properties
index 36b36c73429..90da95efc44 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -82,7 +82,7 @@ mosip.signup.generate-challenge.endpoint=${mosip.kernel.otpmanager.url}/v1/otpma
 mosip.signup.add-identity.endpoint=${mosip.idrepo.identity.url}/idrepository/v1/identity/
 mosip.signup.generate-hash.endpoint=${mosip.kernel.keymanager.url}/v1/keymanager/generateArgon2Hash
 mosip.signup.get-uin.endpoint=${mosip.kernel.idgenerator.url}/v1/idgenerator/uin
-mosip.signup.send-notification.endpoint=https://api-internal.camdgc-dev.mosip.net/v1/notifier/sms/send
+mosip.signup.send-notification.endpoint=https://${mosip.api.internal.host}/v1/notifier/sms/send
 mosip.signup.add-identity.request.id=mosip.id.create
 mosip.signup.add-identity.request.version=v1
 
@@ -110,7 +110,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://${mosip.esignet.host}/authorize', \
 'identifier.allowed.characters': '^[0-9]+', \
 'identifier.length.min': 8, \
 'identifier.length.max': 9, \
@@ -129,4 +129,4 @@ mosip.signup.sms-notification-template.forgot-passsword.eng=You successfully cha
 
 #------------------------------------------ Others ---------------------------------------------------------------------
 logging.level.io.mosip.signup=DEBUG
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
+logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file

From 37c498993fb0191a86b246cf45e4a7b0c7852af7 Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Fri, 19 Jan 2024 17:22:53 +0530
Subject: [PATCH 1266/1358] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 id-repository-default.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 07edd0e699b..52954195333 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -428,10 +428,6 @@ mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.mask.function.identityAttributes=convertToMaskDataFormat
 
-
-mosip.role.idrepo.credentialrequest.postv2requestgeneratorrid=CREDENTIAL_REQUEST,ID_REPOSITORY
-
-mosip.idrepo.credential.request.enable-convention-based-id=true
 mosip.credential.service.fetch-identity.type=bio
 
 mosip.idrepo.credential.request.enable-convention-based-id=false

From e5e704bc35f68d0e15bb15a906715ea9b70bcc6b Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Mon, 22 Jan 2024 13:27:47 +0530
Subject: [PATCH 1267/1358] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 52954195333..f47f0e99ab4 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -269,7 +269,7 @@ mosip.credential.request.crypto-ref-id=credential_request
 
 	## Batch job
 # batch job time intervel in miliseconds
-mosip.credential.request.job.timedelay=15000
+mosip.credential.request.job.timedelay=3000
 #Reprocessing job timeintervel in miliseconds
 mosip.credential.request.reprocess.job.timedelay=1200000
 credential.request.type=auth

From c964085fd4e9a0bc137d1639b63ac67c97ee340d Mon Sep 17 00:00:00 2001
From: "Ritik Jain (IN74108)" <ritik.61074108@ltimindtree.com>
Date: Mon, 22 Jan 2024 18:24:37 +0530
Subject: [PATCH 1268/1358] added time deviation property

Signed-off-by: Ritik Jain (IN74108) <ritik.61074108@ltimindtree.com>
---
 id-repository-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index f27ae584b64..fce662fe002 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -434,4 +434,5 @@ mosip.idrepo.credential-request-v2.rest.uri=${mosip.idrepo.credrequest.generator
 mosip.idrepo.credential-request-v2.rest.httpMethod=POST
 mosip.idrepo.credential-request-v2.rest.headers.mediaType=application/json
 mosip.idrepo.credential-request-v2.rest.timeout=100
-mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
\ No newline at end of file
+mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
+mosip.idrepo.identity.max-request-time-deviation-seconds=60
\ No newline at end of file

From 834b1b01ba1442b8036c3d0abe163aa811cb8214 Mon Sep 17 00:00:00 2001
From: "Ritik Jain (IN74108)" <ritik.61074108@ltimindtree.com>
Date: Mon, 22 Jan 2024 18:27:38 +0530
Subject: [PATCH 1269/1358] last space

Signed-off-by: Ritik Jain (IN74108) <ritik.61074108@ltimindtree.com>
---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index fce662fe002..29419a59bb5 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -435,4 +435,4 @@ mosip.idrepo.credential-request-v2.rest.httpMethod=POST
 mosip.idrepo.credential-request-v2.rest.headers.mediaType=application/json
 mosip.idrepo.credential-request-v2.rest.timeout=100
 mosip.identity.fieldid.handle-postfix.mapping={'phone':'@phone'}
-mosip.idrepo.identity.max-request-time-deviation-seconds=60
\ No newline at end of file
+mosip.idrepo.identity.max-request-time-deviation-seconds=60

From b25de9f3bca9ee07cc1fc1756004f3b7bf3a5145 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Tue, 23 Jan 2024 11:23:20 +0530
Subject: [PATCH 1270/1358] ES-379

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 id-authentication-default.properties |  7 ++-
 id-repository-default.properties     |  2 +-
 signup-default.properties            | 72 ++++++++++++++++++----------
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 719afe2e6b1..cc35fbe10b2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -403,9 +403,9 @@ ida.api.version.kycexchange=1.0
 static.token.enable=true
 
 ## Allowed ID Types (allowed values : UIN/VID/USERID) to be supported for Authentication/KYC/OTP Requests
-request.idtypes.allowed=VID,HANDLE
+request.idtypes.allowed=UIN,VID,HANDLE
 ## The ID types to be supported for Internal Authentication/OTP Requests
-request.idtypes.allowed.internalauth=VID
+request.idtypes.allowed.internalauth=UIN,VID
 
 ## Cryptograpic/Signature verificate related configurations
 mosip.ida.internal.thumbprint-validation-required=false
@@ -638,4 +638,7 @@ mosip.ida.vercred.proof.purpose=assertionMethod
 mosip.ida.vercred.proof.type=RsaSignature2018
 mosip.ida.vercred.proof.verificationmethod=https://${mosip.api.public.host}/.well-known/ida-public-key.json
 mosip.ida.vci.supported.cred.types=VerifiableCredential,MOSIPVerifiableCredential
+
+# 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' : '^\\+855[1-9][0-9]{7,9}@phone$' }
diff --git a/id-repository-default.properties b/id-repository-default.properties
index f47f0e99ab4..cab8581e880 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -382,7 +382,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-pms-client,mosip-hotlist-client,opencrvs-partner,mpartner-default-digitalcard,mpartner-default-mobile
+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,mosip-signup-client
 #openapi properties to sort tag and operations of id-repository services
 springdoc.swagger-ui.tagsSorter=alpha
 springdoc.swagger-ui.operationsSorter=alpha
diff --git a/signup-default.properties b/signup-default.properties
index 90da95efc44..e673da7756b 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -1,11 +1,14 @@
 #----------------------------------------------------------------------------------------------------------------------------
-
+# challenge.timeout, resend-delay are count as seconds
 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=^(?=.*[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
+mosip.signup.audit.description.max-length=2048
 mosip.signup.password.min-length=8
 mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]{1,30}$
 
@@ -13,7 +16,7 @@ mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u
 ## Default resend delay is 60 seconds, with 3 attempts, so 60*3=180 seconds.
 ## Adding 10 seconds buffer to default 180 seconds = 190 seconds.
 ## so 190 seconds is the Generate and verify cookie max age.
-mosip.signup.unauthenticated.txn.timeout=7200
+mosip.signup.unauthenticated.txn.timeout=190
 mosip.signup.challenge.resend-attempt=3
 mosip.signup.challenge.resend-delay=60
 
@@ -21,12 +24,13 @@ mosip.signup.challenge.resend-delay=60
 ## Considering 5 minutes(300 seconds) to complete registration form and submit.
 ## Default status request limit is 10 with 20 seconds request delay, 10*20=200 seconds
 ## so 300+200=500 seconds is the authentication cookie max age.
-mosip.signup.register.txn.timeout=7200
+mosip.signup.verified.txn.timeout=300
 mosip.signup.status-check.txn.timeout=200
 mosip.signup.status.request.delay=20
 mosip.signup.status.request.limit=10
 
 ## ------------------------------------- challenge configuration -------------------------------------------------------
+
 mosip.signup.supported.generate-challenge-type=OTP
 mosip.signup.supported.challenge-format-types={'alpha-numeric', 'base64url-encoded-json'}
 mosip.signup.supported.challenge-types={'OTP', 'KBA'}
@@ -42,12 +46,19 @@ spring.cache.type=simple
 #spring.redis.port=6379
 management.health.redis.enabled=false
 
-mosip.esignet.cache.names=challenge-generated,challenge-verified,status-check,blocked_identifier
-mosip.esignet.cache.size={'challenge-generated': 2000,'challenge-verified': 2000,'status-check': 2000,'blocked_identifier':2000}
-mosip.esignet.cache.expire-in-seconds={'challenge-generated': ${mosip.signup.unauthenticated.txn.timeout},\
-  'challenge-verified': ${mosip.signup.register.txn.timeout},\
-  'status-check': ${mosip.signup.status-check.txn.timeout},\
-  'blocked_identifier': 300 }
+mosip.esignet.cache.names=challenge_generated,challenge_verified,status_check,blocked_identifier,keystore,key_alias
+mosip.esignet.cache.size={'challenge_generated': 200, \
+  'challenge_verified': 200,\
+  'status_check': 200,\
+  'blocked_identifier':2000,\
+  'keystore' : 5, \
+  'key_alias' : 200 }
+mosip.esignet.cache.expire-in-seconds={'challenge_generated': ${mosip.signup.unauthenticated.txn.timeout},\
+  'challenge_verified': ${mosip.signup.verified.txn.timeout},\
+  'status_check': ${mosip.signup.status-check.txn.timeout}, \
+  'blocked_identifier': ${mosip.signup.generate-challenge.blocked.timeout},\
+  'keystore' : 10, \
+  'key_alias' : ${mosip.signup.verified.txn.timeout} }
 
 ## ------------------------------------- Auth adapter ------------------------------------------------------------------
 
@@ -61,8 +72,7 @@ mosip.kernel.auth.appid-realm-map={admin:'mosip',crereq:'mosip',creser:'mosip',i
 mosip.kernel.auth.appids.realm.map={admin:'mosip',crereq:'mosip',creser:'mosip',idrepo:'mosip','regproc':'mosip', signup:'mosip'}
 
 mosip.iam.adapter.clientid=mosip-signup-client
-#mosip.iam.adapter.clientsecret=${mosip.signup.client.secret}
-mosip.iam.adapter.clientsecret=LBIZwf0IGrFlkuXi
+mosip.iam.adapter.clientsecret=${mosip.signup.client.secret}
 mosip.iam.adapter.appid=signup
 mosip.iam.adapter.issuerURL=${keycloak.external.url}/auth/realms/mosip
 mosip.authmanager.client-token-endpoint=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
@@ -78,13 +88,18 @@ mosip.security.csrf-enable=true
 mosip.security.cors-enable=true
 
 ## -------------------------- External endpoints -----------------------------------------------------------------------
-mosip.signup.generate-challenge.endpoint=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
-mosip.signup.add-identity.endpoint=${mosip.idrepo.identity.url}/idrepository/v1/identity/
-mosip.signup.generate-hash.endpoint=${mosip.kernel.keymanager.url}/v1/keymanager/generateArgon2Hash
-mosip.signup.get-uin.endpoint=${mosip.kernel.idgenerator.url}/v1/idgenerator/uin
-mosip.signup.send-notification.endpoint=https://${mosip.api.internal.host}/v1/notifier/sms/send
+
+mosip.signup.generate-challenge.endpoint=${mosip.api.internal.url}/v1/otpmanager/otp/generate
+mosip.signup.get-identity.endpoint=${mosip.api.internal.url}/idrepository/v1/identity/idvid/%s@phone?type=demo&idType=HANDLE
+mosip.signup.identity.endpoint=${mosip.api.internal.url}/idrepository/v1/identity/
+mosip.signup.generate-hash.endpoint=${mosip.api.internal.url}/v1/keymanager/generateArgon2Hash
+mosip.signup.get-uin.endpoint=${mosip.api.internal.url}/v1/idgenerator/uin
+mosip.signup.send-notification.endpoint=${mosip.api.internal.url}/v1/notifier/sms/send
+mosip.signup.get-registration-status.endpoint=${mosip.api.internal.url}/v1/credentialrequest/get/{applicationId}
+mosip.signup.audit-endpoint=${mosip.api.internal.url}/v1/auditmanager/audits
 mosip.signup.add-identity.request.id=mosip.id.create
-mosip.signup.add-identity.request.version=v1
+mosip.signup.update-identity.request.id=mosip.id.update
+mosip.signup.identity.request.version=v1
 
 ## --------------------------------- captcha validator------------------------------------------------------------------
 mosip.signup.send-challenge.captcha-required=false
@@ -94,12 +109,14 @@ mosip.signup.captcha-validator.site-key=${signup.captcha.site.key}
 mosip.signup.captcha-validator.secret=${signup.captcha.secret.key}
 
 ## ----------------------------- UI-Config -----------------------------------------------------------------------------
+
+# Only after current challenge timeout we should enable resend in the UI.
+# In this case timeout and resend-delay should be same always.
 mosip.signup.ui.config.key-values={\
 'identifier.pattern': '${mosip.signup.identifier.regex}', \
 'identifier.prefix': '${mosip.signup.identifier.prefix}', \
 'captcha.site.key': '${mosip.signup.captcha-validator.site-key}', \
 'otp.length': ${mosip.signup.supported.challenge.otp.length}, \
-'otp.secret': true, \
 'password.pattern': '${mosip.signup.password.pattern}', \
 'password.length.max': ${mosip.signup.password.max-length}, \
 'password.length.min': ${mosip.signup.password.min-length}, \
@@ -116,17 +133,20 @@ mosip.signup.ui.config.key-values={\
 'identifier.length.max': 9, \
 'fullname.allowed.characters': '^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]', \
 'fullname.length.min': 1, \
-'fullname.length.max': 30 \
+'fullname.length.max': 30, \
+'otp.blocked' : ${mosip.signup.generate-challenge.blocked.timeout} \
 }
+
 ## ----------------------------- SMS-message -----------------------------------------------------------------------------
 
-mosip.signup.sms-notification-template.send-otp.khm=ប្រើ {challenge} ដើម្បីផ្ទៀងផ្ទាត់គណនី KhID របស់អ្នក។
+# Default charset encoding ISO-8859-1 does not support khmer language characters, so templates in khm language are base64 encoded.
+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.success-registration.khm=អ្នកបានចុះឈ្មោះគណនី KhID ដោយជោគជ័យ។
-mosip.signup.sms-notification-template.success-registration.eng=You successfully registered to KhID account.
-mosip.signup.sms-notification-template.forgot-passsword.khm=\u17a2\u17d2\u1793\u1780\u1794\u17b6\u1793\u1795\u17d2\u179b\u17b6\u179f\u17cb\u1794\u17d2\u178a\u17bc\u179a\u1796\u17b6\u1780\u17d2\u1799\u179f\u1798\u17d2\u1784\u17b6\u178f\u17cb KhID \u178a\u17c4\u1799\u1787\u17c4\u1782\u1787\u17d0\u1799\u17d4
-mosip.signup.sms-notification-template.forgot-passsword.eng=You successfully changed KhID password. 
+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
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
\ No newline at end of file
+logging.level.io.mosip.signup=INFO
+logging.level.org.springframework.web.client.RestTemplate=INFO
\ No newline at end of file

From f5da80c0dcc4528da57d2c7af7f49efbf540632c Mon Sep 17 00:00:00 2001
From: panharith-0118 <148301211+panharith-0118@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:12:24 +0700
Subject: [PATCH 1271/1358] ES-710 (#5149)

Signed-off-by: pr <panharith-an@mptc.gov.kh>
---
 signup-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/signup-default.properties b/signup-default.properties
index e673da7756b..08afcf053ca 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -144,8 +144,8 @@ mosip.signup.sms-notification-template.send-otp.khm=4Z6U4Z+S4Z6a4Z6+IHtjaGFsbGVu
 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.
+mosip.signup.sms-notification-template.forgot-password.khm=4Z6i4Z+S4Z6T4Z6A4Z6U4Z624Z6T4Z6V4Z+S4Z6b4Z624Z6f4Z+L4Z6U4Z+S4Z6K4Z684Z6a4Z6W4Z624Z6A4Z+S4Z6Z4Z6f4Z6Y4Z+S4Z6E4Z624Z6P4Z+LIEtoSUQg4Z6K4Z+E4Z6Z4Z6H4Z+E4Z6C4Z6H4Z+Q4Z6Z4Z+U
+mosip.signup.sms-notification-template.forgot-password.eng=You successfully changed KhID password.
 
 #------------------------------------------ Others ---------------------------------------------------------------------
 logging.level.io.mosip.signup=INFO

From 2390c543534cb1d55081fc162c67fb4135e6a932 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 24 Jan 2024 18:02:08 +0530
Subject: [PATCH 1272/1358] Update signup-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 signup-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/signup-default.properties b/signup-default.properties
index 08afcf053ca..1aee665709d 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -18,7 +18,7 @@ mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u
 ## so 190 seconds is the Generate and verify cookie max age.
 mosip.signup.unauthenticated.txn.timeout=190
 mosip.signup.challenge.resend-attempt=3
-mosip.signup.challenge.resend-delay=60
+mosip.signup.challenge.resend-delay=${mosip.signup.challenge.timeout}
 
 ## Time given to complete registration and get back the status of the registration in seconds.
 ## Considering 5 minutes(300 seconds) to complete registration form and submit.

From 9981152f04dd33c99b69a1f28be487aff3d1161c Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Thu, 25 Jan 2024 00:49:44 +0530
Subject: [PATCH 1273/1358] Update signup-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 signup-default.properties | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/signup-default.properties b/signup-default.properties
index 1aee665709d..3e91891fbcf 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -37,7 +37,7 @@ mosip.signup.supported.challenge-types={'OTP', 'KBA'}
 mosip.signup.supported.challenge.otp.length=6
 
 ## ------------------------------------- Cache configuration -----------------------------------------------------------
-
+mosip.signup.cache.symmetric-algorithm-name=AES/CFB/PKCS5Padding
 spring.cache.type=simple
 
 #spring.cache.type=redis
@@ -51,14 +51,17 @@ mosip.esignet.cache.size={'challenge_generated': 200, \
   'challenge_verified': 200,\
   'status_check': 200,\
   'blocked_identifier':2000,\
-  'keystore' : 5, \
-  'key_alias' : 200 }
+  'keystore' : 10, \
+  'key_alias' : 2 }
+
+## Note: keystore TTL should be more than the key_alias cache TTL.
+## So that key rotation happens before the actual key is removed from the keystore cache.
 mosip.esignet.cache.expire-in-seconds={'challenge_generated': ${mosip.signup.unauthenticated.txn.timeout},\
   'challenge_verified': ${mosip.signup.verified.txn.timeout},\
   'status_check': ${mosip.signup.status-check.txn.timeout}, \
   'blocked_identifier': ${mosip.signup.generate-challenge.blocked.timeout},\
-  'keystore' : 10, \
-  'key_alias' : ${mosip.signup.verified.txn.timeout} }
+  'keystore' : 600, \
+  'key_alias' : 300 }
 
 ## ------------------------------------- Auth adapter ------------------------------------------------------------------
 

From 6b187dda3961f8f05cdcf99c7d7d0aadb3995014 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 31 Jan 2024 21:07:09 +0530
Subject: [PATCH 1274/1358] Update esignet-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 161 +++++++++++++++++++++++++------------
 1 file changed, 109 insertions(+), 52 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index bbe162abeae..cbb4d895d43 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -398,7 +398,7 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
 # Used to verify audience in the PoP JWT
-mosip.esignet.vci.identifier=${mosip.esignet.domain.url}${server.servlet.path}
+mosip.esignet.vci.identifier=${mosip.esignet.domain.url}
 mosip.esignet.vci.authn.filter-urls={ '${server.servlet.path}/vci/credential' }
 # Change this if the VCI is used with different OAUTH2.0 server
 mosip.esignet.vci.authn.issuer-uri=${mosip.esignet.discovery.issuer-id}
@@ -407,57 +407,114 @@ mosip.esignet.vci.authn.jwk-set-uri=${mosip.esignet.jwks-uri}
 mosip.esignet.vci.authn.allowed-audiences={ '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential' }
 
 mosip.esignet.cnonce-expire-seconds=40
-mosip.esignet.vci.supported.jwt-proof-alg={'RS256'}
-mosip.esignet.vci.key-values={ 'credential_issuer': '${mosip.esignet.domain.url}',         \
-  'credential_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', \
-  'credentials_supported': {{\
-  'format': 'ldp_vc',\
-  'id': 'MockVerifiableCredential', \
-  'scope' : 'mock_identity_vc_ldp',\
-  'cryptographic_binding_methods_supported': {'did:jwk'},\
-  'cryptographic_suites_supported': {'RsaSignature2018'},\
-  'proof_types_supported': {'jwt'},\
-  'credential_definition': {\
-  'type': {'VerifiableCredential'},\
-  'credentialSubject': {\
-  'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \
-  'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\
-   }},\
-  'display': {{'name': 'Mock Verifiable Credential by e-Signet', \
-                'locale': 'en', \
-                'logo': {'url': '${mosip.esignet.domain.url}/logo.png',\
-                'alt_text': 'a square logo of a MOSIP'},\
-                'background_color': '#12107c',\
-                'text_color': '#FFFFFF'}}\
-     \ },{\
-  'format': 'ldp_vc',\
-  'id': 'MOSIPVerifiableCredential', \
-  'scope' : 'mosip_identity_vc_ldp',\
-  'cryptographic_binding_methods_supported': {'did:jwk'},\
-  'cryptographic_suites_supported': {'RsaSignature2018'},\
-  'proof_types_supported': {'jwt'},\
-  'credential_definition': {\
-  'type': {'VerifiableCredential'},\
-  'credentialSubject': {\
-  'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\
-  'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\
-  'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\
-  'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\
-  'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\
-  'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\
-  'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\
-  'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\
-  'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\
-  'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\
-   }},\
-  'display': {{'name': 'MOSIP Identity Verifiable Credential', \
-                'locale': 'en', \
-                'logo': {'url': '${mosip.esignet.domain.url}/logo.png',\
-                'alt_text': 'a square logo of a MOSIP'},\
-                'background_color': '#12107c',\
-                'text_color': '#FFFFFF'}}\
-  \ }},\
-  'display': {{'name': 'MOSIP', 'locale': 'en'}}\
+mosip.esignet.vci.supported.jwt-proof-alg={'RS256','PS256'}
+mosip.esignet.vci.key-values={\
+  'v11' : { \
+              'credential_issuer': '${mosip.esignet.vci.identifier}', 	\
+              'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/vci/credential', \
+              'credentials_supported': {\
+                    {\
+                      'format': 'ldp_vc',\
+                      'id': 'MockVerifiableCredential_ldp', \
+                      'scope' : 'mock_identity_vc_ldp',\
+                      'cryptographic_binding_methods_supported': {'did:jwk'},\
+                      'cryptographic_suites_supported': {'RsaSignature2018'},\
+                      'proof_types_supported': {'jwt'},\
+                      'credential_definition': {\
+                        'type': {'VerifiableCredential','MockVerifiableCredential'},\
+                        'credentialSubject': {\
+                          'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \
+                          'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\
+                         }\
+                        },\
+                        'display': {{'name': 'Mock Verifiable Credential by e-Signet', \
+                                    'locale': 'en', \
+                                    'logo': {'url': '${mosipbox.public.url}/logo.png', 'alt_text': 'a square logo of a MOSIP'},\
+                                    'background_color': '#12107c',\
+                                    'text_color': '#FFFFFF'}}\
+                      },\
+                      {\
+                          'format': 'ldp_vc',\
+                          'id': 'MOSIPVerifiableCredential', \
+                          'scope' : 'mosip_identity_vc_ldp',\
+                          'cryptographic_binding_methods_supported': {'did:jwk'},\
+                          'cryptographic_suites_supported': {'RsaSignature2018'},\
+                          'proof_types_supported': {'jwt'},\
+                          'credential_definition': {\
+                              'type': {'VerifiableCredential','MOSIPVerifiableCredential'},\
+                              'credentialSubject': {\
+                                  'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\
+                                  'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\
+                                  'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\
+                                  'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\
+                                  'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\
+                                  'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\
+                                  'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\
+                                  'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\
+                                  'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\
+                                  'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\
+                               }\
+                          },\
+                          'display': {{'name': 'MOSIP Verifiable Credential by e-Signet', \
+                                  'locale': 'en', \
+                                  'logo': {'url': '${mosipbox.public.url}/logo.png','alt_text': 'a square logo of a MOSIP'},\
+                                  'background_color': '#12107c',\
+                                  'text_color': '#FFFFFF'}}\
+                      }\
+              }\
+          },\
+   'latest' : {\
+              'credential_issuer': '${mosip.esignet.vci.identifier}', 	\
+              'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/vci/credential', \
+              'display': {{'name': 'e-Signet', 'locale': 'en'}},\
+              'credentials_supported' : { \
+                 "MockVerifiableCredential_ldp" : {\
+                    'format': 'ldp_vc',\
+                    'scope' : 'mock_identity_vc_ldp',\
+                    'cryptographic_binding_methods_supported': {'did:jwk'},\
+                    'cryptographic_suites_supported': {'RsaSignature2018'},\
+                    'proof_types_supported': {'jwt'},\
+                    'credential_definition': {\
+                    'type': {'VerifiableCredential','MockVerifiableCredential'},\
+                    'credentialSubject': {\
+                    'name': { 'display': {{'name': 'Given Name', 'locale': 'en' }}}, \
+                    'age': { 'display': {{ 'name': 'Age', 'locale': 'en'}}}\
+                     }},\
+                    'display': {{'name': 'Mock Verifiable Credential by e-Signet', \
+                                  'locale': 'en', \
+                                  'logo': {'url': '${mosipbox.public.url}/logo.png',\
+                                  'alt_text': 'a square logo of a MOSIP'},\
+                                  'background_color': '#12107c',\
+                                  'text_color': '#FFFFFF'}}\
+                 }, \
+                'MOSIPVerifiableCredential_ldp' : {\
+                    'format': 'ldp_vc',\
+                    'scope' : 'mosip_identity_vc_ldp',\
+                    'cryptographic_binding_methods_supported': {'did:jwk'},\
+                    'cryptographic_suites_supported': {'RsaSignature2018'},\
+                    'proof_types_supported': {'jwt'},\
+                    'credential_definition': {\
+                    'type': {'VerifiableCredential','MOSIPVerifiableCredential'},\
+                    'credentialSubject': {\
+                      'fullName': { 'display': {{'name': 'Full Name', 'locale': 'en' }}},\
+                      'phone': { 'display': {{'name': 'Phone Number', 'locale': 'en' }}},\
+                      'dateOfBirth': { 'display': {{'name': 'DOB', 'locale': 'en' }}},\
+                      'gender': { 'display': {{'name': 'Gender', 'locale': 'en' }}},\
+                      'residenceStatus': { 'display': {{'name': 'Residence Status', 'locale': 'en' }}},\
+                      'email': { 'display': {{'name': 'Email Id', 'locale': 'en' }}},\
+                      'region': { 'display': {{'name': 'Region', 'locale': 'en' }}},\
+                      'province': { 'display': {{'name': 'Province', 'locale': 'en' }}},\
+                      'city': { 'display': {{'name': 'City', 'locale': 'en' }}},\
+                      'postalCode': { 'display': {{'name': 'Postal Code', 'locale': 'en' }}}\
+                     }},\
+                    'display': {{'name': 'MOSIP Verifiable Credential by e-Signet', \
+                                  'locale': 'en', \
+                                  'logo': {'url': '${mosipbox.public.url}/logo.png','alt_text': 'a square logo of a MOSIP'},\
+                                  'background_color': '#12107c',\
+                                  'text_color': '#FFFFFF'}}\
+                 }\
+              }\
+        }\
   }
 ## -------------------------------------------- Others ----------------------------------------------------------
 

From 35a8c3dc42a46fcb026aa26f350491f68dcbadb9 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 31 Jan 2024 21:15:46 +0530
Subject: [PATCH 1275/1358] Update signup-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 signup-default.properties | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/signup-default.properties b/signup-default.properties
index 3e91891fbcf..f70dfafe6d0 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -14,9 +14,10 @@ mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u
 
 ## Time given to generate and verify the challenge in seconds.
 ## Default resend delay is 60 seconds, with 3 attempts, so 60*3=180 seconds.
-## Adding 10 seconds buffer to default 180 seconds = 190 seconds.
-## so 190 seconds is the Generate and verify cookie max age.
-mosip.signup.unauthenticated.txn.timeout=190
+## Adding 60 seconds for the default generate challenge 180+60=240
+## Adding 10 seconds buffer to default 240 seconds = 250 seconds.
+## so 250 seconds is the Generate and verify cookie max age.
+mosip.signup.unauthenticated.txn.timeout=250
 mosip.signup.challenge.resend-attempt=3
 mosip.signup.challenge.resend-delay=${mosip.signup.challenge.timeout}
 
@@ -105,7 +106,7 @@ mosip.signup.update-identity.request.id=mosip.id.update
 mosip.signup.identity.request.version=v1
 
 ## --------------------------------- captcha validator------------------------------------------------------------------
-mosip.signup.send-challenge.captcha-required=false
+mosip.signup.send-challenge.captcha-required=true
 mosip.signup.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.signup.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.signup.captcha-validator.site-key=${signup.captcha.site.key}
@@ -152,4 +153,4 @@ mosip.signup.sms-notification-template.forgot-password.eng=You successfully chan
 
 #------------------------------------------ Others ---------------------------------------------------------------------
 logging.level.io.mosip.signup=INFO
-logging.level.org.springframework.web.client.RestTemplate=INFO
\ No newline at end of file
+logging.level.org.springframework.web.client.RestTemplate=INFO

From 392a692221f80bb0ebdf312c42368b74909239ba Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 31 Jan 2024 21:18:17 +0530
Subject: [PATCH 1276/1358] Update esignet-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index cbb4d895d43..01aaeadb7d3 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -101,7 +101,7 @@ mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
 # captcha validator
-mosip.esignet.send-otp.captcha-required=false
+mosip.esignet.send-otp.captcha-required=true
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}

From f9f8e26af077e1b480160b46cfc9c34ca68d6cfc Mon Sep 17 00:00:00 2001
From: Chandra Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 2 Feb 2024 11:40:21 +0530
Subject: [PATCH 1277/1358] [MOSIP-29994] Update
 packet-manager-default.properties

Signed-off-by: Chandra Keshav Mishra <chandrakeshavmishra@gmail.com>
---
 packet-manager-default.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index ff436cc381e..2f768edaa36 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -32,6 +32,12 @@ object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
+
+##------------------------------------------------------Redis cache properties----------------------------------------------------
+redis.cache.hostname=10.20.20.90
+redis.cache.port=6379
+# Time to live for 2hrs
+spring.cache.redis.time-to-live=7200000
 # IAM adapter
 mosip.iam.adapter.appid=regproc
 mosip.iam.adapter.clientid=mosip-regproc-client

From 1ac9020e7261a212a32b7a33d80c8d2dadf34fda Mon Sep 17 00:00:00 2001
From: Chandra Keshav Mishra <chandrakeshavmishra@gmail.com>
Date: Fri, 2 Feb 2024 11:59:24 +0530
Subject: [PATCH 1278/1358] [MOSIP-31323] Update
 packet-manager-default.properties

Signed-off-by: Chandra Keshav Mishra <chandrakeshavmishra@gmail.com>
---
 packet-manager-default.properties | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packet-manager-default.properties b/packet-manager-default.properties
index 2f768edaa36..7458c536072 100644
--- a/packet-manager-default.properties
+++ b/packet-manager-default.properties
@@ -32,14 +32,15 @@ object.store.s3.url=http://minio.minio:9000
 object.store.s3.region=${s3.region}
 object.store.s3.readlimit=10000000
 
+# IAM adapter
+mosip.iam.adapter.appid=regproc
+mosip.iam.adapter.clientid=mosip-regproc-client
+mosip.iam.adapter.clientsecret=${mosip.regproc.client.secret}
+mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip
 
 ##------------------------------------------------------Redis cache properties----------------------------------------------------
+## The following properties will be used only when the redis cache provider  jar is available in the loader path of packetmanager service.
 redis.cache.hostname=10.20.20.90
 redis.cache.port=6379
 # Time to live for 2hrs
 spring.cache.redis.time-to-live=7200000
-# IAM adapter
-mosip.iam.adapter.appid=regproc
-mosip.iam.adapter.clientid=mosip-regproc-client
-mosip.iam.adapter.clientsecret=${mosip.regproc.client.secret}
-mosip.iam.adapter.issuerURL=${keycloak.internal.url}/auth/realms/mosip

From 7230f2925e200969ba103ec5c205b9738d30bcb1 Mon Sep 17 00:00:00 2001
From: "Ritik Jain (IN74108)" <ritik.61074108@ltimindtree.com>
Date: Fri, 2 Feb 2024 12:50:36 +0530
Subject: [PATCH 1279/1358] added otp to the list

Signed-off-by: Ritik Jain (IN74108) <ritik.61074108@ltimindtree.com>
---
 application-default.properties | 3 +++
 resident-default.properties    | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 92d55b06a60..0c2b60dbd4b 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -446,5 +446,8 @@ mosip.digitalcard.uincard.password=fullName|dateOfBirth
 mosip.digitalcard.pdf.password.enable.flag=true
 mosip.access_token.subject.claim-name=sub
 
+# Comma separated values of allowed auth types
+auth.types.allowed=otp-email,otp-phone,demo,bio-FINGER,bio-IRIS,bio-FACE,otp
+
 # It is used as a suffix for creating credential request ID using the RID.
 mosip.registration.processor.rid.delimiter=-PDF
diff --git a/resident-default.properties b/resident-default.properties
index 91faa70cd34..5dbd3ef4e01 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -191,7 +191,6 @@ IDREPO_IDENTITY_UPDATE_COUNT=${mosip.idrepo.identity.url}/idrepository/v1/identi
 
 ## Config data
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
-auth.types.allowed=otp-email,otp-phone,demo,bio-FINGER,bio-IRIS,bio-FACE
 
 resident.identityjson=identity-mapping.json
 mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$

From 374d31c10b47620418d23febd1783d6fa0b155c8 Mon Sep 17 00:00:00 2001
From: "Ritik Jain (IN74108)" <ritik.61074108@ltimindtree.com>
Date: Fri, 2 Feb 2024 13:47:35 +0530
Subject: [PATCH 1280/1358] added otp to the list

Signed-off-by: Ritik Jain (IN74108) <ritik.61074108@ltimindtree.com>
---
 application-default.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application-default.properties b/application-default.properties
index 0c2b60dbd4b..0aa14a4d1d1 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -444,10 +444,11 @@ mosip.auth.filter_disable=false
 # PDF Digital card is protected with password using below property based on define attribute it will encrypt by taking first 4 character.
 mosip.digitalcard.uincard.password=fullName|dateOfBirth
 mosip.digitalcard.pdf.password.enable.flag=true
-mosip.access_token.subject.claim-name=sub
 
 # Comma separated values of allowed auth types
 auth.types.allowed=otp-email,otp-phone,demo,bio-FINGER,bio-IRIS,bio-FACE,otp
 
+mosip.access_token.subject.claim-name=sub
+
 # It is used as a suffix for creating credential request ID using the RID.
 mosip.registration.processor.rid.delimiter=-PDF

From 6539b1b325471ac55dd1321d46ee29e21fe70f12 Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Tue, 6 Feb 2024 12:16:37 +0530
Subject: [PATCH 1281/1358] [Mosip-30417] [Mosip_30241] adding properties

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 1e63d2b6bb1..7848164e592 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -642,6 +642,7 @@ mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage
 mosip.regproc.demo.dedupe.server.port=8091
 mosip.regproc.demo.dedupe.eventbus.port=5717
 mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedupe
+mosip.regproc.demo.dedupe.trim-whitespaces.simpleType-value:false
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
@@ -989,6 +990,8 @@ landing.zone.account.name=landing-zone
 landing.zone.type=DMZServer
 mosip.regproc.landing.zone.fixed.delay.millisecs=86400000
 mosip.regproc.landing.zone.inital.delay.millisecs=300000
+mosip.regproc.landing.zone.account.name=landing-zone
+mosip.regproc.landing.zone.type=DMZServer
 
 registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30

From d11076b5a036e609fb23a0e2345ece6909217d5f Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Tue, 6 Feb 2024 13:16:57 +0530
Subject: [PATCH 1282/1358] [Mosip-30417] [Mosip_30241] adding properties

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 7848164e592..9c0b1fb2659 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -986,13 +986,14 @@ mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RE
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
-landing.zone.account.name=landing-zone
-landing.zone.type=DMZServer
+mosip.regproc.landing.zone.account.name=landing-zone
+mosip.regproc.landing.zone.type=DMZServer
 mosip.regproc.landing.zone.fixed.delay.millisecs=86400000
 mosip.regproc.landing.zone.inital.delay.millisecs=300000
 mosip.regproc.landing.zone.account.name=landing-zone
 mosip.regproc.landing.zone.type=DMZServer
 
+
 registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
 ##Ability to update contact information as part of LOST UIN

From 2e98cf18243545e032d251a67d1a1b95f0ae6677 Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Tue, 6 Feb 2024 13:23:11 +0530
Subject: [PATCH 1283/1358] [Mosip-30417] [Mosip_30241] adding properties

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-default.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 9c0b1fb2659..b195e026882 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -990,8 +990,6 @@ mosip.regproc.landing.zone.account.name=landing-zone
 mosip.regproc.landing.zone.type=DMZServer
 mosip.regproc.landing.zone.fixed.delay.millisecs=86400000
 mosip.regproc.landing.zone.inital.delay.millisecs=300000
-mosip.regproc.landing.zone.account.name=landing-zone
-mosip.regproc.landing.zone.type=DMZServer
 
 
 registration.processor.lostrid.max.registrationid=5

From e34046350477ec74c6bf4c379e1411ddad9c2f63 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
Date: Tue, 6 Feb 2024 14:29:04 +0530
Subject: [PATCH 1284/1358]  MOSIP-28427 config fix

Signed-off-by: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
---
 mock-abis-default.properties | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/mock-abis-default.properties b/mock-abis-default.properties
index c0eb32d2b49..d261ac1bbe9 100644
--- a/mock-abis-default.properties
+++ b/mock-abis-default.properties
@@ -8,8 +8,14 @@ management.endpoint.health.show-details=always
 management.endpoits.web.exposure.include=info,health,refresh
 server.port=8081
 abis.return.duplicate=false
-secret_url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
-secret_url.clientnId=mosip-regproc-client
-secret_url.id=string
-secret_url.secretKey=${mosip.regproc.client.secret}
-secret_url.appId=regproc
+#iam adapter
+auth.server.admin.issuer.uri=${keycloak.external.url}/auth/realms/
+mosip.iam.adapter.appid=regproc
+mosip.iam.adapter.clientid=mosip-regproc-client
+mosip.iam.adapter.clientsecret=${mosip.regproc.client.secret}
+mosip.kernel.auth.adapter.ssl-bypass=true
+mosip.kernel.auth.appid-realm-map={regproc:'mosip'}
+mosip.kernel.auth.appids.realm.map={regproc:'mosip'}
+#iam adapter disable local end points
+mosip.service.end-points=/**/*
+mosip.service.exclude.auth.allowed.method=GET,POST,DELETE

From 56e29a5a334f2a1b6450fb8563a4c714b809afca Mon Sep 17 00:00:00 2001
From: Himaja Dhanyamraju
 <43470317+HimajaDhanyamraju2@users.noreply.github.com>
Date: Tue, 6 Feb 2024 19:26:56 +0530
Subject: [PATCH 1285/1358] MOSIP-24522: Added secret key configs

Signed-off-by: Himaja Dhanyamraju <43470317+HimajaDhanyamraju2@users.noreply.github.com>
---
 websub-service.toml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/websub-service.toml b/websub-service.toml
index 59728e25aa1..6e6d105ed72 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -87,6 +87,13 @@ CONSOLIDATOR_BASE_URL = "${mosip.consolidator.url}"
 # consolidator health endpoint
 CONSOLIDATOR_HEALTH_ENDPOINT = "/consolidator/actuator/health"
 
+#Encryption key that will be used to encrypt / decrypt the hub secret
+HUB_SECRET_ENCRYPTION_KEY = "${hub.secret.encryption.key}"
+
+# Below config will allow base64-encoded-bytes / alpha-numeric.
+# Recommended to use base64-encoded-bytes since alpha-numeric is considered less secure. This is just given to ensure the backward compatiblity
+HUB_SECRET_ENCRYPTION_KEY_FORMAT = "alpha-numeric"
+
 [ballerina.http.accessLogConfig]
 # Enable printing access logs in console
 console = true              # Default is false

From f672c0e48904d72a63b3202c4ee0f1ebcaf5137f Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Wed, 7 Feb 2024 00:36:09 +0530
Subject: [PATCH 1286/1358] [Mosip-30417] [Mosip_30241] adding properties

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-default.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index b195e026882..c322f321ecd 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -642,7 +642,7 @@ mosip.regproc.demo.dedupe.message.expiry-time-limit=${mosip.regproc.common.stage
 mosip.regproc.demo.dedupe.server.port=8091
 mosip.regproc.demo.dedupe.eventbus.port=5717
 mosip.regproc.demo.dedupe.server.servlet.path=/registrationprocessor/v1/demodedupe
-mosip.regproc.demo.dedupe.trim-whitespaces.simpleType-value:false
+mosip.regproc.demo.dedupe.trim-whitespaces.simpleType-value=false
 
 #abis-handler-stage
 mosip.regproc.abis.handler.eventbus.kafka.commit.type=single
@@ -986,12 +986,13 @@ mosip.role.registration.getPostsync=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RE
 mosip.role.registration.getPostsyncv2=REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,RESIDENT
 auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip-resident-client,mosip-reg-client
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
+#updated properties name with the prefix (mosip.regproc)
 mosip.regproc.landing.zone.account.name=landing-zone
 mosip.regproc.landing.zone.type=DMZServer
+
 mosip.regproc.landing.zone.fixed.delay.millisecs=86400000
 mosip.regproc.landing.zone.inital.delay.millisecs=300000
 
-
 registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
 ##Ability to update contact information as part of LOST UIN

From 5fc9437c1a488b94a8da3e3f12b849e2a7f76d64 Mon Sep 17 00:00:00 2001
From: Himaja Dhanyamraju
 <43470317+HimajaDhanyamraju2@users.noreply.github.com>
Date: Wed, 7 Feb 2024 13:17:32 +0530
Subject: [PATCH 1287/1358] MOSIP-31499: Changed
 KAFKA_CONSUMER_MAX_POLL_RECORDS value

Signed-off-by: Himaja Dhanyamraju <43470317+HimajaDhanyamraju2@users.noreply.github.com>
---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 6e6d105ed72..9d3466fa5f8 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -70,7 +70,7 @@ INTENT_VERIFICATION_BACKOFF_FACTOR = 2.0
 INTENT_VERIFICATION_MAX_INTERVAL = 20.0
 
 # The maximum retry count
-KAFKA_CONSUMER_MAX_POLL_RECORDS = 50
+KAFKA_CONSUMER_MAX_POLL_RECORDS = 3
 
 # The maximum retry count
 KAFKA_CONSUMER_FETCH_MAX_BYTES = 3145728

From 7cdf2bf2aa6afb3becb526be69fe673b1f295205 Mon Sep 17 00:00:00 2001
From: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
Date: Wed, 7 Feb 2024 18:53:53 +0530
Subject: [PATCH 1288/1358] MOSIP-25179: Added placeholder for sms-authkey

Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
---
 kernel-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 2694c8278f1..bbd1f32f697 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -54,7 +54,7 @@ mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
 mosip.kernel.sms.route=mock
-mosip.kernel.sms.authkey=dummy
+mosip.kernel.sms.authkey=${sms.authkey}
 
 ## Email notification
 mosip.kernel.notification.email.from=do-not-reply@mosip.io

From 4be5a2eb04620e410ba91f5f1523219f09147464 Mon Sep 17 00:00:00 2001
From: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
Date: Wed, 7 Feb 2024 18:54:17 +0530
Subject: [PATCH 1289/1358] MOSIP-27529: Added version-mappings config

Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
---
 registration-default.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/registration-default.properties b/registration-default.properties
index 1eb975382f9..78e6990af1a 100644
--- a/registration-default.properties
+++ b/registration-default.properties
@@ -473,6 +473,9 @@ mosip.kernel.virus-scanner.port=${mosip.kernel.virus-scanner.port}
 mosip.kernel.otp.expiry-time=${mosip.kernel.otp.expiry-time}
 ## end of global properties
 
+# Support Reg.Client upgrade
+mosip.registration.verion.upgrade.version-mappings={ "1.1.4":{ "dbVersion":"1.1.4", "releaseOrder":1}, "1.1.5":{ "dbVersion":"1.1.5", "releaseOrder":2}, "1.1.5.5":{ "dbVersion":"1.1.5.5", "releaseOrder":3}, "1.2.0.1-SNAPSHOT":{ "dbVersion":"1.2.0.1", "releaseOrder":4} }
+
 ## backward compatibility fields	
 mosip.registration.uin.update.configured.fields=test	
 mosip.primary-language=eng

From de11e5b3a39e9a414ad2b6894ea9ec9a0fce0f6a Mon Sep 17 00:00:00 2001
From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:10:53 +0530
Subject: [PATCH 1290/1358] Added required config changes for
 partner-management, data-share, kernel & identity mapping

Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
---
 data-share-policy-schema.json         |   3 +
 identity-mapping.json                 |  14 +-
 kernel-default.properties             | 308 ++++++++++++++------------
 partner-management-default.properties |  36 +--
 4 files changed, 195 insertions(+), 166 deletions(-)

diff --git a/data-share-policy-schema.json b/data-share-policy-schema.json
index c566502991b..c5a0e362c56 100644
--- a/data-share-policy-schema.json
+++ b/data-share-policy-schema.json
@@ -24,6 +24,9 @@
         },
         "source": {
           "type": "string"
+        },
+        "protocol": {
+          "type": "string"
         }
       },
       "required": [
diff --git a/identity-mapping.json b/identity-mapping.json
index 47e3e9e7e6f..322a1b0110e 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -118,6 +118,9 @@
 		"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"
 		},
@@ -133,7 +136,9 @@
 		"country": {
 			"value": "province"
 		},
-		"password" : { "value" : "password" }
+		"password": {
+			"value": "password"
+		}
 	},
 	"metaInfo": {
 		"value": "metaInfo"
@@ -159,9 +164,8 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 2,
-		"gender": 1,
-		"dob": 1,
-		"age": 1
+		"fullName": 3,
+		"gender": 2,
+		"dateOfBirth": 2
 	}
 }
diff --git a/kernel-default.properties b/kernel-default.properties
index 2694c8278f1..6e3802ec306 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -12,17 +12,17 @@
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
 # softhsm.kernel.security.pin
-# softhsm.ida.security.pin
+# softhsm-security-pin
 # email.smtp.host
+# email.smtp.port
 # email.smtp.username
 # email.smtp.secret
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # mosip.api.internal.url
 
-softhsm.kernel.pin=${softhsm.kernel.security.pin}
 softhsm.kernel.security.pin=${softhsm.security.pin}
-
+mosip.kernel.partner.issuer.certificate.allowed.grace.duration=60
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
@@ -37,26 +37,30 @@ mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/s
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
-mosip.kernel.sms.enabled=false
-mosip.kernel.sms.country.code=+91
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+855
+mosip.kernel.sms.number.min.length=8
+mosip.kernel.sms.number.max.length=10
 mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
-#mosip.kernel.sms.api=smsapi
-#mosip.kernel.sms.authkey=authkey
-#mosip.kernel.sms.route=route
-#mosip.kernel.sms.sender=sender
-#mosip.kernel.sms.unicode=unicode
+mosip.kernel.sms.api=smsapi
+mosip.kernel.sms.authkey=authkey
+mosip.kernel.sms.route=route
+mosip.kernel.sms.sender=sender
+mosip.kernel.sms.unicode=unicode
 
-## --msg91 gateway--
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+91
+mosip.kernel.sms.number.length=10
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
 mosip.kernel.sms.route=mock
-mosip.kernel.sms.authkey=dummy
 
 ## Email notification
+
 mosip.kernel.notification.email.from=do-not-reply@mosip.io
 spring.mail.host=${smtp.host}
 spring.mail.username=${smtp.username}
@@ -80,9 +84,12 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass==${softhsm.kernel.security.pin}
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
 # Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
 mosip.kernel.client.crypto.use-resident-service-module-key=true
+# this keys are used to signed the cbor data
+mosip.kernel.keymanager.service.cose.privatekey={cipher}62c0e1cad1ce621008707b2ae154087a059796bd401ee2daf209dd1ed82abad9e44d966b65f3087f7070d748a96d475d2f2c916257289af34cd99097fed1e8d792f18b762a2f48121a1567fb31eb89ca448b809e76d7359754f0e55b92daec56
+mosip.kernel.keymanager.service.cose.publickey={cipher}cb27e063eef5400c446bd61f1585a8cb29ca286b659c1d1b6ef04bea407f344b1c1ed4cbe064f4f335a33393b737f47109c66c2f3b5337ddd09375aaf39ea347474a6924a249eea9adcad86758389aa6
 
 ## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log
@@ -213,6 +220,11 @@ syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosi
 syncdata_database_username=masteruser
 syncdata_database_password=${db.dbuser.password}
 
+licensekeymanager.persistence.jdbc.driver=org.postgresql.Driver
+licensekeymanager_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
+licensekeymanager_database_username=masteruser
+licensekeymanager_database_password=${db.dbuser.password}
+
 ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
 ridgenerator_database_password=${db.dbuser.password}
@@ -241,7 +253,6 @@ keycloak.verify-token-audience=true
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 
 mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
-mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -268,6 +279,7 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 
 master.search.maximum.rows=50
 mosip.level=2
@@ -287,8 +299,8 @@ mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
-kernel.uin.transfer-scheduler-minutes=0
-kernel.uin.transfer-scheduler-hours=*
+kernel.uin.transfer-scheduler-minutes=48
+kernel.uin.transfer-scheduler-hours=17
 kernel.uin.transfer-scheduler-days_of_month=*
 kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
@@ -298,11 +310,10 @@ auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/au
 
 
 ## Proxy otp
-mosip.kernel.auth.proxy-otp=true
+#mosip.kernel.auth.proxy-otp=false
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
-
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
 
@@ -340,16 +351,16 @@ mosip.kernel.partner.sign.masterkey.application.id=PMS
 datastores=ldap_1_DS,db_1_DS,db_2_DS
 
 ## Partner Management Service allowed partner domains
-mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
+mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP,BINDING
 
 ## List of keys to auto generate.
-mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD
+mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD,COMPLIANCE_TOOLKIT
 
 ## Random keys required for ZK encrypt.
 zkcrypto.random.key.generate.count=10000
 
 
-mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident
+mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident,COMPLIANCE_TOOLKIT:COMP-FIR
 
 # Keymanager service keystore cache properties
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
@@ -411,7 +422,12 @@ syncdata.websub.resubscription.delay.millis=48000000
 ## Admin UI
 ## this pattern like --> display column : configKey. 
 ## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns};filterValueMaxCount:{"default":${mosip.kernel.filtervalue.max_columns},"registrationcenters":50,"locations":100}
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns};filterValueMaxCount:{"default":${mosip.kernel.filtervalue.max_columns},"registrationcenters":500,"locations":300}
+
+# Flag to identify the support of no thumbprint in 1.1.3 version. 
+# Added this for backward compatability. default is false, means support is not required.
+# Make it to true if support is required.
+mosip.kernel.keymanager.113nothumbprint.support=false
 
 ## Used to get IAM user details.
 mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
@@ -428,9 +444,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-client,mosip-regproc-client,mosip-prereg-client,mosip-admin-client,mosip-partner-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-mobile,mpartner-default-digitalcard,mosip-signup-client,mosip-toolkit-android-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.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
@@ -441,8 +455,8 @@ mosip.service.end-points={cipher}dd5737cb38b0d354e925a031d1662cae45feb891135577d
 
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
-mosip.kernel.masterdata.template_idauthentication_event=MASTERDATA_IDAUTHENTICATION_TEMPLATES
-mosip.kernel.masterdata.title_event=MASTERDATA_TITLES
+##validity time of mosip-signed certificates
+
 
 ## Roles
 mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
@@ -457,69 +471,69 @@ mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
 mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
 mosip.role.admin.masterdata.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER
-mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
 mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -528,17 +542,17 @@ mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,CENTRAL_ADMIN
 mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION
-mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -551,8 +565,8 @@ mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
@@ -561,26 +575,26 @@ mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_AD
 mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
 mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT
-mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT
-mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -606,8 +620,8 @@ mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,
 mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN
 mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
@@ -615,33 +629,33 @@ mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
 mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT
-mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,ID_REPOSITORY
-mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRINT_PARTNER
-mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRINT_PARTNER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
@@ -671,11 +685,11 @@ mosip.role.admin.masterdata.getuserssearch=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,Z
 mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
 mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
 mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
 mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
@@ -711,20 +725,20 @@ mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_
 mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
 mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadotherdomaincertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadotherdomaincertificate=PARTNER_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postmigratebasekey=KEY_MIGRATION_ADMIN
 mosip.role.keymanager.getzktempcertificate=KEY_MIGRATION_ADMIN
 mosip.role.keymanager.postlicensegenerate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postmigratezkkeys=KEY_MIGRATION_ADMIN
-mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN
-mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
-mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PMS_ADMIN,PMS_USER
+mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
 mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_REQUEST
@@ -735,21 +749,23 @@ mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHE
 mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postcwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postcwtdecode=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postcwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postgenerateargon2hash=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
 
 mosip.kernel.keymanager.jwtsign.validate.json=false
 
 auth.allowed.urls=http://localhost:5000/
 
-
-##This property is used for validation in kernel-masterdata-service
+##These properties are used for validation in kernel-masterdata-service
 #For example, Arabic needs to be added along with english
 #the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
 #the final value in this case might look like [^a-z\u0600-\u06FF]
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9\u0600-\u06FF\u0C80-\u0CFF]
-mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF]
-
-management.health.mail.enabled=true
-
-
-# html content for email notification
-mosip.kernel.mail.content.html.enable=true
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
+mosip.kernel.masterdata.name.validate.regex=[^a-z]
+# query param usd to refer url to redirect after logout
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
+# end session endpoint in OIDC
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
+mosip.kernel.keymgr.hsm.health.check.enabled=false
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 386a5fce360..4884186787f 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -89,7 +89,8 @@ pmp.policy.schema.url= https://schemas.mosip.io/v1/auth-policy
 ## If we add any new policy type, corresponding schema also needs to be added.
 ## format for adding schema configuration for new policy type is as below
 ## pmp.policyTypeName.policy.schema(all are in lowercase)= schema url
-pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP
+pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP,Binding
+pmp.binding.policy.schema = ${mosip.kernel.xsdstorage-uri}binding-policy-schema.json
 pmp.auth.policy.schema = ${mosip.kernel.xsdstorage-uri}auth-policy-schema.json
 pmp.datashare.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
 pmp.credentialissuance.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
@@ -186,7 +187,7 @@ partner.search.maximum.rows=10
 pmp.allowed.credential.types=auth,qrcode,euin,reprint,vercred,opencrvs
 
 ## Allowed partner types who can map policies to credential types
-policy.credential.type.mapping.allowed.partner.types=Credential_Partner,Online_Verification_Partner
+policy.credential.type.mapping.allowed.partner.types=Credential_Partner,Online_Verification_Partner,Auth_Partner
 
 ## Allowed kyc attributes. Used to display in UI
 policy.allowed.kyc.attributes = {"fullName": "Full Name","middleName": "Middle Name","lastName": "Last Name","dateOfBirth": "DateOfBirth","gender": "Gender","phone": "phone"}
@@ -310,16 +311,21 @@ mosip.role.pms.getmisplicensekey=PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.postmispfiltervalues=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 mosip.role.pms.postmispsearch=MISP_PARTNER,MISP,PARTNERMANAGER,PARTNER_ADMIN
 
-# query param usd to refer url to redirect after logout	
-mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri	
-# end session endpoint in OIDC	
-mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout	
-# esignet claims mapping file url	
-mosip.pms.esignet.claims-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/identity-mapping.json	
-# esignet amr-acr mapping file url		
-mosip.pms.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json	
-## esignet Service apis for create and update	
-mosip.pms.esignet.oidc-client-create-url=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client	
-mosip.pms.esignet.oidc-client-update-url=https://${mosip.api.public.host}/v1/esignet/client-mgmt/oidc-client	
-## esignet Service api to fetch the OIDC Client configurations	
-mosip.pms.esignet.config-url=https://${mosip.api.public.host}/v1/esignet/oidc/.well-known/openid-configuration
+# query param usd to refer url to redirect after logout 
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri 
+# end session endpoint in OIDC 
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout 
+# Esignet claims mapping file url 
+mosip.pms.esignet.claims-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/identity-mapping.json
+# Esignet amr-acr mapping file url 
+mosip.pms.esignet.amr-acr-mapping-file-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/amr-acr-mapping.json
+## Esignet Service apis for create and update 
+mosip.pms.esignet.oidc-client-create-url=${mosip.esignet.service.url}/v1/esignet/client-mgmt/oidc-client
+mosip.pms.esignet.oidc-client-update-url=${mosip.esignet.service.url}/v1/esignet/client-mgmt/oidc-client
+
+#Esignet OAuth Client apis for create and update 
+mosip.pms.esignet.oauth-client-create-url=${mosip.esignet.service.url}/v1/esignet/client-mgmt/oauth-client
+mosip.pms.esignet.oauth-client-update-url=${mosip.esignet.service.url}/v1/esignet/client-mgmt/oauth-client
+
+## IDP Service api to fetch OIDC Client configuration 
+mosip.pms.esignet.config-url=${mosip.esignet.service.url}/v1/esignet/oidc/.well-known/openid-configuration

From 64b5caa17c12ec67861f81e323e288467cbf68f2 Mon Sep 17 00:00:00 2001
From: Aiham Hasan <89243555+aihamh@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:54:04 +0530
Subject: [PATCH 1291/1358] [MOSIP-24358] Update applicanttype.mvel

Signed-off-by: Aiham Hasan <89243555+aihamh@users.noreply.github.com>
---
 applicanttype.mvel | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/applicanttype.mvel b/applicanttype.mvel
index 69da629d5dc..6dc4daff750 100644
--- a/applicanttype.mvel
+++ b/applicanttype.mvel
@@ -105,26 +105,38 @@ def getApplicantType() {
     return "001";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
     return "002";
+  } else if (itc == NonResident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
+    return "002";
   } else if (itc == Resident && genderType == MALE && ageCode == CHILD && !isBioExPresent) {
     return "003";
   } else if (itc == Resident && genderType == MALE && ageCode == ADULT && !isBioExPresent) {
     return "004";
+  } else if (itc == Resident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
+    return "004";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
     return "005";
   } else if (itc == NonResident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
     return "006";
+  } else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
+    return "006";
   } else if (itc == Resident && genderType == FEMALE && ageCode == CHILD && !isBioExPresent) {
     return "007";
   } else if (itc == Resident && genderType == FEMALE && ageCode == ADULT && !isBioExPresent) {
     return "008";
+  } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
+    return "008";
   } else if (itc == NonResident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
     return "005";
   } else if (itc == NonResident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
     return "006";
+  } else if (itc == NonResident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
+    return "006";
   } else if (itc == Resident && genderType == Others && ageCode == CHILD && !isBioExPresent) {
     return "007";
   } else if (itc == Resident && genderType == Others && ageCode == ADULT && !isBioExPresent) {
     return "008";
+  } else if (itc == Resident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
+    return "008";
   } else if (itc == NonResident && genderType == MALE && ageCode == CHILD && isBioExPresent) {
     return "009";
   } else if (itc == NonResident && genderType == MALE && ageCode == ADULT && isBioExPresent) {
@@ -169,24 +181,5 @@ def getApplicantType() {
     return "015";
   }
   
-  else if (itc == NonResident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
-    return "014";
-  } else if (itc == Resident && genderType == MALE && ageCode == MINOR && !isBioExPresent) {
-    return "015";
-  }
-  
-   else if (itc == NonResident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
-    return "014";
-  } else if (itc == Resident && genderType == FEMALE && ageCode == MINOR && !isBioExPresent) {
-    return "015";
-  }
-  
-  else if (itc == NonResident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
-    return "014";
-  } else if (itc == Resident && genderType == Others && ageCode == MINOR && !isBioExPresent) {
-    return "015";
-  }
-  
-  
   return "000";
 }

From e5d022dd1e666803e0067a615b2c5cc32a2d9485 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
Date: Wed, 7 Feb 2024 20:25:05 +0530
Subject: [PATCH 1292/1358] Moved missing ida config changes

Signed-off-by: Loganathan Sekar <Loganathan.Sekar@mindtree.com>
---
 id-authentication-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index cc35fbe10b2..b1c2a0c1e37 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -570,14 +570,14 @@ mosip.ida.allowed.domain.uris=${mosip.api.internal.url},https://${mosip.esignet.
 biometrics.datetime.pattern=yyyy-MM-dd'T'HH:mm:ssXXX
 
 #The list of attributes in identity that are to be decrypted by default 
-ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email
+ida-default-identity-filter-attributes=phone,fullName,dateOfBirth,email,preferredLang
 
 #------ Un-encrypted Credential Attributes list -----------
 #The list of attributes in identity that not are Zero Knowledge encrpted while creating the credential in credential service as per the datashare policy. The same credential format is dumped in IDA DB (identity_cache table).
 #These attributes will not be decrypted when fetching the records from IDA DB for Authentication/EKYC/OTP requests.
 #By default all attributes are assumed to be Zero Knowledge encrypted.
 #Specify the attributes here only if they are not encrypted as per the datashare policy.
-ida-zero-knowledge-unencrypted-credential-attributes=
+ida-zero-knowledge-unencrypted-credential-attributes=preferredLang
 
 #openapi properties to sort tags and operations in Id Authentication
 springdoc.swagger-ui.tagsSorter=alpha

From 9e6f499ac3b111f2767098307dfa9b4a972c0e67 Mon Sep 17 00:00:00 2001
From: dhanendra06 <dhanendra.tech@gmail.com>
Date: Thu, 8 Feb 2024 07:23:28 +0530
Subject: [PATCH 1293/1358] resolved the delta config

Signed-off-by: dhanendra06 <dhanendra.tech@gmail.com>
---
 digital-card-default.properties                 | 5 -----
 registration-processor-credential-partners.json | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/digital-card-default.properties b/digital-card-default.properties
index cb370131dc3..909445230d5 100644
--- a/digital-card-default.properties
+++ b/digital-card-default.properties
@@ -90,11 +90,6 @@ IDREPOGETIDBYUIN=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
 # PDFSIGN to signed the pdf card
 PDFSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/pdf/sign
 
-
-# PDF Digital card is protected with password using below property based on define attribute it will encrypt by taking first 4 character.
-mosip.digitalcard.uincard.password=fullName|dateOfBirth
-mosip.digitalcard.pdf.password.enable.flag=true
-
 #verifiable credential property that used to enable vc check.
 mosip.digitalcard.verify.credentials.flag=true
 
diff --git a/registration-processor-credential-partners.json b/registration-processor-credential-partners.json
index 1c74ee4d6c2..0540d3d3025 100644
--- a/registration-processor-credential-partners.json
+++ b/registration-processor-credential-partners.json
@@ -5,7 +5,7 @@
       "partnerId": "mpartner-default-digitalcard",
       "credentialType": "PDFCard",
       "template": "RPR_UIN_CARD_TEMPLATE",
-      "appIdBasedCredentialIdSuffix": ".pdf",
+      "appIdBasedCredentialIdSuffix": "-PDF",
       "process": null,
       "metaInfoFields": null
     },

From 556b9e9554d52c037d3e185fd5a9322922cfdff2 Mon Sep 17 00:00:00 2001
From: Neha2365 <110969715+Neha2365@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:30:07 +0530
Subject: [PATCH 1294/1358] Update id-repository-default properties

Signed-off-by: Neha2365 <110969715+Neha2365@users.noreply.github.com>
---
 id-repository-default.properties | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index 22fa406b923..ad889fa11aa 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -382,7 +382,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,mosip-signup-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
@@ -443,3 +443,7 @@ mosip.idrepo.identity.disable-uin-based-credential-request=false
 # 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.idrepo.identity.max-request-time-deviation-seconds=60
+#Enable this property only when to check cache log
+#logging.level.org.springframework.cache=TRACE
+# By default, it is false. To enable force merge of data, change it to true.
+mosip.idrepo.create-identity.enable-force-merge=false

From 221af925d45ea3f8516b865d88ecbf7fbc92b139 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:50:44 +0530
Subject: [PATCH 1295/1358] Update admin-default.properties

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
---
 admin-default.properties | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index 2ac545f5a79..d22abe4216f 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -209,6 +209,7 @@ mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/mosip/prot
 mosip.iam.module.admin_realm_id=mosip
 mosip.iam.token_endpoint=${keycloak.internal.url}/auth/realms/mosip/protocol/openid-connect/token
 mosip.iam.certs_endpoint=${keycloak.external.url}/auth/realms/mosip/protocol/openid-connect/certs
+
 regproc.token.request.appid=regproc
 regproc.token.request.clientId=mosip-regproc-client
 regproc.token.request.secretKey=${mosip.regproc.client.secret}
@@ -236,17 +237,23 @@ LOST_RID_API=${mosip.regproc.status.service.url}/registrationprocessor/v1/regist
 logging.level.org.springframework.web.client.RestTemplate=DEBUG
 
 # Roles
-mosip.role.admin.getpacketstatusupdate=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.postbulkupload=GLOBAL_ADMIN
-mosip.role.admin.getbulkuploadtranscationtranscationid=GLOBAL_ADMIN
-mosip.role.admin.getbulkuploadgetalltransactions=GLOBAL_ADMIN
+mosip.role.admin.getpacketstatusupdate=REGISTRATION_ADMIN
+mosip.role.admin.postbulkupload=GLOBAL_ADMIN,REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.getbulkuploadtranscationtranscationid=GLOBAL_ADMIN,REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.getbulkuploadgetalltransactions=GLOBAL_ADMIN,REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
 mosip.role.admin.postauditmanagerlog=GLOBAL_ADMIN,ZONAL_ADMIN
 
 
-mosip.role.admin.getgeneratecsrcertificateapplicationidreferenceid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.postuploadcertificate=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.postgeneratecsr=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.postuploadotherdomaincertificate=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.getgeneratecsrcertificateapplicationidreferenceid=KEY_MAKER
+mosip.role.admin.postuploadcertificate=KEY_MAKER
+mosip.role.admin.postgeneratecsr=KEY_MAKER
+mosip.role.admin.postuploadotherdomaincertificate=KEY_MAKER
+
+mosip.role.admin.getlostRiddetailsrid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.postlostRid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.getapplicantDetailsrid=DIGITALCARD_ADMIN
+mosip.role.admin.getapplicantDetailsgetLoginDetails=DIGITALCARD_ADMIN
+mosip.role.admin.getriddigitalcardrid=DIGITALCARD_ADMIN
 
 # packet-manager
 mosip.commons.packetnames=id,evidence,optional
@@ -290,6 +297,8 @@ mosip.kernel.keymanager.uploadcertificate=${mosip.kernel.keymanager.url}/v1/keym
 mosip.kernel.keymanager.uploadotherdomaincertificate=${mosip.kernel.keymanager.url}/v1/keymanager/uploadOtherDomainCertificate
 
 # this property are used in AdminProxyService to get base url and version
+mosip.admin.masterdata.service.url=http://masterdata.kernel/v1
+mosip.admin.keymanager.service.url=http://keymanager.keymanager/v1
 mosip.admin.masterdata.service.version=masterdata.kernel/v1
 mosip.admin.keymanager.service.version=keymanager.keymanager/v1
 mosip.admin.base.url=http:/
@@ -300,3 +309,13 @@ auth.allowed.urls=https://${mosip.admin.host}/
 mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
 # end session endpoint in OIDC
 mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
+
+#--------------------Applicant Details Api-----------------------------
+mosip.admin.identityMappingJson=identity-mapping.json
+mosip.admin.applicant-details.exposed-identity-fields=dob,applicantPhoto
+RETRIEVE_IDENTITY_API=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
+## this property is used to configure max limit of search for the login user to get applicantDetails
+mosip.admin.applicant-details.max.login.count=30
+
+#-------------------Digital Card Api-----------------------------------
+DIGITAL_CARD_STATUS_URL=${mosip.digitalcard.service.url}/v1/digitalcard

From deda883ac8e1ac1768503e69cec66f0900924fa7 Mon Sep 17 00:00:00 2001
From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:12:27 +0530
Subject: [PATCH 1296/1358] updated properties files

Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
---
 kernel-default.properties             | 49 +++++++++++----------------
 partner-management-default.properties |  3 +-
 2 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 6e3802ec306..b683a6000b7 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -12,17 +12,17 @@
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
 # softhsm.kernel.security.pin
-# softhsm-security-pin
+# softhsm.ida.security.pin
 # email.smtp.host
-# email.smtp.port
 # email.smtp.username
 # email.smtp.secret
 # mosip.kernel.tokenid.uin.salt
 # mosip.kernel.tokenid.partnercode.salt
 # mosip.api.internal.url
 
+softhsm.kernel.pin=${softhsm.kernel.security.pin}
 softhsm.kernel.security.pin=${softhsm.security.pin}
-mosip.kernel.partner.issuer.certificate.allowed.grace.duration=60
+
 ## Sync data
 mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.kernel.syncdata.auth-manager-roles=/roles
@@ -37,30 +37,26 @@ mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/s
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
-mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+855
-mosip.kernel.sms.number.min.length=8
-mosip.kernel.sms.number.max.length=10
+mosip.kernel.sms.enabled=false
+mosip.kernel.sms.country.code=+91
 mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
-mosip.kernel.sms.api=smsapi
-mosip.kernel.sms.authkey=authkey
-mosip.kernel.sms.route=route
-mosip.kernel.sms.sender=sender
-mosip.kernel.sms.unicode=unicode
+#mosip.kernel.sms.api=smsapi
+#mosip.kernel.sms.authkey=authkey
+#mosip.kernel.sms.route=route
+#mosip.kernel.sms.sender=sender
+#mosip.kernel.sms.unicode=unicode
 
-mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+91
-mosip.kernel.sms.number.length=10
+## --msg91 gateway--
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
 mosip.kernel.sms.route=mock
+mosip.kernel.sms.authkey=${sms.authkey}
 
 ## Email notification
-
 mosip.kernel.notification.email.from=do-not-reply@mosip.io
 spring.mail.host=${smtp.host}
 spring.mail.username=${smtp.username}
@@ -84,12 +80,9 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
+mosip.kernel.keymanager.hsm.keystore-pass==${softhsm.kernel.security.pin}
 # Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
 mosip.kernel.client.crypto.use-resident-service-module-key=true
-# this keys are used to signed the cbor data
-mosip.kernel.keymanager.service.cose.privatekey={cipher}62c0e1cad1ce621008707b2ae154087a059796bd401ee2daf209dd1ed82abad9e44d966b65f3087f7070d748a96d475d2f2c916257289af34cd99097fed1e8d792f18b762a2f48121a1567fb31eb89ca448b809e76d7359754f0e55b92daec56
-mosip.kernel.keymanager.service.cose.publickey={cipher}cb27e063eef5400c446bd61f1585a8cb29ca286b659c1d1b6ef04bea407f344b1c1ed4cbe064f4f335a33393b737f47109c66c2f3b5337ddd09375aaf39ea347474a6924a249eea9adcad86758389aa6
 
 ## Auditmanager
 mosip.kernel.auditmanager-service-logs-location=logs/audit.log
@@ -220,11 +213,6 @@ syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosi
 syncdata_database_username=masteruser
 syncdata_database_password=${db.dbuser.password}
 
-licensekeymanager.persistence.jdbc.driver=org.postgresql.Driver
-licensekeymanager_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-licensekeymanager_database_username=masteruser
-licensekeymanager_database_password=${db.dbuser.password}
-
 ridgenerator_database_username =regprcuser
 ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
 ridgenerator_database_password=${db.dbuser.password}
@@ -253,6 +241,7 @@ keycloak.verify-token-audience=true
 mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
 
 mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 mosip.admin.login_flow.name=authorization_code
 mosip.admin.login_flow.response_type=code
 mosip.admin.login_flow.scope=cls
@@ -279,7 +268,6 @@ mosip.keycloak.admin.secret.key=${keycloak.admin.password}
 mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 
-mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
 
 master.search.maximum.rows=50
 mosip.level=2
@@ -299,8 +287,8 @@ mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
 ## UIN scheduler
 kernel.uin.transfer-scheduler-type=cron
 kernel.uin.transfer-scheduler-seconds=0
-kernel.uin.transfer-scheduler-minutes=48
-kernel.uin.transfer-scheduler-hours=17
+kernel.uin.transfer-scheduler-minutes=0
+kernel.uin.transfer-scheduler-hours=*
 kernel.uin.transfer-scheduler-days_of_month=*
 kernel.uin.transfer-scheduler-months=*
 kernel.uin.transfer-scheduler-days_of_week=*
@@ -310,10 +298,11 @@ auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/au
 
 
 ## Proxy otp
-#mosip.kernel.auth.proxy-otp=false
+mosip.kernel.auth.proxy-otp=true
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
+
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
 
@@ -351,7 +340,7 @@ mosip.kernel.partner.sign.masterkey.application.id=PMS
 datastores=ldap_1_DS,db_1_DS,db_2_DS
 
 ## Partner Management Service allowed partner domains
-mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP,BINDING
+mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 
 ## List of keys to auto generate.
 mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD,COMPLIANCE_TOOLKIT
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 4884186787f..859ac099286 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -89,8 +89,7 @@ pmp.policy.schema.url= https://schemas.mosip.io/v1/auth-policy
 ## If we add any new policy type, corresponding schema also needs to be added.
 ## format for adding schema configuration for new policy type is as below
 ## pmp.policyTypeName.policy.schema(all are in lowercase)= schema url
-pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP,Binding
-pmp.binding.policy.schema = ${mosip.kernel.xsdstorage-uri}binding-policy-schema.json
+pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP 
 pmp.auth.policy.schema = ${mosip.kernel.xsdstorage-uri}auth-policy-schema.json
 pmp.datashare.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
 pmp.credentialissuance.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json

From d938597bd548b129e36055cd4c9149ab85b0d7cb Mon Sep 17 00:00:00 2001
From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:15:08 +0530
Subject: [PATCH 1297/1358] updated properties files

Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
---
 kernel-default.properties             | 2 +-
 partner-management-default.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index b683a6000b7..0a1efa8dfc9 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -54,7 +54,7 @@ mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
 mosip.kernel.sms.route=mock
-mosip.kernel.sms.authkey=${sms.authkey}
+mosip.kernel.sms.authkey=dummy
 
 ## Email notification
 mosip.kernel.notification.email.from=do-not-reply@mosip.io
diff --git a/partner-management-default.properties b/partner-management-default.properties
index 859ac099286..9e4f8cb403d 100644
--- a/partner-management-default.properties
+++ b/partner-management-default.properties
@@ -89,7 +89,7 @@ pmp.policy.schema.url= https://schemas.mosip.io/v1/auth-policy
 ## If we add any new policy type, corresponding schema also needs to be added.
 ## format for adding schema configuration for new policy type is as below
 ## pmp.policyTypeName.policy.schema(all are in lowercase)= schema url
-pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP 
+pmp.allowed.policy.types=Auth,DataShare,CredentialIssuance,MISP
 pmp.auth.policy.schema = ${mosip.kernel.xsdstorage-uri}auth-policy-schema.json
 pmp.datashare.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json
 pmp.credentialissuance.policy.schema=${mosip.kernel.xsdstorage-uri}data-share-policy-schema.json

From 90fe06a657e89e59ae2f511a077299be0d0bcf32 Mon Sep 17 00:00:00 2001
From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:20:15 +0530
Subject: [PATCH 1298/1358] Update identity-mapping.json

Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
---
 identity-mapping.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 322a1b0110e..dab04032fc6 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,7 +164,7 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 3,
+		"fullName": 2,
 		"gender": 2,
 		"dateOfBirth": 2
 	}

From 6c9735bccd1ef2f6520e8e000af3d41ca01c775f Mon Sep 17 00:00:00 2001
From: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
Date: Thu, 8 Feb 2024 10:22:20 +0530
Subject: [PATCH 1299/1358] Update kernel-default.properties

Signed-off-by: GOKULRAJ136 <110164849+GOKULRAJ136@users.noreply.github.com>
---
 kernel-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index 0a1efa8dfc9..ffc45c8168d 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -393,8 +393,8 @@ subscriptions-delay-on-startup=120000
 
 
 # Pause & resume api proeprties
-PACKET_RESUME_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflowaction
-PACKET_PAUSE_API=${mosip.regproc.workflow.url}/registrationprocessor/v1/workflowmanager/workflow/search
+PACKET_RESUME_API=${mosip.api.internal.url}/registrationprocessor/v1/workflowmanager/workflowaction
+PACKET_PAUSE_API=${mosip.api.internal.url}/registrationprocessor/v1/workflowmanager/workflow/search
 KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 
 ## resubscription and subscription initial delay for masterdata service

From a1efdcb729446455732545eaf232eea97d967df4 Mon Sep 17 00:00:00 2001
From: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
Date: Thu, 8 Feb 2024 12:02:20 +0530
Subject: [PATCH 1300/1358] Updated MESSAGE_DELIVERY_TIMEOUT

Signed-off-by: HimajaDhanyamraju2 <dhanyamraju.himaja2@mindtree.com>
---
 websub-service.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/websub-service.toml b/websub-service.toml
index 9d3466fa5f8..177d6cfb6e0 100644
--- a/websub-service.toml
+++ b/websub-service.toml
@@ -39,7 +39,7 @@ MESSAGE_DELIVERY_RETRY_INTERVAL = 3.0
 MESSAGE_DELIVERY_COUNT = 3
 
 # The message delivery timeout
-MESSAGE_DELIVERY_TIMEOUT = 60.0
+MESSAGE_DELIVERY_TIMEOUT = 30.0
 
 # The base URL of IDP
 MOSIP_AUTH_BASE_URL = "${mosip.kernel.authmanager.url}/v1/authmanager"

From 25a01bd704decdd55133157c687cc6ee3169c5ab Mon Sep 17 00:00:00 2001
From: Swati Goel <meet2swati@gmail.com>
Date: Thu, 8 Feb 2024 13:19:10 +0530
Subject: [PATCH 1301/1358] [INJIMOB-838] update mimoto and issuer
 configuration

Signed-off-by: Swati Goel <meet2swati@gmail.com>
---
 mimoto-default.properties  |   9 ++--
 mimoto-issuers-config.json | 106 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 110 insertions(+), 5 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index 564acfb0096..f9ea19278bf 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -3,7 +3,7 @@
 public.url=${mosip.api.internal.url}/residentmobileapp
 mosip.resident.base.url=${mosip.resident.url}/resident/v1
 mosip.esignet.base.url=${mosip.esignet.host}/v1/esignet
-idp.binding.base.url=https://${mosip.api.public.host}/v1/esignet/binding
+idp.binding.base.url=https://${mosip.esignet.base.url}/binding
 
 RESIDENT_OTP=${mosip.resident.base.url}/req/otp
 RESIDENT_CREDENTIAL_REQUEST=${mosip.resident.base.url}/req/credential
@@ -17,6 +17,7 @@ RESIDENT_AID_GET_INDIVIDUALID=${mosip.resident.base.url}/aid/status
 BINDING_OTP=${idp.binding.base.url}/binding-otp
 WALLET_BINDING=${idp.binding.base.url}/wallet-binding
 
+
 # Resident App
 credential.template=template.json
 credential.sample=sample_credential.json
@@ -141,7 +142,7 @@ server.tomcat.accesslog.prefix=stdout
 server.tomcat.accesslog.buffered=false
 server.tomcat.accesslog.suffix=
 server.tomcat.accesslog.file-date-format=
-server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}"}
+server.tomcat.accesslog.pattern={"@timestamp":"%{yyyy-MM-dd'T'HH:mm:ss.SSS'Z'}t","level":"ACCESS","level_value":70000,"traceId":"%{X-B3-TraceId}i","appId":"%{X-AppId}i","statusCode":%s,"req.requestURI":"%U","bytesSent":%b,"timeTaken":%T,"appName":"${spring.application.name}"}
 server.tomcat.accesslog.className=io.mosip.kernel.core.logger.config.SleuthValve
 registration.processor.unMaskedUin.length=5
 
@@ -179,6 +180,7 @@ mosip.auth.filter_disable=false
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 vercred.type.vid=VID
+
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotokeybinding
 wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
@@ -189,8 +191,7 @@ mosip.kernel.masterdata.name.validate.regex=[^a-z\u0600-\u06FF\u0C80-\u0CFF]
 #mosip notification otp channel config
 mosip.notificationtype=SMS|EMAIL|PHONE
 
-# OpenID
-# Configurations related to openid4vc
+# Configurations related to openid4vci
 mosip.openid.issuers=mimoto-issuers-config.json
 GET_TOKEN=${public.internet.url}/v1/esignet/login/oauth/token
 mosip.oidc.esignet.token.endpoint=https://${mosip.esignet.base.url}/oauth/v2/token
diff --git a/mimoto-issuers-config.json b/mimoto-issuers-config.json
index ef317989e4d..eaf5f112b9c 100644
--- a/mimoto-issuers-config.json
+++ b/mimoto-issuers-config.json
@@ -9,7 +9,59 @@
             "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
             "alt_text": "digits-icon"
           },
+          "title": "Download via UIN, VID, AID",
+          "description":"Enter your national ID to download your card.",
           "language": "en"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "رمز الأرقام"
+          },
+          "title": "التنزيل عبر UIN, VID, AID",
+          "description": "أدخل رقم الهوية الوطنية الخاص بك لتنزيل بطاقتك.",
+          "language": "en"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "अंक-आइकन"
+          },
+          "title": "UIN, VID, AID के माध्यम से डाउनलोड करे",
+          "description":"अपना कार्ड डाउनलोड करने के लिए अपनी राष्ट्रीय आईडी दर्ज करें।",
+          "language": "hi"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "ಅಂಕಿ-ಐಕಾನ್"
+          },
+          "title": "UIN, VID, AID ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ",
+          "description": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮ್ಮ ರಾಷ್ಟ್ರೀಯ ID ಅನ್ನು ನಮೂದಿಸಿ.",
+          "language": "kn"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "இலக்கங்கள்-ஐகான்"
+          },
+          "title": "UIN, VID, AID மூலம் பதிவிறக்கவும்",
+          "description":"உங்கள் கார்டைப் பதிவிறக்க உங்கள் தேசிய ஐடியை உள்ளிடவும்.",
+          "language": "ta"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
+            "alt_text": "digits-icon"
+          },
+          "title": "I-download sa pamamagitan ng UIN, VID, AID",
+          "description":"Ilagay ang iyong national ID para i-download ang iyong card.",
+          "language": "fil"
         }
       ],
       "protocol": "OTP"
@@ -23,7 +75,59 @@
             "url": "https://${mosip.esignet.host}/logo.png",
             "alt_text": "esignet-logo"
           },
+          "title": "Download via e-Signet",
+          "description": "Enter your national ID to download your card.",
           "language": "en"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "esignet-logo"
+          },
+          "title": "e-Signet التنزيل عبر",
+          "description": "أدخل رقم الهوية الوطنية الخاص بك لتنزيل بطاقتك." ,
+          "language": "ar"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "esignet-लोगो"
+          },
+          "title": "ई-हस्ताक्षर के माध्यम से डाउनलोड करें",
+          "description":"अपना कार्ड डाउनलोड करने के लिए अपनी राष्ट्रीय आईडी दर्ज करें।",
+          "language": "hi"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "esignet-ಲೋಗೋ"
+          },
+          "title": "ಇ-ಸಿಗ್ನೆಟ್ ಮೂಲಕ ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+          "description": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮ್ಮ ರಾಷ್ಟ್ರೀಯ ID ಅನ್ನು ನಮೂದಿಸಿ.",
+          "language": "kn"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "esignet-லோகோ"
+          },
+          "title": "இ-சிக்னெட் மூலம் பதிவிறக்கம் செய்யவும்",
+          "description":"உங்கள் கார்டைப் பதிவிறக்க உங்கள் தேசிய ஐடியை உள்ளிடவும்.",
+          "language": "ta"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://${mosip.esignet.host}/logo.png",
+            "alt_text": "logo-signet"
+          },
+          "title": "I-download sa pamamagitan ng e-Signet",
+          "description":"Ilagay ang iyong national ID para i-download ang iyong card.",
+          "language": "fil"
         }
       ],
       "protocol": "OpenId4VCI",
@@ -35,7 +139,7 @@
       "authorization_endpoint": "https://${mosip.esignet.host}/authorize",
       "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token",
       "credential_endpoint": "https://${mosip.esignet.host}/v1/esignet/vci/credential",
-      "credential_audience": "https://${mosip.esignet.host}/v1/esignet"
+      "credential_audience": "https://${mosip.esignet.host}"
     }
   ]
 }
\ No newline at end of file

From f57cab43403b22b7692d3280c8a95da2e7204c63 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Thu, 8 Feb 2024 15:40:05 +0530
Subject: [PATCH 1302/1358] [MOSIP-31511]Update kernel-default.properties

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
---
 kernel-default.properties | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/kernel-default.properties b/kernel-default.properties
index ffa240b1e0d..6e3dfa765a4 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -12,7 +12,7 @@
 # mosip.reg.client.secret
 # mosip.prereg.client.secret
 # softhsm.kernel.security.pin
-# softhsm.ida.security.pin
+# softhsm-security-pin
 # email.smtp.host
 # email.smtp.username
 # email.smtp.secret
@@ -20,7 +20,6 @@
 # mosip.kernel.tokenid.partnercode.salt
 # mosip.api.internal.url
 
-softhsm.kernel.pin=${softhsm.kernel.security.pin}
 softhsm.kernel.security.pin=${softhsm.security.pin}
 
 ## Sync data
@@ -37,24 +36,25 @@ mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/s
 mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
 
 ## SMS notification
-mosip.kernel.sms.enabled=false
+mosip.kernel.sms.enabled=true
 mosip.kernel.sms.country.code=+91
 mosip.kernel.sms.number.length=10
 #mosip.kernel.sms.gateway : "infobip" or "msg91"
 mosip.kernel.sms.gateway=${sms.gateway.provider}
 ## --msg91 gateway--
-#mosip.kernel.sms.api=smsapi
-#mosip.kernel.sms.authkey=authkey
-#mosip.kernel.sms.route=route
-#mosip.kernel.sms.sender=sender
-#mosip.kernel.sms.unicode=unicode
+mosip.kernel.sms.api=smsapi
+mosip.kernel.sms.authkey=${sms.authkey}
+mosip.kernel.sms.route=route
+mosip.kernel.sms.sender=sender
+mosip.kernel.sms.unicode=unicode
 
-## --msg91 gateway--
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+91
+mosip.kernel.sms.number.length=10
 mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
 mosip.kernel.sms.sender=AD-MOSIP
 mosip.kernel.sms.password=dummy
 mosip.kernel.sms.route=mock
-mosip.kernel.sms.authkey=${sms.authkey}
 
 ## Email notification
 mosip.kernel.notification.email.from=do-not-reply@mosip.io
@@ -80,7 +80,7 @@ mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass==${softhsm.kernel.security.pin}
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
 # Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
 mosip.kernel.client.crypto.use-resident-service-module-key=true
 
@@ -298,11 +298,10 @@ auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/au
 
 
 ## Proxy otp
-mosip.kernel.auth.proxy-otp=true
+#mosip.kernel.auth.proxy-otp=false
 mosip.kernel.auth.proxy-otp-value=111111
 mosip.security.provider.name=SunPKCS11-pkcs11-proxy
 
-
 ## identity schema backward compatability ########
 mosip.ui.spec.default.domain=registration-client
 
@@ -349,6 +348,7 @@ mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,RE
 zkcrypto.random.key.generate.count=10000
 
 
+
 mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident,COMPLIANCE_TOOLKIT:COMP-FIR
 
 # Keymanager service keystore cache properties

From c67344e0fade4054bb3841b7aa59f84f0ca1ba5f Mon Sep 17 00:00:00 2001
From: Neha2365 <110969715+Neha2365@users.noreply.github.com>
Date: Fri, 9 Feb 2024 11:30:06 +0530
Subject: [PATCH 1303/1358] 
 MOSIP-31517-clone-1-2-0-1-on-demand-template-extraction config changes

Signed-off-by: Neha2365 <110969715+Neha2365@users.noreply.github.com>
---
 id-authentication-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index b1c2a0c1e37..21fdfbd6c3e 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -271,6 +271,7 @@ ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
 ida-topic-pmp-oidc-client-created=OIDC_CLIENT_CREATED
 ida-topic-pmp-oidc-client-updated=OIDC_CLIENT_UPDATED
+ida-topic-on-demand-template-extraction=AUTHENTICATION_ERRORS
 
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -642,3 +643,6 @@ 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' : '^\\+855[1-9][0-9]{7,9}@phone$' }
+
+# Partner Id for encryption used in ondemand template extraction
+mosip.ida.ondemand.template.extraction.partner.id=mpartner-default-tempextraction

From 8943fec8f080aa2020d0d6c1ca7135f94c2247c4 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Sun, 11 Feb 2024 20:59:39 +0530
Subject: [PATCH 1304/1358] ES-391

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 id-authentication-default.properties | 6 +++---
 kernel-default.properties            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 21fdfbd6c3e..4572dd5cfa2 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -360,7 +360,7 @@ notification.time.format=HH:mm:ss
 ## Allowed authentication types for Authentciation/E-KYC/Internal Authentication requests
 ## Accepted values otp-request, otp, demo, bio-Finger, bio-Iris, bio-Face
 ## Configure authentications permissable for a country
-auth.types.allowed=demo,otp,bio-Finger,bio-Iris,bio-Face
+auth.types.allowed=demo,otp,bio-Finger,bio-Iris,bio-Face,pwd,kbt
 ## Configure authentications permissable for e-KYC for a country
 ekyc.auth.types.allowed=demo,otp,bio-Finger,bio-Iris,bio-Face
 ## Configure authentication types permissable for internal authentication 
@@ -484,7 +484,7 @@ mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 
 ## Partner Management Service allowed partner domains
-mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM
+mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 
 # IAM Adapter 
 mosip.iam.adapter.clientid=${mosip.ida.auth.clientId}
@@ -642,7 +642,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' : '^\\+855[1-9][0-9]{7,9}@phone$' }
+mosip.ida.handle-types.regex={ '@phone' : '^\\+91[1-9][0-9]{7,9}@phone$' }
 
 # Partner Id for encryption used in ondemand template extraction
 mosip.ida.ondemand.template.extraction.partner.id=mpartner-default-tempextraction
diff --git a/kernel-default.properties b/kernel-default.properties
index 6e3dfa765a4..61227265940 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -433,7 +433,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
+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}

From fcc946f0e524d33377a80ed051a417d5f30687b2 Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Mon, 12 Feb 2024 19:58:46 +0530
Subject: [PATCH 1305/1358] MOSIP-31314-Added otp freezing properties

Signed-off-by: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
---
 id-authentication-default.properties | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 4572dd5cfa2..f95bcab961a 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -341,6 +341,10 @@ ida.errormessages.default-lang=en
 ## Configure Time limit for OTP Flooding scenario (in minutes) 
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=100
+## OTP Freezing. When user attempts multiple times with invalid OTP consecutively, it will be allowed only for certain number of attempts as per the theshold. After that it will go to frozen state for the user for the given duration. During the frozen time the OTP Request and validation both will be throwing error. After that it will be unfrozen and both actions will be allowed. Default is 5 if unspecified.
+mosip.ida.otp.validation.attempt.count.threshold=5
+# The duration in minutes for which the OTP will be frozen for a user, after that it it will be unfrozen. Default is 30 mins if unspecified.
+mosip.ida.otp.frozen.duration.minutes=30
 
 ## Notification templates
 ida.auth.mail.content.template=auth-email-content

From b1cf869a75ee5aea361cdc64b6830d38dc6d16df Mon Sep 17 00:00:00 2001
From: shubham_G <88794020+shubham17998@users.noreply.github.com>
Date: Fri, 16 Feb 2024 10:57:14 +0530
Subject: [PATCH 1306/1358] [DSD-4615] Update
 id-authentication-default.properties

Signed-off-by: shubham_G <88794020+shubham17998@users.noreply.github.com>
---
 id-authentication-default.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index f95bcab961a..0b881e2031f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -650,3 +650,5 @@ mosip.ida.handle-types.regex={ '@phone' : '^\\+91[1-9][0-9]{7,9}@phone$' }
 
 # Partner Id for encryption used in ondemand template extraction
 mosip.ida.ondemand.template.extraction.partner.id=mpartner-default-tempextraction
+
+ida-topic-on-demand-template-extraction=AUTHENTICATION_ERRORS

From f9b73e600fb49ac66b5ead0878826440c993819d Mon Sep 17 00:00:00 2001
From: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
Date: Fri, 16 Feb 2024 13:52:54 +0530
Subject: [PATCH 1307/1358] MOSIP-31634-Exposing resident portal to public for
 demo

Signed-off-by: Loganathan Sekar <42532387+LoganathanSekar7627@users.noreply.github.com>
---
 resident-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resident-default.properties b/resident-default.properties
index 5dbd3ef4e01..24143eacaab 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -344,7 +344,7 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 #mosip.resident.oidc.userinfo.jwt.signed=false
 ################### Mock-keycloak IdP config ends
 ###########################################################
-mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
+mosip.iam.module.redirecturi=${mosip.api.public.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests Manage-Credentials

From c43f66b6cccc084e0c16eee77b1a1ca78f30ab54 Mon Sep 17 00:00:00 2001
From: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Date: Fri, 16 Feb 2024 14:27:06 +0530
Subject: [PATCH 1308/1358] changed signup-default.properties

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
---
 signup-default.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/signup-default.properties b/signup-default.properties
index f70dfafe6d0..73604837bd0 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -93,14 +93,14 @@ mosip.security.cors-enable=true
 
 ## -------------------------- External endpoints -----------------------------------------------------------------------
 
-mosip.signup.generate-challenge.endpoint=${mosip.api.internal.url}/v1/otpmanager/otp/generate
-mosip.signup.get-identity.endpoint=${mosip.api.internal.url}/idrepository/v1/identity/idvid/%s@phone?type=demo&idType=HANDLE
-mosip.signup.identity.endpoint=${mosip.api.internal.url}/idrepository/v1/identity/
-mosip.signup.generate-hash.endpoint=${mosip.api.internal.url}/v1/keymanager/generateArgon2Hash
-mosip.signup.get-uin.endpoint=${mosip.api.internal.url}/v1/idgenerator/uin
-mosip.signup.send-notification.endpoint=${mosip.api.internal.url}/v1/notifier/sms/send
-mosip.signup.get-registration-status.endpoint=${mosip.api.internal.url}/v1/credentialrequest/get/{applicationId}
-mosip.signup.audit-endpoint=${mosip.api.internal.url}/v1/auditmanager/audits
+mosip.signup.generate-challenge.endpoint=http://otpmanager.kernel/v1/otpmanager/otp/generate
+mosip.signup.get-identity.endpoint=http://identity.idrepo/idrepository/v1/identity/idvid/%s@phone?type=demo&idType=HANDLE
+mosip.signup.identity.endpoint=http://identity.idrepo/idrepository/v1/identity/
+mosip.signup.generate-hash.endpoint=http://keymanager.keymanager/v1/keymanager/generateArgon2Hash
+mosip.signup.get-uin.endpoint=http://idgenerator.kernel/v1/idgenerator/uin
+mosip.signup.send-notification.endpoint=http://notifier.kernel/v1/notifier/sms/send
+mosip.signup.get-registration-status.endpoint=http://credentialrequest.idrepo/v1/credentialrequest/get/{applicationId}
+mosip.signup.audit-endpoint=http://auditmanager.kernel/v1/auditmanager/audits
 mosip.signup.add-identity.request.id=mosip.id.create
 mosip.signup.update-identity.request.id=mosip.id.update
 mosip.signup.identity.request.version=v1

From 9f785867b3b06eddd4812e6e1b933fe59197c6a5 Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
Date: Mon, 19 Feb 2024 12:19:46 +0530
Subject: [PATCH 1309/1358] MOSIP-31662 config changes

Signed-off-by: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
---
 registration-processor-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c322f321ecd..4ce5da2b5f3 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -399,7 +399,7 @@ mosip.regproc.workflow-manager.action.job.days_of_week=*
 # For example BioDedupeStage:SUCCESS is given in filter and stage is SecurezoneNotificationStage then packet which latest transaction status code is SUCCESS and its in  in BioDedupeStage then it will restart processing from SecurezoneNotificationStage. 
 registration.processor.reprocess.restart-from-stage=SecurezoneNotificationStage
 # * means it will consider SUCCESS,REPROCESS,IN_PROGRESS latest transaction status codes, any stage having both * and another status, it will be considered to have all the statuses for that stage
-registration.processor.reprocess.restart-trigger-filter=DemodedupStage:SUCCESS,BioDedupeStage:*,UinGeneratorStage:REPROCESS
+registration.processor.reprocess.restart-trigger-filter=DemoDedupeStage:SUCCESS,BioDedupeStage:*,UinGeneratorStage:REPROCESS
 
 
 mosip.regproc.workflow.manager.eventbus.kafka.commit.type=single

From 086981ac397e46a7877f66a3b959a285be7c4da8 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Fri, 23 Feb 2024 00:41:35 +0530
Subject: [PATCH 1310/1358] Update esignet-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 01aaeadb7d3..08d37b876ef 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -112,14 +112,14 @@ mosip.esignet.authenticator.ida-exchange-id=mosip.identity.kycexchange
 mosip.esignet.authenticator.ida-send-otp-id=mosip.identity.otp
 mosip.esignet.authenticator.ida-version=1.0
 mosip.esignet.authenticator.ida-domainUri=https://${mosip.esignet.host}
-mosip.esignet.authenticator.ida.cert-url=https://${mosip.api.public.host}/mosip-certs/ida-partner.cer
-mosip.esignet.authenticator.ida.kyc-auth-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.misp.license.key}/
-mosip.esignet.authenticator.ida.kyc-exchange-url=https://${mosip.api.internal.host}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.misp.license.key}/
-mosip.esignet.authenticator.ida.send-otp-url=https://${mosip.api.internal.host}/idauthentication/v1/otp/${mosip.esignet.misp.license.key}/
-mosip.esignet.binder.ida.key-binding-url=https://${mosip.api.internal.host}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
-mosip.esignet.authenticator.ida.get-certificates-url=https://${mosip.api.internal.host}/idauthentication/v1/internal/getAllCertificates
-mosip.esignet.authenticator.ida.auth-token-url=https://${mosip.api.internal.host}/v1/authmanager/authenticate/clientidsecretkey
-mosip.esignet.authenticator.ida.audit-manager-url=https://${mosip.api.internal.host}/v1/auditmanager/audits
+mosip.esignet.authenticator.ida.cert-url=${mosip.file.server.url}/mosip-certs/ida-partner.cer
+mosip.esignet.authenticator.ida.kyc-auth-url=${mosip.ida.auth.url}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida.kyc-exchange-url=${mosip.ida.auth.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida.send-otp-url=${mosip.ida.otp.url}/idauthentication/v1/otp/${mosip.esignet.misp.license.key}/
+mosip.esignet.binder.ida.key-binding-url=${mosip.ida.auth.url}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.misp.license.key}/
+mosip.esignet.authenticator.ida.get-certificates-url=${mosip.ida.internal.url}/idauthentication/v1/internal/getAllCertificates
+mosip.esignet.authenticator.ida.auth-token-url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.esignet.authenticator.ida.audit-manager-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 mosip.esignet.authenticator.ida.client-id=mosip-ida-client
 mosip.esignet.authenticator.ida.secret-key=${mosip.ida.client.secret}
 mosip.esignet.authenticator.ida.app-id=ida

From a4f12bdb35015caf567470fa100363f4026a2fb0 Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Fri, 23 Feb 2024 17:55:33 +0530
Subject: [PATCH 1311/1358] adding trim-whitespaces.simpleType-value to the
 config

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index c322f321ecd..b234dcb69cb 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -675,6 +675,7 @@ mosip.regproc.uin.generator.message.expiry-time-limit=${mosip.regproc.common.sta
 mosip.regproc.uin.generator.server.port=8099
 mosip.regproc.uin.generator.eventbus.port=5719
 mosip.regproc.uin.generator.server.servlet.path=/registrationprocessor/v1/uin-generator
+mosip.regproc.uin.generator.trim-whitespaces.simpleType-value=false
 
 # abis-middle-ware-stage
 mosip.regproc.abis.middleware.eventbus.kafka.commit.type=single

From d4c4f7edf4ef0dc9218a5e036ebe3e20ae99d04f Mon Sep 17 00:00:00 2001
From: Yash S <119652212+yashmsonkusare@users.noreply.github.com>
Date: Thu, 29 Feb 2024 18:38:56 +0530
Subject: [PATCH 1312/1358] MOSIP-31661:debug mode is turned of in mosip-config
 for REST APIS  for release-1.2.0.1 (#5534)

Signed-off-by: Yash S <119652212+yashmsonkusare@users.noreply.github.com>
---
 admin-default.properties                  | 2 +-
 application-default.properties            | 2 +-
 registration-processor-default.properties | 1 -
 resident-app-default.properties           | 3 ++-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-default.properties b/admin-default.properties
index d22abe4216f..a20d69c5933 100644
--- a/admin-default.properties
+++ b/admin-default.properties
@@ -234,7 +234,7 @@ mosip.iam.adapter.self-token-renewal-enable=true
 mosip.registration.processor.lostrid.id=mosip.registration.lostrid
 mosip.registration.processor.lostrid.version=1.0
 LOST_RID_API=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/lostridsearch
-logging.level.org.springframework.web.client.RestTemplate=DEBUG
+logging.level.org.springframework.web.client.RestTemplate=INFO
 
 # Roles
 mosip.role.admin.getpacketstatusupdate=REGISTRATION_ADMIN
diff --git a/application-default.properties b/application-default.properties
index 0aa14a4d1d1..9266853eab5 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -398,7 +398,7 @@ mosip.stage.environment=Developer
 logging.level.root=INFO
 logging.level.io.mosip=INFO
 logging.level.io.vertx=INFO
-logging.level.io.mosip.registration.processor.status=DEBUG
+logging.level.io.mosip.registration.processor.status=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 
 ## Tomcat access logs
diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index ee63f279eff..5160e6ca4a8 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -998,7 +998,6 @@ registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
 ##Ability to update contact information as part of LOST UIN
 uingenerator.lost.packet.allowed.update.fields=phone,email,permanentAddress
-logging.level.org.apache.activemq.ActiveMQConnectionFactory=DEBUG
 
 ##timeout in milliseconds for health check registrer
 mosip.regproc.health-check.handler-timeout=2000
\ No newline at end of file
diff --git a/resident-app-default.properties b/resident-app-default.properties
index 8c45381053b..418989d0943 100644
--- a/resident-app-default.properties
+++ b/resident-app-default.properties
@@ -125,7 +125,8 @@ mosip.kernel.tokenid.length=36
 logging.level.root=WARN
 logging.level.io.mosip=INFO
 # logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
-logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
+logging.level.io.mosip.kernel.auth.defaultadapter=INFO
+logging.level.org.springframework.http.client=INFO
 logging.level.org.springframework.http.client=DEBUG
 logging.level.io.mosip.residentapp=INFO
 logging.level.reactor.netty.http.client=INFO

From b4c978d5490639565e728c4392dfa0ba06e5870c Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:39:28 +0530
Subject: [PATCH 1313/1358] Update biosdk-service-default.properties

Signed-off-by: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
---
 biosdk-service-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biosdk-service-default.properties b/biosdk-service-default.properties
index bf202460333..d2b65bacfb0 100644
--- a/biosdk-service-default.properties
+++ b/biosdk-service-default.properties
@@ -1,5 +1,5 @@
 #iam mock-sdk config
-sdk_check_iso_timestamp_format=true
+sdk_check_iso_timestamp_format=false
 mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
 biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2
 

From 3876c07339089e09e626c760edad435a915bd66a Mon Sep 17 00:00:00 2001
From: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
Date: Thu, 28 Mar 2024 18:23:21 +0530
Subject: [PATCH 1314/1358] Update biosdk-service-default.properties

Signed-off-by: n-chandrasekhar <92979786+n-chandrasekhar@users.noreply.github.com>
---
 biosdk-service-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/biosdk-service-default.properties b/biosdk-service-default.properties
index d2b65bacfb0..bf202460333 100644
--- a/biosdk-service-default.properties
+++ b/biosdk-service-default.properties
@@ -1,5 +1,5 @@
 #iam mock-sdk config
-sdk_check_iso_timestamp_format=false
+sdk_check_iso_timestamp_format=true
 mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
 biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2
 

From 91880e7dbcd0906bb764bc1b0bf862ad35aad9ef Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:46:39 +0530
Subject: [PATCH 1315/1358] Update id-repository-default.properties

updated
mosip.idrepo.create-identity.enable-force-merge=true

Signed-off-by: likhitharl <91238496+likhitharl@users.noreply.github.com>
---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index ad889fa11aa..ecd8f90b441 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -446,4 +446,4 @@ mosip.idrepo.identity.max-request-time-deviation-seconds=60
 #Enable this property only when to check cache log
 #logging.level.org.springframework.cache=TRACE
 # By default, it is false. To enable force merge of data, change it to true.
-mosip.idrepo.create-identity.enable-force-merge=false
+mosip.idrepo.create-identity.enable-force-merge=true

From 18882524ec53039414b8613cf48e04bce7835d3a Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:10:04 +0530
Subject: [PATCH 1316/1358] Update id-repository-default.properties

Signed-off-by: likhitharl <91238496+likhitharl@users.noreply.github.com>
---
 id-repository-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-repository-default.properties b/id-repository-default.properties
index ecd8f90b441..ad889fa11aa 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -446,4 +446,4 @@ mosip.idrepo.identity.max-request-time-deviation-seconds=60
 #Enable this property only when to check cache log
 #logging.level.org.springframework.cache=TRACE
 # By default, it is false. To enable force merge of data, change it to true.
-mosip.idrepo.create-identity.enable-force-merge=true
+mosip.idrepo.create-identity.enable-force-merge=false

From a802623c737e2124c1460cd7cc7684d2721ba110 Mon Sep 17 00:00:00 2001
From: Neha2365 <110969715+Neha2365@users.noreply.github.com>
Date: Thu, 4 Apr 2024 11:51:16 +0530
Subject: [PATCH 1317/1358] Update id-authentication-default properties

Signed-off-by: Neha2365 <110969715+Neha2365@users.noreply.github.com>
---
 id-authentication-default.properties | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 0b881e2031f..39b5d22a7b6 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -271,7 +271,6 @@ ida-topic-fraud-analysis=IDA_FRAUD_ANALYTICS
 ida-topic-auth-anonymous-profile=ANONYMOUS_PROFILE
 ida-topic-pmp-oidc-client-created=OIDC_CLIENT_CREATED
 ida-topic-pmp-oidc-client-updated=OIDC_CLIENT_UPDATED
-ida-topic-on-demand-template-extraction=AUTHENTICATION_ERRORS
 
 # in minutes
 mosip.iam.adapter.validate-expiry-check-rate=15
@@ -649,6 +648,10 @@ mosip.ida.vci.supported.cred.types=VerifiableCredential,MOSIPVerifiableCredentia
 mosip.ida.handle-types.regex={ '@phone' : '^\\+91[1-9][0-9]{7,9}@phone$' }
 
 # Partner Id for encryption used in ondemand template extraction
-mosip.ida.ondemand.template.extraction.partner.id=mpartner-default-tempextraction
+mosip.ida.authentication.error.eventing.encrypt.partner.id=mpartner-default-tempextraction
 
-ida-topic-on-demand-template-extraction=AUTHENTICATION_ERRORS
+#kafka topic
+ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
+#kafka Configuration
+mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
+spring.kafka.admin.properties.allow.auto.create.topics=true

From e2e21677b212248155ec45829a926229990bc28d Mon Sep 17 00:00:00 2001
From: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
Date: Tue, 16 Apr 2024 13:13:47 +0530
Subject: [PATCH 1318/1358] MOSIP-32283 config chagnes

Signed-off-by: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
---
 registration-processor-default.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 5160e6ca4a8..09c83318208 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -989,10 +989,10 @@ auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
 #updated properties name with the prefix (mosip.regproc)
 mosip.regproc.landing.zone.account.name=landing-zone
-mosip.regproc.landing.zone.type=DMZServer
+mosip.regproc.landing.zone.type=ObjectStore
 
-mosip.regproc.landing.zone.fixed.delay.millisecs=86400000
-mosip.regproc.landing.zone.inital.delay.millisecs=300000
+mosip.regproc.landing.zone.fixed.delay.millisecs=120000
+mosip.regproc.landing.zone.inital.delay.millisecs=120000
 
 registration.processor.lostrid.max.registrationid=5
 mosip.registration.processor.lostrid.max-registration-date-filter-interval=30

From 73723e93e23e3396e54fe738c388d1fd99534e25 Mon Sep 17 00:00:00 2001
From: Neha2365 <110969715+Neha2365@users.noreply.github.com>
Date: Thu, 18 Apr 2024 16:00:21 +0530
Subject: [PATCH 1319/1358] Update id-authentication-default.properties (#5882)

Signed-off-by: Neha2365 <110969715+Neha2365@users.noreply.github.com>
---
 id-authentication-default.properties | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 39b5d22a7b6..690970bea5f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -647,11 +647,15 @@ mosip.ida.vci.supported.cred.types=VerifiableCredential,MOSIPVerifiableCredentia
 # 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$' }
 
+#-------------------------------- Authentication error eventing-------------------------------
+#It enable and disable the bean init of kafka and Authentication error eventing
+mosip.ida.authentication.error.eventing.enabled=true
+#If we enable authentication error eventing as true we need all the below property
+ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 # Partner Id for encryption used in ondemand template extraction
 mosip.ida.authentication.error.eventing.encrypt.partner.id=mpartner-default-tempextraction
-
-#kafka topic
-ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 #kafka Configuration
 mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
 spring.kafka.admin.properties.allow.auto.create.topics=true
+logging.level.org.apache.kafka=DEBUG
+#----------------------------------------------------end------------------------------------------

From d79e2d5a25052ebee97376b82d56def018b88543 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 29 Apr 2024 13:38:52 +0530
Subject: [PATCH 1320/1358] Update id-authentication-default.properties

Updated mosip.ida.authentication.error.eventing.enabled=false

Signed-off-by: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 690970bea5f..de014b7fe0c 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -649,7 +649,7 @@ 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
-mosip.ida.authentication.error.eventing.enabled=true
+mosip.ida.authentication.error.eventing.enabled=false
 #If we enable authentication error eventing as true we need all the below property
 ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 # Partner Id for encryption used in ondemand template extraction

From 303b594826a4ed353b3b561c5945705135f1f3fc Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Mon, 29 Apr 2024 17:57:55 +0530
Subject: [PATCH 1321/1358] Update id-authentication-default.properties

Updated mosip.ida.authentication.error.eventing.enabled=true

Signed-off-by: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index de014b7fe0c..690970bea5f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -649,7 +649,7 @@ 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
-mosip.ida.authentication.error.eventing.enabled=false
+mosip.ida.authentication.error.eventing.enabled=true
 #If we enable authentication error eventing as true we need all the below property
 ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 # Partner Id for encryption used in ondemand template extraction

From 5f441b2449a89d4a7c1f4096d27796b1d416f22c Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Tue, 30 Apr 2024 14:22:34 +0530
Subject: [PATCH 1322/1358] Update esignet-default.properties

Updated mosip.esignet.send-otp.captcha-required=false
updated 'captcha.enable' : 'pwd'


Signed-off-by: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 08d37b876ef..af298e6a242 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -101,7 +101,7 @@ mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
 # captcha validator
-mosip.esignet.send-otp.captcha-required=true
+mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}
@@ -383,7 +383,7 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
   'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
-  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'otp,pwd', \
+  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'pwd', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': 4501-4600, \
   'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \

From d2350f9f4d4c443300e43701919c8b040551da3d Mon Sep 17 00:00:00 2001
From: kameshsr <kameshsr1338@gmail.com>
Date: Thu, 2 May 2024 13:37:11 +0530
Subject: [PATCH 1323/1358] MOSIP-32772 Move resident related config to pla1201

Signed-off-by: kameshsr <kameshsr1338@gmail.com>
---
 application-default.properties              |    6 +
 digitalcard-template.properties             |    5 +-
 id-repository-default.properties            |    9 +-
 resident-default.properties                 | 1231 ++++++++++++-------
 resident-ui-personalized-card-schema.json   |  308 +++--
 resident-ui-share-credential-schema.json    |  310 +++--
 resident-ui-update-demographics-schema.json |  844 +++++++++++--
 7 files changed, 1908 insertions(+), 805 deletions(-)

diff --git a/application-default.properties b/application-default.properties
index 9266853eab5..836e20b25cf 100644
--- a/application-default.properties
+++ b/application-default.properties
@@ -452,3 +452,9 @@ mosip.access_token.subject.claim-name=sub
 
 # It is used as a suffix for creating credential request ID using the RID.
 mosip.registration.processor.rid.delimiter=-PDF
+
+# Web UI Idle timeout related properties
+mosip.webui.auto.logout.idle=180
+mosip.webui.auto.logout.ping=30
+mosip.webui.auto.logout.timeout=60
+
diff --git a/digitalcard-template.properties b/digitalcard-template.properties
index 4adc8fbe396..1d8a52898e5 100644
--- a/digitalcard-template.properties
+++ b/digitalcard-template.properties
@@ -1,3 +1,2 @@
-RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+TG9nbzwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
-
-vid-card-type=PGh0bWw+PGhlYWQ+CjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyIgY2hhcnNldD0id2luZG93cy0xMjUyIj4KPG1ldGEgbmFtZT0iR2VuZXJhdG9yIiBjb250ZW50PSJNaWNyb3NvZnQiIHdvcmQ9IiIgMTU9IiIgKGZpbHRlcmVkKT0iIj4KPC9oZWFkPjxib2R5IGxhbmc9IkVOLVVTIj4KCjxkaXYgc3R5bGU9IndpZHRoOjEwMCU7aGVpZ2h0OjEwMHZoOyI+Cgk8dGFibGUgc3R5bGU9IndpZHRoOiAzMzlweDttYXJnaW46IDAgYXV0bztiYWNrZ3JvdW5kOiAjRkZGRkZGO2JvcmRlci1yYWRpdXM6IDEwcHg7b3BhY2l0eTogMTtib3JkZXI6MXB4IHNvbGlkICNFMkUyRTI7Ij4KPHRib2R5Pjx0cj4KI2lmKCRpc1Bob3RvU2V0KQo8dGQgc3R5bGU9IndpZHRoOjI1JTt2ZXJ0aWNhbC1hbGlnbjogdG9wO3BhZGRpbmc6NXB4OyI+PGltZyBzdHlsZT0idG9wOiA1MXB4O2xlZnQ6IDQ1cHg7d2lkdGg6IDgwcHg7aGVpZ2h0OiA5M3B4O29wYWNpdHk6IDE7Ym9yZGVyOjFweCBzb2xpZCAjRTJFMkUyO2JvcmRlci1yYWRpdXM6NXB4OyIgc3JjPSQhQXBwbGljYW50UGhvdG8+PC90ZD4KI2VuZAo8dGQgc3R5bGU9IndpZHRoOjY1JSI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJICA8dGJvZHk+PHRyPgoJCQk8dGQgY29sc3Bhbj0iMiIgc3R5bGU9InBhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7cGFkZGluZzogM3B4OyI+RnVsbCBOYW1lPC9sYWJlbD4KICAgICAgICAgICAgPGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0iLyogZm9udC13ZWlnaHQ6IGJvbGQ7ICovdGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRuYW1lPC9kaXY+PC90ZD4KCQkgIDwvdHI+CgkJICAKCQkgIDx0cj4KCQkJPHRkIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxO3BhZGRpbmc6IDNweDsiPkRvQjwvbGFiZWw+CiAgICAgICAgICAgIDxkaXYgY29sc3Bhbj0iMiIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtwYWRkaW5nOjBweCAzcHg7Ij4kZGF0ZU9mQmlydGg8L2Rpdj48L3RkPgoJCQk8dGQgc3R5bGU9InBhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5JRCBUeXBlPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7LyogcGFkZGluZzogMHB4IDBweDsgKi8iPlZJRDwvZGl2PjwvdGQ+CgkJICA8L3RyPgoJCQoJCTwvdGJvZHk+PC90YWJsZT4KCTwvdGQ+Cgk8dGQgc3R5bGU9IndpZHRoOiAxNSU7dmVydGljYWwtYWxpZ246dG9wOy8qIG1hcmdpbi10b3A6IDEwJTsgKi8iPjxpbWcgc3R5bGU9Ii8qIHRvcDogNDZweDsgKi8vKiBsZWZ0OiAzMjRweDsgKi93aWR0aDogMzVweDtoZWlnaHQ6IDM4cHg7YmFja2dyb3VuZDogdHJhbnNwYXJlbnQgdXJsKCdpbWcvbG9nbyAoMikucG5nJykgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O29wYWNpdHk6IDE7IiBzcmM9Imh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL2xvZ28ucG5nIiBhbHQ9Im1vc2lwIj48L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iNiI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJCTx0Ym9keT48dHI+CgkJCQoKCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOiA1cHg7Ij4KCQkJCTxkaXYgY29sc3Bhbj0iMTIiPgoJCQkJCQk8ZGl2IGNvbHNwYW49IjYiID4KCQkJCTxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+VklEPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kdmlkPC9kaXY+PC9kaXY+PC90ZD4KCQkJCQoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlO3BhZGRpbmc6IDVweDsiPjxkaXYgY29sc3Bhbj0iNiIgc3R5bGU9InBhZGRpbmctbGVmdDogMzJweDsiID48bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPlZJRCBUeXBlPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7Ij4kdmlkVHlwZTwvZGl2PjwvZGl2PjwvdGQ+CgkJCQk8L2Rpdj4KCQkJCQoJCQk8L3RyPgoJCQoJCQk8dHI+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7Ij4KCQkJCTxkaXYgY29sc3Bhbj0iMTIiPgoJCQkJPGRpdiBjb2xzcGFuPSI2IiA+CgkJCQk8bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPkdlbmVyYXRlZCBvbjwvbGFiZWw+PGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6IDJweCAxcHg7Ij4kZ2VucmF0ZWRPblRpbWVzdGFtcDwvZGl2PjwvZGl2PjwvdGQ+CgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7Ij48ZGl2IGNvbHNwYW49IjYiIHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDMycHg7IiA+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5FeHBpcmVzIG9uPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7cGFkZGluZzogMnB4IDJweDsiPiRleHBpcnlUaW1lc3RhbXA8L2Rpdj48L2Rpdj48L3RkPgoJCQkJPC9kaXY+CgkJCTwvdHI+CgoJCTwvdGJvZHk+PC90YWJsZT4KCTwvdGQ+CjwvdHI+Cjx0cj4KCTx0ZCBjb2xzcGFuPSIzIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtoZWlnaHQ6IDQwcHg7dGV4dC1hbGlnbjogY2VudGVyO2JvcmRlci10b3A6MXB4IHNvbGlkICNFMkUyRTI7Ij48aW1nIHN0eWxlPSJ0b3A6IDUxcHg7bGVmdDogNDVweDsgbWFyZ2luLWJvdHRvbTogLTRweDsiIHNyYz0iZGF0YTppbWFnZS9wbmc7YmFzZTY0LCBpVkJPUncwS0dnb0FBQUFOU1VoRVVnQUFBQTRBQUFBT0NBWUFBQUFmU0MzUkFBQUFCbUpMUjBRQS93RC9BUCtndmFlVEFBQUFnRWxFUVZRb2tjM1J3UTJDWUF5RzRZZEVqZ1JoQTJQaWdUR2NRNWRoQUhhQkFUdzdnUWRQTHVBTWV1QTNLbEZUYjN4SkQwM3p0bDliNXFvY0xjcC93UUxIRkcvd0RyZGdESkFsc01icXg4UU1IVGJZNGhTMXVzUUJ6YWRpazRwVnBOTmlBcDJ4TnU3eVRSZGNIMGt2ZnB6OWE1ZlM4OXhGeE9vVWJvM1BucUh1bmdrak5HQ3JWVWNBQUFBQVNVVk9SSzVDWUlJPSI+PHNwYW4gc3R5bGU9Im1hcmdpbi1sZWZ0OiA1cHg7Ij4gPC9zcGFuPlRyYW5zYWN0aW9ucyBhbGxvd2VkIDogJHRyYW5zYWN0aW9uc0xlZnRDb3VudDwvdGQ+CjwvdHI+CjwvdGJvZHk+PC90YWJsZT4KPC9kaXY+CjwvYm9keT48L2h0bWw+
+RPR_UIN_CARD_TEMPLATE=PCFET0NUWVBFIGh0bWw+IDxodG1sPiA8aGVhZD4gPG1ldGEgY2hhcnNldD0idXRmLTgiPiA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0id2lkdGg9ZGV2aWNlLXdpZHRoLCBpbml0aWFsLXNjYWxlPTEiPiA8dGl0bGU+VUlOIENhcmQ8L3RpdGxlPiA8c3R5bGU+IC5tYWluLXRhYmxlIHsgbWFyZ2luLWxlZnQ6IDYwcHg7OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMzUwcHg7IGJvcmRlcjogMXB4IHNvbGlkIGJsYWNrOyB9IC5jaXIgeyBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7IGJvcmRlci1yYWRpdXM6IDYwcHg7IGJveC1zaGFkb3c6IDBweCAwcHggMnB4ICMwMDAwMDA7IHBhZGRpbmc6IDAuNWVtIDAuNmVtOyB9IC5uYW1lLWhlYWQtY29sb3IgeyBjb2xvcjogYmxhY2s7IH0gLmhlYWQtdGl0bGUgeyBtYXJnaW4tbGVmdDogLTg1cHg7IH0gLmJhci1jb2RlLXBhZGRpbmcgeyBtYXJnaW4tdG9wOiAyMHB4OyBtYXJnaW4tbGVmdDogMjBweDsgfSAudG9wLWJ1ZmZlciB7IG1hcmdpbi1sZWZ0OjEwcHg7IH0gPC9zdHlsZT4gPC9oZWFkPiA8Ym9keT4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIj4gPHRyPiA8dGQ+Jm5ic3A7IDxkaXYgY2xhc3M9ImNpciI+PGZvbnQgc2l6ZT0iMSI+PGltZyBzcmMgPSAiaHR0cHM6Ly9tb3NpcC5pby9pbWFnZXMvbW9zaXBuLWxvZ28ucG5nIiBzdHlsZT0id2lkdGg6IDUwcHg7IGhlaWdodDogMzBweDsiPjwvZm9udD48L2Rpdj4gPC90ZD4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Zm9udCBzaXplPSI1ImNsYXNzPSIgaGVhZC10aXRsZSI+ICZuYnNwOyZuYnNwOyBLaW5nZG9tIG9mIE15Q291bnRyeSAmbmJzcDsmbmJzcDsmbmJzcDsgPC9mb250PiA8L2xhYmVsPjwvdGQ+IDx0ZCByb3dzcGFuPSI0Ij4gPGRpdj4gPGRpdiBzdHlsZT0iYm9yZGVyOiBzb2xpZCBibGFjayAxcHg7IGhlaWdodDogMTUwcHg7IHdpZHRoOiAxMjBweDsiPiAjaWYoJGlzUGhvdG9TZXQpPGltZyBzcmMgPSAkIUFwcGxpY2FudFBob3RvIHN0eWxlPSJ3aWR0aDogMTIwcHg7IGhlaWdodDogMTUwcHgiPiAjZW5kICA8L2Rpdj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPlVJTiZuYnNwOzombmJzcDs8L2I+PC9sYWJlbD4gPHNwYW4gY2xhc3M9Im5hbWUtY29sb3IiPiAkIVVJTiA8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCByb3dzcGFuPSIxIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj5OYW1lJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3BhbiBjbGFzcz0ibmFtZS1jb2xvciI+ICQhZnVsbE5hbWVfZW5nPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgcm93c3Bhbj0iMSI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KfYs9mFJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWZ1bGxOYW1lX2FyYTwvc3Bhbj4gPC9kaXY+IDwvdGQ+IDwvdHI+IDx0cj4gPHRkIHJvd3NwYW49IjEiPiA8ZGl2IGNsYXNzPSJibG9jayB0b3AtYnVmZmVyIj4gPGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkRPQi/Yqtin2LHZitiuJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWRhdGVPZkJpcnRoPC9zcGFuPiA8L2Rpdj4gPC90ZD4gPC90cj4gPHRyPiA8dGQgY29sc3Bhbj0iMiI+IDxkaXYgY2xhc3M9ImJsb2NrIHRvcC1idWZmZXIiPiA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+R2VuZGVyJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9lbmc8L3NwYW4+ICZuYnNwOyZuYnNwOyA8bGFiZWwgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciI+PGI+2KzZhtizJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8c3Bhbj4kIWdlbmRlcl9hcmE8L3NwYW4+IDwvZGl2PiA8L3RkPiA8L3RyPiA8dHI+IDx0ZCBjb2xzcGFuPSIzIj4gPGRpdiBjbGFzcz0icm93IiBzdHlsZT0ibWFyZ2luLXJpZ2h0OiAwcHg7IG1hcmdpbi1sZWZ0OiAtMTBweDsiPiA8ZGl2IGNsYXNzPSJjb2wtbWQtMiB0b3AtYnVmZmVyIj4gPGRpdiBjbGFzcz0iYmxvY2sgdG9wLWJ1ZmZlciI+IDx0YWJsZT4gPHRyPiA8dGQ+PGxhYmVsIGNsYXNzPSJuYW1lLWhlYWQtY29sb3IiPjxiPkFkZHJlc3MmbmJzcDs6Jm5ic3A7PC9iPjwvbGFiZWw+IDwvdGQ+IDx0ZD48c3Bhbj4kIWFkZHJlc3NMaW5lMV9lbmcsICQhYWRkcmVzc0xpbmUyX2VuZywgJCFhZGRyZXNzTGluZTNfZW5nLCAkIXJlZ2lvbl9lbmcsICQhcHJvdmluY2VfZW5nLCAkIWNpdHlfZW5nLCAkIXBvc3RhbENvZGUgPC9zcGFuPjwvdGQ+IDwvdHI+IDx0cj4gPHRkPjxsYWJlbCBjbGFzcz0ibmFtZS1oZWFkLWNvbG9yIj48Yj7YudmG2YjYp9mGJm5ic3A7OiZuYnNwOzwvYj48L2xhYmVsPiA8L3RkPiA8dGQ+PHNwYW4+JCFhZGRyZXNzTGluZTFfYXJhLCAkIWFkZHJlc3NMaW5lMl9hcmEsICQhYWRkcmVzc0xpbmUzX2FyYSwgJCFyZWdpb25fYXJhLCAkIXByb3ZpbmNlX2FyYSwgJCFjaXR5X2FyYSwgJCFwb3N0YWxDb2RlIDwvc3Bhbj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9kaXY+IDwvZGl2PiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPGRpdj4mbmJzcDs8L2Rpdj4gPHRhYmxlIGNsYXNzPSJtYWluLXRhYmxlIiBzdHlsZT0iaGVpZ2h0OiAzMDBweCI+IDx0cj4gPHRkPiA8ZGl2IHN0eWxlPSJtYXJnaW4tbGVmdDogMTBweDsgbWFyZ2luLXJpZ2h0OiAxMHB4OyBib3JkZXI6IHNvbGlkIGJsYWNrIDFweDsgaGVpZ2h0OiAyNTBweDsgd2lkdGg6IDI1MHB4OyI+IDxkaXYgY2xhc3M9ImNvbC1tZC02Ij4gPGRpdiBjbGFzcz0iYmFyLWNvZGUtcGFkZGluZyI+PC9kaXY+IDxpbWcgc3JjPSQhUXJDb2RlIHN0eWxlPSJ3aWR0aDogMjUwcHg7IGhlaWdodDogMjUwcHg7IG1hcmdpbi10b3A6IC0yMHB4Ij4gPC9kaXY+IDwvZGl2PiA8L3RkPiA8dGQ+IDxkaXYgY2xhc3M9Im5hbWUtaGVhZC1jb2xvciBjb2wtbWQtNiI+IDxicj4gRm9yIGFueSBpc3N1ZXMgcGxlYXNlIGNvbnRhY3QgdXMgYXQ8YnI+IDxicj4gUmVnaXN0cmF0aW9uIFByb2NjZXNzb3IsSGFuZ2luZyBHYXJkZW5zLEdsb2JhbCBWaWxsYWdlIFRlY2ggUGFyaywgTXlzb3JlIFJkLFJWQ0UsQmVuZ2FsdXJ1LCBLYXJuYXRha2EgNTYwMDU5PGJyPiA8YnI+INmE2KPZitipINmF2LTYp9mD2YQg2YrYsdis2Ykg2KfZhNin2KrYtdin2YQg2KjZhtinINi52YTZiSA8YnI+2KfZhNiq2LPYrNmK2YQg2KfZhNmF2LnYp9mE2KzYjCDYp9mE2K3Yr9in2KbZgiDYp9mE2YXYudmE2YLYqSDYjCDYp9mE2YLYsdmK2Kkg2KfZhNi52KfZhNmF2YrYqSBUZWNoIFBhcmssIE15c29yZSBSZCxSVkNFIDU2MDA1OSDYqNmG2LrYp9mE2YjYsdmI2Iwg2YPYp9ix2YbYp9iq2KfZg9inIDxicj4gPGJyPiA8L2Rpdj4gPC90ZD4gPC90cj4gPC90YWJsZT4gPC9ib2R5PiA8L2h0bWw+
+vid-card-type=PGh0bWw+PGhlYWQ+CjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0idGV4dC9odG1sOyIgY2hhcnNldD0id2luZG93cy0xMjUyIj4KPG1ldGEgbmFtZT0iR2VuZXJhdG9yIiBjb250ZW50PSJNaWNyb3NvZnQiIHdvcmQ9IiIgMTU9IiIgKGZpbHRlcmVkKT0iIj4KPC9oZWFkPjxib2R5IGxhbmc9IkVOLVVTIj4KCjxkaXYgc3R5bGU9IndpZHRoOjEwMCU7aGVpZ2h0OjEwMHZoOyI+Cgk8dGFibGUgc3R5bGU9IndpZHRoOiAzMzlweDttYXJnaW46IDAgYXV0bztiYWNrZ3JvdW5kOiAjRkZGRkZGO2JvcmRlci1yYWRpdXM6IDEwcHg7b3BhY2l0eTogMTtib3JkZXI6MXB4IHNvbGlkICNFMkUyRTI7Ij4KPHRib2R5Pjx0cj4KI2lmKCRpc1Bob3RvU2V0KQo8dGQgc3R5bGU9IndpZHRoOjI1JTt2ZXJ0aWNhbC1hbGlnbjogdG9wO3BhZGRpbmc6NXB4OyI+PGltZyBzdHlsZT0idG9wOiA1MXB4O2xlZnQ6IDQ1cHg7d2lkdGg6IDgwcHg7aGVpZ2h0OiA5M3B4O29wYWNpdHk6IDE7Ym9yZGVyOjFweCBzb2xpZCAjRTJFMkUyO2JvcmRlci1yYWRpdXM6NXB4OyIgc3JjPSQhQXBwbGljYW50UGhvdG8+PC90ZD4KI2VuZAo8dGQgc3R5bGU9IndpZHRoOjY1JSI+CgkJPHRhYmxlIHN0eWxlPSJib3JkZXI6bm9uZTtib3JkZXItY29sbGFwc2U6IGNvbGxhcHNlO3dpZHRoOiAxMDAlOyI+CgkJICA8dGJvZHk+CiAgICAgICAgICAgIDx0cj4KCQkJPHRkIGNvbHNwYW49IjIiIHN0eWxlPSJwYWRkaW5nOjNweDsiPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxO3BhZGRpbmc6IDNweDsiPkZ1bGwgTmFtZSA8L2xhYmVsPgogICAgICAgICAgICA8ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSIvKiBmb250LXdlaWdodDogYm9sZDsgKi90ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7cGFkZGluZzowcHggM3B4OyB3aWR0aDoyMDBweDtvdmVyZmxvdy13cmFwOiBicmVhay13b3JkOyI+PHA+JGZ1bGxOYW1lX2VuZzwvcD48L2Rpdj48L3RkPgoJCSAgPC90cj4KCQkgIAoJCSAgPHRyPgoJCQk8dGQgc3R5bGU9InBhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7cGFkZGluZzogM3B4OyI+RG9CPC9sYWJlbD4KICAgICAgICAgICAgPGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6MHB4IDNweDsiPiRkb2I8L2Rpdj48L3RkPgoJCQk8dGQgc3R5bGU9InBhZGRpbmc6M3B4OyI+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5JRCBUeXBlPC9sYWJlbD48ZGl2IGNvbHNwYW49IjIiIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgNjAwIDEycHgvMTVweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7LyogcGFkZGluZzogMHB4IDBweDsgKi8iPlZJRDwvZGl2PjwvdGQ+CgkJICA8L3RyPgoJCQoJCTwvdGJvZHk+PC90YWJsZT4KCTwvdGQ+Cgk8dGQgc3R5bGU9IndpZHRoOiAxNSU7dmVydGljYWwtYWxpZ246dG9wOy8qIG1hcmdpbi10b3A6IDEwJTsgKi8iPjxpbWcgc3R5bGU9Ii8qIHRvcDogNDZweDsgKi8vKiBsZWZ0OiAzMjRweDsgKi93aWR0aDogMzVweDtoZWlnaHQ6IDI1cHg7YmFja2dyb3VuZDogdHJhbnNwYXJlbnQgdXJsKCdpbWcvbG9nbyAoMikucG5nJykgMCUgMCUgbm8tcmVwZWF0IHBhZGRpbmctYm94O29wYWNpdHk6IDE7IiBzcmM9Imh0dHBzOi8vbW9zaXAuaW8vaW1hZ2VzL21vc2lwbi1sb2dvLnBuZyIgYWx0PSJtb3NpcCI+PC90ZD4KPC90cj4KPHRyPgoJPHRkIGNvbHNwYW49IjYiPgoJCTx0YWJsZSBzdHlsZT0iYm9yZGVyOm5vbmU7Ym9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTt3aWR0aDogMTAwJTsiPgoJCQk8dGJvZHk+PHRyPgoJCQkKCgkJCQk8dGQgc3R5bGU9IndpZHRoOiA1MCU7cGFkZGluZzogNXB4OyI+CgkJCQk8ZGl2IGNvbHNwYW49IjEyIj4KCQkJCQkJPGRpdiBjb2xzcGFuPSI2IiA+CgkJCQk8bGFiZWwgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCBub3JtYWwgMTFweC8xNHB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICM2NjY2NjY7b3BhY2l0eTogMTsiPlZJRDwvbGFiZWw+PGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxOyI+JHZpZDwvZGl2PjwvZGl2PjwvdGQ+CgkJCQkKCQkJCTx0ZCBzdHlsZT0id2lkdGg6IDUwJTtwYWRkaW5nOiA1cHg7Ij48ZGl2IGNvbHNwYW49IjYiIHN0eWxlPSJwYWRkaW5nLWxlZnQ6IDMycHg7IiA+PGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5WSUQgVHlwZTwvbGFiZWw+PGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxOyI+JHZpZFR5cGU8L2Rpdj48L2Rpdj48L3RkPgoJCQkJPC9kaXY+CgkJCQkKCQkJPC90cj4KCQkKCQkJPHRyPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlOyI+CgkJCQk8ZGl2IGNvbHNwYW49IjEyIj4KCQkJCTxkaXYgY29sc3Bhbj0iNiIgPgoJCQkJPGxhYmVsIHN0eWxlPSJ0ZXh0LWFsaWduOiBsZWZ0O2ZvbnQ6IG5vcm1hbCBub3JtYWwgbm9ybWFsIDExcHgvMTRweCBJbnRlcjtsZXR0ZXItc3BhY2luZzogMHB4O2NvbG9yOiAjNjY2NjY2O29wYWNpdHk6IDE7Ij5HZW5lcmF0ZWQgb248L2xhYmVsPjxkaXYgY29sc3Bhbj0iMiIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2xldHRlci1zcGFjaW5nOiAwcHg7Y29sb3I6ICMwMDAwMDA7b3BhY2l0eTogMTtwYWRkaW5nOiAycHggMXB4OyI+JGdlbnJhdGVkT25UaW1lc3RhbXA8L2Rpdj48L2Rpdj48L3RkPgoJCQkJPHRkIHN0eWxlPSJ3aWR0aDogNTAlOyI+PGRpdiBjb2xzcGFuPSI2IiBzdHlsZT0icGFkZGluZy1sZWZ0OiAzMnB4OyIgPjxsYWJlbCBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIG5vcm1hbCAxMXB4LzE0cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzY2NjY2NjtvcGFjaXR5OiAxOyI+RXhwaXJlcyBvbjwvbGFiZWw+PGRpdiBjb2xzcGFuPSIyIiBzdHlsZT0idGV4dC1hbGlnbjogbGVmdDtmb250OiBub3JtYWwgbm9ybWFsIDYwMCAxMnB4LzE1cHggSW50ZXI7bGV0dGVyLXNwYWNpbmc6IDBweDtjb2xvcjogIzAwMDAwMDtvcGFjaXR5OiAxO3BhZGRpbmc6IDJweCAycHg7Ij4kZXhwaXJ5VGltZXN0YW1wPC9kaXY+PC9kaXY+PC90ZD4KCQkJCTwvZGl2PgoJCQk8L3RyPgoKCQk8L3Rib2R5PjwvdGFibGU+Cgk8L3RkPgo8L3RyPgo8dHI+Cgk8dGQgY29sc3Bhbj0iMyIgc3R5bGU9InRleHQtYWxpZ246IGxlZnQ7Zm9udDogbm9ybWFsIG5vcm1hbCA2MDAgMTJweC8xNXB4IEludGVyO2NvbG9yOiAjMDAwMDAwO29wYWNpdHk6IDE7aGVpZ2h0OiA0MHB4O3RleHQtYWxpZ246IGNlbnRlcjtib3JkZXItdG9wOjFweCBzb2xpZCAjRTJFMkUyOyI+PGltZyBzdHlsZT0idG9wOiA1MXB4O2xlZnQ6IDQ1cHg7IG1hcmdpbi1ib3R0b206IC00cHg7IiBzcmM9ImRhdGE6aW1hZ2UvcG5nO2Jhc2U2NCwgaVZCT1J3MEtHZ29BQUFBTlNVaEVVZ0FBQUE0QUFBQU9DQVlBQUFBZlNDM1JBQUFBQm1KTFIwUUEvd0QvQVArZ3ZhZVRBQUFBZ0VsRVFWUW9rYzNSd1EyQ1lBeUc0WWRFamdSaEEyUGlnVEdjUTVkaEFIYUJBVHc3Z1FkUEx1QU1ldUEzS2xGVGIzeEpEMDN6dGw5YjVxb2NMY3Avd1FMSEZHL3dEcmRnREpBbHNNYnF4OFFNSFRiWTRoUzF1c1FCemFkaWs0cFZwTk5pQXAyeE51N3lUUmRjSDBrdmZwejlhNWZTODl4RnhPb1VibzNQbnFIdW5na2pOR0NyVlVjQUFBQUFTVVZPUks1Q1lJST0iPjxzcGFuIHN0eWxlPSJtYXJnaW4tbGVmdDogNXB4OyI+IDwvc3Bhbj5UcmFuc2FjdGlvbnMgYWxsb3dlZCA6ICR0cmFuc2FjdGlvbnNMZWZ0Q291bnQ8L3RkPgo8L3RyPgo8L3Rib2R5PjwvdGFibGU+CjwvZGl2Pgo8L2JvZHk+PC9odG1sPg==
\ No newline at end of file
diff --git a/id-repository-default.properties b/id-repository-default.properties
index ad889fa11aa..bae6711cfe3 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -76,6 +76,9 @@ mosip.idrepo.identity.application.version=v1
 mosip.idrepo.identity.id.create=mosip.id.create
 mosip.idrepo.identity.id.read=mosip.id.read
 mosip.idrepo.identity.id.update=mosip.id.update
+mosip.identity.get.drafts.id=mosip.identity.get.drafts
+mosip.identity.get.drafts.version=1.0
+
 #database mappings for identity service
 mosip.idrepo.identity.db.url=jdbc:postgresql://${mosip.idrepo.db.url}:${mosip.idrepo.db.port}/${mosip.idrepo.db.identity.db-name}
 mosip.idrepo.identity.db.username=${mosip.idrepo.db.identity.username}
@@ -412,7 +415,7 @@ mosip.role.idrepo.identity.postauthtypesstatus=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.identity.postdraftcreateregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.patchdraftupdateregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.getdraftpublishregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
-mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.deletedraftdiscardregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY,RESIDENT
 mosip.role.idrepo.identity.draftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.getdraftregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.putdraftextractbiometricsregistrationId=REGISTRATION_PROCESSOR,ID_REPOSITORY
@@ -426,6 +429,8 @@ mosip.role.idrepo.vid.postvidregenerate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postviddeactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
+mosip.role.idrepo.identity.getdraftUIN=RESIDENT,ID_REPOSITORY
+
 mosip.mask.function.identityAttributes=convertToMaskDataFormat
 
 mosip.credential.service.fetch-identity.type=bio
@@ -447,3 +452,5 @@ mosip.idrepo.identity.max-request-time-deviation-seconds=60
 #logging.level.org.springframework.cache=TRACE
 # By default, it is false. To enable force merge of data, change it to true.
 mosip.idrepo.create-identity.enable-force-merge=false
+
+mosip.identity.get.excluded.attribute.list=UIN,verifiedAttributes,IDSchemaVersion
\ No newline at end of file
diff --git a/resident-default.properties b/resident-default.properties
index 24143eacaab..953d6eb8a8d 100644
--- a/resident-default.properties
+++ b/resident-default.properties
@@ -8,18 +8,35 @@
 # mosip.regproc.client.secret
 # keycloak.internal.url.
 
+logging.level.root=INFO
+logging.level.io.mosip.resident.batch=INFO
+# Whether to enable LoggingFilter - this will print the request details such as URL, headers and body for debugging purpose. Default is false.
+logging.level.io.mosip.resident.config.LoggingInterceptor=INFO
+resident.rest.template.logging.interceptor.filter.enabled=false
+
+resident.logging.filter.enabled=false
+logging.level.io.mosip.resident.filter=INFO
+
+# Whether to enable logging - this will print the repository method calls for debugging purpose. Default is true.
+resident.db.logging.aspect.enabled=false
+logging.level.io.mosip.resident.aspect.DatabaseLoggingAspect=INFO
+
+#URL pattern for logging filter. For example, "/callback/*" .Defaults to "/*".
+resident.logging.filter.url.pattern=/*
+# Whether to enable WebsubCallbackRequestDecoratorFilter. Default is true.
+resident.websub.request.decorator.filter.enabled=true
+# Websub topic subscription topics
+subscriptions-delay-on-startup_millisecs=120000
+re-subscription-interval-in-seconds=43200
+
 #--------------APIs ID and Version --------------
+#------------Request IDs---------------------
+# The request IDs used in Resident REST APIs
+mosip.resident.api.id.otp.request=mosip.identity.otp.internal
+mosip.resident.api.id.auth=mosip.identity.auth.internal
 auth.internal.id=mosip.identity.auth.internal
-auth.internal.version=1.0
 mosip.registration.processor.print.id=mosip.registration.print
-mosip.registration.processor.application.version=1.0
 vid.create.id=mosip.vid.create
-mosip.resident.create.vid.version=v1
-resident.vid.version=v1
-resident.vid.version.new=1.0
-resident.revokevid.version=v1
-resident.revokevid.version.new=1.0
-resident.version.new=1.0
 resident.vid.id=mosip.resident.vid
 resident.vid.id.generate=mosip.resident.vid.generate
 resident.vid.policy.id=mosip.resident.vid.policy
@@ -27,7 +44,6 @@ resident.vid.get.id=mosip.resident.vid.get
 auth.type.status.id=mosip.identity.authtype.status.update
 resident.authlock.id=mosip.resident.authlock
 resident.checkstatus.id=mosip.resident.checkstatus
-resident.checkstatus.version=v1
 resident.euin.id=mosip.resident.euin
 resident.printuin.id=mosip.resident.printuin
 resident.uin.id=mosip.resident.uin
@@ -36,120 +52,184 @@ resident.updateuin.id=mosip.resident.updateuin
 resident.authunlock.id=mosip.resident.authunlock
 resident.authhistory.id=mosip.resident.authhistory
 resident.authLockStatusUpdateV2.id=mosip.resident.auth.lock.unlock
-resident.authLockStatusUpdateV2.version=1.0
 resident.service.history.id=mosip.service.history.get
-resident.service.history.version=1.0
 resident.document.upload.id=mosip.resident.document.upload
-resident.document.get.id=mosip.resident.document.get	
-resident.document.get.version=1.0
-resident.document.list.id=mosip.resident.document.list	
-resident.document.list.version=1.0
-resident.service.pin.status.id=mosip.resident.pin.status	
-resident.service.pin.status.version=v1	
-resident.service.unpin.status.id=mosip.resident.unpin.status	
-resident.service.unpin.status.version=v1	
-resident.document.delete.id=mosip.resident.document.delete	
-resident.document.delete.version=1.0
+resident.document.get.id=mosip.resident.document.get
+resident.document.list.id=mosip.resident.document.list
+resident.service.pin.status.id=mosip.resident.pin.status
+resident.service.unpin.status.id=mosip.resident.unpin.status
+resident.document.delete.id=mosip.resident.document.delete
 resident.contact.details.update.id=mosip.resident.contact.details.update.id
 resident.contact.details.send.otp.id=mosip.resident.contact.details.send.otp.id
 mosip.resident.service.status.check.id=mosip.registration.external.status
-mosip.resident.service.status.check.version=1.0
 resident.service.unreadnotificationlist.id=mosip.resident.service.history.unread
 resident.service.event.id=mosip.resident.event.status
-resident.service.event.version=1.0
 resident.identity.info.id=mosip.resident.identity.info
-resident.identity.info.version=1.0
 resident.share.credential.id=mosip.resident.share.credential
-resident.share.credential.version=1.0
-mosip.resident.request.response.version=1.0
 vid.revoke.id=mosip.vid.update
 resident.revokevid.id=mosip.resident.vidstatus
 mosip.resident.revokevid.id=mosip.resident.vid.revoke
 mosip.resident.grievance.ticket.request.id=mosip.resident.grievance.ticket.request
-mosip.resident.grievance.ticket.request.version=1.0
 resident.channel.verification.status.id=mosip.resident.channel.verification.status
-resident.channel.verification.status.version=1.0
 resident.event.ack.download.id=mosip.resident.event.ack.download
-resident.event.ack.download.version=1.0
 resident.download.card.eventid.id =mosip.resident.download.card.eventid
-resident.download.card.eventid.version=1.0
 mosip.resident.request.vid.card.id=mosip.resident.request.vid.card
-mosip.resident.request.vid.card.version=1.0
 mosip.credential.request.service.id=mosip.credential.request.service.id
-mosip.credential.request.service.version=1.0
 mosip.resident.checkstatus.individualid.id=mosip.resident.check-stage-status
-mosip.resident.checkstatus.individualid.version=1.0
 mosip.resident.download.personalized.card.id=mosip.resident.download.personalized.card
 mosip.resident.transliteration.transliterate.id=mosip.resident.transliteration.transliterate
 resident.ui.properties.id=resident.ui.properties
-resident.ui.properties.version=1.0
 mosip.resident.identity.auth.internal.id=mosip.identity.auth.internal
 mosip.resident.user.profile.id=mosip.resident.profile
+resident.download.reg.centers.list.id=mosip.resident.download.reg.centers.list
+resident.download.nearest.reg.centers.id=mosip.resident.download.nearest.reg.centers
+resident.download.supporting.documents.id=mosip.resident.download.supporting.documents
+resident.send.card.id=mosip.resident.send.card
+resident.pinned.eventid.id=mosip.resident.pinned.eventid
+resident.unpinned.eventid.id=mosip.resident.unpinned.eventid
+resident.auth.proxy.partners.id=mosip.resident.auth.proxy.partners
+resident.events.eventid.id=mosip.resident.events.eventid
+resident.notification.id=mosip.resident.notification.get
+resident.profile.id=mosip.resident.profile.get
+resident.notification.click.id=mosip.resident.notification.click
+mosip.credential.store.id=mosip.credential.store
+resident.vids.id=mosip.resident.vids.get
+mosip.resident.download.uin.card=mosip.resident.download.uin.card
+mosip.registration.processor.registration.sync.id=mosip.registration.sync
+id.repo.update=mosip.id.update
+mosip.resident.get.pending.drafts=mosip.resident.get.pending.drafts
+mosip.resident.discard.pending.drafts=mosip.resident.discard.pending.drafts
+
+#------------Request Versions---------------------
+# The request versions used in Resident REST APIs
+mosip.resident.api.version.otp.request=1.0
+mosip.resident.api.version.auth=1.0
+auth.internal.version=1.0
+mosip.registration.processor.application.version=1.0
+mosip.resident.create.vid.version=v1
+resident.vid.version=v1
+resident.vid.version.new=1.0
+resident.revokevid.version=v1
+resident.revokevid.version.new=1.0
+resident.version.new=1.0
+resident.checkstatus.version=v1
+resident.authLockStatusUpdateV2.version=1.0
+resident.service.history.version=1.0
+resident.document.get.version=1.0
+resident.document.list.version=1.0
+resident.service.pin.status.version=v1
+resident.service.unpin.status.version=v1
+resident.document.delete.version=1.0
+mosip.resident.service.status.check.version=1.0
+resident.service.event.version=1.0
+resident.identity.info.version=1.0
+resident.share.credential.version=1.0
+mosip.resident.request.response.version=1.0
+mosip.resident.grievance.ticket.request.version=1.0
+resident.channel.verification.status.version=1.0
+resident.event.ack.download.version=1.0
+resident.download.card.eventid.version=1.0
+mosip.resident.request.vid.card.version=1.0
+mosip.credential.request.service.version=1.0
+mosip.resident.checkstatus.individualid.version=1.0
+resident.ui.properties.version=1.0
+mosip.resident.get.pending.drafts.version=1.0
+mosip.resident.discard.pending.drafts.version=1.0
 
+#Database config
+mosip.resident.database.hostname=postgres-postgresql.postgres
+mosip.resident.database.port=5432
 
-PARTNER_REFERENCE_Id=mpartner-default-resident
-APPLICATION_Id=RESIDENT
+javax.persistence.jdbc.driver=org.postgresql.Driver
+javax.persistence.jdbc.url=jdbc:postgresql://${mosip.resident.database.hostname}:${mosip.resident.database.port}/mosip_resident
+javax.persistence.jdbc.user=residentuser
+javax.persistence.jdbc.password=${db.dbuser.password}
 
-DECRYPT_API_URL=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
 mosip-prereg-host=${mosip.prereg.host}
 mosip-prereg-ui-url=https://${mosip-prereg-host}/pre-registration-ui/
 
-
 ## Token generation
 token.request.id=io.mosip.resident
-resident.appid=resident
 token.request.version=1.0
+resident.appid=resident
 resident.clientId=mosip-resident-client
 resident.secretKey=${mosip.resident.client.secret}
 # Below is defined in application properties
 token.request.issuerUrl=${mosip.keycloak.issuerUrl}
 
-
+## Partner related details
+mosip.ida.partner.type=Online_Verification_Partner
 ida.online-verification-partner-id=mpartner-default-auth
+idrepo-dummy-online-verification-partner-id=MOVP
+resident.share-credential.partner.type=Auth_Partner
+resident.authentication-request.partner.type=Auth_Partner
+resident.order-physical-card.partner.type=Print_Partner
 
 #DB properties to skip automatic table creation in startup
+hibernate.show_sql=true
 hibernate.hbm2ddl.auto=none
-hibernate.show_sql=false
 hibernate.temp.use_jdbc_metadata_defaults=false
-spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 hibernate.jdbc.lob.non_contextual_creation = true
+spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 
 
 ## Auth Services
+IDA_INTERNAL=${mosip.ida.internal.url}/idauthentication/v1/internal
+INTERNALAUTH=${IDA_INTERNAL}/auth
+INTERNALAUTHTRANSACTIONS=${IDA_INTERNAL}/authTransactions
+KERNELENCRYPTIONSERVICE=${IDA_INTERNAL}/getCertificate
+OTP_GEN_URL=${IDA_INTERNAL}/otp
 KERNELAUTHMANAGER=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
-REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
-INTERNALAUTH=${mosip.ida.internal.url}/idauthentication/v1/internal/auth
-INTERNALAUTHTRANSACTIONS=${mosip.ida.internal.url}/idauthentication/v1/internal/authTransactions
-KERNELENCRYPTIONSERVICE=${mosip.ida.internal.url}/idauthentication/v1/internal/getCertificate
-IDAUTHCREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
-IDAUTHREVOKEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 
-## Notification service
-IDREPOGETIDBYUIN=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
-IDREPOGETIDBYRID=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid
-GETUINBYVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
-resident.notification.emails=mosiptestuser@gmail.com
-resident.notification.message=Notification has been sent to the provided contact detail(s)
+## Credential Req & service calls
+CREDENTIAL_STATUS_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/get/
+CREDENTIAL_REQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
+CREDENTIAL_CANCELREQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/cancel/
+CREDENTIAL_TYPES_URL=${mosip.idrepo.credential.service.url}/v1/credentialservice/types
+
+## IdRepo identity Service calls
+IDREPO_IDENTITY=${mosip.idrepo.identity.url}/idrepository/v1/identity
+IDREPOSITORY=${IDREPO_IDENTITY}/
+IDREPOGETIDBYUIN=${IDREPO_IDENTITY}/idvid
+IDREPOGETIDBYRID=${IDREPO_IDENTITY}/idvid
+IDREPO_IDENTITY_URL=${IDREPO_IDENTITY}/idvid/{id}
+GET_RID_BY_INDIVIDUAL_ID=${IDREPO_IDENTITY}/rid/{individualId}
+IDREPO_IDENTITY_UPDATE_COUNT=${IDREPO_IDENTITY}/{individualId}/update-counts
+AUTHTYPESTATUSUPDATE=${IDREPO_IDENTITY}/authtypes/status
+IDREPO_IDENTITY_GET_DRAFT_UIN=${IDREPO_IDENTITY}/draft/uin/{UIN}
+IDREPO_IDENTITY_DISCARD_DRAFT=${IDREPO_IDENTITY}/draft/discard/
+
+## IdRepo vid Service calls
+IDREPO_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid
+CREATEVID=${IDREPO_VID}
+GETUINBYVID=${IDREPO_VID}
+IDAUTHCREATEVID=${IDREPO_VID}
+IDAUTHREVOKEVID=${IDREPO_VID}
+RETRIEVE_VIDS=${IDREPO_VID}/uin/
 
-## templates
+## Key manager
+KEYMANAGER=${mosip.kernel.keymanager.url}/v1/keymanager
+ENCRYPTURL=${KEYMANAGER}/encrypt
+DECRYPT_API_URL=${KEYMANAGER}/decrypt
+mosip.resident.keymanager.encrypt-uri=${KEYMANAGER}/encrypt
+mosip.resident.keymanager.decrypt-uri=${KEYMANAGER}/decrypt
+PACKETSIGNPUBLICKEY=${KEYMANAGER}/tpmsigning/publickey
+mosip.keymanager.jwt.sign.end.point=${KEYMANAGER}/jwtSign
+PDFSIGN=${KEYMANAGER}/pdf/sign
+
+## Master Data api calls
 MASTER=${mosip.kernel.masterdata.url}/v1/masterdata
 TEMPLATES=${MASTER}/templates
 MACHINEDETAILS=${MASTER}/machines
 MACHINESEARCH=${MASTER}/machines/search
 MACHINECREATE=${MASTER}/machines
 CENTERDETAILS=${MASTER}/registrationcenters
-RIDGENERATION=${mosip.kernel.ridgenerator.url}/v1/ridgenerator/generate/rid
-CREATEVID=${mosip.idrepo.vid.url}/idrepository/v1/vid
-IDREPOSITORY=${mosip.idrepo.identity.url}/idrepository/v1/identity/
-ENCRYPTURL=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt
-PACKETSIGNPUBLICKEY=${mosip.kernel.keymanager.url}/v1/keymanager/tpmsigning/publickey
-MIDSCHEMAURL=${mosip.kernel.syncdata.url}/v1/syncdata/latestidschema
-
-#Master Data api calls
 VALID_DOCUMENT_BY_LANGCODE_URL=${MASTER}/validdocuments/{langCode}
 LOCATION_HIERARCHY_LEVEL_BY_LANGCODE_URL=${MASTER}/locationHierarchyLevels/{langcode}
+LOCATION_HIERARCHY=${MASTER}/locationHierarchyLevels
 IMMEDIATE_CHILDREN_BY_LOCATIONCODE_AND_LANGCODE_URL=${MASTER}/locations/immediatechildren/{locationcode}/{langcode}
 LOCATION_INFO_BY_LOCCODE_AND_LANGCODE_URL=${MASTER}/locations/info/{locationcode}/{langcode}
+IMMEDIATE_CHILDREN_BY_LOCATION_CODE=${MASTER}/locations/immediatechildren
 REGISTRATION_CENTER_FOR_LOCATION_CODE_URL=${MASTER}/registrationcenters/{langcode}/{hierarchylevel}/names
 REGISTRATION_CENTER_BY_LOCATION_TYPE_AND_SEARCH_TEXT_PAGINATED_URL=${MASTER}/registrationcenters/page/{langcode}/{hierarchylevel}/{name}
 COORDINATE_SPECIFIC_REGISTRATION_CENTERS_URL=${MASTER}/getcoordinatespecificregistrationcenters/{langcode}/{longitude}/{latitude}/{proximitydistance}
@@ -157,74 +237,91 @@ APPLICANT_VALID_DOCUMENT_URL=${MASTER}/applicanttype/{applicantId}/languages
 WORKING_DAYS_BY_REGISTRATION_ID=${MASTER}/workingdays/{registrationCenterID}/{langCode}
 LATEST_ID_SCHEMA_URL =${MASTER}/idschema/latest
 TEMPLATES_BY_LANGCODE_AND_TEMPLATETYPECODE_URL=${MASTER}/templates/{langcode}/{templatetypecode}
-GENDER_TYPE_BY_LANGCODE=${MASTER}/gendertypes/{langcode}
+DYNAMIC_FIELD_BASED_ON_LANG_CODE_AND_FIELD_NAME=${MASTER}/dynamicfields/{fieldName}/{langcode}
+DYNAMIC_FIELD_BASED_ON_FIELD_NAME=${MASTER}/dynamicfields/{fieldName}
 DOCUMENT_TYPE_BY_DOCUMENT_CATEGORY_AND_LANG_CODE=${MASTER}/documenttypes/{documentcategorycode}/{langcode}
 
-
-# DMZ service call
-SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
-PACKETRECEIVER=http://regproc-group1.regproc/registrationprocessor/v1/packetreceiver/registrationpackets
+## Notification service
 SMSNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/sms/send
 EMAILNOTIFIER=${mosip.kernel.notification.url}/v1/notifier/email/send
-AUTHTYPESTATUSUPDATE=${mosip.idrepo.identity.url}/idrepository/v1/identity/authtypes/status
+resident.notification.emails=mosiptestuser@gmail.com
+resident.notification.message=Notification has been sent to the provided contact detail(s)
 
-#Regitstration processor reprint service
-#Registration status service
-REGISTRATIONSTATUSSEARCH=http://regproc-status.regproc/registrationprocessor/v1/registrationstatus/externalstatus/search
-resident.center.id=10001
-resident.machine.id=10080
+## Partner manager service URLs
+PMS_PARTNER_MANAGER=${mosip.pms.partnermanager.url}/v1/partnermanager
+POLICY_REQ_URL=${PMS_PARTNER_MANAGER}/partners/{partnerId}/credentialtype/{credentialType}/policies
+PARTNER_API_URL=${PMS_PARTNER_MANAGER}/partners
+PARTNER_DETAILS_NEW_URL=${PMS_PARTNER_MANAGER}/partners/v2
+mosip.pms.pmp.partner.rest.uri=${PMS_PARTNER_MANAGER}/partners?partnerType=${mosip.ida.partner.type}
 
-#Credential Req service
-POLICY_REQ_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/{partnerId}/credentialtype/{credentialType}/policies
-OTP_GEN_URL=${mosip.ida.internal.url}/idauthentication/v1/internal/otp
-CREDENTIAL_STATUS_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/get/
-CREDENTIAL_REQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/requestgenerator
-CREDENTIAL_CANCELREQ_URL=${mosip.idrepo.credrequest.generator.url}/v1/credentialrequest/cancel/
-CREDENTIAL_TYPES_URL=${mosip.idrepo.credential.service.url}/v1/credentialservice/types
-PARTNER_API_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners
-mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
-RETRIEVE_VIDS=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin/
-
-#IdRepo Service calls
-IDREPO_IDENTITY_UPDATE_COUNT=${mosip.idrepo.identity.url}/idrepository/v1/identity/{individualId}/update-counts
+## Reg-proc service calls
+REGPROCPRINT=http://regproc-group7.regproc/registrationprocessor/v1/print/uincard
+SYNCSERVICE=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/sync
+PACKETRECEIVER=${mosip.packet.receiver.url}/registrationprocessor/v1/packetreceiver/registrationpackets
+GET_RID_STATUS=${mosip.regproc.transaction.service.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
+REGISTRATIONSTATUSSEARCH=${mosip.regproc.status.service.url}/registrationprocessor/v1/registrationstatus/externalstatus/search
+
+## Resident API calls
+mosip.service-context=${server.servlet.context-path}
+RESIDENT_SERVICE=${mosip.resident.url}${mosip.service-context}
+RESIDENT_REQ_CREDENTIAL_URL=${RESIDENT_SERVICE}/req/credential/status/
+GET_ORDER_STATUS_URL=${RESIDENT_SERVICE}/mock/print-partner/check-order-status
+mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
+mosip.resident.grievance.url=${mosip.api.public.url}${mosip.service-context}/mock/external/grievance/redressel?name={name}&emailId={email}&phoneNo={phone}&eventId={eventId}
 
+## other service calls
+MIDSCHEMAURL=${mosip.kernel.syncdata.url}/v1/syncdata/latestidschema
+DIGITAL_CARD_STATUS_URL=${mosip.digitalcard.service.url}/v1/digitalcard/
+RIDGENERATION=${mosip.kernel.ridgenerator.url}/v1/ridgenerator/generate/rid
+otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+mosip.resident.service.mock.pdf.url=https://uidai.gov.in/images/New_eAadhaar1.pdf
+mosip.kernel.masterdata.audit-url=${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
 
 ## Config data
 resident.datetime.pattern=yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
 
-resident.identityjson=identity-mapping.json
-mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
-mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
+# Comma separated values of allowed auth types
+auth.types.allowed=otp-email,otp-phone,demo,bio-FINGER,bio-IRIS,bio-FACE
+
+# auth-type unlock duration
+resident.auth-type.default.unlock.duration.seconds=100
+
+# Template type codes for allowed Auth-type list (auth.types.allowed)-
+resident.otp-email.template.property.attribute.list=mosip.otp-email.template.property
+resident.otp-phone.template.property.attribute.list=mosip.otp-phone.template.property
+resident.demo.template.property.attribute.list=mosip.demo.template.property
+resident.bio-FINGER.template.property.attribute.list=mosip.bio-finger.template.property
+resident.bio-IRIS.template.property.attribute.list=mosip.bio-iris.template.property
+resident.bio-FACE.template.property.attribute.list=mosip.bio-face.template.property
+
+# Template type codes for Auth-type status-
+resident.UNLOCKED.template.property.attribute.list=mosip.unlocked.template.property
+resident.LOCKED.template.property.attribute.list=mosip.locked.template.property
 
 #Validation properties
+mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$
+mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$
 resident.grievance-redressal.alt-email.chars.limit=128
 resident.grievance-redressal.alt-phone.chars.limit=64
 resident.grievance-redressal.comments.chars.limit=1024
 resident.share-credential.purpose.chars.limit=1024
-mosip.resident.eventid.searchtext.length=16
-mosip.kernel.uin.length=10
-mosip.kernel.vid.length=16
-mosip.kernel.rid.length=29
 mosip.resident.eid.length=16
-
-
-mosip.kernel.otp.default-length=6
-resident.message.allowed.special.char.regex=^[A-Za-z0-9 .,-]+$
-resident.purpose.allowed.special.char.regex=^[A-Za-z0-9 .,-]+$
+mosip.resident.eventid.searchtext.length=${mosip.resident.eid.length}
+resident.message.allowed.special.char.regex=^[\\r\\nA-Za-z0-9 .,'-]+$
+resident.purpose.allowed.special.char.regex=^[\\r\\nA-Za-z0-9 .,'-]+$
 resident.id.allowed.special.char.regex=^[0-9]+$
 resident.document.validation.transaction-id.regex=^[0-9]{10}$
 resident.document.validation.document-id.regex=^[A-Za-z0-9-]{20,}$
 resident.validation.is-numeric.regex=^[0-9]+$
 resident.otp.validation.transaction-id.regex=^[0-9]{10}$
-resident.validation.event-id.regex=^[0-9]{16}$
+resident.validation.event-id.regex=^[0-9]{${mosip.resident.eid.length}}$
 
 ## Security
 mosip.security.csrf-enable:false
 mosip.security.secure-cookie:false
 
 IDSchema.Version=0.1
-id.repo.update=mosip.id.update
-mosip.registration.processor.registration.sync.id=mosip.registration.sync
+
 id.repo.vidType=Perpetual
 token.request.appid=resident
 token.request.clientId=mosip-resident-client
@@ -241,23 +338,26 @@ registration.processor.identityjson=identity-mapping.json
 resident.update-uin.machine-name-prefix = resident_machine_
 resident.update-uin.machine-spec-id = RESIDENT-1
 resident.update-uin.machine-zone-code = MOR
+resident.center.id=10001
+resident.machine.id=10080
 
 #Auth Adapter rest template authentication configs
 mosip.iam.adapter.appid=resident
 mosip.iam.adapter.clientid=mosip-resident-client
 mosip.iam.adapter.clientsecret=${mosip.resident.client.secret}
 
-mosip.service-context=/resident/v1
+
 ## The exclusion list of URL patterns that should not be part of authentication and authorization
 mosip.service.end-points=/**/req/otp,/**/proxy/**/*,/**/validate-otp,/**/channel/verification-status,/**/req/credential/**,/**/req/card/*,/**/req/auth-history,/**/rid/check-status,/**/req/auth-lock,/**/req/auth-unlock,/**/req/update-uin,/**/req/print-uin,/**/req/euin,/**/credential/types,/**/req/policy/**,/**/aid/status,/**/individualId/otp,/**/mock/**,/**/callback/**,/**/download-card,/**/download/registration-centers-list/**,/**/download/supporting-documents/**,/**/vid/policy,/**/vid,/vid/**,/**/download/nearestRegistrationcenters/**,/**/authorize/admin/validateToken,/**/logout/user,/**/aid-stage/**
 
 mosip.service.exclude.auth.allowed.method=POST,GET,PATCH,PUT
 
 mosip.ida.env=Production
+mosip.ida.domain-url=${mosipbox.public.url}
 
 ## Captcha service
 ## Configuration for google re-captcha
-mosip.resident.captcha.enable=true
+mosip.resident.captcha.enable=false
 mosip.resident.captcha.id.validate=mosip.resident.captcha.id.validate
 mosip.resident.captcha.sitekey=${resident.captcha.site.key}
 mosip.resident.captcha.secretkey=${resident.captcha.secret.key}
@@ -265,58 +365,23 @@ mosip.resident.captcha.resourse.url=http://resident-captcha.resident/resident/v1
 mosip.resident.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify
 
 
-#------------Request IDs---------------------
-# The request IDs used in Resident REST APIs
-mosip.resident.api.id.otp.request=mosip.identity.otp.internal
-mosip.resident.api.id.auth=mosip.identity.auth.internal
-
-#------------Request Versions---------------------
-# The request versions used in Resident REST APIs
-mosip.resident.api.version.otp.request=1.0
-mosip.resident.api.version.auth=1.0
-
-resident.view.history.serviceType.filters=ALL,AUTHENTICATION_REQUEST,SERVICE_REQUEST,DATA_UPDATE_REQUEST,ID_MANAGEMENT_REQUEST,DATA_SHARE_REQUEST
-resident.view.history.status.filters=all,Success,In Progress,Failed
-
 #Comma separated values of property keys to be exposed to /proxy/config/ui-properties API
 
-resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.template.tnc.order-a-physical-card,resident.template.tnc.share-cred-with-partner,resident.template.tnc.update-demo,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters,resident.ui.notification.update.interval.seconds,mosip.kernel.otp.expiry-time,resident.grievance-redressal.alt-email.chars.limit,resident.grievance-redressal.alt-phone.chars.limit,resident.grievance-redressal.comments.chars.limit,resident.share-credential.purpose.chars.limit,mosip.resident.eventid.searchtext.length,mosip.kernel.uin.length,mosip.kernel.vid.length,mosip.kernel.rid.length,mosip.resident.eid.length,mosip.kernel.otp.default-length,resident.message.allowed.special.char.regex,resident.purpose.allowed.special.char.regex,resident.id.allowed.special.char.regex,resident.version.new,mosip.resident.identity.auth.internal.id
-
-
-
-#IdRepo Identity call
-IDREPO_IDENTITY_URL=${mosip.idrepo.identity.url}/idrepository/v1/identity/idvid/{id}
-
-#Pre-reg application service call
-#PREREG_TRANSLITERATION_URL=${mosip.prereg.application.url}/preregistration/v1/transliteration/transliterate
-
-#Database config
-mosip.resident.database.hostname=postgres-postgresql.postgres
-mosip.resident.database.port=5432
-
-javax.persistence.jdbc.driver=org.postgresql.Driver
-javax.persistence.jdbc.url=jdbc:postgresql://${mosip.resident.database.hostname}:${mosip.resident.database.port}/mosip_resident
-javax.persistence.jdbc.user=residentuser
-javax.persistence.jdbc.password=${db.dbuser.password}
-
-
+resident.ui.propertyKeys=mosip.mandatory-languages,mosip.optional-languages,mosip.utc-datetime-pattern,mosip.iam.adapter.clientid,resident.datetime.pattern,mosip.resident.api.id.otp.request,mosip.resident.api.id.auth,mosip.resident.api.version.otp.request,mosip.resident.api.version.auth,mosip-prereg-host,mosip-prereg-ui-url,auth.types.allowed,resident.view.history.serviceType.filters,resident.view.history.status.filters,resident.auth-type.default.unlock.duration.seconds,mosip.resident.grievance.url,mosip.api.public.host,mosip.resident.captcha.sitekey,mosip.resident.captcha.secretkey,mosip.webui.auto.logout.idle,mosip.webui.auto.logout.ping,mosip.webui.auto.logout.timeout,mosip.resident.download.registration.centre.file.name.convention,mosip.resident.download.supporting.document.file.name.convention,mosip.resident.download.personalized.card.naming.convention,mosip.resident.ack.manage_my_vid.name.convention,mosip.resident.ack.secure_my_id.name.convention,mosip.resident.ack.personalised_card.name.convention,mosip.resident.ack.update_my_data.name.convention,mosip.resident.ack.share_credential.name.convention,mosip.resident.ack.order_physical_card.name.convention,mosip.resident.ack.name.convention,mosip.resident.uin.card.name.convention,mosip.resident.vid.card.name.convention,mosip.resident.download.service.history.file.name.convention,mosip.resident.download.nearest.registration.centre.file.name.convention,auth.internal.id,auth.internal.version,mosip.registration.processor.print.id,mosip.registration.processor.application.version,vid.create.id,mosip.resident.create.vid.version,resident.vid.version,resident.vid.version.new,resident.revokevid.version,resident.revokevid.version.new,resident.vid.id,resident.vid.id.generate,resident.vid.policy.id,resident.vid.get.id,auth.type.status.id,resident.authlock.id,resident.checkstatus.id,resident.checkstatus.version,resident.euin.id,resident.printuin.id,resident.uin.id,resident.rid.id,resident.updateuin.id,resident.authunlock.id,resident.authhistory.id,resident.authLockStatusUpdateV2.id,resident.authLockStatusUpdateV2.version,resident.service.history.id,resident.service.history.version,resident.document.upload.id,resident.document.get.id,resident.document.get.version,resident.document.list.id,resident.document.list.version,resident.service.pin.status.id,resident.service.pin.status.version,resident.service.unpin.status.id,resident.service.unpin.status.version,resident.document.delete.id,resident.document.delete.version,resident.contact.details.update.id,resident.contact.details.send.otp.id,mosip.resident.service.status.check.id,mosip.resident.service.status.check.version,resident.service.unreadnotificationlist.id,resident.service.event.id,resident.service.event.version,resident.identity.info.id,resident.identity.info.version,resident.share.credential.id,resident.share.credential.version,mosip.resident.request.response.version,vid.revoke.id,resident.revokevid.id,mosip.resident.revokevid.id,mosip.resident.grievance.ticket.request.id,mosip.resident.grievance.ticket.request.version,resident.channel.verification.status.id,resident.channel.verification.status.version,resident.event.ack.download.id,resident.event.ack.download.version,resident.download.card.eventid.id ,resident.download.card.eventid.version,mosip.resident.request.vid.card.id,mosip.resident.request.vid.card.version,mosip.credential.request.service.id,mosip.credential.request.service.version,mosip.resident.checkstatus.individualid.id,mosip.resident.checkstatus.individualid.version,mosip.resident.download.personalized.card.id,mosip.resident.transliteration.transliterate.id,resident.ui.properties.id,resident.ui.properties.version,resident.nearby.centers.distance.meters,resident.ui.notification.update.interval.seconds,mosip.kernel.otp.expiry-time,resident.grievance-redressal.alt-email.chars.limit,resident.grievance-redressal.alt-phone.chars.limit,resident.grievance-redressal.comments.chars.limit,resident.share-credential.purpose.chars.limit,mosip.resident.eventid.searchtext.length,mosip.kernel.uin.length,mosip.kernel.vid.length,mosip.kernel.rid.length,mosip.resident.eid.length,mosip.kernel.otp.default-length,resident.message.allowed.special.char.regex,resident.purpose.allowed.special.char.regex,resident.id.allowed.special.char.regex,resident.version.new,mosip.resident.identity.auth.internal.id,resident.validation.event-id.regex,resident.document.validation.transaction-id.regex,resident.document.validation.document-id.regex,resident.validation.is-numeric.regex,resident.otp.validation.transaction-id.regex,,mosip.resident.captcha.enable,resident.download.reg.centers.list.id,resident.download.nearest.reg.centers.id,resident.download.supporting.documents.id,resident.send.card.id,resident.pinned.eventid.id,resident.unpinned.eventid.id,resident.auth.proxy.partners.id,resident.events.eventid.id,resident.notification.id,resident.profile.id,resident.notification.click.id,mosip.credential.store.id,resident.vids.id,mosip.resident.zoom,mosip.resident.maxZoom,mosip.resident.minZoom
 
 
 auth.allowed.urls=https://${mosip.resident.host}/,https://${mosip.resident.host}/resident-ui/,https://${mosip.resident.host}/resident-ui/**
 
 
-# IAM
-mosip.iam.module.login_flow.name=authorization_code
-
 ###########################################################
 # IdP config
-# Note: When enabling MOSIP-IdP comment Mock Keycloak config, vise versa.
-################## MOSIP ESignet config
-mosip.iam.module.clientID=sK-zOe1Ke6X-f83yRpR4sOHxuPAWNZ5vzEpOjCyKWMk
+# Note: When enabling MOSIP E-Signet comment Mock Keycloak config, vise versa.
+################## MOSIP E-Signet config
+mosip.iam.module.clientID=${resident.oidc.clientid}
 mosip.iam.module.clientsecret=
-mosip.iam.base.url=https://${mosip.api.public.host}/v1/esignet
+mosip.iam.base.url=https://${mosip.esignet.host}/v1/esignet
 mosip.iam.authorization_endpoint=https://${mosip.esignet.host}/authorize
-mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/token
+mosip.iam.token_endpoint=${mosip.iam.base.url}/oauth/v2/token
 mosip.iam.userinfo_endpoint=${mosip.iam.base.url}/oidc/userinfo
 mosip.iam.certs_endpoint=${mosip.iam.base.url}/oauth/.well-known/jwks.json
 auth.server.admin.issuer.uri=${mosip.iam.base.url}
@@ -331,7 +396,7 @@ auth.server.admin.oidc.certs.url=${mosip.iam.certs_endpoint}
 mosip.iam.logout.offline=true
 auth.server.admin.validate.url=
 mosip.resident.oidc.userinfo.jwt.verify.enabled=false
-################### MOSIP IdP config ends
+################### MOSIP E-Signet config ends
 
 ################### Mock-keycloak IdP config
 #mosip.iam.module.clientID=mosip-resident-client
@@ -344,19 +409,23 @@ mosip.resident.oidc.userinfo.jwt.verify.enabled=false
 #mosip.resident.oidc.userinfo.jwt.signed=false
 ################### Mock-keycloak IdP config ends
 ###########################################################
-mosip.iam.module.redirecturi=${mosip.api.public.url}/resident/v1/login-redirect/
+
+
+## IAM
+mosip.iam.module.redirecturi=${mosip.api.internal.url}/resident/v1/login-redirect/
 #mosip.iam.module.redirecturi=${tempuri}/v1/admin/login-redirect/
+mosip.iam.module.login_flow.name=authorization_code
 #mosip.iam.module.login_flow.scope=cls
 mosip.iam.module.login_flow.scope=openid profile Manage-Identity-Data Manage-VID Manage-Authentication Manage-Service-Requests Manage-Credentials
+mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 mosip.iam.module.login_flow.response_type=code
-
 mosip.iam.module.admin_realm_id=mosip
 
-#User-info claim attributes in open-id-connect based login with UIN/VID in MOSIP-IDP
+## User-info claim attributes in open-id-connect based login with UIN/VID in MOSIP-IDP
 mosip.resident.identity.claim.individual-id=individual_id
 mosip.resident.identity.claim.ida-token=ida_token
 
-#Scopes
+## Scopes
 mosip.scope.resident.getinputattributevalues=Manage-Identity-Data
 mosip.scope.resident.patchrevokevid=Manage-VID
 mosip.scope.resident.postgeneratevid=Manage-VID
@@ -369,7 +438,7 @@ mosip.scope.resident.patchUpdateUin=Manage-Identity-Data
 mosip.scope.resident.getServiceAuthHistoryRoles=Manage-Service-Requests
 mosip.scope.resident.postSendPhysicalCard=Manage-Credentials
 mosip.scope.resident.getUnreadServiceList=Manage-Service-Requests
-mosip.scope.resident.getNotificationCount=Manage-Service-Requests
+mosip.scope.resident.getNotificationCount=
 mosip.scope.resident.getNotificationClick=Manage-Service-Requests
 mosip.scope.resident.getupdatedttimes=Manage-Service-Requests
 mosip.scope.resident.postRequestDownloadPersonalizedCard=Manage-Credentials
@@ -380,21 +449,31 @@ mosip.scope.resident.getDownloadCard=Manage-Credentials
 mosip.scope.resident.postPersonalizedCard=Manage-Credentials
 mosip.scope.resident.getOrderRedirect=Manage-Credentials
 
-## Key manager
-mosip.resident.keymanager.encrypt-uri=${mosip.kernel.keymanager.url}/v1/keymanager/encrypt	
-mosip.resident.keymanager.decrypt-uri=${mosip.kernel.keymanager.url}/v1/keymanager/decrypt
-
-# Object Store configuration
-mosip.resident.object.store.account-name=resident
-mosip.resident.object.store.bucket-name=resident
-mosip.resident.object.store.adapter-name=s3Adapter
-object.store.s3.use.account.as.bucketname=true
 
-# Key manager encryption/decryption configuration
+## Key manager encryption/decryption configuration
+APPLICATION_Id=RESIDENT
+PARTNER_REFERENCE_Id=mpartner-default-resident
 mosip.resident.keymanager.application-name=RESIDENT
 mosip.resident.keymanager.reference-id=resident_document
 mosip.datashare.application.id=PARTNER
 mosip.datashare.reference.id=mparter-default-euin
+mosip.resident.oidc.keymanager.reference.id=IDP_USER_INFO
+mosip.resident.sign.pdf.application.id=KERNEL
+mosip.resident.sign.pdf.reference.id=SIGN
+
+## Object Store configuration
+mosip.resident.object.store.account-name=resident
+mosip.resident.object.store.bucket-name=resident
+mosip.resident.object.store.adapter-name=s3Adapter
+object.store.s3.use.account.as.bucketname=true
+object.store.s3.accesskey=${s3.accesskey}
+object.store.s3.secretkey=${s3.secretkey}
+## For Minio:
+object.store.s3.url=http://minio.minio:9000
+## For AWS:
+#object.store.s3.url=s3.${s3.region}.amazonaws.com
+object.store.s3.region=${s3.region}
+object.store.s3.readlimit=10000000
 
 # Virus Scanner configuration
 mosip.resident.virus-scanner.enabled=true
@@ -402,8 +481,6 @@ mosip.resident.virus-scanner.enabled=true
 # VID Policy url
 mosip.resident.vid-policy-url=${config.server.file.storage.uri}mosip-vid-policy.json
 
-
-
 # Resident UI Schema JSON file name
 resident-ui-schema-file-name-prefix=resident-ui
 # IDA Mapping JSON file URI
@@ -419,15 +496,15 @@ identity-mapping-file-url=${config.server.file.storage.uri}${identity-mapping-fi
 # Identity Mapping JSON file property source
 identity-mapping-file-source=url:${identity-mapping-file-url}
 
-
+# amr-acr JSON file name
+amr-acr.json.filename=amr-acr-mapping.json
 
 # Identity Data format MVEL file name
-resident-data-format-mvel-file-name=identity-data-formatter.mvel
+resident-data-format-mvel-file-name=credentialdata.mvel
 resident-data-format-mvel-file-url=${config.server.file.storage.uri}${resident-data-format-mvel-file-name} 
 resident-data-format-mvel-file-source=url:${resident-data-format-mvel-file-url}
 
 
-
 # WebSub Topic and callback propertis for auth type status event
 resident.websub.authtype-status.secret=${resident.websub.authtype.status.secret}
 resident.websub.authtype-status.topic=AUTH_TYPE_STATUS_UPDATE_ACK
@@ -440,6 +517,17 @@ resident.websub.authTransaction-status.topic=AUTHENTICATION_TRANSACTION_STATUS
 resident.websub.callback.authTransaction-status.relative.url=${server.servlet.context-path}/callback/authTransaction
 resident.websub.callback.authTransaction-status.url=${mosip.api.internal.url}${resident.websub.callback.authTransaction-status.relative.url}
 
+# WebSub Topic and callback propertis for credential status event
+resident.websub.credential-status.secret=${resident.websub.credential.status.update.secret}
+resident.websub.credential-status.topic=CREDENTIAL_STATUS_UPDATE
+resident.websub.callback.credential-status.relative.url=${server.servlet.context-path}/callback/credentialStatusUpdate
+resident.websub.callback.credential-status.url=${mosip.api.internal.url}${resident.websub.callback.credential-status.relative.url}
+
+# WebSub Topic and callback propertis for regproc complete workflow event
+resident.websub.regproc.workflow.complete.secret=${resident.websub.regproc.workflow.complete.secret}
+mosip.regproc.workflow.complete.topic=REGISTRATION_PROCESSOR_WORKFLOW_COMPLETED_EVENT
+resident.websub.callback.regproc.workflow.complete.relative.url=${server.servlet.context-path}/callback/regprocworkflow
+resident.websub.callback.regproc.workflow.complete.url=${mosip.api.internal.url}${resident.websub.callback.regproc.workflow.complete.relative.url}
 
 
 #--------------------------------TokenId generator---------------------------------------------------#
@@ -447,228 +535,206 @@ mosip.kernel.tokenid.uin.salt=${mosip.kernel.uin.salt}
 mosip.kernel.tokenid.partnercode.salt=${mosip.kernel.partnercode.salt}
 #------------------------------------
 
-# Object store
-object.store.s3.accesskey=${s3.accesskey}
-object.store.s3.secretkey=${s3.secretkey}
-## For Minio: object.store.s3.url=http://minio.minio:9000
-## For AWS: object.store.s3.url=s3.${s3.region}.amazonaws.com
-object.store.s3.url=http://minio.minio:9000
-object.store.s3.region=${s3.region}
-object.store.s3.readlimit=10000000
-
-# Partner Service URL
-mosip.pms.pmp.partner.rest.uri=${mosip.pms.partnermanager.url}/v1/partnermanager/partners?partnerType=Online_Verification_Partner
 
 #Mask functions
 resident.email.mask.function=maskEmail
 resident.phone.mask.function=maskPhone
-resident.data.mask.function=convertToMaskDataFormat
-
-#property for dateOfBirth
-resident.dateofbirth.pattern=yyyy/MM/dd
-
-resident.documents.category=individualBiometrics
-
-#order card payment
-mosip.resident.order.card.payment.enabled=true
-
-#Check Order Status URL
-GET_ORDER_STATUS_URL=${mosip.resident.url}/resident/v1/mock/print-partner/check-order-status
-
-RESIDENT_REQ_CREDENTIAL_URL=${mosip.resident.url}/resident/v1/req/credential/status/
-
-DIGITAL_CARD_STATUS_URL=${mosip.digitalcard.service.url}/v1/digitalcard/
-mosip.resident.service.mock.pdf.url=https://uidai.gov.in/images/New_eAadhaar1.pdf
-
-
-#templates for resident
-resident.template.tnc.order-a-physical-card=tnc-order-a-physical-card
-resident.template.tnc.share-cred-with-partner=tnc-share-cred-with-partner
-resident.template.tnc.update-demo=tnc-update-demo
+resident.data.mask.function=convertToMaskData
 
 # Batch job configuration for credential status update
-mosip.resident.update.service.status.job.enabled=true
+mosip.resident.update.service.status.job.enabled=false
 mosip.resident.update.service.status.job.initial-delay=60000
-mosip.resident.update.service.status.job.interval.millisecs=60000
-
-# auth-type unlock duration
-resident.auth-type.default.unlock.duration.seconds=100
-
-#templates for email subject
-resident.template.email.subject.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received-email-subject
-resident.template.email.subject.success.cust-and-down-my-card=cust-and-down-my-card-success-email-subject
-resident.template.email.subject.failure.cust-and-down-my-card=cust-and-down-my-card-failure-email-subject
+#Interval for checking the credential status for async requests. Note, this is done as a fallback though credential status update is hanlded in resident service via websub notification.
+mosip.resident.update.service.status.job.interval.millisecs=600000
 
-resident.template.email.subject.request-received.order-a-physical-card=order-a-physical-card-request-received-email-subject
-resident.template.email.subject.success.order-a-physical-card=order-a-physical-card-success-email-subject
-resident.template.email.subject.failure.order-a-physical-card=order-a-physical-card-failure-email-subject
 
-resident.template.email.subject.request-received.share-cred-with-partner=share-cred-with-partner-request-received-email-subject
-resident.template.email.subject.success.share-cred-with-partner=share-cred-with-partner-success-email-subject
-resident.template.email.subject.failure.share-cred-with-partner=share-cred-with-partner-failure-email-subject
+# Template type codes for email subject
+resident.template.email.subject.request-received.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-request-received-email-subject
+resident.template.email.subject.success.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-success-email-subject
+resident.template.email.subject.failure.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-failure-email-subject
+
+resident.template.email.subject.request-received.ORDER_PHYSICAL_CARD=order-a-physical-card-request-received-email-subject
+resident.template.email.subject.success.ORDER_PHYSICAL_CARD=order-a-physical-card-success-email-subject
+resident.template.email.subject.failure.ORDER_PHYSICAL_CARD=order-a-physical-card-failure-email-subject
 
-resident.template.email.subject.request-received.lock-unlock-auth=lock-unlock-auth-request-received-email-subject
-resident.template.email.subject.success.lock-unlock-auth=lock-unlock-auth-success-email-subject
-resident.template.email.subject.failure.lock-unlock-auth=lock-unlock-auth-failure-email-subject
-
-resident.template.email.subject.request-received.update-demo-data=update-demo-data-request-received-email-subject
-resident.template.email.subject.success.update-demo-data=update-demo-data-success-email-subject
-resident.template.email.subject.failure.update-demo-data=update-demo-data-failure-email-subject
-
-resident.template.email.subject.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received-email-subject
-resident.template.email.subject.success.gen-or-revoke-vid=gen-or-revoke-vid-success-email-subject
-resident.template.email.subject.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure-email-subject
-
-resident.template.email.subject.request-received.vid-card-download=vid-card-download-request-received-email-subject
-resident.template.email.subject.success.vid-card-download=vid-card-download-success-email-subject
-resident.template.email.subject.failure.vid-card-download=vid-card-download-failure-email-subject
-
-resident.template.email.subject.request-received.get-my-uin-card=get-my-uin-card-request-received-email-subject
-resident.template.email.subject.success.get-my-uin-card=get-my-uin-card-success-email-subject
-resident.template.email.subject.failure.get-my-uin-card=get-my-uin-card-failure-email-subject
-
-resident.template.email.subject.request-received.verify-my-phone-email=verify-my-phone-email-request-received-email-subject
-resident.template.email.subject.success.verify-my-phone-email=verify-my-phone-email-success-email-subject
-resident.template.email.subject.failure.verify-my-phone-email=verify-my-phone-email-failure-email-subject
-
-#templates for email content
-resident.template.email.content.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received-email-content
-resident.template.email.content.success.cust-and-down-my-card=cust-and-down-my-card-success-email-content
-resident.template.email.content.failure.cust-and-down-my-card=cust-and-down-my-card-failure-email-content
-
-resident.template.email.content.request-received.order-a-physical-card=order-a-physical-card-request-received-email-content
-resident.template.email.content.success.order-a-physical-card=order-a-physical-card-success-email-content
-resident.template.email.content.failure.order-a-physical-card=order-a-physical-card-failure-email-content
-
-resident.template.email.content.request-received.share-cred-with-partner=share-cred-with-partner-request-received-email-content
-resident.template.email.content.success.share-cred-with-partner=share-cred-with-partner-success-email-content
-resident.template.email.content.failure.share-cred-with-partner=share-cred-with-partner-failure-email-content
-
-resident.template.email.content.request-received.lock-unlock-auth=lock-unlock-auth-request-received-email-content
-resident.template.email.content.success.lock-unlock-auth=lock-unlock-auth-success-email-content
-resident.template.email.content.failure.lock-unlock-auth=lock-unlock-auth-failure-email-content
-
-resident.template.email.content.request-received.update-demo-data=update-demo-data-request-received-email-content
-resident.template.email.content.success.update-demo-data=update-demo-data-success-email-content
-resident.template.email.content.failure.update-demo-data=update-demo-data-failure-email-content
-
-resident.template.email.content.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received-email-content
-resident.template.email.content.success.gen-or-revoke-vid=gen-or-revoke-vid-success-email-content
-resident.template.email.content.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure-email-content
-
-resident.template.email.content.request-received.vid-card-download=vid-card-download-request-received-email-content
-resident.template.email.content.success.vid-card-download=vid-card-download-success-email-content
-resident.template.email.content.failure.vid-card-download=vid-card-download-failure-email-content
-
-resident.template.email.content.request-received.get-my-uin-card=get-my-uin-card-request-received-email-content
-resident.template.email.content.success.get-my-uin-card=get-my-uin-card-success-email-content
-resident.template.email.content.failure.get-my-uin-card=get-my-uin-card-failure-email-content
-
-resident.template.email.content.request-received.verify-my-phone-email=verify-my-phone-email-request-received-email-content
-resident.template.email.content.success.verify-my-phone-email=verify-my-phone-email-success-email-content
-resident.template.email.content.failure.verify-my-phone-email=verify-my-phone-email-failure-email-content
-
-#templates for sms content
-resident.template.sms.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received_SMS
-resident.template.sms.success.cust-and-down-my-card=cust-and-down-my-card-success_SMS
-resident.template.sms.failure.cust-and-down-my-card=cust-and-down-my-card-failure_SMS
-
-resident.template.sms.request-received.order-a-physical-card=order-a-physical-card-request-received_SMS
-resident.template.sms.success.order-a-physical-card=order-a-physical-card-success_SMS
-resident.template.sms.failure.order-a-physical-card=order-a-physical-card-failure_SMS
-
-resident.template.sms.request-received.share-cred-with-partner=share-cred-with-partner-request-received_SMS
-resident.template.sms.success.share-cred-with-partner=share-cred-with-partner-success_SMS
-resident.template.sms.failure.share-cred-with-partner=share-cred-with-partner-failure_SMS
-
-resident.template.sms.request-received.lock-unlock-auth=lock-unlock-auth-request-received_SMS
-resident.template.sms.success.lock-unlock-auth=lock-unlock-auth-success_SMS
-resident.template.sms.failure.lock-unlock-auth=lock-unlock-auth-failure_SMS
-
-resident.template.sms.request-received.update-demo-data=update-demo-data-request-received_SMS
-resident.template.sms.success.update-demo-data=update-demo-data-success_SMS
-resident.template.sms.failure.update-demo-data=update-demo-data-failure_SMS
-
-resident.template.sms.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received_SMS
-resident.template.sms.success.gen-or-revoke-vid=gen-or-revoke-vid-success_SMS
-resident.template.sms.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure_SMS
-
-resident.template.sms.request-received.vid-card-download=vid-card-download-request-received_SMS
-resident.template.sms.success.vid-card-download=vid-card-download-success_SMS
-resident.template.sms.failure.vid-card-download=vid-card-download-failure_SMS
-
-resident.template.sms.request-received.get-my-uin-card=get-my-uin-card-request-received_SMS
-resident.template.sms.success.get-my-uin-card=get-my-uin-card-success_SMS
-resident.template.sms.failure.get-my-uin-card=get-my-uin-card-failure_SMS
-
-resident.template.sms.request-received.verify-my-phone-email=verify-my-phone-email-request-received_SMS
-resident.template.sms.success.verify-my-phone-email=verify-my-phone-email-success_SMS
-resident.template.sms.failure.verify-my-phone-email=verify-my-phone-email-failure_SMS
-
-#templates for bell-icon notification
-resident.template.bell-icon.request-received.cust-and-down-my-card=cust-and-down-my-card-request-received_BELL
-resident.template.bell-icon.success.cust-and-down-my-card=cust-and-down-my-card-success_BELL
-resident.template.bell-icon.failure.cust-and-down-my-card=cust-and-down-my-card-failure_BELL
-
-resident.template.bell-icon.request-received.order-a-physical-card=order-a-physical-card-request-received_BELL
-resident.template.bell-icon.success.order-a-physical-card=order-a-physical-card-success_BELL
-resident.template.bell-icon.failure.order-a-physical-card=order-a-physical-card-failure_BELL
-
-resident.template.bell-icon.request-received.share-cred-with-partner=share-cred-with-partner-request-received_BELL
-resident.template.bell-icon.success.share-cred-with-partner=share-cred-with-partner-success_BELL
-resident.template.bell-icon.failure.share-cred-with-partner=share-cred-with-partner-failure_BELL
-
-resident.template.bell-icon.request-received.lock-unlock-auth=lock-unlock-auth-request-received_BELL
-resident.template.bell-icon.success.lock-unlock-auth=lock-unlock-auth-success_BELL
-resident.template.bell-icon.failure.lock-unlock-auth=lock-unlock-auth-failure_BELL
-
-resident.template.bell-icon.request-received.update-demo-data=update-demo-data-request-received_BELL
-resident.template.bell-icon.success.update-demo-data=update-demo-data-success_BELL
-resident.template.bell-icon.failure.update-demo-data=update-demo-data-failure_BELL
-
-resident.template.bell-icon.request-received.gen-or-revoke-vid=gen-or-revoke-vid-request-received_BELL
-resident.template.bell-icon.success.gen-or-revoke-vid=gen-or-revoke-vid-success_BELL
-resident.template.bell-icon.failure.gen-or-revoke-vid=gen-or-revoke-vid-failure_BELL
-
-resident.template.bell-icon.request-received.get-my-uin-card=get-my-uin-card-request-received_BELL
-resident.template.bell-icon.success.get-my-uin-card=get-my-uin-card-success_BELL
-resident.template.bell-icon.failure.get-my-uin-card=get-my-uin-card-failure_BELL
-
-resident.template.bell-icon.request-received.verify-my-phone-email=verify-my-phone-email-request-received_BELL
-resident.template.bell-icon.success.verify-my-phone-email=verify-my-phone-email-success_BELL
-resident.template.bell-icon.failure.verify-my-phone-email=verify-my-phone-email-failure_BELL
-
-#templates for purpose (success) content
-resident.template.purpose.success.cust-and-down-my-card=cust-and-down-my-card-positive-purpose
-resident.template.purpose.success.order-a-physical-card=order-a-physical-card-positive purpose
-resident.template.purpose.success.share-cred-with-partner=share-cred-with-partner-positive-purpose
-resident.template.purpose.success.lock-unlock-auth=lock-unlock-auth-positive-purpose
-resident.template.purpose.success.update-demo-data=update-demo-data-positive-purpose
-resident.template.purpose.success.gen-or-revoke-vid=gen-or-revoke-vid-positive-purpose
-resident.template.purpose.success.get-my-uin-card=get-my-uin-card-positive-purpose
-resident.template.purpose.success.verify-my-phone-email=verify-my-phone-email-positive-purpose
-
-#templates for purpose (in-progress/failure) content
-resident.template.purpose.failure.cust-and-down-my-card=cust-and-down-my-card-negative-purpose
-resident.template.purpose.failure.order-a-physical-card=order-a-physical-card-negative purpose
-resident.template.purpose.failure.share-cred-with-partner=share-cred-with-partner-negative-purpose
-resident.template.purpose.failure.lock-unlock-auth=lock-unlock-auth-negative-purpose
-resident.template.purpose.failure.update-demo-data=update-demo-data-negative-purpose
-resident.template.purpose.failure.gen-or-revoke-vid=gen-or-revoke-vid-negative-purpose
-resident.template.purpose.failure.get-my-uin-card=get-my-uin-card-negative-purpose
-resident.template.purpose.failure.verify-my-phone-email=verify-my-phone-email-negative-purpose
-
-#templates for summary (success) content
-resident.template.summary.success.cust-and-down-my-card=cust-and-down-my-card-success-summary
-resident.template.summary.success.order-a-physical-card=order-a-physical-card-success-summary
-resident.template.summary.success.share-cred-with-partner=share-cred-with-partner-success-summary
-resident.template.summary.success.lock-unlock-auth=lock-unlock-auth-success-summary
-resident.template.summary.success.update-demo-data=update-demo-data-success-summary
-resident.template.summary.success.gen-or-revoke-vid=gen-or-revoke-vid-success-summary
-resident.template.summary.success.get-my-uin-card=get-my-uin-card-success-summary
-resident.template.summary.success.verify-my-phone-email=verify-my-phone-email-success-summary
-
-#templates for acknowledgement
+resident.template.email.subject.request-received.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-request-received-email-subject
+resident.template.email.subject.success.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-success-email-subject
+resident.template.email.subject.failure.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-failure-email-subject
+
+resident.template.email.subject.request-received.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-request-received-email-subject
+resident.template.email.subject.success.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-success-email-subject
+resident.template.email.subject.failure.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-failure-email-subject
+
+resident.template.email.subject.request-received.UPDATE_MY_UIN=update-demo-data-request-received-email-subject
+resident.template.email.subject.success.UPDATE_MY_UIN=update-demo-data-success-email-subject
+resident.template.email.subject.failure.UPDATE_MY_UIN=update-demo-data-failure-email-subject
+resident.template.email.subject.regproc-success.UPDATE_MY_UIN=update-demo-data-regproc-success-email-subject
+resident.template.email.subject.regproc-failure.UPDATE_MY_UIN=update-demo-data-regproc-failure-email-subject
+resident.template.email.subject.cancelled.UPDATE_MY_UIN=update-demo-data-discarded-email-subject
+
+resident.template.email.subject.request-received.GENERATE_VID=gen-or-revoke-vid-request-received-email-subject
+resident.template.email.subject.success.GENERATE_VID=gen-or-revoke-vid-success-email-subject
+resident.template.email.subject.failure.GENERATE_VID=gen-or-revoke-vid-failure-email-subject
+
+resident.template.email.subject.request-received.REVOKE_VID=gen-or-revoke-vid-request-received-email-subject
+resident.template.email.subject.success.REVOKE_VID=gen-or-revoke-vid-success-email-subject
+resident.template.email.subject.failure.REVOKE_VID=gen-or-revoke-vid-failure-email-subject
+
+resident.template.email.subject.request-received.VID_CARD_DOWNLOAD=vid-card-download-request-received-email-subject
+resident.template.email.subject.success.VID_CARD_DOWNLOAD=vid-card-download-success-email-subject
+resident.template.email.subject.failure.VID_CARD_DOWNLOAD=vid-card-download-failure-email-subject
+
+resident.template.email.subject.request-received.GET_MY_ID=get-my-uin-card-request-received-email-subject
+resident.template.email.subject.success.GET_MY_ID=get-my-uin-card-success-email-subject
+resident.template.email.subject.failure.GET_MY_ID=get-my-uin-card-failure-email-subject
+
+resident.template.email.subject.request-received.VALIDATE_OTP=verify-my-phone-email-request-received-email-subject
+resident.template.email.subject.success.VALIDATE_OTP=verify-my-phone-email-success-email-subject
+resident.template.email.subject.failure.VALIDATE_OTP=verify-my-phone-email-failure-email-subject
+
+resident.template.email.subject.success.SEND_OTP=receive-otp-mail-subject
+
+# Template type codes for email content
+resident.template.email.content.request-received.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-request-received-email-content
+resident.template.email.content.success.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-success-email-content
+resident.template.email.content.failure.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-failure-email-content
+
+resident.template.email.content.request-received.ORDER_PHYSICAL_CARD=order-a-physical-card-request-received-email-content
+resident.template.email.content.success.ORDER_PHYSICAL_CARD=order-a-physical-card-success-email-content
+resident.template.email.content.failure.ORDER_PHYSICAL_CARD=order-a-physical-card-failure-email-content
+
+resident.template.email.content.request-received.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-request-received-email-content
+resident.template.email.content.success.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-success-email-content
+resident.template.email.content.failure.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-failure-email-content
+
+resident.template.email.content.request-received.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-request-received-email-content
+resident.template.email.content.success.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-success-email-content
+resident.template.email.content.failure.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-failure-email-content
+
+resident.template.email.content.request-received.UPDATE_MY_UIN=update-demo-data-request-received-email-content
+resident.template.email.content.success.UPDATE_MY_UIN=update-demo-data-success-email-content
+resident.template.email.content.failure.UPDATE_MY_UIN=update-demo-data-failure-email-content
+resident.template.email.content.regproc-success.UPDATE_MY_UIN=update-demo-data-regproc-success-email-content
+resident.template.email.content.regproc-failure.UPDATE_MY_UIN=update-demo-data-regproc-failure-email-content
+resident.template.email.content.cancelled.UPDATE_MY_UIN=update-demo-data-discarded-email-content
+
+resident.template.email.content.request-received.GENERATE_VID=gen-or-revoke-vid-request-received-email-content
+resident.template.email.content.success.GENERATE_VID=gen-or-revoke-vid-success-email-content
+resident.template.email.content.failure.GENERATE_VID=gen-or-revoke-vid-failure-email-content
+
+resident.template.email.content.request-received.REVOKE_VID=gen-or-revoke-vid-request-received-email-content
+resident.template.email.content.success.REVOKE_VID=gen-or-revoke-vid-success-email-content
+resident.template.email.content.failure.REVOKE_VID=gen-or-revoke-vid-failure-email-content
+
+resident.template.email.content.request-received.VID_CARD_DOWNLOAD=vid-card-download-request-received-email-content
+resident.template.email.content.success.VID_CARD_DOWNLOAD=vid-card-download-success-email-content
+resident.template.email.content.failure.VID_CARD_DOWNLOAD=vid-card-download-failure-email-content
+
+resident.template.email.content.request-received.GET_MY_ID=get-my-uin-card-request-received-email-content
+resident.template.email.content.success.GET_MY_ID=get-my-uin-card-success-email-content
+resident.template.email.content.failure.GET_MY_ID=get-my-uin-card-failure-email-content
+
+resident.template.email.content.request-received.VALIDATE_OTP=verify-my-phone-email-request-received-email-content
+resident.template.email.content.success.VALIDATE_OTP=verify-my-phone-email-success-email-content
+resident.template.email.content.failure.VALIDATE_OTP=verify-my-phone-email-failure-email-content
+
+resident.template.email.content.success.SEND_OTP=receive-otp-mail-content
+
+# Template type codes for sms content
+resident.template.sms.request-received.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-request-received_SMS
+resident.template.sms.success.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-success_SMS
+resident.template.sms.failure.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-failure_SMS
+
+resident.template.sms.request-received.ORDER_PHYSICAL_CARD=order-a-physical-card-request-received_SMS
+resident.template.sms.success.ORDER_PHYSICAL_CARD=order-a-physical-card-success_SMS
+resident.template.sms.failure.ORDER_PHYSICAL_CARD=order-a-physical-card-failure_SMS
+
+resident.template.sms.request-received.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-request-received_SMS
+resident.template.sms.success.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-success_SMS
+resident.template.sms.failure.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-failure_SMS
+
+resident.template.sms.request-received.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-request-received_SMS
+resident.template.sms.success.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-success_SMS
+resident.template.sms.failure.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-failure_SMS
+
+resident.template.sms.request-received.UPDATE_MY_UIN=update-demo-data-request-received_SMS
+resident.template.sms.success.UPDATE_MY_UIN=update-demo-data-success_SMS
+resident.template.sms.failure.UPDATE_MY_UIN=update-demo-data-failure_SMS
+resident.template.sms.regproc-success.UPDATE_MY_UIN=update-demo-data-regproc-success_SMS
+resident.template.sms.regproc-failure.UPDATE_MY_UIN=update-demo-data-regproc-failure_SMS
+resident.template.sms.cancelled.UPDATE_MY_UIN=update-demo-data-discarded-SMS
+
+resident.template.sms.request-received.GENERATE_VID=gen-or-revoke-vid-request-received_SMS
+resident.template.sms.success.GENERATE_VID=gen-or-revoke-vid-success_SMS
+resident.template.sms.failure.GENERATE_VID=gen-or-revoke-vid-failure_SMS
+
+resident.template.sms.request-received.REVOKE_VID=gen-or-revoke-vid-request-received_SMS
+resident.template.sms.success.REVOKE_VID=gen-or-revoke-vid-success_SMS
+resident.template.sms.failure.REVOKE_VID=gen-or-revoke-vid-failure_SMS
+
+resident.template.sms.request-received.VID_CARD_DOWNLOAD=vid-card-download-request-received_SMS
+resident.template.sms.success.VID_CARD_DOWNLOAD=vid-card-download-success_SMS
+resident.template.sms.failure.VID_CARD_DOWNLOAD=vid-card-download-failure_SMS
+
+resident.template.sms.request-received.GET_MY_ID=get-my-uin-card-request-received_SMS
+resident.template.sms.success.GET_MY_ID=get-my-uin-card-success_SMS
+resident.template.sms.failure.GET_MY_ID=get-my-uin-card-failure_SMS
+
+resident.template.sms.request-received.VALIDATE_OTP=verify-my-phone-email-request-received_SMS
+resident.template.sms.success.VALIDATE_OTP=verify-my-phone-email-success_SMS
+resident.template.sms.failure.VALIDATE_OTP=verify-my-phone-email-failure_SMS
+
+resident.template.sms.success.SEND_OTP=receive-otp
+
+# Template type codes for purpose (success) content
+resident.template.purpose.success.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-positive-purpose
+resident.template.purpose.success.ORDER_PHYSICAL_CARD=order-a-physical-card-positive purpose
+resident.template.purpose.success.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-positive-purpose
+resident.template.purpose.success.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-positive-purpose
+resident.template.purpose.success.UPDATE_MY_UIN=update-demo-data-positive-purpose
+resident.template.purpose.success.GENERATE_VID=gen-or-revoke-vid-positive-purpose
+resident.template.purpose.success.REVOKE_VID=gen-or-revoke-vid-positive-purpose
+resident.template.purpose.success.GET_MY_ID=get-my-uin-card-positive-purpose
+resident.template.purpose.success.VALIDATE_OTP=verify-my-phone-email-positive-purpose
+resident.template.purpose.success.VID_CARD_DOWNLOAD=vid-card-download-positive-purpose
+
+# Template type codes for purpose (in-progress/failure) content
+resident.template.purpose.failure.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-negative-purpose
+resident.template.purpose.failure.ORDER_PHYSICAL_CARD=order-a-physical-card-negative purpose
+resident.template.purpose.failure.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-negative-purpose
+resident.template.purpose.failure.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-negative-purpose
+resident.template.purpose.failure.UPDATE_MY_UIN=update-demo-data-negative-purpose
+resident.template.purpose.failure.GENERATE_VID=gen-or-revoke-vid-negative-purpose
+resident.template.purpose.failure.REVOKE_VID=gen-or-revoke-vid-negative-purpose
+resident.template.purpose.failure.GET_MY_ID=get-my-uin-card-negative-purpose
+resident.template.purpose.failure.VALIDATE_OTP=verify-my-phone-email-negative-purpose
+resident.template.purpose.failure.VID_CARD_DOWNLOAD=vid-card-download-negative-purpose
+
+# Template type codes for purpose (cancelled) content
+resident.template.purpose.cancelled.UPDATE_MY_UIN=update-demo-data-cancelled-purpose
+
+# Template type codes for purpose(Identity updated) content
+resident.template.purpose.regproc-success.UPDATE_MY_UIN=update-demo-data-regproc-success-purpose
+
+# Template type codes for summary (success) content
+resident.template.summary.success.DOWNLOAD_PERSONALIZED_CARD=cust-and-down-my-card-success-summary
+resident.template.summary.success.ORDER_PHYSICAL_CARD=order-a-physical-card-success-summary
+resident.template.summary.success.SHARE_CRED_WITH_PARTNER=share-cred-with-partner-success-summary
+resident.template.summary.success.AUTH_TYPE_LOCK_UNLOCK=lock-unlock-auth-success-summary
+resident.template.summary.success.UPDATE_MY_UIN=update-demo-data-success-summary
+resident.template.summary.success.GENERATE_VID=gen-or-revoke-vid-success-summary
+resident.template.summary.success.REVOKE_VID=gen-or-revoke-vid-success-summary
+resident.template.summary.success.GET_MY_ID=get-my-uin-card-success-summary
+resident.template.summary.success.VALIDATE_OTP=verify-my-phone-email-success-summary
+resident.template.summary.success.VID_CARD_DOWNLOAD=vid-card-download-positive-summary
+
+# Template type code for summary (cancelled) content
+resident.template.summary.cancelled.UPDATE_MY_UIN=update-demo-data-cancelled-summary
+
+# Template type code for summary (regproc-success) content
+resident.template.summary.regproc-success.UPDATE_MY_UIN=update-demo-data-regproc-success-summary
+
+# Template type codes for acknowledgement PDFs
 resident.template.ack.share-cred-with-partner=acknowledgement-share-cred-with-partner
 resident.template.ack.manage-my-vid=acknowledgement-manage-my-vid
 resident.template.ack.order-a-physical-card=acknowledgement-order-a-physical-card
@@ -676,68 +742,68 @@ resident.template.ack.download-a-personalized-card=acknowledgement-download-a-pe
 resident.template.ack.update-demographic-data=acknowledgement-update-demographic-data
 resident.template.ack.verify-email-id-or-phone-number=acknowledgement-verify-email-id-or-phone-number
 resident.template.ack.secure-my-id=acknowledgement-secure-my-id
-resident.template.email.subject.success.send-otp=receive-otp-mail-subject
-resident.template.email.content.success.send-otp=receive-otp-mail-content
-resident.template.email.subject.success.validate-otp=validate-otp-mail-subject
-resident.template.email.content.success.validate-otp=validate-otp-mail-content
-resident.template.sms.success.send-otp=receive-otp
-resident.template.sms.success.validate-otp=validate-otp
-
-#template for list of supporting documents
-resident.template.support-docs-list=supporting-docs-list
+resident.template.ack.authentication.request=acknowledgment-authentication-request
+resident.template.ack.get.my.id=acknowledgment-get-my-id
+resident.template.ack.vid.card.download=acknowledgment-vid-card-download
 
+# Template type codes for list of supporting documents, service history, registration centers and vid card
+resident.template.support-docs-list=supporting-docs-list
 mosip.resident.service.history.template.type.code=service-history-type
 resident.template.registration.centers.list=registration-centers-list
-mosip.resident.grievance.url=https://${mosip.api.public.host}/resident/v1/mock/external/grievance/redressel?name={name}&emailId={email}&phoneNo={phone}&eventId={eventId}
+mosip.resident.vid.card.template.property=vid-card-type
 
-#template required properties
+# Template required properties
 resident.template.date.pattern=dd-MM-yyyy
 resident.template.time.pattern=HH:mm:ss
 resident.ui.track-service-request-url=https://${mosip.resident.host}/#/uinservices/trackservicerequest?eid=
 
-otpChannel.mobile=phone
-otpChannel.email=email
-otp-generate.rest.uri=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+# View history filters
+resident.view.history.serviceType.filters=ALL,AUTHENTICATION_REQUEST,SERVICE_REQUEST,DATA_UPDATE_REQUEST,ID_MANAGEMENT_REQUEST,DATA_SHARE_REQUEST
+resident.view.history.status.filters=ALL,SUCCESS,IN_PROGRESS,FAILED,CANCELED
 
-#to get id_token in cookie and validate it
-auth.validate.id-token=true
+# Maximum data to download in a PDF
+resident.service-history.download.max.count=100
+resident.registration-centers.download.max.count=100
 
-mosip.resident.download.uin.card=mosip.resident.download.uin.card
-GET_RID_BY_INDIVIDUAL_ID=${mosip.idrepo.identity.url}/idrepository/v1/identity/rid/{individualId}
+## The Registration centers will be searched based on the distance value in meters from the Geo location identified
+resident.nearby.centers.distance.meters=2000
+
+# Page size in Bell Icon Notification list and View history
+resident.notifications.default.page.size=100
+resident.view-history.default.page.size=10
 
+#to get id_token in cookie and validate it
+auth.validate.id-token=true
+idToken=id_token
+auth.token.header=Authorization
 mosip.resident.access_token.auth_mode.claim-name=acr
 mosip.resident.oidc.id_token.ida_token.claim-name=sub
-idToken=id_token
+mosip.resident.oidc.auth_token.expiry.claim-name=exp
 mosip.resident.oidc.userinfo.encryption.enabled=false
-mosip.resident.oidc.keymanager.reference.id=IDP_USER_INFO
+
 mosip.client.assertion.reference.id=
 mosip.include.payload=true
 mosip.include.certificate=true
 mosip.include.cert.hash=false
-mosip.keymanager.jwt.sign.end.point=${mosip.kernel.keymanager.url}/v1/keymanager/jwtSign
-mosip.iam.module.login_flow.claims={"userinfo":{"name":{"essential":true},"picture":{"essential":true},"email":{"essential":true},"phone_number":{"essential":true},"individual_id":{"essential":true}}}
 
-#Rectangle coordinates for pfd signataured data
+
+# Rectangle coordinates for PDF signatured data
 mosip.resident.service.uincard.lowerleftx=73
 mosip.resident.service.uincard.lowerlefty=100
 mosip.resident.service.uincard.upperrightx=300
 mosip.resident.service.uincard.upperrighty=300
 mosip.resident.service.uincard.signature.reason="Digitally Signed"
 
-PDFSIGN=${mosip.kernel.keymanager.url}/v1/keymanager/pdf/sign
-
-# get partner details
-PARTNER_DETAILS_NEW_URL=${mosip.pms.partnermanager.url}/v1/partnermanager/partners/v2
-
-#pdf signature appid & refId
-mosip.resident.sign.pdf.application.id=KERNEL
-mosip.resident.sign.pdf.reference.id=SIGN
-
 mosip.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
 
 #method name to create password
 resident.create.password.method.name=getPassword
-#File name for the downloaded personalized card.  "eventId" and "timestamp" are configurable. If they are removed from below property then they will be removed from file name also.
+
+resident.ui.notification.update.interval.seconds=30
+resident.ui.datetime.pattern.default=yyyy-MM-dd HH:mm:ss
+resident.filename.datetime.pattern.default=yyyy-MM-dd'T'HH_mm_ss
+
+#File name for the downloaded PDFs.  "eventId" and "timestamp" are configurable. If they are removed from below property then they will be removed from file name also.
 mosip.resident.download.registration.centre.file.name.convention=Registration_centers_{timestamp}
 mosip.resident.download.supporting.document.file.name.convention=Supporting_documents_{timestamp}
 mosip.resident.download.personalized.card.naming.convention=Personalised_card_{eventId}_{timestamp}
@@ -748,93 +814,332 @@ mosip.resident.ack.update_my_data.name.convention=Ack_{featureName}_{eventId}_{t
 mosip.resident.ack.share_credential.name.convention=Ack_{featureName}_{eventId}_{timestamp}
 mosip.resident.ack.order_physical_card.name.convention=Ack_{featureName}_{eventId}_{timestamp}
 mosip.resident.ack.name.convention=Ack_{featureName}_{eventId}_{timestamp}
-
 mosip.resident.uin.card.name.convention=UIN_{eventId}_{timestamp}
 mosip.resident.vid.card.name.convention=VID_{eventId}_{timestamp}
 mosip.resident.download.service.history.file.name.convention=View_history_{timestamp}
 mosip.resident.download.nearest.registration.centre.file.name.convention=Registration_centers_{timestamp}
+mosip.resident.download.card.naming.convention=Get_my_UIN_{timestamp}
+
+# Credential request config for sharing credential to partner
+mosip.resident.request.credential.credentialType=vercred
+#mosip.resident.request.credential.credentialType=euin
 
-mosip.resident.request.credential.credentialType=euin
+#Temporarily uncommented below 2 properties for testing release 1201 branch in env.
 mosip.resident.request.credential.isEncrypt=true
-mosip.resident.request.credential.encryption.key=abc123
+mosip.resident.request.credential.encryption.key=${mosip.resident.request.credential.encryption.key}
 
+mosip.digital.card.credential.type=PDFCard
 mosip.credential.issuer=mpartner-default-digitalcard
 
-#claim names
+# Claim names
 mosip.resident.name.token.claim-name=name
 mosip.resident.photo.token.claim-photo=picture
 mosip.resident.individual.id.claim.name=individual_id
 mosip.resident.email.token.claim-email=email
-mosip.resident.phone.token.claim-phone=phone
+mosip.resident.phone.token.claim-phone=phone_number
 
-mosip.resident.applicant.name.property=applicantName
+# Value based properties
+otpChannel.email=email
+otpChannel.mobile=phone
+mosip.idrepo.vid.reactive-status=ACTIVE
+resident.dateofbirth.pattern=yyyy/MM/dd
 mosip.resident.photo.attribute.name=photo
-mosip.digital.card.credential.type=PDFCard
+mosip.resident.order.card.payment.enabled=true
+resident.update.preferred.language.by.name=true
+resident.documents.category=individualBiometrics
+mosip.resident.schema.attribute-name=attributeName
+mosip.resident.applicant.name.property=applicantName
+mosip.resident.authentication.mode.property=authenticationMode
+resident.attribute.names.without.documents.required=preferredLanguage,email,phone
+resident.additional.identity.attribute.to.fetch=UIN,email,phone,dateOfBirth,fullName,photo
+
 
 ## OTP flooding
 ## Configure Time limit for OTP Flooding scenario (in minutes)
 otp.request.flooding.duration=1
 otp.request.flooding.max-count=100
 
-mosip.resident.message.code.maximum.length=1024
 
-GET_RID_STATUS=${mosipbox.public.url}/registrationprocessor/v1/registrationtransaction/search/{rid}
+# Maximum file size and allowed file types for uploading document
+mosip.max.file.upload.size.in.bytes=2306867
+mosip.allowed.extension=pdf,jpeg,png,jpg
+
+
+# Reg-proc packet status codes
+resident.success.packet-status-code.list=PROCESSED,SUCCESS,UIN_GENERATED
+resident.in-progress.packet-status-code.list=PROCESSING,REREGISTER,RESEND,RECEIVED,UPLOAD_PENDING,AWAITING_INFORMATION,REPROCESS
+resident.failure.packet-status-code.list=REJECTED,FAILED,REPROCESS_FAILED
+
+# Reg-proc packet transaction type codes
+resident.REQUEST_RECEIVED.packet-transaction-type-code.list=PACKET_RECEIVER,VIRUS_SCAN,SECUREZONE_NOTIFICATION,UPLOAD_PACKET,VALIDATE_PACKET,PACKET_CLASSIFICATION
+resident.VALIDATION_STAGE.packet-transaction-type-code.list=CMD_VALIDATION,OPERATOR_VALIDATION,QUALITY_CLASSIFIER,SUPERVISOR_VALIDATION,INTRODUCER_VALIDATION,BIOMETRIC_AUTHENTICATION,EXTERNAL_INTEGRATION
+resident.VERIFICATION_STAGE.packet-transaction-type-code.list=DEMOGRAPHIC_VERIFICATION,MANUAL_ADJUDICATION,VERIFICATION,BIOGRAPHIC_VERIFICATION
+resident.UIN_GENERATION_STAGE.packet-transaction-type-code.list=UIN_GENERATOR,BIOMETRIC_EXTRACTION,NOTIFICATION,FINALIZATION,PACKET_REPROCESS
+resident.CARD_READY_TO_DOWNLOAD.packet-transaction-type-code.list=PRINT_SERVICE,PRINT_POSTAL_SERVICE,PRINT
+
 sequence-order=Request received, Validation stage, Verification stage, Uin generation stage, Card ready to download
 
-resident.additional.identity.attribute.to.fetch=UIN,email,phone,dateOfBirth,fullName,photo
 
-resident.template.ack.authentication.request=acknowledgment-authentication-request
-resident.template.ack.get.my.id=acknowledgment-get-my-id
-resident.template.ack.vid.card.download=acknowledgment-vid-card-download
+##Synchronous events
 
-resident.template.purpose.success.vid-card-download=vid-card-download-positive-purpose
-resident.template.purpose.failure.vid-card-download=vid-card-download-negative-purpose
-resident.template.summary.success.vid-card-download=vid-card-download-positive-summary
+resident.request.success.status.list.AUTHENTICATION_REQUEST=AUTHENTICATION_SUCCESSFUL,Y
+resident.request.failed.status.list.AUTHENTICATION_REQUEST=AUTHENTICATION_FAILED,N
+resident.request.cancelled.status.list.AUTHENTICATION_REQUEST=
 
-resident.ui.datetime.pattern=yyyy-MM-dd HH:mm:ss
-resident.filename.datetime.pattern=yyyy-MM-dd'T'HH_mm_ss
+resident.request.new.status.list.DOWNLOAD_PERSONALIZED_CARD=NEW
+resident.batchjob.process.success.status.list.DOWNLOAD_PERSONALIZED_CARD=CARD_DOWNLOADED
+resident.request.failed.status.list.DOWNLOAD_PERSONALIZED_CARD=FAILED
+resident.request.cancelled.status.list.DOWNLOAD_PERSONALIZED_CARD=
 
-## The Registration centers will be searched based on the distance value in meters from the Geo location identified
-resident.nearby.centers.distance.meters=2000
+resident.request.new.status.list.GET_MY_ID=NEW
+resident.request.in-progress.status.list.GET_MY_ID=OTP_REQUESTED
+resident.request.success.status.list.GET_MY_ID=CARD_DOWNLOADED,OTP_VERIFIED
+resident.request.failed.status.list.GET_MY_ID=FAILED
+resident.request.cancelled.status.list.GET_MY_ID=
+
+resident.request.new.status.list.BOOK_AN_APPOINTMENT=
+resident.request.success.status.list.BOOK_AN_APPOINTMENT=
+resident.request.failed.status.list.BOOK_AN_APPOINTMENT=
+resident.request.cancelled.status.list.BOOK_AN_APPOINTMENT=
+
+resident.request.new.status.list.GENERATE_VID=NEW
+resident.request.success.status.list.GENERATE_VID=VID_GENERATED
+resident.request.failed.status.list.GENERATE_VID=FAILED
+resident.request.cancelled.status.list.GENERATE_VID=
+
+resident.request.new.status.list.REVOKE_VID=NEW
+resident.request.success.status.list.REVOKE_VID=VID_REVOKED
+resident.request.failed.status.list.REVOKE_VID=FAILED
+resident.request.cancelled.status.list.REVOKE_VID=
+
+resident.request.new.status.list.SEND_OTP=
+resident.request.success.status.list.SEND_OTP=
+resident.request.failed.status.list.SEND_OTP=
+resident.request.cancelled.status.list.SEND_OTP=
+
+resident.request.new.status.list.VALIDATE_OTP=OTP_REQUESTED
+resident.request.success.status.list.VALIDATE_OTP=OTP_VERIFIED
+resident.request.failed.status.list.VALIDATE_OTP=OTP_VERIFICATION_FAILED
+resident.request.cancelled.status.list.VALIDATE_OTP=
+
+resident.request.new.status.list.DEFAULT=
+resident.request.success.status.list.DEFAULT=
+resident.request.failed.status.list.DEFAULT=
+resident.request.cancelled.status.list.DEFAULT=
 
-mosip.idrepo.vid.reactive-status=ACTIVE
 
 # Asyc Request Types
 resident.async.request.types=VID_CARD_DOWNLOAD,ORDER_PHYSICAL_CARD,SHARE_CRED_WITH_PARTNER,UPDATE_MY_UIN
-resident.batchjob.process.status.list=NEW,ISSUED,RECEIVED,PRINTING,CARD_DELIVERED,PAYMENT_CONFIRMED,IN_TRANSIT
-resident.ui.notification.update.interval.seconds=30
 
-mosip.allowed.extension=pdf,jpeg,png,jpg
-
-mosip.resident.schema.attribute-name=attributeName
+##Asynchronous events
+
+resident.request.new.status.list.SHARE_CRED_WITH_PARTNER=NEW
+resident.request.in-progress.status.list.SHARE_CRED_WITH_PARTNER=ISSUED
+resident.request.success.status.list.SHARE_CRED_WITH_PARTNER=RECEIVED,DATA_SHARED_SUCCESSFULLY,STORED
+resident.request.failed.status.list.SHARE_CRED_WITH_PARTNER=FAILED
+resident.request.cancelled.status.list.SHARE_CRED_WITH_PARTNER=
+resident.request.notification.status.list.SHARE_CRED_WITH_PARTNER=FAILED,RECEIVED,DATA_SHARED_SUCCESSFULLY,STORED
+
+resident.request.new.status.list.ORDER_PHYSICAL_CARD=NEW
+resident.request.in-progress.status.list.ORDER_PHYSICAL_CARD=PAYMENT_CONFIRMED,ISSUED,PRINTING,IN_TRANSIT
+resident.request.success.status.list.ORDER_PHYSICAL_CARD=CARD_DELIVERED
+resident.request.failed.status.list.ORDER_PHYSICAL_CARD=FAILED,PAYMENT_FAILED
+resident.request.cancelled.status.list.ORDER_PHYSICAL_CARD=
+resident.request.notification.status.list.ORDER_PHYSICAL_CARD=PAYMENT_CONFIRMED,ISSUED,PRINTING,IN_TRANSIT,CARD_DELIVERED,FAILED,PAYMENT_FAILED,CARD_DELIVERED
+
+resident.request.new.status.list.UPDATE_MY_UIN=NEW
+resident.request.in-progress.status.list.UPDATE_MY_UIN=PROCESSING,PAUSED,RESUMABLE,REPROCESS,PAUSED_FOR_ADDITIONAL_INFO,IDENTITY_UPDATED
+resident.request.success.status.list.UPDATE_MY_UIN=PROCESSED,DATA_UPDATED,STORED,CARD_READY_TO_DOWNLOAD,CARD_DOWNLOADED
+resident.request.failed.status.list.UPDATE_MY_UIN=FAILED,REJECTED,REPROCESS_FAILED
+resident.request.cancelled.status.list.UPDATE_MY_UIN=CANCELED
+resident.request.notification.status.list.UPDATE_MY_UIN=PROCESSED,DATA_UPDATED,STORED,CARD_READY_TO_DOWNLOAD,CARD_DOWNLOADED,FAILED,REJECTED,REPROCESS_FAILED,IDENTITY_UPDATED
+
+resident.request.new.status.list.AUTH_TYPE_LOCK_UNLOCK=NEW
+resident.request.in-progress.status.list.AUTH_TYPE_LOCK_UNLOCK=
+resident.request.success.status.list.AUTH_TYPE_LOCK_UNLOCK=COMPLETED
+resident.request.failed.status.list.AUTH_TYPE_LOCK_UNLOCK=FAILED
+resident.request.cancelled.status.list.AUTH_TYPE_LOCK_UNLOCK=
+resident.request.notification.status.list.AUTH_TYPE_LOCK_UNLOCK=COMPLETED,FAILED
+
+resident.request.new.status.list.VID_CARD_DOWNLOAD=NEW
+resident.request.in-progress.status.list.VID_CARD_DOWNLOAD=ISSUED
+resident.request.success.status.list.VID_CARD_DOWNLOAD=STORED,CARD_READY_TO_DOWNLOAD,CARD_DOWNLOADED
+resident.request.failed.status.list.VID_CARD_DOWNLOAD=FAILED
+resident.request.cancelled.status.list.VID_CARD_DOWNLOAD=
+resident.request.notification.status.list.VID_CARD_DOWNLOAD=STORED,CARD_READY_TO_DOWNLOAD,CARD_DOWNLOADED,FAILED
+
+
+# define property name in below format-
+#resident.<attribute name>.template.property.attribute.list
+resident.PHONE.template.property.attribute.list=mosip.phone.template.property
+resident.EMAIL.template.property.attribute.list=mosip.email.template.property
+resident.GENERATE_VID.template.property.attribute.list=mosip.generated.template.property
+resident.REVOKE_VID.template.property.attribute.list=mosip.revoked.template.property
+
+# template type codes for event status code
+resident.event.status.SUCCESS.template.property=mosip.event.status.success.template
+resident.event.status.FAILED.template.property=mosip.event.status.failed.template
+resident.event.status.IN_PROGRESS.template.property=mosip.event.status.inprogress.template
+resident.event.status.CANCELED.template.property=mosip.event.status.cancelled.template
+
+# template type codes for event types
+# define property name in below format-
+# resident.event.type.<eventType>.template.property
+resident.event.type.AUTHENTICATION_REQUEST.template.property=mosip.event.type.AUTHENTICATION_REQUEST
+resident.event.type.SHARE_CRED_WITH_PARTNER.template.property=mosip.event.type.SHARE_CRED_WITH_PARTNER
+resident.event.type.DOWNLOAD_PERSONALIZED_CARD.template.property=mosip.event.type.DOWNLOAD_PERSONALIZED_CARD
+resident.event.type.ORDER_PHYSICAL_CARD.template.property=mosip.event.type.ORDER_PHYSICAL_CARD
+resident.event.type.GET_MY_ID.template.property=mosip.event.type.GET_MY_ID
+resident.event.type.UPDATE_MY_UIN.template.property=mosip.event.type.UPDATE_MY_UIN
+resident.event.type.GENERATE_VID.template.property=mosip.event.type.GENERATE_VID
+resident.event.type.REVOKE_VID.template.property=mosip.event.type.REVOKE_VID
+resident.event.type.AUTH_TYPE_LOCK_UNLOCK.template.property=mosip.event.type.AUTH_TYPE_LOCK_UNLOCK
+resident.event.type.VID_CARD_DOWNLOAD.template.property=mosip.event.type.VID_CARD_DOWNLOAD
+resident.event.type.SEND_OTP.template.property=mosip.event.type.SEND_OTP
+resident.event.type.VALIDATE_OTP.template.property=mosip.event.type.VALIDATE_OTP
+resident.event.type.DEFAULT.template.property=mosip.event.type.DEFAULT
+
+# template type codes for service types
+# define property name in below format-
+# resident.service-type.<serviceType>.template.property
+resident.service-type.AUTHENTICATION_REQUEST.template.property=mosip.service.type.AUTHENTICATION_REQUEST
+resident.service-type.SERVICE_REQUEST.template.property=mosip.service.type.SERVICE_REQUEST
+resident.service-type.DATA_UPDATE_REQUEST.template.property=mosip.service.type.DATA_UPDATE_REQUEST
+resident.service-type.ID_MANAGEMENT_REQUEST.template.property=mosip.service.type.ID_MANAGEMENT_REQUEST
+resident.service-type.DATA_SHARE_REQUEST.template.property=mosip.service.type.DATA_SHARE_REQUEST
+resident.service-type.ASYNC.template.property=mosip.service.type.ASYNC
+
+resident.ALL.template.property=mosip.template.ALL
+resident.UNKNOWN.template.property=mosip.template.UNKNOWN
+
+# template type codes for id-authentication request types description
+# define property name in below format-
+# resident.id-auth.request-type.<authTypeCode>.<statusCode>.descr
+resident.id-auth.request-type.OTP-REQUEST.SUCCESS.descr=mosip.ida.auth-request.OTP-REQUEST.Y.descr
+resident.id-auth.request-type.OTP-AUTH.SUCCESS.descr=mosip.ida.auth-request.OTP-AUTH.Y.descr
+resident.id-auth.request-type.DEMO-AUTH.SUCCESS.descr=mosip.ida.auth-request.DEMO-AUTH.Y.descr
+resident.id-auth.request-type.FINGERPRINT-AUTH.SUCCESS.descr=mosip.ida.auth-request.FINGERPRINT-AUTH.Y.descr
+resident.id-auth.request-type.IRIS-AUTH.SUCCESS.descr=mosip.ida.auth-request.IRIS-AUTH.Y.descr
+resident.id-auth.request-type.FACE-AUTH.SUCCESS.descr=mosip.ida.auth-request.FACE-AUTH.Y.descr
+resident.id-auth.request-type.STATIC-PIN-AUTH.SUCCESS.descr=mosip.ida.auth-request.STATIC-PIN-AUTH.Y.descr
+resident.id-auth.request-type.STATIC-PIN-STORAGE.SUCCESS.descr=mosip.ida.auth-request.STATIC-PIN-STORAGE.Y.descr
+resident.id-auth.request-type.EKYC-AUTH.SUCCESS.descr=mosip.ida.auth-request.EKYC-AUTH.Y.descr
+resident.id-auth.request-type.KYC-AUTH.SUCCESS.descr=mosip.ida.auth-request.KYC-AUTH.Y.descr
+resident.id-auth.request-type.KYC-EXCHANGE.SUCCESS.descr=mosip.ida.auth-request.KYC-EXCHANGE.Y.descr
+resident.id-auth.request-type.IDENTITY-KEY-BINDING.SUCCESS.descr=mosip.ida.auth-request.IDENTITY-KEY-BINDING.Y.descr
+resident.id-auth.request-type.TOKEN-REQUEST.SUCCESS.descr=mosip.ida.auth-request.TOKEN-REQUEST.Y.descr
+resident.id-auth.request-type.TOKEN-AUTH.SUCCESS.descr=mosip.ida.auth-request.TOKEN-AUTH.Y.descr
+resident.id-auth.request-type.UNKNOWN.SUCCESS.descr=mosip.ida.auth-request.UNKNOWN.Y.descr
+resident.id-auth.request-type.OTP-REQUEST.FAILED.descr=mosip.ida.auth-request.OTP-REQUEST.N.descr
+resident.id-auth.request-type.OTP-AUTH.FAILED.descr=mosip.ida.auth-request.OTP-AUTH.N.descr
+resident.id-auth.request-type.DEMO-AUTH.FAILED.descr=mosip.ida.auth-request.DEMO-AUTH.N.descr
+resident.id-auth.request-type.FINGERPRINT-AUTH.FAILED.descr=mosip.ida.auth-request.FINGERPRINT-AUTH.N.descr
+resident.id-auth.request-type.IRIS-AUTH.FAILED.descr=mosip.ida.auth-request.IRIS-AUTH.N.descr
+resident.id-auth.request-type.FACE-AUTH.FAILED.descr=mosip.ida.auth-request.FACE-AUTH.N.descr
+resident.id-auth.request-type.STATIC-PIN-AUTH.FAILED.descr=mosip.ida.auth-request.STATIC-PIN-AUTH.N.descr
+resident.id-auth.request-type.STATIC-PIN-STORAGE.FAILED.descr=mosip.ida.auth-request.STATIC-PIN-STORAGE.N.descr
+resident.id-auth.request-type.EKYC-AUTH.FAILED.descr=mosip.ida.auth-request.EKYC-AUTH.N.descr
+resident.id-auth.request-type.KYC-AUTH.FAILED.descr=mosip.ida.auth-request.KYC-AUTH.N.descr
+resident.id-auth.request-type.KYC-EXCHANGE.FAILED.descr=mosip.ida.auth-request.KYC-EXCHANGE.N.descr
+resident.id-auth.request-type.IDENTITY-KEY-BINDING.FAILED.descr=mosip.ida.auth-request.IDENTITY-KEY-BINDING.N.descr
+resident.id-auth.request-type.TOKEN-REQUEST.FAILED.descr=mosip.ida.auth-request.TOKEN-REQUEST.N.descr
+resident.id-auth.request-type.TOKEN-AUTH.FAILED.descr=mosip.ida.auth-request.TOKEN-AUTH.N.descr
+resident.id-auth.request-type.UNKNOWN.FAILED.descr=mosip.ida.auth-request.UNKNOWN.N.descr
+
+# template type codes for authentication modes (authTypeCode)
+# define property name in below format-
+# resident.auth-type-code.<authTypeCode>.code
+resident.auth-type-code.OTP-REQUEST.code=mosip.auth-type-code.OTP-REQUEST
+resident.auth-type-code.OTP-AUTH.code=mosip.auth-type-code.OTP-AUTH
+resident.auth-type-code.DEMO-AUTH.code=mosip.auth-type-code.DEMO-AUTH
+resident.auth-type-code.FINGERPRINT-AUTH.code=mosip.auth-type-code.FINGERPRINT-AUTH
+resident.auth-type-code.IRIS-AUTH.code=mosip.auth-type-code.IRIS-AUTH
+resident.auth-type-code.FACE-AUTH.code=mosip.auth-type-code.FACE-AUTH
+resident.auth-type-code.STATIC-PIN-AUTH.code=mosip.auth-type-code.STATIC-PIN-AUTH
+resident.auth-type-code.STATIC-PIN-STORAGE.code=mosip.auth-type-code.STATIC-PIN-STORAGE
+resident.auth-type-code.EKYC-AUTH.code=mosip.auth-type-code.EKYC-AUTH
+resident.auth-type-code.KYC-AUTH.code=mosip.auth-type-code.KYC-AUTH
+resident.auth-type-code.KYC-EXCHANGE.code=mosip.auth-type-code.KYC-EXCHANGE
+resident.auth-type-code.IDENTITY-KEY-BINDING.code=mosip.auth-type-code.IDENTITY-KEY-BINDING
+resident.auth-type-code.TOKEN-REQUEST.code=mosip.auth-type-code.TOKEN-REQUEST
+resident.auth-type-code.TOKEN-AUTH.code=mosip.auth-type-code.TOKEN-AUTH
+resident.auth-type-code.PWD.code=mosip.auth-type-code.PWD
+resident.auth-type-code.PIN.code=mosip.auth-type-code.PIN
+resident.auth-type-code.OTP.code=mosip.auth-type-code.OTP
+resident.auth-type-code.Wallet.code=mosip.auth-type-code.Wallet
+resident.auth-type-code.L1-bio-device.code=mosip.auth-type-code.L1-bio-device
+
+# Below property will retrieve VID when requested. Default is false so, UIN will be retrieved.
+# Endpoints using below property- /individualId/otp, /aid/status
+#resident.flag.use-vid-only=true
 
-mosip.max.file.upload.size.in.bytes=2000000
-
-resident.service-history.download.max.count=115
-
-# Below property will retrieve VID when requested.
-resident.flag.use-vid-only=true
-
-mosip.idp.otp.template.property=mosip.idp.otp.template.property
-# Below property will retrieve VID when requested.
-mosip.idp.biometrics.template.property=mosip.idp.biometrics.template.property
-mosip.idp.unknown.authentication.template.property=mosip.idp.unknown.authentication.template.property
-mosip.full.name.template.property=mosip.full.name.template.property
-mosip.date.of.birth.template.property=mosip.date.of.birth.template.property
-mosip.uin.template.property=mosip.uin.template.property
-mosip.perpetual.vid.template.property=mosip.perpetual.vid.template.property
-mosip.phone.template.property=mosip.phone.template.property
-mosip.email.template.property=mosip.email.template.property
-mosip.address.template.property=mosip.address.template.property
-mosip.gender.template.property=mosip.gender.template.property
-mosip.defualt.template.property=mosip.defualt.template.property
-mosip.idp.acr.generated.code=mosip:idp:acr:generated-code
-mosip.idp.acr.biometrics=mosip:idp:acr:biometrics
-mosip.idp.unknown.authentication=unknown
-auth.token.header=Authorization
 # Class name of the referenceValidator. Commenting or removing this property will disable reference validator.
 mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator
-mosip.resident.vid.card.template.property=vid-card-type
-mosip.resident.download-card.url=${mosip.api.public.url}${mosip.service-context}/download-card/event/{eventId}
+
+
 spring.servlet.multipart.max-file-size=10MB
 
+
+# for validating request time as per before & after time limit (in seconds) in contact-details/update API.
+resident.future.time.limit=60
+resident.past.time.limit=60
+
+# The java.time.format.FormatStyle enum to use for date time formatting based on locale. Allowed values with examples are:
+# * FULL ('Tuesday, April 12, 1952 AD' or '3:30:42pm PST'),
+# * LONG('January 12, 1952'),
+# * MEDIUM ('Jan 12, 1952'),
+# * SHORT ('12.13.52' or '3:30pm').
+# Default value is MEDIUM. For more details refer to the enum.
+resident.date.time.formmatting.style=MEDIUM
+resident.date.time.replace.special.chars={" ": "_", "," : "", ":" : "."}
+
+#cache expiration times are in milliseconds.
+resident.cache.expiry.time.millisec.templateCache=86400000
+resident.cache.expiry.time.millisec.partnerCache=86400000
+resident.cache.expiry.time.millisec.getValidDocumentByLangCode=86400000
+resident.cache.expiry.time.millisec.getLocationHierarchyLevelByLangCode=86400000
+resident.cache.expiry.time.millisec.getImmediateChildrenByLocCodeAndLangCode=86400000
+resident.cache.expiry.time.millisec.getLocationDetailsByLocCodeAndLangCode=86400000
+resident.cache.expiry.time.millisec.getCoordinateSpecificRegistrationCenters=86400000
+resident.cache.expiry.time.millisec.getApplicantValidDocument=86400000
+resident.cache.expiry.time.millisec.getRegistrationCentersByHierarchyLevel=86400000
+resident.cache.expiry.time.millisec.getRegistrationCenterByHierarchyLevelAndTextPaginated=86400000
+resident.cache.expiry.time.millisec.getRegistrationCenterWorkingDays=86400000
+resident.cache.expiry.time.millisec.getLatestIdSchema=86400000
+resident.cache.expiry.time.millisec.getGenderCodeByGenderTypeAndLangCode=86400000
+resident.cache.expiry.time.millisec.getDocumentTypesByDocumentCategoryAndLangCode=86400000
+resident.cache.expiry.time.millisec.getDynamicFieldBasedOnLangCodeAndFieldName=86400000
+resident.cache.expiry.time.millisec.getCenterDetails=86400000
+resident.cache.expiry.time.millisec.getImmediateChildrenByLocCode=86400000
+resident.cache.expiry.time.millisec.getLocationHierarchyLevels=86400000
+resident.cache.expiry.time.millisec.getAllDynamicFieldByName=86400000
+
+
+#added multi languages for testing
+mosip.optional-languages=fra,ara,hin,tam,kan,spa
+
+# Separators
+# Usage: resident.attribute.separator.<attribute>=<separator string>
+resident.attribute.separator.fullAddress=, 
+
+# Limit the number of async threads created in Resident services. This count is divided into 4 thread groups configured in 'io.mosip.resident.config.Config' class
+mosip.resident.async-core-pool-size=100
+mosip.resident.async-max-pool-size=100
+
+# Logo property
+# This property is used in all downloaded PDF files.
+mosip.pdf.header.logo.url=https://mosip.io/images/mosipn-logo.png
+
+# These properties is used in reg-center feature for map zoom in & out.
+mosip.resident.zoom=14
+mosip.resident.maxZoom=18
+mosip.resident.minZoom=5
+
+# Transliteration work around property since eng to fra directly is not supported in icu4j.This can be added for any other unsupported language also.
+# For example resident-transliteration-workaround-for-<fromLanguageCode>-<toLanguageCode> = fromLanguageCode-intermediateLanguageCode-toLanguageCode
+# For Intermediate language code transliteration should work in both ways.
+resident-transliteration-workaround-for-eng-fra=eng-hin,hin-fra
+resident-transliteration-workaround-for-eng-spa=eng-hin,hin-spa
+
+# Reg-processer-credential-partner-policy-url
+mosip.resident.reg-processer-credential-partner-policy-url=${config.server.file.storage.uri}registration-processor-credential-partners.json
\ No newline at end of file
diff --git a/resident-ui-personalized-card-schema.json b/resident-ui-personalized-card-schema.json
index 375ebabf0d8..c72dbb7d91f 100644
--- a/resident-ui-personalized-card-schema.json
+++ b/resident-ui-personalized-card-schema.json
@@ -2,19 +2,35 @@
 	"identity": [
 		{
 			"attributeName": "fullName",
-			"maskRequired": false,			
+			"maskRequired": false,
 			"formatRequired": true,
+			"defaultFormat":"fullName",
 			"label": {
-				"eng": "Name"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Name",
+				"ara": "اسم",
+				"fra":"Nom",
+				"hin":"नाम",
+				"tam":"பெயர்",
+				"kan":"ಹೆಸರು",
+				"spa":"Nombre"
 			},
 			"formatOptionLabel":{
-				"eng": "Name Format"
+				"eng": "Name Format",
+				"ara": "تنسيق الاسم",
+				"fra":"Format du nom",
+				"hin":"नाम प्रारूप",
+				"tam":"பெயர் வடிவம்",
+				"kan":"ಹೆಸರು ಸ್ವರೂಪ",
+				"spa":"Formato de nombre"
 			},
 			"formatOption":{
-				"eng": [{"label":"First Name", "value":"firstName"}, {"label":"Middle Name", "value":"middleName"}, {"label":"Last Name", "value":"lastName"}, {"label":"Full Name", "value":"fullName"}]
+				"eng": [{"label":"Full Name", "value":"fullName","checked":true}],
+				"ara": [{"label":"الاسم الكامل", "value":"fullName","checked":true}],
+				"fra": [{"label":"nom et prénom", "value":"fullName","checked":true}],
+				"hin": [{"label":"पूरा नाम", "value":"fullName","checked":true}],
+				"tam": [{"label":"முழு பெயர்", "value":"fullName","checked":true}],
+				"kan": [{"label":"ಪೂರ್ಣ ಹೆಸರು", "value":"fullName","checked":true}],
+				"spa": [{"label":"Nombre completo", "value":"fullName","checked":true}]
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -24,17 +40,33 @@
 			"attributeName": "dateOfBirth",
 			"maskRequired": false,
 			"formatRequired": true,
+			"defaultFormat":"DD/MMM/YYYY",
 			"label": {
-				"eng": "DOB"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Date of birth",
+				"ara": "تاريخ الميلاد",
+				"fra": "date de naissance",
+				"hin": "जन्म की तारीख",
+				"tam": "பிறந்த தேதி",
+				"kan": "ಹುಟ್ತಿದ ದಿನ",
+				"spa": "fecha de nacimiento"
 			},
 			"formatOptionLabel":{
-				"eng": "Date Format"
+				"eng": "Date Format",
+				"ara": "صيغة التاريخ",
+				"fra":"Format de date",
+				"hin":"तारिख का प्रारूप",
+				"tam":"தேதி வடிவம்",
+				"kan":"ದಿನಾಂಕ ಸ್ವರೂಪ",
+				"spa":"Formato de fecha"
 			},
 			"formatOption":{
-				"eng": [{"label":"DD/MM", "value":"DD/MM"}, {"label":"DD/MM/YYYY", "value":"DD/MM/YYYY"}]
+				"eng": [{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"ara": [{"label":"اليوم / الشهر ", "value":"DD/MMM","checked":false}, {"label":"اليوم / الشهر / السنة", "value":"DD/MMM/YYYY","checked":true}],
+				"fra":[{"label":"JJ/MMM", "value":"DD/MMM","checked":false}, {"label":"JJ/MMM/AAAA", "value":"DD/MMM/YYYY","checked":true}],
+				"hin":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"tam":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"kan":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"spa":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}]
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -46,10 +78,22 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "UIN"
+				"eng": "UIN",
+				"ara": "UIN",
+				"fra":"UIN",
+				"hin":"UIN",
+				"tam":"UIN",
+				"kan":"UIN",
+				"spa":"UIN"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask UIN",
+				"ara": "قناع UIN",
+				"fra":"Masque UIN",
+				"hin":"मास्क UIN",
+				"tam":"UIN-ஐ மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ UIN",
+				"spa":"Máscara UIN"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":false,
@@ -61,10 +105,22 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "Perpetual VID"
+				"eng": "Perpetual VID",
+				"ara": "دائم VID",
+				"fra":"VID perpétuel",
+				"hin":"सतत VID",
+				"tam":"நிரந்தர VID",
+				"kan":"ಶಾಶ್ವತ VID",
+				"spa":"VID perpetuo"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask Perpetual VID",
+				"ara": "قناع VID الدائم",
+				"fra":"Masque perpétuel VID",
+				"hin":"मास्क सदा VID",
+				"tam":"நிரந்தர VID-ஐ மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ ಶಾಶ್ವತ VID",
+				"spa":"Máscara Perpetuo VID"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":false,
@@ -76,10 +132,22 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "Phone Number"
+				"eng": "Phone Number",
+				"ara": "رقم التليفون",
+				"fra":"Numéro de téléphone",
+				"hin":"फ़ोन नंबर",
+				"tam":"தொலைபேசி எண்",
+				"kan":"ದೂರವಾಣಿ ಸಂಖ್ಯೆ",
+				"spa":"Número de teléfono"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask Phone Number",
+				"ara": "رقم هاتف القناع",
+				"fra":"Masquer le numéro de téléphone",
+				"hin":"मास्क फ़ोन नंबर",
+				"tam":"தொலைபேசி எண்ணை மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ ಫೋನ್ ಸಂಖ್ಯೆ",
+				"spa":"Máscara Número de teléfono"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -91,114 +159,106 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "Email ID"
+				"eng": "Email ID",
+				"ara": "عنوان الايميل",
+				"fra":"Identifiant de messagerie",
+				"hin":"ईमेल ID",
+				"tam":"மின்னஞ்சல் ID",
+				"kan":"ಇಮೇಲ್ ID",
+				"spa":"Identificación de correo"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask Email ID",
+				"ara": "قناع البريد الإلكتروني ID",
+				"fra":"Masquer ID de messagerie",
+				"hin":"मास्क ईमेल",
+				"tam":"மின்னஞ்சல் ID-ஐ மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ ಇಮೇಲ್ ID",
+				"spa":"Enmascarar ID de correo electrónico"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
 			"checked":false
 		},
 		{
-			"attributeName": "addressLine1",
+			"attributeName": "fullAddress",
 			"maskRequired": false,
 			"formatRequired": true,
+			"defaultFormat":"addressLine1,addressLine2,addressLine3,region,province,city,zone,postalCode",
 			"label": {
-				"eng": "Address"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Address",
+				"ara": "عنوان",
+				"fra":"Adresse",
+				"hin":"पता",
+				"tam":"முகவரி",
+				"kan":"ವಿಳಾಸ",
+				"spa":"DIRECCIÓN"
 			},
 			"formatOptionLabel":{
-				"eng": "Address Format"
+				"eng": "Address Format",
+				"ara": "تنسيق العنوان",
+				"fra":"Format d'adresse",
+				"hin":"पता प्रारूप",
+				"tam":"முகவரி வடிவம்",
+				"kan":"ವಿಳಾಸ ಸ್ವರೂಪ",
+				"spa":"Formato de dirección"
 			},
 			"formatOption":{
-				"eng": [{"label":"Region", "value":"region"}, {"label":"Province", "value":"province"}, {"label":"City", "value":"city"}, {"label":"Full Address", "value":"fullAddress"}]
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "addressLine2",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Address Line2"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "addressLine3",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Address Line3"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "city",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "City"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "region",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Region"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "province",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Province"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "postalCode",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Postal Code"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": [{"label":"Address line1", "value":"addressLine1","checked":true},
+					{"label":"Address line2", "value":"addressLine2","checked":true},
+					{"label":"Address line3", "value":"addressLine3","checked":true},
+					{"label":"Region", "value":"region","checked":true},
+					{"label":"Province", "value":"province","checked":true},
+					{"label":"City", "value":"city","checked":true},
+					{"label":"Zone", "value":"zone","checked":true},
+					{"label":"Postal code", "value":"postalCode","checked":true},
+					{"label":"Full Address", "value":"fullAddress","checked":true}],
+				"ara": [{"label":"العنوان سطر 1", "value":"addressLine1","checked":true},{"label":"سطر العنوان 2", "value":"addressLine2","checked":true},{"label":"سطر العنوان 3", "value":"addressLine3","checked":true}, {"label":"منطقة", "value":"region","checked":true}, {"label":"مقاطعة", "value":"province","checked":true}, {"label":"مدينة", "value":"city","checked":true}, {"label":"منطقة", "value":"zone","checked":true},{"label":"رمز بريدي", "value":"postalCode","checked":true}, {"label":"العنوان الكامل", "value":"fullAddress","checked":true}],
+				"fra":[{"label":"Adresse 1", "value":"addressLine1","checked":true},
+					{"label":"Adresse Ligne 2", "value":"addressLine2","checked":true},
+					{"label":"Ligne d'adresse3", "value":"addressLine3","checked":true},
+					{"label":"Région", "value":"region","checked":true},
+					{"label":"Province", "value":"province","checked":true},
+					{"label":"Ville", "value":"city","checked":true},
+					{"label":"Zone", "value":"zone","checked":true},
+					{"label":"Code Postal", "value":"postalCode","checked":true},
+					{"label":"Adresse complète", "value":"fullAddress","checked":true}],
+				"hin":[{"label":"पता पंक्ति 1", "value":"addressLine1","checked":true},
+					{"label":"पता पंक्ति नं। 2", "value":"addressLine2","checked":true},
+					{"label":"पता पंक्ति3", "value":"addressLine3","checked":true},
+					{"label":"क्षेत्र", "value":"region","checked":true},
+					{"label":"प्रांत", "value":"province","checked":true},
+					{"label":"शहर", "value":"city","checked":true},
+					{"label":"क्षेत्र", "value":"zone","checked":true},
+					{"label":"डाक कोड", "value":"postalCode","checked":true},
+					{"label":"पूरा पता", "value":"fullAddress","checked":true}],
+				"tam":[{"label":"முகவரி வரி 1", "value":"addressLine1","checked":true},
+					{"label":"முகவரி வரி 2", "value":"addressLine2","checked":true},
+					{"label":"முகவரி வரி 3", "value":"addressLine3","checked":true},
+					{"label":"பிராந்தியம்", "value":"region","checked":true},
+					{"label":"மாகாணம்", "value":"province","checked":true},
+					{"label":"நகரம்", "value":"city","checked":true},
+					{"label":"மண்டலம்", "value":"zone","checked":true},
+					{"label":"அஞ்சல் குறியீடு", "value":"postalCode","checked":true},
+					{"label":"முழு முகவரி", "value":"fullAddress","checked":true}],
+				"kan":[{"label":"ವಿಳಾಸ ಸಾಲು 1", "value":"addressLine1","checked":true},
+					{"label":"ವಿಳಾಸ ಸಾಲು 2", "value":"addressLine2","checked":true},
+					{"label":"ವಿಳಾಸ ಸಾಲು 3", "value":"addressLine3","checked":true},
+					{"label":"ಪ್ರದೇಶ", "value":"region","checked":true},
+					{"label":"ಪ್ರಾಂತ್ಯ", "value":"province","checked":true},
+					{"label":"ನಗರ", "value":"city","checked":true},
+					{"label":"ವಲಯ", "value":"zone","checked":true},
+					{"label":"ಅಂಚೆ ಕೋಡ್", "value":"postalCode","checked":true},
+					{"label":"ಪೂರ್ತಿ ವಿಳಾಸ", "value":"fullAddress","checked":true}],
+				"spa":[{"label":"Dirección Línea 1", "value":"addressLine1","checked":true},
+					{"label":"Línea de dirección2", "value":"addressLine2","checked":true},
+					{"label":"Línea de dirección3", "value":"addressLine3","checked":true},
+					{"label":"Región", "value":"region","checked":true},
+					{"label":"Provincia", "value":"province","checked":true},
+					{"label":"Ciudad", "value":"city","checked":true},
+					{"label":"Zona", "value":"zone","checked":true},
+					{"label":"Código Postal", "value":"postalCode","checked":true},
+					{"label":"Dirección completa", "value":"fullAddress","checked":true}]
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -209,10 +269,13 @@
 			"maskRequired": false,
 			"formatRequired": false,
 			"label": {
-				"eng": "Gender"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Gender",
+				"ara": "جنس",
+				"fra":"Genre",
+				"hin":"लिंग",
+				"tam":"பாலினம்",
+				"kan":"ಲಿಂಗ",
+				"spa":"Género"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -223,14 +286,17 @@
 			"maskRequired": false,
 			"formatRequired": false,
 			"label": {
-				"eng": "Image"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Image",
+				"ara": "صورة",
+				"fra":"Image",
+				"hin":"छवि",
+				"tam":"படம்",
+				"kan":"ಚಿತ್ರ",
+				"spa":"Imagen"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
 			"checked":false
 		}
 	]
-}
+}
\ No newline at end of file
diff --git a/resident-ui-share-credential-schema.json b/resident-ui-share-credential-schema.json
index 375ebabf0d8..268d47ee673 100644
--- a/resident-ui-share-credential-schema.json
+++ b/resident-ui-share-credential-schema.json
@@ -1,20 +1,36 @@
 {
 	"identity": [
 		{
-			"attributeName": "fullName",
-			"maskRequired": false,			
+			"attributeName": "name",
+			"maskRequired": false,
 			"formatRequired": true,
+			"defaultFormat":"fullName",
 			"label": {
-				"eng": "Name"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Name",
+				"ara": "اسم",
+				"fra":"Nom",
+				"hin":"नाम",
+				"tam":"பெயர்",
+				"kan":"ಹೆಸರು",
+				"spa":"Nombre"
 			},
 			"formatOptionLabel":{
-				"eng": "Name Format"
+				"eng": "Name Format",
+				"ara": "تنسيق الاسم",
+				"fra":"Format du nom",
+				"hin":"नाम प्रारूप",
+				"tam":"பெயர் வடிவம்",
+				"kan":"ಹೆಸರು ಸ್ವರೂಪ",
+				"spa":"Formato de nombre"
 			},
 			"formatOption":{
-				"eng": [{"label":"First Name", "value":"firstName"}, {"label":"Middle Name", "value":"middleName"}, {"label":"Last Name", "value":"lastName"}, {"label":"Full Name", "value":"fullName"}]
+				"eng": [{"label":"Full Name", "value":"fullName","checked":true}],
+				"ara": [{"label":"الاسم الكامل", "value":"fullName","checked":true}],
+				"fra": [{"label":"nom et prénom", "value":"fullName","checked":true}],
+				"hin": [{"label":"पूरा नाम", "value":"fullName","checked":true}],
+				"tam": [{"label":"முழு பெயர்", "value":"fullName","checked":true}],
+				"kan": [{"label":"ಪೂರ್ಣ ಹೆಸರು", "value":"fullName","checked":true}],
+				"spa": [{"label":"Nombre completo", "value":"fullName","checked":true}]
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -24,17 +40,33 @@
 			"attributeName": "dateOfBirth",
 			"maskRequired": false,
 			"formatRequired": true,
+			"defaultFormat":"DD/MMM/YYYY",
 			"label": {
-				"eng": "DOB"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Date of birth",
+				"ara": "تاريخ الميلاد",
+				"fra": "date de naissance",
+				"hin": "जन्म की तारीख",
+				"tam": "பிறந்த தேதி",
+				"kan": "ಹುಟ್ತಿದ ದಿನ",
+				"spa": "fecha de nacimiento"
 			},
 			"formatOptionLabel":{
-				"eng": "Date Format"
+				"eng": "Date Format",
+				"ara": "صيغة التاريخ",
+				"fra":"Format de date",
+				"hin":"तारिख का प्रारूप",
+				"tam":"தேதி வடிவம்",
+				"kan":"ದಿನಾಂಕ ಸ್ವರೂಪ",
+				"spa":"Formato de fecha"
 			},
 			"formatOption":{
-				"eng": [{"label":"DD/MM", "value":"DD/MM"}, {"label":"DD/MM/YYYY", "value":"DD/MM/YYYY"}]
+				"eng": [{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"ara": [{"label":"اليوم / الشهر ", "value":"DD/MMM","checked":false}, {"label":"اليوم / الشهر / السنة", "value":"DD/MMM/YYYY","checked":true}],
+				"fra":[{"label":"JJ/MMM", "value":"DD/MMM","checked":false}, {"label":"JJ/MMM/AAAA", "value":"DD/MMM/YYYY","checked":true}],
+				"hin":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"tam":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"kan":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}],
+				"spa":[{"label":"DD/MMM", "value":"DD/MMM","checked":false}, {"label":"DD/MMM/YYYY", "value":"DD/MMM/YYYY","checked":true}]
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -46,10 +78,22 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "UIN"
+				"eng": "UIN",
+				"ara": "UIN",
+				"fra":"UIN",
+				"hin":"UIN",
+				"tam":"UIN",
+				"kan":"UIN",
+				"spa":"UIN"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask UIN",
+				"ara": "قناع UIN",
+				"fra":"Masque UIN",
+				"hin":"मास्क UIN",
+				"tam":"UIN-ஐ மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ UIN",
+				"spa":"Máscara UIN"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":false,
@@ -61,10 +105,22 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "Perpetual VID"
+				"eng": "Perpetual VID",
+				"ara": "دائم VID",
+				"fra":"VID perpétuel",
+				"hin":"सतत VID",
+				"tam":"நிரந்தர VID",
+				"kan":"ಶಾಶ್ವತ VID",
+				"spa":"VID perpetuo"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask Perpetual VID",
+				"ara": "قناع VID الدائم",
+				"fra":"Masque perpétuel VID",
+				"hin":"मास्क सदा VID",
+				"tam":"நிரந்தர VID-ஐ மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ ಶಾಶ್ವತ VID",
+				"spa":"Máscara Perpetuo VID"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":false,
@@ -76,10 +132,22 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "Phone Number"
+				"eng": "Phone Number",
+				"ara": "رقم التليفون",
+				"fra":"Numéro de téléphone",
+				"hin":"फ़ोन नंबर",
+				"tam":"தொலைபேசி எண்",
+				"kan":"ದೂರವಾಣಿ ಸಂಖ್ಯೆ",
+				"spa":"Número de teléfono"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask Phone Number",
+				"ara": "رقم هاتف القناع",
+				"fra":"Masquer le numéro de téléphone",
+				"hin":"मास्क फ़ोन नंबर",
+				"tam":"தொலைபேசி எண்ணை மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ ಫೋನ್ ಸಂಖ್ಯೆ",
+				"spa":"Máscara Número de teléfono"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -91,114 +159,106 @@
 			"maskRequired": true,
 			"formatRequired": false,
 			"label": {
-				"eng": "Email ID"
+				"eng": "Email ID",
+				"ara": "عنوان الايميل",
+				"fra":"Identifiant de messagerie",
+				"hin":"ईमेल ID",
+				"tam":"மின்னஞ்சல் ID",
+				"kan":"ಇಮೇಲ್ ID",
+				"spa":"Identificación de correo"
 			},
 			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Mask Email ID",
+				"ara": "قناع البريد الإلكتروني ID",
+				"fra":"Masquer ID de messagerie",
+				"hin":"मास्क ईमेल",
+				"tam":"மின்னஞ்சல் ID-ஐ மறைக்கவும்",
+				"kan":"ಮಾಸ್ಕ್ ಇಮೇಲ್ ID",
+				"spa":"Enmascarar ID de correo electrónico"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
 			"checked":false
 		},
 		{
-			"attributeName": "addressLine1",
+			"attributeName": "fullAddress",
 			"maskRequired": false,
 			"formatRequired": true,
+			"defaultFormat":"addressLine1,addressLine2,addressLine3,region,province,city,zone,postalCode",
 			"label": {
-				"eng": "Address"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Address",
+				"ara": "عنوان",
+				"fra":"Adresse",
+				"hin":"पता",
+				"tam":"முகவரி",
+				"kan":"ವಿಳಾಸ",
+				"spa":"DIRECCIÓN"
 			},
 			"formatOptionLabel":{
-				"eng": "Address Format"
+				"eng": "Address Format",
+				"ara": "تنسيق العنوان",
+				"fra":"Format d'adresse",
+				"hin":"पता प्रारूप",
+				"tam":"முகவரி வடிவம்",
+				"kan":"ವಿಳಾಸ ಸ್ವರೂಪ",
+				"spa":"Formato de dirección"
 			},
 			"formatOption":{
-				"eng": [{"label":"Region", "value":"region"}, {"label":"Province", "value":"province"}, {"label":"City", "value":"city"}, {"label":"Full Address", "value":"fullAddress"}]
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "addressLine2",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Address Line2"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "addressLine3",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Address Line3"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "city",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "City"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "region",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Region"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "province",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Province"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
-			},
-			"displaykeyinsharewithpartner":true,
-			"displaykeyinpersonalisedcard":true,
-			"checked":false
-		},
-		{
-			"attributeName": "postalCode",
-			"maskRequired": false,
-			"formatRequired": false,
-			"label": {
-				"eng": "Postal Code"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": [{"label":"Address line1", "value":"addressLine1","checked":true},
+					{"label":"Address line2", "value":"addressLine2","checked":true},
+					{"label":"Address line3", "value":"addressLine3","checked":true},
+					{"label":"Region", "value":"region","checked":true},
+					{"label":"Province", "value":"province","checked":true},
+					{"label":"City", "value":"city","checked":true},
+					{"label":"Zone", "value":"zone","checked":true},
+					{"label":"Postal code", "value":"postalCode","checked":true},
+					{"label":"Full Address", "value":"fullAddress","checked":true}],
+				"ara": [{"label":"العنوان سطر 1", "value":"addressLine1","checked":true},{"label":"سطر العنوان 2", "value":"addressLine2","checked":true},{"label":"سطر العنوان 3", "value":"addressLine3","checked":true}, {"label":"منطقة", "value":"region","checked":true}, {"label":"مقاطعة", "value":"province","checked":true}, {"label":"مدينة", "value":"city","checked":true}, {"label":"منطقة", "value":"zone","checked":true},{"label":"رمز بريدي", "value":"postalCode","checked":true}, {"label":"العنوان الكامل", "value":"fullAddress","checked":true}],
+				"fra":[{"label":"Adresse 1", "value":"addressLine1","checked":true},
+					{"label":"Adresse Ligne 2", "value":"addressLine2","checked":true},
+					{"label":"Ligne d'adresse3", "value":"addressLine3","checked":true},
+					{"label":"Région", "value":"region","checked":true},
+					{"label":"Province", "value":"province","checked":true},
+					{"label":"Ville", "value":"city","checked":true},
+					{"label":"Zone", "value":"zone","checked":true},
+					{"label":"Code Postal", "value":"postalCode","checked":true},
+					{"label":"Adresse complète", "value":"fullAddress","checked":true}],
+				"hin":[{"label":"पता पंक्ति 1", "value":"addressLine1","checked":true},
+					{"label":"पता पंक्ति नं। 2", "value":"addressLine2","checked":true},
+					{"label":"पता पंक्ति3", "value":"addressLine3","checked":true},
+					{"label":"क्षेत्र", "value":"region","checked":true},
+					{"label":"प्रांत", "value":"province","checked":true},
+					{"label":"शहर", "value":"city","checked":true},
+					{"label":"क्षेत्र", "value":"zone","checked":true},
+					{"label":"डाक कोड", "value":"postalCode","checked":true},
+					{"label":"पूरा पता", "value":"fullAddress","checked":true}],
+				"tam":[{"label":"முகவரி வரி 1", "value":"addressLine1","checked":true},
+					{"label":"முகவரி வரி 2", "value":"addressLine2","checked":true},
+					{"label":"முகவரி வரி 3", "value":"addressLine3","checked":true},
+					{"label":"பிராந்தியம்", "value":"region","checked":true},
+					{"label":"மாகாணம்", "value":"province","checked":true},
+					{"label":"நகரம்", "value":"city","checked":true},
+					{"label":"மண்டலம்", "value":"zone","checked":true},
+					{"label":"அஞ்சல் குறியீடு", "value":"postalCode","checked":true},
+					{"label":"முழு முகவரி", "value":"fullAddress","checked":true}],
+				"kan":[{"label":"ವಿಳಾಸ ಸಾಲು 1", "value":"addressLine1","checked":true},
+					{"label":"ವಿಳಾಸ ಸಾಲು 2", "value":"addressLine2","checked":true},
+					{"label":"ವಿಳಾಸ ಸಾಲು 3", "value":"addressLine3","checked":true},
+					{"label":"ಪ್ರದೇಶ", "value":"region","checked":true},
+					{"label":"ಪ್ರಾಂತ್ಯ", "value":"province","checked":true},
+					{"label":"ನಗರ", "value":"city","checked":true},
+					{"label":"ವಲಯ", "value":"zone","checked":true},
+					{"label":"ಅಂಚೆ ಕೋಡ್", "value":"postalCode","checked":true},
+					{"label":"ಪೂರ್ತಿ ವಿಳಾಸ", "value":"fullAddress","checked":true}],
+				"spa":[{"label":"Dirección Línea 1", "value":"addressLine1","checked":true},
+					{"label":"Línea de dirección2", "value":"addressLine2","checked":true},
+					{"label":"Línea de dirección3", "value":"addressLine3","checked":true},
+					{"label":"Región", "value":"region","checked":true},
+					{"label":"Provincia", "value":"province","checked":true},
+					{"label":"Ciudad", "value":"city","checked":true},
+					{"label":"Zona", "value":"zone","checked":true},
+					{"label":"Código Postal", "value":"postalCode","checked":true},
+					{"label":"Dirección completa", "value":"fullAddress","checked":true}]
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -209,10 +269,13 @@
 			"maskRequired": false,
 			"formatRequired": false,
 			"label": {
-				"eng": "Gender"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Gender",
+				"ara": "جنس",
+				"fra":"Genre",
+				"hin":"लिंग",
+				"tam":"பாலினம்",
+				"kan":"ಲಿಂಗ",
+				"spa":"Género"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
@@ -223,14 +286,17 @@
 			"maskRequired": false,
 			"formatRequired": false,
 			"label": {
-				"eng": "Image"
-			},
-			"maskRequiredLabel": {
-				"eng": "Mask It"
+				"eng": "Image",
+				"ara": "صورة",
+				"fra":"Image",
+				"hin":"छवि",
+				"tam":"படம்",
+				"kan":"ಚಿತ್ರ",
+				"spa":"Imagen"
 			},
 			"displaykeyinsharewithpartner":true,
 			"displaykeyinpersonalisedcard":true,
 			"checked":false
 		}
 	]
-}
+}
\ No newline at end of file
diff --git a/resident-ui-update-demographics-schema.json b/resident-ui-update-demographics-schema.json
index 7bb6ee0d40b..9550dbced10 100644
--- a/resident-ui-update-demographics-schema.json
+++ b/resident-ui-update-demographics-schema.json
@@ -2,6 +2,24 @@
   "identity": [
     {
       "attributeName": "fullName",
+      "label": {
+        "eng": "Name",
+        "ara": "اسم",
+        "fra": "Nom",
+        "hin": "नाम",
+        "tam": "பெயர்",
+        "kan": "ಹೆಸರು",
+        "spa": "Nombre"
+      },
+      "placeHolder": {
+        "eng": "Enter new name",
+        "ara": "أدخل الاسم الجديد",
+        "fra": "Entrez un nouveau nom",
+        "hin": "नया नाम दर्ज करें",
+        "tam": "புதிய பெயரை உள்ளிடவும்",
+        "kan": "ಹೊಸ ಹೆಸರನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Introduce un nuevo nombre"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -9,39 +27,109 @@
           "New Name"
         ],
         "ara": [
-          "Current Name_ara",
-          "New Name_ara"
+          "الاسم الحالي",
+          "اسم جديد"
         ],
         "fra": [
-          "Current Name_fra",
-          "New Name_fra"
+          "Nom actuel",
+          "Nouveau nom"
+        ],
+        "hin": [
+          "वर्तमान नाम",
+          "नया नाम"
+        ],
+        "tam": [
+          "தற்போதைய பெயர்",
+          "புதிய பெயர்"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಹೆಸರು",
+          "ಹೊಸ ಹೆಸರು"
+        ],
+        "spa": [
+          "Nombre actual",
+          "Nuevo nombre"
         ]
       },
       "controlType": "textbox",
-      "tabgroup": "identity"
+      "tabgroup": "identity",
+      "dataType": "notString"
     },
     {
       "attributeName": "dateOfBirth",
+      "label": {
+        "eng": "DOB",
+        "ara": "DOB",
+        "fra": "DOB",
+        "hin": "DOB",
+        "tam": "DOB",
+        "kan": "DOB",
+        "spa": "DOB"
+      },
+      "placeHolder": {
+        "eng": "DOB",
+        "ara": "DOB",
+        "fra": "DOB",
+        "hin": "DOB",
+        "tam": "DOB",
+        "kan": "DOB",
+        "spa": "DOB"
+      },
       "description": "",
       "labelName": {
         "eng": [
-          "Current DOB",
-          "New DOB"
+          "Current Date of birth",
+          "New Date of birth"
         ],
         "ara": [
-          "Current DOB_ara",
-          "New DOB_ara"
+          "تاريخ الميلاد الحالي",
+          "تاريخ الميلاد الجديد"
         ],
         "fra": [
-          "Current DOB_fra",
-          "New DOB_fra"
+          "Date de naissance actuelle",
+          "Nouvelle date de naissance"
+        ],
+        "hin": [
+          "वर्तमान जन्मतिथि",
+          "नई जन्मतिथि"
+        ],
+        "tam": [
+          "தற்போதைய பிறந்த தேதி",
+          "புதிய பிறந்த தேதி"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಜನ್ಮ ದಿನಾಂಕ",
+          "ಹೊಸ ಜನ್ಮ ದಿನಾಂಕ"
+        ],
+        "spa": [
+          "Fecha de nacimiento actual",
+          "nuevo nacimiento"
         ]
       },
       "controlType": "calendar",
-      "tabgroup": "identity"
+      "tabgroup": "identity",
+      "dataType": "string"
     },
     {
       "attributeName": "gender",
+      "label": {
+        "eng": "Gender",
+        "ara": "جنس",
+        "fra": "Genre",
+        "hin": "लिंग",
+        "tam": "பாலினம்",
+        "kan": "ಲಿಂಗ",
+        "spa": "Género"
+      },
+      "placeHolder": {
+        "eng": "Enter gender",
+        "ara": "أدخل الجنس",
+        "fra": "Entrez le sexe",
+        "hin": "लिंग दर्ज करें",
+        "tam": "பாலினத்தை உள்ளிடவும்",
+        "kan": "ಲಿಂಗವನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Introduce el género"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -49,19 +137,54 @@
           "New Gender"
         ],
         "ara": [
-          "Current Gender_ara",
-          "New Gender_ara"
+          "الجنس الحالي",
+          "جنس جديد"
         ],
         "fra": [
-          "Current Gender_fra",
-          "New Gender_fra"
+          "Sexe actuel",
+          "Nouveau genre"
+        ],
+        "hin": [
+          "वर्तमान लिंग",
+          "नया लिंग"
+        ],
+        "tam": [
+          "தற்போதைய பாலினம்",
+          "புதிய பாலினம்"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಲಿಂಗ",
+          "ಹೊಸ ಲಿಂಗ"
+        ],
+        "spa": [
+          "Género actual",
+          "Nuevo género"
         ]
       },
       "controlType": "dropdown",
-      "tabgroup": "identity"
+      "tabgroup": "identity",
+      "dataType": "notString"
     },
     {
       "attributeName": "proofOfIdentity",
+      "label": {
+        "eng": "Proof Of Identity",
+        "ara": "إثبات الهوية",
+        "fra": "Preuve d'identité",
+        "hin": "सबूत की पहचान",
+        "tam": "அடையாள சான்று",
+        "kan": "ಗುರುತಿನ ಆಧಾರ",
+        "spa": "Prueba de identidad"
+      },
+      "placeHolder": {
+        "eng": "Proof Of Identity",
+        "ara": "إثبات الهوية",
+        "fra": "Preuve d'identité",
+        "hin": "सबूत की पहचान",
+        "tam": "அடையாள சான்று",
+        "kan": "ಗುರುತಿನ ಆಧಾರ",
+        "spa": "Prueba de identidad"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -69,28 +192,82 @@
           "Document Type",
           "Document Reference ID",
           "Proof Of Document",
-          "Allowed file type : pdf,jpeg,png,jpg and allowed file size : 2mb"
+          "Allowed File types: pdf, jpeg, png, jpg",
+          "Allowed File size: 2 MB"
         ],
         "ara": [
-          "Identity Proof_ara",
-          "Document Type_ara",
-          "Document Reference ID_ara",
-          "Proof Of Document_ara",
-          "Allowed file type_ara : pdf,jpeg,png,jpg and allowed file size : 2mb"
+          "إثبات الهوية",
+          "نوع الوثيقة",
+          "معرّف مرجع المستند",
+          "إثبات المستند",
+          "أنواع الملفات المسموح بها: pdf، jpeg، png، jpg",
+          "حجم الملف المسموح به: MB 2"
         ],
         "fra": [
-          "Identity Proof_fra",
-          "Document Type_fra",
-          "Document Reference ID_fra",
-          "Proof Of Document_fra",
-          "Allowed file type_fra : pdf,jpeg,png,jpg and allowed file size : 2mb"
+          "Preuve d'identité",
+          "Type de document",
+          "Identifiant de référence du document",
+          "Preuve de document",
+          "Types de fichiers autorisés : pdf, jpeg, png, jpg",
+          "Taille de fichier autorisée : 2 MB"
+        ],
+        "hin": [
+          "पहचान प्रमाण पत्र",
+          "दस्तावेज़ का प्रकार",
+          "दस्तावेज़ संदर्भ ID",
+          "दस्तावेज़ का प्रमाण",
+          "अनुमत फ़ाइल प्रकार: pdf, jpeg, png, jpg",
+          "अनुमत फ़ाइल आकार: 2 MB"
+        ],
+        "tam": [
+          "அடையாளச் சான்று",
+          "ஆவண வகை",
+          "ஆவண குறிப்பு ID",
+          "ஆவண ஆதாரம்",
+          "அனுமதிக்கப்பட்ட கோப்பு வகைகள்: pdf, jpeg, png, jpg",
+          "அனுமதிக்கப்பட்ட கோப்பு அளவு: 2 MB"
+        ],
+        "kan": [
+          "ಗುರುತಿನ ಪುರಾವೆ",
+          "ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ",
+          "ಡಾಕ್ಯುಮೆಂಟ್ ರೆಫರೆನ್ಸ್ ID",
+          "ಡಾಕ್ಯುಮೆಂಟ್ ಪುರಾವೆ",
+          "ಅನುಮತಿಸಲಾದ ಫೈಲ್ ಪ್ರಕಾರಗಳು: pdf, jpeg, png, jpg",
+          "ಅನುಮತಿಸಲಾದ ಫೈಲ್ ಗಾತ್ರ: 2 MB"
+        ],
+        "spa": [
+          "Prueba de identidad",
+          "Tipo de Documento",
+          "ID de referencia del documento",
+          "Prueba de Documento",
+          "Tipos de archivos permitidos: pdf, jpeg, png, jpg",
+          "Tamaño de archivo permitido: 2 MB"
         ]
       },
       "controlType": "fileupload",
-      "tabgroup": "identity"
+      "tabgroup": "identity",
+      "dataType": "notString"
     },
     {
       "attributeName": "addressLine1",
+      "label": {
+        "eng": "Address line1",
+        "ara": "العنوان سطر 1",
+        "fra": "Adresse 1",
+        "hin": "पता पंक्ति 1",
+        "tam": "முகவரி வரி 1",
+        "kan": "ವಿಳಾಸ ಸಾಲು 1",
+        "spa": "Dirección Línea 1"
+      },
+      "placeHolder": {
+        "eng": "Enter Address line1",
+        "ara": "أدخل سطر العنوان1",
+        "fra": "Entrez l'adresse ligne1",
+        "hin": "पता पंक्ति 1 दर्ज करें",
+        "tam": "முகவரி வரி 1 ஐ உள்ளிடவும்",
+        "kan": "ವಿಳಾಸ ಸಾಲು 1 ಅನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Introducir dirección línea 1"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -98,19 +275,164 @@
           "New Address Line1"
         ],
         "ara": [
-          "Current Address Line1_ara",
-          "New Address Line1_ara"
+          "سطر العنوان الحالي 1",
+          "سطر العنوان الجديد 1"
+        ],
+        "fra": [
+          "Ligne d'adresse actuelle1",
+          "Nouvelle ligne d'adresse1"
+        ],
+        "hin": [
+          "वर्तमान पता पंक्ति1",
+          "नया पता पंक्ति1"
+        ],
+        "tam": [
+          "தற்போதைய முகவரி வரி 1",
+          "புதிய முகவரி வரி 1"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ವಿಳಾಸ ಸಾಲು 1",
+          "ಹೊಸ ವಿಳಾಸ ಸಾಲು 1"
+        ],
+        "spa": [
+          "Línea 1 de dirección actual",
+          "Nueva línea de dirección 1"
+        ]
+      },
+      "controlType": "textbox",
+      "tabgroup": "address",
+      "dataType": "notString"
+    },
+    {
+      "attributeName": "addressLine2",
+      "label": {
+        "eng": "Address line2",
+        "ara": "سطر العنوان 2",
+        "fra": "Adresse 2",
+        "hin": "पता पंक्ति 2",
+        "tam": "முகவரி வரி 2",
+        "kan": "ವಿಳಾಸ ಸಾಲು 2",
+        "spa": "Dirección Línea 2"
+      },
+      "placeHolder": {
+        "eng": "Enter Address line2",
+        "ara": "أدخل سطر العنوان2",
+        "fra": "Entrez l'adresse ligne2",
+        "hin": "पता पंक्ति 2 दर्ज करें",
+        "tam": "முகவரி வரி 2 ஐ உள்ளிடவும்",
+        "kan": "ವಿಳಾಸ ಸಾಲು 2 ಅನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Introducir dirección línea 2"
+      },
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Address Line2",
+          "New Address Line2"
+        ],
+        "ara": [
+          "سطر العنوان الحالي2",
+          "سطر العنوان الجديد2"
+        ],
+        "fra": [
+          "Ligne d'adresse actuelle2",
+          "Nouvelle ligne d'adresse2"
+        ],
+        "hin": [
+          "वर्तमान पता पंक्ति2",
+          "नया पता पंक्ति2"
+        ],
+        "tam": [
+          "தற்போதைய முகவரி வரி 2",
+          "புதிய முகவரி வரி 2"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ವಿಳಾಸ ಸಾಲು 2",
+          "ಹೊಸ ವಿಳಾಸ ಸಾಲು 2"
+        ],
+        "spa": [
+          "Línea 2 de dirección actual",
+          "Nueva línea de dirección 2"
+        ]
+      },
+      "controlType": "textbox",
+      "tabgroup": "address",
+      "dataType": "notString"
+    },
+    {
+      "attributeName": "addressLine3",
+      "label": {
+        "eng": "Address line3",
+        "ara": "سطر العنوان3",
+        "fra": "Adresse 3",
+        "hin": "पता पंक्ति 3",
+        "tam": "முகவரி வரி 3",
+        "kan": "ವಿಳಾಸ ಸಾಲು 3",
+        "spa": "Dirección Línea 3"
+      },
+      "placeHolder": {
+        "eng": "Enter Address line3",
+        "ara": "أدخل سطر العنوان3",
+        "fra": "Entrez l'adresse ligne3",
+        "hin": "पता पंक्ति 3 दर्ज करें",
+        "tam": "முகவரி வரி 3 ஐ உள்ளிடவும்",
+        "kan": "ವಿಳಾಸ ಸಾಲು 3 ಅನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Introducir dirección línea 3"
+      },
+      "description": "",
+      "labelName": {
+        "eng": [
+          "Current Address Line3",
+          "New Address Line3"
+        ],
+        "ara": [
+          "سطر العنوان الحالي3",
+          "سطر العنوان الجديد3"
         ],
         "fra": [
-          "Current Address Line1_fra",
-          "New Address Line1_fra"
+          "Ligne d'adresse actuelle3",
+          "Nouvelle ligne d'adresse3"
+        ],
+        "hin": [
+          "वर्तमान पता पंक्ति3",
+          "नया पता पंक्ति3"
+        ],
+        "tam": [
+          "தற்போதைய முகவரி வரி 3",
+          "புதிய முகவரி வரி 3"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ವಿಳಾಸ ಸಾಲು 3",
+          "ಹೊಸ ವಿಳಾಸ ಸಾಲು 3"
+        ],
+        "spa": [
+          "Línea 3 de dirección actual",
+          "Nueva línea de dirección 3"
         ]
       },
       "controlType": "textbox",
-      "tabgroup": "address"
+      "tabgroup": "address",
+      "dataType": "notString"
     },
     {
       "attributeName": "region",
+      "label": {
+        "eng": "Region",
+        "ara": "منطقة",
+        "fra": "Région",
+        "hin": "क्षेत्र",
+        "tam": "பிராந்தியம்",
+        "kan": "ಪ್ರದೇಶ",
+        "spa": "Región"
+      },
+      "placeHolder": {
+        "eng": "Select Region",
+        "ara": "اختر المنطقة",
+        "fra": "Choisissez une région",
+        "hin": "प्रदेश का चयन करें",
+        "tam": "பகுதியை உள்ளிடவும்",
+        "kan": "ಪ್ರದೇಶವನ್ನು ಆಯ್ಕೆಮಾಡಿ",
+        "spa": "Seleccione la región"
+      },
       "name": "Region",
       "description": "",
       "labelName": {
@@ -119,20 +441,55 @@
           "New Region"
         ],
         "ara": [
-          "Current Region_ara",
-          "New Region_ara"
+          "المنطقة الحالية",
+          "منطقة جديدة"
         ],
         "fra": [
-          "Current Region_fra",
-          "New Region_fra"
+          "Région actuelle",
+          "Nouvelle région"
+        ],
+        "hin": [
+          "वर्तमान प्रदेश",
+          "नया प्रदेश"
+        ],
+        "tam": [
+          "தற்போதைய பிராந்தியம்",
+          "புதிய பிராந்தியம்"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಪ್ರದೇಶ",
+          "ಹೊಸ ಪ್ರದೇಶ"
+        ],
+        "spa": [
+          "Región Actual",
+          "Nueva Región"
         ]
       },
       "controlType": "dropdown",
       "tabgroup": "address",
-      "locationHierarchyLevel": 1
+      "locationHierarchyLevel": 1,
+      "dataType": "notString"
     },
     {
       "attributeName": "province",
+      "label": {
+        "eng": "Province",
+        "ara": "مقاطعة",
+        "fra": "Province",
+        "hin": "प्रांत",
+        "tam": "மாகாணம்",
+        "kan": "ಪ್ರಾಂತ್ಯ",
+        "spa": "Provincia"
+      },
+      "placeHolder": {
+        "eng": "Select Province",
+        "ara": "اختر المقاطعة",
+        "fra": "Sélectionnez une province",
+        "hin": "प्रांत चुनें",
+        "tam": "ஒரு மாகாணத்தைத் தேர்ந்தெடுக்கவும்",
+        "kan": "ಒಂದು ಪ್ರಾಂತ್ಯವನ್ನು ಆಯ್ಕೆಮಾಡಿ",
+        "spa": "Seleccione una provincia"
+      },
       "name": "Province",
       "description": "",
       "labelName": {
@@ -141,20 +498,55 @@
           "New Province"
         ],
         "ara": [
-          "Current Province_ara",
-          "New Province_ara"
+          "المقاطعة الحالية",
+          "مقاطعة جديدة"
         ],
         "fra": [
-          "Current Province_fra",
-          "New Province_fra"
+          "Province actuelle",
+          "Nouvelle Province"
+        ],
+        "hin": [
+          "वर्तमान प्रांत",
+          "नया प्रांत"
+        ],
+        "tam": [
+          "தற்போதைய மாகாணம்",
+          "புதிய மாகாணம்"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಪ್ರಾಂತ್ಯ",
+          "ಹೊಸ ಪ್ರಾಂತ್ಯ"
+        ],
+        "spa": [
+          "Provincia Actual",
+          "Nueva Provincia"
         ]
       },
       "controlType": "dropdown",
       "tabgroup": "address",
-      "locationHierarchyLevel": 2
+      "locationHierarchyLevel": 2,
+      "dataType": "notString"
     },
     {
       "attributeName": "city",
+      "label": {
+        "eng": "City",
+        "ara": "مدينة",
+        "fra": "Ville",
+        "hin": "शहर",
+        "tam": "நகரம்",
+        "kan": "ನಗರ",
+        "spa": "Ciudad"
+      },
+      "placeHolder": {
+        "eng": "Select City",
+        "ara": "اختر مدينة",
+        "fra": "Sélectionnez une ville",
+        "hin": "शहर चुनें",
+        "tam": "நகரத்தைத் தேர்ந்தெடுக்கவும்",
+        "kan": "ನಗರವನ್ನು ಆಯ್ಕೆಮಾಡಿ",
+        "spa": "Ciudad selecta"
+      },
       "name": "City",
       "description": "",
       "labelName": {
@@ -163,20 +555,55 @@
           "New City"
         ],
         "ara": [
-          "Current City_ara",
-          "New City_ara"
+          "المدينة الحالية",
+          "مدينة جديدة"
         ],
         "fra": [
-          "Current City_fra",
-          "New City_fra"
+          "Ville actuelle",
+          "Nouvelle ville"
+        ],
+        "hin": [
+          "वर्तमान शहर",
+          "नया शहर"
+        ],
+        "tam": [
+          "தற்போதைய நகரம்",
+          "புதிய நகரம்"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ನಗರ",
+          "ಹೊಸ ನಗರ"
+        ],
+        "spa": [
+          "Ciudad Actual",
+          "Ciudad Nueva"
         ]
       },
       "controlType": "dropdown",
       "tabgroup": "address",
-      "locationHierarchyLevel": 3
+      "locationHierarchyLevel": 3,
+      "dataType": "notString"
     },
     {
       "attributeName": "zone",
+      "label": {
+        "eng": "Zone",
+        "ara": "منطقة",
+        "fra": "Zone",
+        "hin": "क्षेत्र",
+        "tam": "மண்டலம்",
+        "kan": "ವಲಯ",
+        "spa": "Zona"
+      },
+      "placeHolder": {
+        "eng": "Select Zone",
+        "ara": "حدد المنطقة",
+        "fra": "Sélectionnez une zone",
+        "hin": "जोन चुनें",
+        "tam": "மண்டலத்தைத் தேர்ந்தெடுக்கவும்",
+        "kan": "ವಲಯವನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Seleccione una zona"
+      },
       "name": "Zone",
       "description": "",
       "labelName": {
@@ -185,20 +612,55 @@
           "New Zone"
         ],
         "ara": [
-          "Current Zone_ara",
-          "New Zone_ara"
+          "المنطقة الحالية",
+          "منطقة جديدة"
         ],
         "fra": [
-          "Current Zone_fra",
-          "New Zone_fra"
+          "Zone actuelle",
+          "Nouvelle zone"
+        ],
+        "hin": [
+          "वर्तमान क्षेत्र",
+          "नया क्षेत्र"
+        ],
+        "tam": [
+          "தற்போதைய மண்டலம்",
+          "புதிய மண்டலம்"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ವಲಯ",
+          "ಹೊಸ ವಲಯ"
+        ],
+        "spa": [
+          "Zona Actual",
+          "Nueva Zona"
         ]
       },
       "controlType": "dropdown",
       "tabgroup": "address",
-      "locationHierarchyLevel": 4
+      "locationHierarchyLevel": 4,
+      "dataType": "string"
     },
     {
       "attributeName": "postalCode",
+      "label": {
+        "eng": "Postal Code",
+        "ara": "رمز بريدي",
+        "fra": "Code Postal",
+        "hin": "डाक कोड",
+        "tam": "குறியீடு",
+        "kan": "ಕೋಡ್",
+        "spa": "Código Postal"
+      },
+      "placeHolder": {
+        "eng": "Select Postal Code",
+        "ara": "حدد الرمز البريدي",
+        "fra": "Sélectionnez le code postal",
+        "hin": "पोस्टल कोड चुनें",
+        "tam": "அஞ்சல் குறியீட்டைத் தேர்ந்தெடுக்கவும்",
+        "kan": "ಪೋಸ್ಟಲ್ ಕೋಡ್ ಆಯ್ಕೆಮಾಡಿ",
+        "spa": "Seleccione Código Postal"
+      },
       "name": "Postal Code",
       "description": "",
       "labelName": {
@@ -207,20 +669,55 @@
           "New Postal Code"
         ],
         "ara": [
-          "Current Postal Code_ara",
-          "New Postal Code_ara"
+          "الرمز البريدي الحالي",
+          "رمز بريدي جديد"
         ],
         "fra": [
-          "Current Postal Code_fra",
-          "New Postal Code_fra"
+          "Code postal actuel",
+          "Nouveau code postal"
+        ],
+        "hin": [
+          "वर्तमान पोस्टल कोड",
+          "नया पोस्टल कोड"
+        ],
+        "tam": [
+          "தற்போதைய அஞ்சல் குறியீடு",
+          "புதிய அஞ்சல் குறியீடு"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಪೋಸ್ಟಲ್ ಕೋಡ್",
+          "ಹೊಸ ಪೋಸ್ಟಲ್ ಕೋಡ್"
+        ],
+        "spa": [
+          "Código Postal Actual",
+          "Nuevo código postal"
         ]
       },
       "controlType": "dropdown",
       "tabgroup": "address",
-      "locationHierarchyLevel": 5
+      "locationHierarchyLevel": 5,
+      "dataType": "notString"
     },
     {
       "attributeName": "proofOfAddress",
+      "label": {
+        "eng": "Proof Of Address",
+        "ara": "إثبات العنوان",
+        "fra": "Un justificatif de domicile",
+        "hin": "पते का प्रमाण",
+        "tam": "முகவரி சான்று",
+        "kan": "ವಿಳಾಸದ ಪುರಾವೆ",
+        "spa": "Comprobante de domicilio"
+      },
+      "placeHolder": {
+        "eng": "Proof Of Address",
+        "ara": "إثبات العنوان",
+        "fra": "Un justificatif de domicile",
+        "hin": "पते का प्रमाण",
+        "tam": "முகவரி சான்று",
+        "kan": "ವಿಳಾಸದ ಪುರಾವೆ",
+        "spa": "Comprobante de domicilio"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -228,28 +725,82 @@
           "Document Type",
           "Document Reference ID",
           "Proof Of Document",
-          "Allowed file type : pdf,jpeg,png,jpg and allowed file size : 2mb"
+          "Allowed File types: pdf, jpeg, png, jpg",
+          "Allowed File size: 2 MB"
         ],
         "ara": [
-          "Address Proof_ara",
-          "Document Type_ara",
-          "Document Reference ID_ara",
-          "Proof Of Document_ara",
-          "Allowed file type_ara : pdf,jpeg,png,jpg and allowed file size : 2mb"
+          "إثبات العنوان",
+          "نوع المستند",
+          "معرف مرجع المستند",
+          "إثبات المستند",
+          "أنواع الملفات المسموح بها: pdf، jpeg، png، jpg",
+          "حجم الملف المسموح به: MB 2"
         ],
         "fra": [
-          "Address Proof_fra",
-          "Document Type_fra",
-          "Document Reference ID_fra",
-          "Proof Of Document_fra",
-          "Allowed file type_fra : pdf,jpeg,png,jpg and allowed file size : 2mb"
+          "Épreuve d'adresse",
+          "Type de document",
+          "ID de référence du document",
+          "Preuve de document",
+          "Types de fichiers autorisés : pdf, jpeg, png, jpg",
+          "Taille de fichier autorisée : 2 MB"
+        ],
+        "hin": [
+          "पता प्रमाण पत्र",
+          "दस्तावेज़ प्रकार",
+          "दस्तावेज़ संदर्भ ID",
+          "दस्तावेज़ का प्रमाण",
+          "अनुमत फ़ाइल प्रकार: pdf, jpeg, png, jpg",
+          "अनुमत फ़ाइल आकार: 2 MB"
+        ],
+        "tam": [
+          "முகவரிச் சான்று",
+          "ஆவண வகை",
+          "ஆவணக் குறிப்பு ID",
+          "ஆவண ஆதாரம்",
+          "அனுமதிக்கப்பட்ட கோப்பு வகைகள்: pdf, jpeg, png, jpg",
+          "அனுமதிக்கப்பட்ட கோப்பு அளவு: 2 MB"
+        ],
+        "kan": [
+          "ವಿಳಾಸ ಪುರಾವೆ",
+          "ಡಾಕ್ಯುಮೆಂಟ್ ಪ್ರಕಾರ",
+          "ಡಾಕ್ಯುಮೆಂಟ್ ರೆಫರೆನ್ಸ್ ID",
+          "ಡಾಕ್ಯುಮೆಂಟ್ ಪುರಾವೆ",
+          "ಅನುಮತಿಸಲಾದ ಫೈಲ್ ಪ್ರಕಾರಗಳು: pdf, jpeg, png, jpg",
+          "ಅನುಮತಿಸಲಾದ ಫೈಲ್ ಗಾತ್ರ: 2 MB"
+        ],
+        "spa": [
+          "Prueba de dirección",
+          "Tipo de documento",
+          "ID de referencia del documento",
+          "Prueba de Documento",
+          "Tipos de archivos permitidos: pdf, jpeg, png, jpg",
+          "Tamaño de archivo permitido: 2 MB"
         ]
       },
       "controlType": "fileupload",
-      "tabgroup": "address"
+      "tabgroup": "address",
+      "dataType": "notString"
     },
     {
       "attributeName": "email",
+      "label": {
+        "eng": "Email ID",
+        "ara": "عنوان الايميل",
+        "fra": "Identifiant de messagerie",
+        "hin": "ईमेल ID",
+        "tam": "மின்னஞ்சல் முகவரி",
+        "kan": "ಇಮೇಲ್ ID",
+        "spa": "Identificación de correo"
+      },
+      "placeHolder": {
+        "eng": "Enter email ID",
+        "ara": "أدخل معرف البريد الإلكتروني",
+        "fra": "Entrez l'identifiant de messagerie",
+        "hin": "ईमेल ID दर्ज करें",
+        "tam": "மின்னஞ்சல் ID-ஐ உள்ளிடவும்",
+        "kan": "ಇಮೇಲ್ ID ನಮೂದಿಸಿ",
+        "spa": "Ingrese su ID de correo electrónico"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -259,23 +810,66 @@
           "Send OTP"
         ],
         "ara": [
-          "Current email ID_ara",
-          "New email ID_ara",
-          "Confirm New email ID_ara",
-          "Send OTP_ara"
+          "معرف البريد الإلكتروني الحالي",
+          "معرف البريد الإلكتروني الجديد",
+          "تأكيد معرف البريد الإلكتروني الجديد",
+          "إرسال OTP"
         ],
         "fra": [
-          "Current email ID_fra",
-          "New email ID_fra",
-          "Confirm New email ID_fra",
-          "Send OTP_fra"
+          "Identifiant de messagerie actuel",
+          "Nouvel identifiant de messagerie",
+          "Confirmer le nouvel identifiant de messagerie",
+          "Envoyer OTP"
+        ],
+        "hin": [
+          "वर्तमान ईमेल ID",
+          "नई ईमेल ID",
+          "नई ईमेल ID की पुष्टि करें",
+          "OTP भेजें"
+        ],
+        "tam": [
+          "தற்போதைய மின்னஞ்சல் ID",
+          "புதிய மின்னஞ்சல் ID",
+          "புதிய மின்னஞ்சல் ID-ஐ உறுதிப்படுத்தவும்",
+          "OTP ஐ அனுப்பு"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಇಮೇಲ್ ID",
+          "ಹೊಸ ಇಮೇಲ್ ID",
+          "ಹೊಸ ಇಮೇಲ್ ID ದೃಢೀಕರಿಸಿ",
+          "OTP ಕಳುಹಿಸಿ"
+        ],
+        "spa": [
+          "ID de correo electrónico actual",
+          "Nueva identificación de correo electrónico",
+          "Confirmar nuevo ID de correo electrónico",
+          "Enviar OTP"
         ]
       },
       "controlType": "textbox",
-      "tabgroup": "contact"
+      "tabgroup": "contact",
+      "dataType": "string"
     },
     {
       "attributeName": "phone",
+      "label": {
+        "eng": "Phone Number",
+        "ara": "رقم التليفون",
+        "fra": "Numéro de téléphone",
+        "hin": "फ़ोन नंबर",
+        "tam": "தொலைபேசி எண்",
+        "kan": "ದೂರವಾಣಿ ಸಂಖ್ಯೆ",
+        "spa": "Número de teléfono"
+      },
+      "placeHolder": {
+        "eng": "Enter Phone Number",
+        "ara": "أدخل رقم الهاتف",
+        "fra": "Entrez le numéro de téléphone",
+        "hin": "फोन नंबर दर्ज",
+        "tam": "தொலைபேசி எண்ணை உள்ளிடவும்",
+        "kan": "ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ",
+        "spa": "Ingresa número telefónico"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -285,23 +879,66 @@
           "Send OTP"
         ],
         "ara": [
-          "Current Phone Number_ara",
-          "New Phone Number_ara",
-          "Confirm New Phone Number_ara",
-          "Send OTP_ara"
+          "رقم الهاتف الحالي",
+          "رقم الهاتف الجديد",
+          "تأكيد رقم الهاتف الجديد",
+          "إرسال OTP"
         ],
         "fra": [
-          "Current Phone Number_fra",
-          "New Phone Number_fra",
-          "Confirm New Phone Number_fra",
-          "Send OTP_fra"
+          "Numéro de téléphone actuel",
+          "Nouveau numéro de téléphone",
+          "Confirmer le nouveau numéro de téléphone",
+          "Envoyer OTP"
+        ],
+        "hin": [
+          "वर्तमान फ़ोन नंबर",
+          "नया फ़ोन नंबर",
+          "नए फ़ोन नंबर की पुष्टि करें",
+          "OTP भेजें"
+        ],
+        "tam": [
+          "தற்போதைய தொலைபேசி எண்",
+          "புதிய தொலைபேசி எண்",
+          "புதிய தொலைபேசி எண்ணை உறுதிப்படுத்தவும்",
+          "OTP ஐ அனுப்பு"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಫೋನ್ ಸಂಖ್ಯೆ",
+          "ಹೊಸ ಫೋನ್ ಸಂಖ್ಯೆ",
+          "ಹೊಸ ಫೋನ್ ಸಂಖ್ಯೆಯನ್ನು ದೃಢೀಕರಿಸಿ",
+          "OTP ಕಳುಹಿಸಿ"
+        ],
+        "spa": [
+          "Número de teléfono actual",
+          "Nuevo número de teléfono",
+          "Confirmar nuevo número de teléfono",
+          "Enviar OTP"
         ]
       },
       "controlType": "textbox",
-      "tabgroup": "contact"
+      "tabgroup": "contact",
+      "dataType": "string"
     },
     {
       "attributeName": "preferredLang",
+      "label": {
+        "eng": "Preferred Language",
+        "ara": "اللغة المفضلة",
+        "fra": "langue préférée",
+        "hin": "पसंदीदा भाषा",
+        "tam": "விருப்ப மொழி",
+        "kan": "ಆದ್ಯತೆಯ ಭಾಷೆ",
+        "spa": "Idioma preferido"
+      },
+      "placeHolder": {
+        "eng": "Select Preferred Language",
+        "ara": "اختر اللغة المفضلة",
+        "fra": "Sélectionner la langue préférée",
+        "hin": "पसंदीदा भाषा चुनें",
+        "tam": "விருப்ப மொழியைத் தேர்ந்தெடுக்கவும்.",
+        "kan": "ಆಯ್ಕೆಯಾದ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.",
+        "spa": "Seleccionar Idioma Preferido"
+      },
       "description": "",
       "labelName": {
         "eng": [
@@ -309,16 +946,33 @@
           "New Notification Language"
         ],
         "ara": [
-          "Current Notification Language_ara",
-          "New Notification Language_ara"
+          "لغة الإخطار الحالية",
+          "لغة الإعلام الجديدة"
         ],
         "fra": [
-          "Current Notification Language_fra",
-          "New Notification Language_fra"
+          "Langue de notification actuelle",
+          "Nouvelle langue de notification"
+        ],
+        "hin": [
+          "वर्तमान अधिसूचना भाषा",
+          "नई अधिसूचना भाषा"
+        ],
+        "tam": [
+          "தற்போதைய அறிவிப்பு மொழி",
+          "புதிய அறிவிப்பு மொழி"
+        ],
+        "kan": [
+          "ಪ್ರಸ್ತುತ ಅಧಿಸೂಚನೆ ಭಾಷೆ",
+          "ಹೊಸ ಅಧಿಸೂಚನೆ ಭಾಷೆ"
+        ],
+        "spa": [
+          "Idioma de notificación actual",
+          "Nuevo idioma de notificación"
         ]
       },
       "controlType": "dropdown",
-      "tabgroup": "notificationLanguage"
+      "tabgroup": "notificationLanguage",
+      "dataType": "string"
     }
   ]
-}
+}
\ No newline at end of file

From 9cf01d537907c9a3a55e2253c50e5b0fab00475e Mon Sep 17 00:00:00 2001
From: kameshsr <kameshsr1338@gmail.com>
Date: Thu, 2 May 2024 18:20:31 +0530
Subject: [PATCH 1324/1358] MOSIP-32772 Added correct credential data config

Signed-off-by: kameshsr <kameshsr1338@gmail.com>
---
 credentialdata.mvel              | 66 ++++++++++++++++++++++++++++----
 id-repository-default.properties |  2 +-
 identity-data-formatter.mvel     |  2 +-
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/credentialdata.mvel b/credentialdata.mvel
index 06fc121edf7..17f98203899 100644
--- a/credentialdata.mvel
+++ b/credentialdata.mvel
@@ -5,17 +5,69 @@ def convertDateFormat(value, inputformat, outputformat) {
     String formattedDate= DateUtils.formatDate(date, outputformat);
 	return formattedDate;
 };
-def convertToMaskData(value) {
 
-StringBuilder sbMaskString = new StringBuilder("");
+def convertToMaskData(maskData) {
+	int maskDataLength = 0;
+	char ch = 'X';
+	if (maskData.indexOf("@") > 0){
+		maskDataLength = maskData.indexOf("@");
+	} else {
+		maskDataLength = maskData.length();
+	}
+	maskDataLength -= 2;
+	for (int i = 1; i < maskDataLength; ++i) {
+		maskData = maskData.substring(0, i) + ch + maskData.substring(i + 1);
+	}
+	return maskData;
+};
+
+def formatName(names) {
+	StringBuilder name = new StringBuilder("");
+	for (int i = 0; i < names.size(); i++) {
+		name.append(names[i]);
+		if(i < names.size() - 1) {
+			name.append(" ");
+		}
+	}
+	return name.toString()
+};
 
-		for (int i = 0; i < 2; i++) {
-			sbMaskString.append("*");
+def formatAddress(addressLines) {
+	StringBuilder address = new StringBuilder("");
+	for (int i = 0; i < addressLines.size(); i++) {
+		address.append(addressLines[i]);
+		if(i < addressLines.size() - 1) {
+			address.append(", ");
 		}
-		return sbMaskString.toString() + value.substring(0 + 2);
+	}
+	return address.toString()
+};
+
+def maskPhone(inputPhoneNum) {
+	return inputPhoneNum.replaceAll(".(?=.{4})", "*");
+};
+
+def maskEmail(inputEmailAddr) {
+	return inputEmailAddr.replaceAll("(^[^@]{3}|(?!^)\\G)[^@]", "$1*");
 };
-def formatName(firstName,middleName,lastName) {
 
-return firstName+" "+middleName+" "+lastName;
+def getPassword(attributeValues) {
+    String pdfPwd = "";
+    for(String attribute:attributeValues) {
+        attribute = getFormattedPasswordAttribute(attribute);
+        pdfPwd = pdfPwd.concat(attribute.substring(0, 4));
+    }
+    return pdfPwd.toUpperCase();
 };
 
+def getFormattedPasswordAttribute(password){
+    if(password.length()==3){
+        return password=password.concat(password.substring(0,1));
+    }else if(password.length()==2){
+        return password=password.repeat(2);
+    }else if(password.length()==1) {
+        return password=password.repeat(4);
+    }else {
+        return password.toUpperCase();
+    }
+};
\ No newline at end of file
diff --git a/id-repository-default.properties b/id-repository-default.properties
index bae6711cfe3..7f21f014640 100644
--- a/id-repository-default.properties
+++ b/id-repository-default.properties
@@ -431,7 +431,7 @@ mosip.role.idrepo.vid.postvidreactivate=RESIDENT,ID_REPOSITORY
 mosip.role.idrepo.vid.postdraftvid=REGISTRATION_PROCESSOR,ID_REPOSITORY
 mosip.role.idrepo.identity.getdraftUIN=RESIDENT,ID_REPOSITORY
 
-mosip.mask.function.identityAttributes=convertToMaskDataFormat
+mosip.mask.function.identityAttributes=convertToMaskData
 
 mosip.credential.service.fetch-identity.type=bio
 
diff --git a/identity-data-formatter.mvel b/identity-data-formatter.mvel
index bdb36811299..59b10640c43 100644
--- a/identity-data-formatter.mvel
+++ b/identity-data-formatter.mvel
@@ -9,7 +9,7 @@ def maskEmail(inputEmailAddr) {
 return inputEmailAddr.replaceAll("(^[^@]{3}|(?!^)\\G)[^@]", "$1*");
 };
 
-def convertToMaskDataFormat(maskData) {
+def convertToMaskData(maskData) {
 	int maskDataLength = 0;
 	char ch = '*';
 	if (maskData.indexOf("@") > 0){

From 6de3116caee9d5cc3dc6fda5173723e310974da7 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 2 May 2024 19:04:57 +0530
Subject: [PATCH 1325/1358] Update id-authentication-default.properties

Updated mosip.ida.authentication.error.eventing.enabled=false
and removed below properties:
mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
spring.kafka.admin.properties.allow.auto.create.topics=true

Signed-off-by: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
---
 id-authentication-default.properties | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 690970bea5f..44fa0825fc6 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -649,13 +649,11 @@ 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
-mosip.ida.authentication.error.eventing.enabled=true
+mosip.ida.authentication.error.eventing.enabled=false
 #If we enable authentication error eventing as true we need all the below property
 ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 # Partner Id for encryption used in ondemand template extraction
 mosip.ida.authentication.error.eventing.encrypt.partner.id=mpartner-default-tempextraction
 #kafka Configuration
-mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
-spring.kafka.admin.properties.allow.auto.create.topics=true
 logging.level.org.apache.kafka=DEBUG
 #----------------------------------------------------end------------------------------------------

From 91060fae641dfefad10ec6e55b79077e6c43618a Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 2 May 2024 19:19:56 +0530
Subject: [PATCH 1326/1358] Update id-authentication-default.properties

Commented #mosip.ida.authentication.error.eventing.enabled=true

Signed-off-by: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
---
 id-authentication-default.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 44fa0825fc6..8a17a700fe8 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -649,11 +649,13 @@ 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
-mosip.ida.authentication.error.eventing.enabled=false
+#mosip.ida.authentication.error.eventing.enabled=true
 #If we enable authentication error eventing as true we need all the below property
 ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 # Partner Id for encryption used in ondemand template extraction
 mosip.ida.authentication.error.eventing.encrypt.partner.id=mpartner-default-tempextraction
 #kafka Configuration
+mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafka.port},kafka-1.kafka-headless.${kafka.profile}:${kafka.port},kafka-2.kafka-headless.${kafka.profile}:${kafka.port}
+spring.kafka.admin.properties.allow.auto.create.topics=true
 logging.level.org.apache.kafka=DEBUG
 #----------------------------------------------------end------------------------------------------

From 60d5aec447a1328a8fcf570f4bdf2ea6be764084 Mon Sep 17 00:00:00 2001
From: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
Date: Thu, 2 May 2024 19:28:55 +0530
Subject: [PATCH 1327/1358] Update id-authentication-default.properties

Updated
mosip.ida.authentication.error.eventing.enabled=true

Signed-off-by: Anuranjan14 <120705365+Anuranjan14@users.noreply.github.com>
---
 id-authentication-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 8a17a700fe8..690970bea5f 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -649,7 +649,7 @@ 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
-#mosip.ida.authentication.error.eventing.enabled=true
+mosip.ida.authentication.error.eventing.enabled=true
 #If we enable authentication error eventing as true we need all the below property
 ida-topic-authentication-error-eventing=AUTHENTICATION_ERRORS
 # Partner Id for encryption used in ondemand template extraction

From bc6e73afe6bf6c4dfc19db149f29b41d234a477d Mon Sep 17 00:00:00 2001
From: kameshsr <kameshsr1338@gmail.com>
Date: Fri, 3 May 2024 11:00:42 +0530
Subject: [PATCH 1328/1358] MOSIP-32772 Added missing config

Signed-off-by: kameshsr <kameshsr1338@gmail.com>
---
 credential-service-default.properties | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/credential-service-default.properties b/credential-service-default.properties
index c1ca318cd03..947703614bf 100644
--- a/credential-service-default.properties
+++ b/credential-service-default.properties
@@ -30,4 +30,17 @@ credentialType.formatter.VERCRED=VerCredProvider
 credentialType.formatter.PDFCARD=VerCredProvider
 GENERATE_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid
 RETRIEVE_VID=${mosip.idrepo.vid.url}/idrepository/v1/vid/uin
-credential.service.default.vid.type=PERPETUAL
\ No newline at end of file
+credential.service.default.vid.type=PERPETUAL
+
+mosip.mask.function.identityAttributes=convertToMaskData
+mosip.mask.function.date=convertToMaskDate
+mosip.format.function.address=formatAddress
+mosip.format.function.name=formatName
+mosip.format.function.dateTimeFormat=convertDateFormat
+
+mosip.mask.function.identityAttributes.default=convertToMaskData
+mosip.mask.function.identityAttributes.phone=maskPhone
+mosip.mask.function.identityAttributes.email=maskEmail
+mosip.credential.photo.attribute.names=photo,face
+mosip.credential.name.attribute.names=fullName,name
+mosip.credential.address.attribute.names=fullAddress,address
\ No newline at end of file

From a75f358ec61f313fe50be515eebc0df98bed1cb9 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Tue, 7 May 2024 13:07:56 +0530
Subject: [PATCH 1329/1358] Update identity-mapping.json

Removed dob from attribute count

Signed-off-by: likhitharl <91238496+likhitharl@users.noreply.github.com>
---
 identity-mapping.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index dab04032fc6..475c23801ff 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -166,6 +166,6 @@
 	"attributeUpdateCountLimit": {
 		"fullName": 2,
 		"gender": 2,
-		"dateOfBirth": 2
+		
 	}
 }

From 983d6bb50052a65fb0437b141855bb0a53f6145d Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Tue, 7 May 2024 13:21:41 +0530
Subject: [PATCH 1330/1358] Update identity-mapping.json

Signed-off-by: likhitharl <91238496+likhitharl@users.noreply.github.com>
---
 identity-mapping.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 475c23801ff..075de37de7c 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -165,7 +165,7 @@
 	},
 	"attributeUpdateCountLimit": {
 		"fullName": 2,
-		"gender": 2,
+		"gender": 2
 		
 	}
 }

From 5c3eec544e0db74bf29b6e87e320d69a91535103 Mon Sep 17 00:00:00 2001
From: likhitharl <91238496+likhitharl@users.noreply.github.com>
Date: Tue, 7 May 2024 13:35:52 +0530
Subject: [PATCH 1331/1358] Update identity-mapping.json

Updated "dateOfBirth": 3

Signed-off-by: likhitharl <91238496+likhitharl@users.noreply.github.com>
---
 identity-mapping.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 075de37de7c..c27a4a51ffb 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,8 +164,9 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 2,
-		"gender": 2
+		"fullName": 5,
+		"gender": 4,
+		"dateOfBirth": 3
 		
 	}
 }

From bb38a806c5943fc9f138ba3f8e47b5a9b38e5b50 Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Wed, 8 May 2024 12:23:28 +0530
Subject: [PATCH 1332/1358] Update identity-mapping.json

Updated count limit for testing purpose

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 identity-mapping.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index c27a4a51ffb..f1211f409ad 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,9 +164,9 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 5,
-		"gender": 4,
-		"dateOfBirth": 3
+		"fullName": 6,
+		"gender": 6,
+		"dateOfBirth": 6
 		
 	}
 }

From 78dac6edd8f13480c7c6fa269f302f1af901f22b Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Wed, 8 May 2024 14:07:00 +0530
Subject: [PATCH 1333/1358] Update identity-mapping.json

Updated count limit to zero for testing

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 identity-mapping.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index f1211f409ad..f71454b3020 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,9 +164,9 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 6,
-		"gender": 6,
-		"dateOfBirth": 6
+		"fullName": 0,
+		"gender": 0,
+		"dateOfBirth": 0
 		
 	}
 }

From 7f458db32c2ae8557d019146e561b69faff52de1 Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Wed, 8 May 2024 17:39:07 +0530
Subject: [PATCH 1334/1358] Update identity-mapping.json

Removed DOB and Gender attribute for testing

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 identity-mapping.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index f71454b3020..875fcd52b6c 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,9 +164,8 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 0,
-		"gender": 0,
-		"dateOfBirth": 0
+		"fullName": 3
+		
 		
 	}
 }

From 4f27e8a71ef7427772e0b708246fc0cae21b31c5 Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Thu, 9 May 2024 13:23:02 +0530
Subject: [PATCH 1335/1358] Update identity-mapping.json

Reverting back the changes

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 identity-mapping.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 875fcd52b6c..9f8109612c9 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,7 +164,10 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 3
+		"fullName": 2,
+		"gender": 4,
+		"dateOfBirth": 3
+
 		
 		
 	}

From 9d528005b0fcfe083d706804035d89547ccef017 Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Thu, 9 May 2024 17:16:17 +0530
Subject: [PATCH 1336/1358] Update mosip-vid-policy.json

Updated line 15,16 and 18 for testing purpose

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 mosip-vid-policy.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index af3eecc2322..5e8ebb77603 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -12,10 +12,10 @@
         {
             "vidType": "Temporary",
             "vidPolicy": {
-                "validForInMinutes": 30,
-                "transactionsAllowed": 1,
+                "validForInMinutes": 10,
+                "transactionsAllowed": 2,
                 "instancesAllowed": 20,
-                "autoRestoreAllowed": false,
+                "autoRestoreAllowed": true,
                 "restoreOnAction": "REGENERATE"
             }
         },

From fe50de11388e2d5d62583e14c54f8f0c262de86d Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Thu, 9 May 2024 19:35:59 +0530
Subject: [PATCH 1337/1358] Update mosip-vid-policy.json

Reverted the changes

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 mosip-vid-policy.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mosip-vid-policy.json b/mosip-vid-policy.json
index 5e8ebb77603..af3eecc2322 100644
--- a/mosip-vid-policy.json
+++ b/mosip-vid-policy.json
@@ -12,10 +12,10 @@
         {
             "vidType": "Temporary",
             "vidPolicy": {
-                "validForInMinutes": 10,
-                "transactionsAllowed": 2,
+                "validForInMinutes": 30,
+                "transactionsAllowed": 1,
                 "instancesAllowed": 20,
-                "autoRestoreAllowed": true,
+                "autoRestoreAllowed": false,
                 "restoreOnAction": "REGENERATE"
             }
         },

From 89464cfa0168c7b8c51228ac562d6a7a6d467f6c Mon Sep 17 00:00:00 2001
From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>
Date: Fri, 10 May 2024 20:49:03 +0530
Subject: [PATCH 1338/1358] [DSD-5240] Update mimoto-default.properties (#6081)

Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>
---
 mimoto-default.properties | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index f9ea19278bf..dbf33f52c4f 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -102,10 +102,10 @@ mosip.country.code=MOR
 registration.processor.signature.isEnabled=true
 
 # Language Supported By Platform - ISO
-mosip.supported-languages=eng,ara,kan,hin,tam,fra
+mosip.supported-languages=eng,ara,fra
 
 mosip.template-language=eng
-mosip.optional-languages=kan,ara,fra,tam,hin
+mosip.optional-languages=ara,fra
 mosip.mandatory-languages=eng
 
 # mosip.primary-language=eng
@@ -129,7 +129,7 @@ mosip.kernel.tokenid.length=36
 
 # log level
 logging.level.root=WARN
-logging.level.io.mosip=INFO
+logging.level.io.mosip=DEBUG
 # logging.level.io.mosip.kernel.auth.defaultadapter.filter=INFO
 logging.level.io.mosip.kernel.auth.defaultadapter=DEBUG
 logging.level.org.springframework.http.client=DEBUG
@@ -180,7 +180,7 @@ mosip.auth.filter_disable=false
 mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
 mosip.kernel.auth.appids.realm.map={prereg:'mosip',ida:'mosip',registrationclient:'mosip',regproc:'mosip',partner:'mosip',resident:'mosip',admin:'mosip',crereq:'mosip',creser:'mosip',datsha:'mosip',idrepo:'mosip'}
 vercred.type.vid=VID
-
+mosip.idp.partner.id=mpartner-default-mobile
 mosip.idp.partner.encryption.key={cipher}b77f8738b7fb8c48f84d587b045fa50099a569c381d1857eddbcd04afd83cd08
 wallet.binding.partner.id=mpartner-default-mimotokeybinding
 wallet.binding.partner.api.key=${mimoto.wallet.binding.partner.api.key}
@@ -193,13 +193,10 @@ mosip.notificationtype=SMS|EMAIL|PHONE
 
 # Configurations related to openid4vci
 mosip.openid.issuers=mimoto-issuers-config.json
-GET_TOKEN=${public.internet.url}/v1/esignet/login/oauth/token
-mosip.oidc.esignet.token.endpoint=https://${mosip.esignet.base.url}/oauth/v2/token
-mosip.oidc.esignet.aud=https://${mosip.esignet.base.url}/oauth/v2/token
-mosip.oidc.client.id=${mimoto.oidc.partner.clientid}
-mosip.oidc.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
+mosip.openid.issuer.credentialSupported=sunbird-insurance-wellKnown.json
+mosip.openid.htmlTemplate=credential-template.html
 mosip.oidc.p12.filename=oidckeystore.p12
 mosip.oidc.p12.password=${mimoto.oidc.keystore.password}
-mosip.oidc.p12.alias=mpartner-default-mimotooidc
 #Property to test the mounted p12 file extraction of openid4vci flow.
-mosip.oidc.p12.path=certs/
\ No newline at end of file
+mosip.oidc.p12.path=certs/
+logging.level.org.springframework.web.client.RestTemplate=INFO

From a6635d448c8a842a76c6a2096e45ea26b139ef48 Mon Sep 17 00:00:00 2001
From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>
Date: Fri, 10 May 2024 21:05:56 +0530
Subject: [PATCH 1339/1358] [DSD-5240] Updated mimoto-default.properties

Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>
---
 mimoto-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mimoto-default.properties b/mimoto-default.properties
index dbf33f52c4f..a1d5afb1d7c 100644
--- a/mimoto-default.properties
+++ b/mimoto-default.properties
@@ -195,6 +195,7 @@ mosip.notificationtype=SMS|EMAIL|PHONE
 mosip.openid.issuers=mimoto-issuers-config.json
 mosip.openid.issuer.credentialSupported=sunbird-insurance-wellKnown.json
 mosip.openid.htmlTemplate=credential-template.html
+mosip.oidc.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
 mosip.oidc.p12.filename=oidckeystore.p12
 mosip.oidc.p12.password=${mimoto.oidc.keystore.password}
 #Property to test the mounted p12 file extraction of openid4vci flow.

From e761f0f2d3640c5e101ab13dd603715d1f0d7f47 Mon Sep 17 00:00:00 2001
From: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>
Date: Fri, 10 May 2024 21:16:32 +0530
Subject: [PATCH 1340/1358] [DSD-5240] Update mimoto-default.properties (#6082)

* [DSD-5240] Update mimoto-default.properties

Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>

* Update mimoto-issuers-config.json

Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>

---------

Signed-off-by: Praful Rakhade <99539100+Prafulrakhade@users.noreply.github.com>
---
 mimoto-issuers-config.json | 276 +++++++++++++++++++++++++++++--------
 1 file changed, 221 insertions(+), 55 deletions(-)

diff --git a/mimoto-issuers-config.json b/mimoto-issuers-config.json
index eaf5f112b9c..1b84da834c2 100644
--- a/mimoto-issuers-config.json
+++ b/mimoto-issuers-config.json
@@ -6,65 +6,66 @@
         {
           "name": "UIN, VID, AID",
           "logo": {
-            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
-            "alt_text": "digits-icon"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "mosip logo"
           },
-          "title": "Download via UIN, VID, AID",
-          "description":"Enter your national ID to download your card.",
+          "title": "Download MOSIP Credentials via OTP",
+          "description":"Download credentials by providing UIN, VID or AID",
           "language": "en"
         },
         {
           "name": "UIN, VID, AID",
           "logo": {
-            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
-            "alt_text": "رمز الأرقام"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "شعار موسيب"
           },
-          "title": "التنزيل عبر UIN, VID, AID",
-          "description": "أدخل رقم الهوية الوطنية الخاص بك لتنزيل بطاقتك.",
-          "language": "en"
+          "title": "قم بتنزيل بيانات اعتماد MOSIP عبر OTP",
+          "description": "قم بتنزيل بيانات الاعتماد من خلال توفير UIN أو VID أو AID",
+          "language": "ar"
         },
         {
           "name": "UIN, VID, AID",
           "logo": {
-            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
-            "alt_text": "अंक-आइकन"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "मोसिप लोगो"
           },
-          "title": "UIN, VID, AID के माध्यम से डाउनलोड करे",
-          "description":"अपना कार्ड डाउनलोड करने के लिए अपनी राष्ट्रीय आईडी दर्ज करें।",
+          "title": "OTP के माध्यम से MOSIP क्रेडेंशियल डाउनलोड करें",
+          "description":"यूआईएन, वीआईडी या एआईडी प्रदान करके क्रेडेंशियल डाउनलोड करें",
           "language": "hi"
         },
         {
           "name": "UIN, VID, AID",
           "logo": {
-            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
-            "alt_text": "ಅಂಕಿ-ಐಕಾನ್"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "mosip ಲೋಗೋ"
           },
-          "title": "UIN, VID, AID ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ",
-          "description": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮ್ಮ ರಾಷ್ಟ್ರೀಯ ID ಅನ್ನು ನಮೂದಿಸಿ.",
+          "title": "OTP ಮೂಲಕ MOSIP ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+          "description": "UIN, VID ಅಥವಾ AID ಒದಗಿಸುವ ಮೂಲಕ ರುಜುವಾತುಗಳನ್ನು ಡೌನ್\u200Cಲೋಡ್ ಮಾಡಿ",
           "language": "kn"
         },
         {
           "name": "UIN, VID, AID",
           "logo": {
-            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
-            "alt_text": "இலக்கங்கள்-ஐகான்"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "mosip சின்னம்"
           },
-          "title": "UIN, VID, AID மூலம் பதிவிறக்கவும்",
-          "description":"உங்கள் கார்டைப் பதிவிறக்க உங்கள் தேசிய ஐடியை உள்ளிடவும்.",
+          "title": "OTP வழியாக MOSIP சான்றுகளைப் பதிவிறக்கவும்",
+          "description":"UIN, VID அல்லது AID ஐ வழங்குவதன் மூலம் நற்சான்றிதழ்களைப் பதிவிறக்கவும்",
           "language": "ta"
         },
         {
           "name": "UIN, VID, AID",
           "logo": {
-            "url": "https://${mosip.api.public.host}/inji/digit-icon.png",
-            "alt_text": "digits-icon"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "logo ng mosip"
           },
-          "title": "I-download sa pamamagitan ng UIN, VID, AID",
-          "description":"Ilagay ang iyong national ID para i-download ang iyong card.",
+          "title": "I-download ang Mga Kredensyal ng MOSIP sa pamamagitan ng OTP",
+          "description":"Mag-download ng mga kredensyal sa pamamagitan ng pagbibigay ng UIN, VID o AID",
           "language": "fil"
         }
       ],
-      "protocol": "OTP"
+      "protocol": "OTP",
+      "enabled": "true"
     },
     {
       "credential_issuer": "ESignet",
@@ -72,74 +73,239 @@
         {
           "name": "e-Signet",
           "logo": {
-            "url": "https://${mosip.esignet.host}/logo.png",
-            "alt_text": "esignet-logo"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "mosip-logo"
           },
-          "title": "Download via e-Signet",
-          "description": "Enter your national ID to download your card.",
+          "title": "Download MOSIP Credentials",
+          "description": "Download credentials by providing UIN or VID",
           "language": "en"
         },
         {
           "name": "e-Signet",
           "logo": {
-            "url": "https://${mosip.esignet.host}/logo.png",
-            "alt_text": "esignet-logo"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "شعار موسيب"
           },
-          "title": "e-Signet التنزيل عبر",
-          "description": "أدخل رقم الهوية الوطنية الخاص بك لتنزيل بطاقتك." ,
+          "title": "قم بتنزيل بيانات اعتماد MOSIP",
+          "description": "توفير UIN أو VIDقم بتنزيل بيانات الاعتماد عن طريق" ,
           "language": "ar"
         },
         {
           "name": "e-Signet",
           "logo": {
-            "url": "https://${mosip.esignet.host}/logo.png",
-            "alt_text": "esignet-लोगो"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "मोसिप लोगो"
           },
-          "title": "ई-हस्ताक्षर के माध्यम से डाउनलोड करें",
-          "description":"अपना कार्ड डाउनलोड करने के लिए अपनी राष्ट्रीय आईडी दर्ज करें।",
+          "title": "MOSIP क्रेडेंशियल डाउनलोड करेंं",
+          "description":"यूआईएन या वीआईडी प्रदान करके क्रेडेंशियल डाउनलोड करें",
           "language": "hi"
         },
         {
           "name": "e-Signet",
           "logo": {
-            "url": "https://${mosip.esignet.host}/logo.png",
-            "alt_text": "esignet-ಲೋಗೋ"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "mosip ಲೋಗೋ"
           },
-          "title": "ಇ-ಸಿಗ್ನೆಟ್ ಮೂಲಕ ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
-          "description": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮ್ಮ ರಾಷ್ಟ್ರೀಯ ID ಅನ್ನು ನಮೂದಿಸಿ.",
+          "title": "MOSIP ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+          "description": "UIN ಅಥವಾ VID ಒದಗಿಸುವ ಮೂಲಕ ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
           "language": "kn"
         },
         {
           "name": "e-Signet",
           "logo": {
-            "url": "https://${mosip.esignet.host}/logo.png",
-            "alt_text": "esignet-லோகோ"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "mosip லோகோ"
           },
-          "title": "இ-சிக்னெட் மூலம் பதிவிறக்கம் செய்யவும்",
-          "description":"உங்கள் கார்டைப் பதிவிறக்க உங்கள் தேசிய ஐடியை உள்ளிடவும்.",
+          "title": "MOSIP சான்றுகளைப் பதிவிறக்கவும்",
+          "description":"UIN அல்லது VIDஐ வழங்குவதன் மூலம் நற்சான்றிதழ்களைப் பதிவிறக்கவும்",
           "language": "ta"
         },
         {
           "name": "e-Signet",
           "logo": {
-            "url": "https://${mosip.esignet.host}/logo.png",
-            "alt_text": "logo-signet"
+            "url": "https://${mosip.api.public.host}/inji/mosip-logo.png",
+            "alt_text": "logo ng mosip"
           },
-          "title": "I-download sa pamamagitan ng e-Signet",
-          "description":"Ilagay ang iyong national ID para i-download ang iyong card.",
+          "title": "I-download ang Mga Kredensyal ng MOSIP",
+          "description":"Mag-download ng mga kredensyal sa pamamagitan ng pagbibigay ng UIN o VID",
           "language": "fil"
         }
       ],
       "protocol": "OpenId4VCI",
       "client_id": "${mimoto.oidc.partner.clientid}",
+      "client_alias": "mpartner-default-mimotooidc",
       "scopes_supported": ["mosip_identity_vc_ldp"],
       "additional_headers": { "Accept": "application/json" },
-      ".well-known": null,
+      ".well-known": "https://${mosip.esignet.host}/.well-known/openid-credential-issuer?version=v11",
       "redirect_uri": "io.mosip.residentapp.inji://oauthredirect",
       "authorization_endpoint": "https://${mosip.esignet.host}/authorize",
-      "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token",
+      "authorization_audience": "https://${mosip.esignet.host}/v1/esignet/oauth/v2/token",
+      "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token/ESignet",
+      "proxy_token_endpoint": "https://${mosip.esignet.host}/v1/esignet/oauth/v2/token",
       "credential_endpoint": "https://${mosip.esignet.host}/v1/esignet/vci/credential",
-      "credential_audience": "https://${mosip.esignet.host}"
-    }
+      "credential_type": ["VerifiableCredential", "MOSIPVerifiableCredential"],
+      "credential_audience": "https://${mosip.esignet.host}",
+      "enabled": "true"
+    },
+    {
+      "credential_issuer": "Sunbird",
+      "display": [
+        {
+          "name": "Sunbird RC Insurance Verifiable Credential",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "a square logo of a Sunbird"
+          },
+          "language": "en",
+          "title": "Download Sunbird Credentials",
+          "description": "Download credentials with your Policy Number"
+        },
+        {
+          "name": "بيانات الاعتماد التي يمكن التحقق منها للتأمين Sunbird RC",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "شعار مربع لطائر الشمس"
+          },
+          "language": "ar",
+          "title": "قم بتنزيل بيانات اعتماد Sunbird",
+          "description": "قم بتنزيل بيانات الاعتماد باستخدام رقم السياسة الخاص بك"
+        },
+        {
+          "name": "सनबर्ड आरसी बीमा सत्यापन योग्य क्रेडेंशियल",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "सनबर्ड का एक चौकोर लोगो"
+          },
+          "language": "hi",
+          "title": "सनबर्ड क्रेडेंशियल्स डाउनलोड करेंं",
+          "description": "अपने पॉलिसी नंबर के साथ क्रेडेंशियल डाउनलोड करें"
+        },
+        {
+          "name": "ಸನ್ಬರ್ಡ್ ಆರ್ಸಿ ವಿಮೆ ಪರಿಶೀಲಿಸಬಹುದಾದ ರುಜುವಾತು",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "ಸನ್ ಬರ್ಡ್ ನ ಚೌಕಾಕಾರದ ಲೋಗೋ"
+          },
+          "language": "kn",
+          "title": "ಸನ್ಬರ್ಡ್ ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+          "description": "ನಿಮ್ಮ ಪಾಲಿಸಿ ಸಂಖ್ಯೆಯೊಂದಿಗೆ ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ"
+        },
+        {
+          "name": "Sunbird RC இன்சூரன்ஸ் சரிபார்க்கக்கூடிய நற்சான்றிதழ்",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "சூரிய பறவையின் சதுர சின்னம்"
+          },
+          "language": "ta",
+          "title": "Sunbird சான்றுகளைப் பதிவிறக்கவும்",
+          "description": "உங்கள் பாலிசி எண்ணுடன் நற்சான்றிதழ்களைப் பதிவிறக்கவும்"
+        },
+        {
+          "name": "Kredensyal na Nabe-verify ng Sunbird RC Insurance",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "isang parisukat na logo ng isang Sunbird"
+          },
+          "language": "fil",
+          "title": "I-download ang Mga Kredensyal ng Sunbird",
+          "description": "Mag-download ng mga kredensyal gamit ang iyong Numero ng Patakaran"
+        }
+      ],
+      "protocol": "OpenId4VCI",
+      "client_id": "${mimoto.oidc.sunbird.partner.clientid}",
+      "client_alias": "esignet-sunbird-partner",
+      "scopes_supported": ["sunbird_rc_insurance_vc_ldp"],
+      "additional_headers": { "Accept": "application/json" },
+      ".well-known": "https://${mosip.esignet.insurance.host}/.well-known/openid-credential-issuer?version=v11",
+      "redirect_uri": "io.mosip.residentapp.inji://oauthredirect",
+      "authorization_endpoint": "https://${mosip.esignet.insurance.host}/authorize",
+      "authorization_audience": "https://${mosip.esignet.insurance.host}/v1/esignet/oauth/v2/token",
+      "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token/Sunbird",
+      "proxy_token_endpoint": "https://${mosip.esignet.insurance.host}/v1/esignet/oauth/v2/token",
+      "credential_endpoint": "https://${mosip.esignet.insurance.host}/v1/esignet/vci/credential",
+      "credential_type": ["VerifiableCredential", "InsuranceCredential"],
+      "credential_audience": "https://${mosip.esignet.insurance.host}",
+      "enabled": "true"
+    },
+{
+      "credential_issuer": "Sunbird140",
+      "display": [
+        {
+          "name": "Sunbird 140 RC Insurance Verifiable Credential",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "a square logo of a Sunbird"
+          },
+          "language": "en",
+          "title": "Download Sunbird 140 Credentials",
+          "description": "Download credentials with your Policy Number"
+        },
+        {
+          "name": "بيانات الاعتماد التي يمكن التحقق منها للتأمين Sunbird RC",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "شعار مربع لطائر الشمس"
+          },
+          "language": "ar",
+          "title": "قم بتنزيل بيانات اعتماد Sunbird",
+          "description": "قم بتنزيل بيانات الاعتماد باستخدام رقم السياسة الخاص بك"
+        },
+        {
+          "name": "सनबर्ड आरसी बीमा सत्यापन योग्य क्रेडेंशियल",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "सनबर्ड का एक चौकोर लोगो"
+          },
+          "language": "hi",
+          "title": "सनबर्ड क्रेडेंशियल्स डाउनलोड करेंं",
+          "description": "अपने पॉलिसी नंबर के साथ क्रेडेंशियल डाउनलोड करें"
+        },
+        {
+          "name": "ಸನ್ಬರ್ಡ್ ಆರ್ಸಿ ವಿಮೆ ಪರಿಶೀಲಿಸಬಹುದಾದ ರುಜುವಾತು",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "ಸನ್ ಬರ್ಡ್ ನ ಚೌಕಾಕಾರದ ಲೋಗೋ"
+          },
+          "language": "kn",
+          "title": "ಸನ್ಬರ್ಡ್ ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+          "description": "ನಿಮ್ಮ ಪಾಲಿಸಿ ಸಂಖ್ಯೆಯೊಂದಿಗೆ ರುಜುವಾತುಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ"
+        },
+        {
+          "name": "Sunbird RC இன்சூரன்ஸ் சரிபார்க்கக்கூடிய நற்சான்றிதழ்",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "சூரிய பறவையின் சதுர சின்னம்"
+          },
+          "language": "ta",
+          "title": "Sunbird சான்றுகளைப் பதிவிறக்கவும்",
+          "description": "உங்கள் பாலிசி எண்ணுடன் நற்சான்றிதழ்களைப் பதிவிறக்கவும்"
+        },
+        {
+          "name": "Kredensyal na Nabe-verify ng Sunbird RC Insurance",
+          "logo": {
+            "url": "https://sunbird.org/images/sunbird-logo-new.png",
+            "alt_text": "isang parisukat na logo ng isang Sunbird"
+          },
+          "language": "fil",
+          "title": "I-download ang Mga Kredensyal ng Sunbird",
+          "description": "Mag-download ng mga kredensyal gamit ang iyong Numero ng Patakaran"
+        }
+      ],
+      "protocol": "OpenId4VCI",
+      "client_id": "esignet-sunbird-140-partner",
+      "client_alias": "esignet-sunbird-140-partner",
+      "scopes_supported": ["sunbird_rc_insurance_vc_ldp"],
+      "additional_headers": { "Accept": "application/json" },
+      ".well-known": "https://esignet-140.qa-inji.mosip.net/.well-known/openid-credential-issuer?version=v11",
+      "redirect_uri": "io.mosip.residentapp.inji://oauthredirect",
+      "authorization_endpoint": "https://esignet-140.qa-inji.mosip.net/authorize",
+      "authorization_audience": "https://esignet-140.qa-inji.mosip.net/v1/esignet/oauth/v2/token",
+      "token_endpoint": "https://${mosip.api.public.host}/residentmobileapp/get-token/Sunbird140",
+      "proxy_token_endpoint": "https://esignet-140.qa-inji.mosip.net/v1/esignet/oauth/v2/token",
+      "credential_endpoint": "https://esignet-140.qa-inji.mosip.net/v1/esignet/vci/credential",
+      "credential_type": ["VerifiableCredential", "InsuranceCredential"],
+      "credential_audience": "https://esignet-140.qa-inji.mosip.net",
+      "enabled": "false"
+    }    
   ]
-}
\ No newline at end of file
+}

From 9e7e0cde69b4e87a0e6a3c3aa410393780374757 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 14 May 2024 10:31:26 +0530
Subject: [PATCH 1341/1358] [DSD-5255] Update esignet-default.properties

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 esignet-default.properties | 175 ++++++++++++++++++++++++++++++++-----
 1 file changed, 152 insertions(+), 23 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index af298e6a242..48b8a2a3214 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -35,19 +35,50 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 # By default, only 2 link codes can be active, and the time period it can be active is defined here, default value is 1 minute
-mosip.esignet.link-code-expire-in-secs=60
+mosip.esignet.link-code-expire-in-secs=600
 # Number of link code allowed to be generated in a transaction, the default value is 10
 mosip.esignet.generate-link-code.limit-per-transaction=10
 # Time to complete consent after successful authentication, the default value is 120
-mosip.esignet.authentication-expire-in-secs=120
+mosip.esignet.authentication-expire-in-secs=600
 
+# Auth challenge type & format mapping. Auth challenge length validations for each auth factor type.
+mosip.esignet.auth-challenge.OTP.format=alpha-numeric
+mosip.esignet.auth-challenge.OTP.min-length=6
+mosip.esignet.auth-challenge.OTP.max-length=6
+
+mosip.esignet.auth-challenge.PWD.format=alpha-numeric
+mosip.esignet.auth-challenge.PWD.min-length=8
+mosip.esignet.auth-challenge.PWD.max-length=30
+
+mosip.esignet.auth-challenge.BIO.format=encoded-json
+mosip.esignet.auth-challenge.BIO.min-length=5000
+mosip.esignet.auth-challenge.BIO.max-length=300000
+
+mosip.esignet.auth-challenge.WLA.format=jwt
+mosip.esignet.auth-challenge.WLA.min-length=100
+mosip.esignet.auth-challenge.WLA.max-length=800
+
+mosip.esignet.auth-challenge.KBA.format=base64url-encoded-json
+mosip.esignet.auth-challenge.KBA.min-length=50
+mosip.esignet.auth-challenge.KBA.max-length=500
+
+mosip.esignet.auth-challenge.PIN.format=number
+mosip.esignet.auth-challenge.PIN.min-length=4
+mosip.esignet.auth-challenge.PIN.max-length=4
+
+
+# Endpoints required to have oauth-details-hash and oauth-details-key HTTP header
 mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authorization/send-otp', \
   '${server.servlet.path}/authorization/authenticate', \
   '${server.servlet.path}/authorization/v2/authenticate', \
   '${server.servlet.path}/authorization/v3/authenticate', \
   '${server.servlet.path}/authorization/auth-code'}
 
-mosip.esignet.captcha.required.auth-factors={'PWD'}
+#This property is used for captcha validation and allowed values are send-otp and pwd.
+#captcha validation is enabled for send-otp and pwd.
+mosip.esignet.captcha.required=pwd,send-otp
+
+
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 
@@ -92,16 +123,24 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 ## ------------------------------------------- Integrations ------------------------------------------------------------
 
-mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
+mosip.esignet.integration.scan-base-package=io.mosip.esignet.mock.integration,io.mosip.authentication.esignet.integration
 mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
+mosip.esignet.integration.authenticator=MockAuthenticationService
 mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
 mosip.esignet.integration.key-binder=IdaKeyBinderImpl
 mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
+#mosip.esignet.integration.scan-base-package=io.mosip.esignet.sunbirdrc.integration.service,io.mosip.esignet.mock.integration
+#mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
+#mosip.esignet.integration.authenticator=SunbirdRCAuthenticationService
+#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
+#mosip.esignet.integration.audit-plugin=LoggerAuditService
+#mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
+#mosip.esignet.integration.vci-plugin=SunbirdRCVCIssuancePlugin
+
 # captcha validator
-mosip.esignet.send-otp.captcha-required=false
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}
@@ -146,8 +185,8 @@ mosip.esignet.mock.vciplugin.verification-method=${mosip.esignet.vci.authn.jwk-s
 mosip.esignet.supported.authorize.scopes={'Manage-Identity-Data','Manage-VID','Manage-Authentication','Manage-Service-Requests','Manage-Credentials'}
 mosip.esignet.supported.openid.scopes={'profile','email','phone'}
 mosip.esignet.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number'},'email' : {'email'}, 'phone' : {'phone_number'}}
-mosip.esignet.supported.credential.scopes={'mock_identity_vc_ldp', 'mosip_identity_vc_ldp'}
-mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'mosip_identity_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential'}
+mosip.esignet.supported.credential.scopes={'mock_identity_vc_ldp', 'mosip_identity_vc_ldp','sunbird_rc_insurance_vc_ldp'}
+mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'mosip_identity_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'sunbird_rc_insurance_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential'}
 
 ## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
 mosip.esignet.supported.response.types={'code'}
@@ -196,14 +235,15 @@ mosip.esignet.cache.security.algorithm-name=AES/ECB/PKCS5Padding
 
 mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction,vcissuance
 
-#spring.cache.type=redis
-#spring.cache.cache-names=${mosip.esignet.cache.names}
-#spring.redis.host=localhost
-#spring.redis.port=6379
+spring.cache.type=redis
+spring.cache.cache-names=${mosip.esignet.cache.names}
+spring.redis.host=redis-master-0.redis-headless.redis.svc.cluster.local
+spring.redis.port=6379
+spring.redis.password=${redis.password}
 management.health.redis.enabled=false
 
 # 'simple' cache type is only applicable only for Non-Production setup
-spring.cache.type=simple
+#spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
 
 # Cache size setup is applicable only for 'simple' cache type. 
@@ -224,15 +264,15 @@ mosip.esignet.cache.size={'clientdetails' : 200, \
 
 # Cache expire in seconds is applicable for both 'simple' and 'Redis' cache type
 mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
-'preauth': 300,\
+'preauth': 600,\
 'authenticated': ${mosip.esignet.authentication-expire-in-secs}, \
-'authcodegenerated': 60, \
+'authcodegenerated': 600, \
 'userinfo': ${mosip.esignet.access-token-expire-seconds}, \
 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
-'linked': 120, \
+'linked': 600, \
 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, \
 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, \
-'consented': 60, \
+'consented': 600, \
 'authtokens': 86400, \
 'bindingtransaction': 600, \
 'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
@@ -278,7 +318,7 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'display_values_supported' : ${mosip.esignet.supported.ui.displays}, \
   \ 'subject_types_supported' : { 'pairwise' }, \
   \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
-  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
+  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics', 'mosip:idp:acr:knowledge'},\
   \ 'request_parameter_supported' : false, \
   \ 'claims_locales_supported' : {'en'}, \
   \ 'ui_locales_supported' : {'en'} }
@@ -371,21 +411,29 @@ mosip.kernel.keymgr.hsm.health.check.encrypt=true
 # 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property
 # 3. If esignet is deployed with MOSIP IDA, then 'resend.otp.delay.secs' must be the same as 'mosip.kernel.otp.expiry-time'
 
-mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
- 'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' },{'wallet.name': 'Inji Mobile App1', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
+mosip.esignet.ui.wallet.config={{'wallet.name': 'walletName', 'wallet.logo-url': '/images/qr_code.png', 'wallet.download-uri': '#', \
  'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}
 
 mosip.esignet.ui.signup.config={'signup.banner': true, 'signup.url': 'https://${mosip.signup.host}/signup'}
 
 mosip.esignet.ui.forgot-password.config={'forgot-password': true, 'forgot-password.url': 'https://${mosip.signup.host}/reset-password'}
 
+## Configuration required to display KBI form. 
+# individual-id-field is set with field id which should be considered as an individual ID in the authenticate request.
+# form-details holds the list of field details like below:
+# id -> unique field Id, type -> holds datatype, format -> only supported for date fields, regex -> pattern to validate the input value, maxLength -> number of allowed characters
+# Example: mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id': '${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^\\s*[+-]?(\\d+|\\d*\\.\\d+|\\d+\\.\\d*)([Ee][+-]?\\d*)?\\s*$'},{'id':'fullName', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^[A-Za-z\\s]{1,}[\\.]{0,1}[A-Za-z\\s]{0,}$'},{'id':'dob', 'type':'date', 'format':'dd/mm/yyyy'}}
+mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id':'policyNumber', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^\\s*[+-]?(\\d+|\\d*\\.\\d+|\\d+\\.\\d*)([Ee][+-]?\\d*)?\\s*$'},{'id':'fullName', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '\\S*'},{"id":"dob", "type":"date", "format":"dd/mm/yyyy"}}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=policyNumber
+
+## Configuration Map input to UI at the start of every transaction.
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
   'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
-  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'pwd', \
+  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : '${mosip.esignet.captcha.required}', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
-  'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': 4501-4600, \
+  'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': '4501-4600', \
   'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \
   'password.max-length': 20, \
   'username.regex': '^[1-9][0-9]{7,8}$',\
@@ -394,7 +442,9 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'username.max-length': 9, \
   '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 \ }
+  'error.banner.close-timer': 10,\
+  'auth.factor.kba.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}',\
+  'auth.factor.kba.field-details': ${mosip.esignet.authenticator.default.auth-factor.kba.field-details} }
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
 # Used to verify audience in the PoP JWT
@@ -413,7 +463,7 @@ mosip.esignet.vci.key-values={\
               'credential_issuer': '${mosip.esignet.vci.identifier}', 	\
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/vci/credential', \
               'credentials_supported': {\
-                    {\
+                     {\
                       'format': 'ldp_vc',\
                       'id': 'MockVerifiableCredential_ldp', \
                       'scope' : 'mock_identity_vc_ldp',\
@@ -432,6 +482,34 @@ mosip.esignet.vci.key-values={\
                                     'logo': {'url': '${mosipbox.public.url}/logo.png', 'alt_text': 'a square logo of a MOSIP'},\
                                     'background_color': '#12107c',\
                                     'text_color': '#FFFFFF'}}\
+                     },\
+                      {\
+                      'format': 'ldp_vc',\
+                      'id': 'InsuranceCredential', \
+                      'scope' : 'sunbird_rc_insurance_vc_ldp',\
+                      'cryptographic_binding_methods_supported': {'did:jwk'},\
+                      'cryptographic_suites_supported': {'Ed25519Signature2020'},\
+                      'proof_types_supported': {'jwt'},\
+                      'credential_definition': {\
+                        'type': {'VerifiableCredential','InsuranceCredential'},\
+                        'credentialSubject': {\
+                          'fullName': {'display': {{'name': 'Name','locale': 'en'}}}, \
+                          'mobile': {'display': {{'name': 'Phone Number','locale': 'en'}}},\
+                          'dob': {'display': {{'name': 'Date of Birth','locale': 'en'}}},\
+                          'gender': {'display': {{'name': 'Gender','locale': 'en'}}},\
+                          'benefits': {'display': {{'name': 'Benefits','locale': 'en'}}},\
+                          'email': {'display': {{'name': 'Email Id','locale': 'en'}}},\
+                          'policyIssuedOn': {'display': {{'name': 'Policy Issued On','locale': 'en'}}},\
+                          'policyExpiresOn': {'display': {{'name': 'Policy Expires On','locale': 'en'}}},\
+                          'policyName': {'display': {{'name': 'Policy Name','locale': 'en'}}},\
+                          'policyNumber': {'display': {{'name': 'Policy Number','locale': 'en'}}}\
+                         }},\
+                        'display': {{'name': 'Sunbird RC Insurance Verifiable Credential', \
+                                    'locale': 'en', \
+                                    'logo': {'url': 'https://sunbird.org/images/sunbird-logo-new.png', 'alt_text': 'a square logo of a Sunbird'},\
+                                    'background_color': '#FDFAF9',\
+                                    'text_color': '#7C4616'}},\
+                        'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
                       },\
                       {\
                           'format': 'ldp_vc',\
@@ -487,6 +565,33 @@ mosip.esignet.vci.key-values={\
                                   'background_color': '#12107c',\
                                   'text_color': '#FFFFFF'}}\
                  }, \
+                 'InsuranceCredential' : {\
+                    'format': 'ldp_vc',\
+                    'scope' : 'sunbird_rc_insurance_vc_ldp',\
+                    'cryptographic_binding_methods_supported': {'did:jwk'},\
+                    'cryptographic_suites_supported': {'Ed25519Signature2020'},\
+                    'proof_types_supported': {'jwt'},\
+                    'credential_definition': {\
+                      'type': {'VerifiableCredential','InsuranceCredential'},\
+                      'credentialSubject': {\
+                            'fullName': {'display': {{'name': 'Name','locale': 'en'}}}, \
+                            'mobile': {'display': {{'name': 'Phone Number','locale': 'en'}}},\
+                            'dob': {'display': {{'name': 'Date of Birth','locale': 'en'}}},\
+                            'gender': {'display': {{'name': 'Gender','locale': 'en'}}},\
+                            'benefits': {'display': {{'name': 'Benefits','locale': 'en'}}},\
+                            'email': {'display': {{'name': 'Email Id','locale': 'en'}}},\
+                            'policyIssuedOn': {'display': {{'name': 'Policy Issued On','locale': 'en'}}},\
+                            'policyExpiresOn': {'display': {{'name': 'Policy Expires On','locale': 'en'}}},\
+                            'policyName': {'display': {{'name': 'Policy Name','locale': 'en'}}},\
+                            'policyNumber': {'display': {{'name': 'Policy Number','locale': 'en'}}}\
+                     }},\
+                    'display': {{'name': 'Sunbird RC Insurance Verifiable Credential', \
+                                  'locale': 'en', \
+                                  'logo': {'url': 'https://sunbird.org/images/sunbird-logo-new.png','alt_text': 'a square logo of a Sunbird'},\
+                                  'background_color': '#FDFAF9',\
+                                  'text_color': '#7C4616'}},\
+                    'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
+                 },\
                 'MOSIPVerifiableCredential_ldp' : {\
                     'format': 'ldp_vc',\
                     'scope' : 'mosip_identity_vc_ldp',\
@@ -520,3 +625,27 @@ mosip.esignet.vci.key-values={\
 
 #logging.level.org.springframework.web.client.RestTemplate=DEBUG
 #logging.level.io.mosip.esignet=INFO
+
+##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
+
+mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.individual-id-field=policyNumber
+mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.field-details={{"id":"policyNumber", "type":"text", "format":""},{"id":"fullName", "type":"text", "format":""},{"id":"dob", "type":"date", "format":"dd/mm/yyyy"}}
+mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
+mosip.esignet.authenticator.sunbird-rc.kba.entity-id-field=osid
+
+mosip.esignet.vciplugin.sunbird-rc.enable-psut-based-registry-search=false
+mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
+mosip.esignet.vciplugin.sunbird-rc.issue-credential-url=http://10.3.148.107/credential/credentials/issue
+mosip.esignet.vciplugin.sunbird-rc.supported-credential-types=LifeInsuranceCredential,InsuranceCredential
+mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.static-value-map.issuerId=did:web:holashchand.github.io:test_project:32b08ca7-9979-4f42-aacc-1d73f3ac5322
+mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.template-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/insurance-credential.json
+mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.registry-get-url=http://10.3.148.107/registry/api/v1/Insurance/
+mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.cred-schema-id=did:schema:0d10a2cf-94de-4ffc-b32c-4f1a61ee05ba
+mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.cred-schema-version=1.0.0
+
+mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.static-value-map.issuerId=did:web:holashchand.github.io:test_project:32b08ca7-9979-4f42-aacc-1d73f3ac5322
+mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.template-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/life-insurance-credential.json
+mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.registry-get-url=http://10.3.148.107/registry/api/v1/Insurance/
+mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.cred-schema-id=did:schema:0d10a2cf-94de-4ffc-b32c-4f1a61ee05ba
+mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.cred-schema-version=1.0.0
+mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search

From 478249da4babcb1dc6b4fc396c40ec7393b931b1 Mon Sep 17 00:00:00 2001
From: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
Date: Tue, 14 May 2024 11:53:01 +0530
Subject: [PATCH 1342/1358] [DSD-5255] Update esignet-default.properties

Signed-off-by: abhishek8shankar <127825992+abhishek8shankar@users.noreply.github.com>
---
 esignet-default.properties | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 48b8a2a3214..9daf9167f48 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -436,10 +436,10 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': '4501-4600', \
   'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \
   'password.max-length': 20, \
-  'username.regex': '^[1-9][0-9]{7,8}$',\
-  'username.prefix': '+855', \
-  'username.postfix': '@phone', \
-  'username.max-length': 9, \
+  'username.regex': '^[0-9]{10,30}$',\
+  'username.prefix': '', \
+  'username.postfix': '', \
+  '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,\

From ba84e4c124183d43f9f1c738a6776facd83e0f0d Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Wed, 15 May 2024 10:59:50 +0530
Subject: [PATCH 1343/1358] [ES-952]Update esignet-default.properties (#6117)

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 9daf9167f48..432177de530 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -76,7 +76,7 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
 
 #This property is used for captcha validation and allowed values are send-otp and pwd.
 #captcha validation is enabled for send-otp and pwd.
-mosip.esignet.captcha.required=pwd,send-otp
+mosip.esignet.captcha.required=
 
 
 

From 114cdb75f0b0154138d8b7c53fbe4da11dc83840 Mon Sep 17 00:00:00 2001
From: syed salman <syedsalman3753@gmail.com>
Date: Fri, 24 May 2024 18:15:05 +0530
Subject: [PATCH 1344/1358] [DSD-4578] Updated kernel-default.properties for
 PKCS12

Signed-off-by: syed salman <syedsalman3753@gmail.com>
---
 kernel-default.properties    |  10 +-
 migration-default.properties | 772 +++++++++++++++++++++++++++++++++++
 2 files changed, 777 insertions(+), 5 deletions(-)
 create mode 100644 migration-default.properties

diff --git a/kernel-default.properties b/kernel-default.properties
index 61227265940..5978d2a6e2c 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -73,11 +73,11 @@ spring.servlet.multipart.max-file-size=5MB
 
 ## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
-mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+mosip.kernel.keymanager.hsm.keystore-type=PKCS12
 # For PKCS11 provide Path of config file.
 # For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
 # For Offline & JCE property can be left blank, specified value will be ignored.
-mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+mosip.kernel.keymanager.hsm.config-path=/home/mosip/config/keys.p12
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
@@ -345,11 +345,11 @@ mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD,COMPLIANCE_TOOLKIT
 
 ## Random keys required for ZK encrypt.
-zkcrypto.random.key.generate.count=10000
+zkcrypto.random.key.generate.count=0
 
 
 
-mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident,COMPLIANCE_TOOLKIT:COMP-FIR
+mosip.kernel.keymanager.autogen.basekeys.list=
 
 # Keymanager service keystore cache properties
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
@@ -433,7 +433,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
+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-migration-client
 mosip.iam.adapter.appid=admin
 mosip.iam.adapter.clientid=mosip-admin-client
 mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
diff --git a/migration-default.properties b/migration-default.properties
new file mode 100644
index 00000000000..148af18732f
--- /dev/null
+++ b/migration-default.properties
@@ -0,0 +1,772 @@
+# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
+# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
+# helm chart:
+# db.dbuser.password 
+# keycloak.external.url
+# keycloak.internal.host
+# keycloak.internal.url
+# keycloak.admin.password
+# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
+# mosip.ida.client.secret
+# mosip.admin.client.secret
+# mosip.reg.client.secret
+# mosip.prereg.client.secret
+# softhsm.kernel.security.pin
+# softhsm-security-pin
+# email.smtp.host
+# email.smtp.username
+# email.smtp.secret
+# mosip.kernel.tokenid.uin.salt
+# mosip.kernel.tokenid.partnercode.salt
+# mosip.api.internal.url
+
+softhsm.kernel.security.pin=${softhsm.security.pin}
+
+## Sync data
+mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
+mosip.kernel.syncdata.auth-manager-roles=/roles
+mosip.kernel.syncdata.auth-user-details=/userdetails
+mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
+mosip.kernel.syncdata.syncdata-version-id=v1.0
+# Name of the file that is present in the config server which has registration specific config.
+mosip.kernel.syncdata.registration-center-config-file=registration-${spring.profiles.active}.properties
+# Name of the file that is present in the config server which has global config.
+mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
+mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
+mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
+
+## SMS notification
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+91
+mosip.kernel.sms.number.length=10
+#mosip.kernel.sms.gateway : "infobip" or "msg91"
+mosip.kernel.sms.gateway=${sms.gateway.provider}
+## --msg91 gateway--
+mosip.kernel.sms.api=smsapi
+mosip.kernel.sms.authkey=${sms.authkey}
+mosip.kernel.sms.route=route
+mosip.kernel.sms.sender=sender
+mosip.kernel.sms.unicode=unicode
+
+mosip.kernel.sms.enabled=true
+mosip.kernel.sms.country.code=+91
+mosip.kernel.sms.number.length=10
+mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
+mosip.kernel.sms.sender=AD-MOSIP
+mosip.kernel.sms.password=dummy
+mosip.kernel.sms.route=mock
+
+## Email notification
+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=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
+
+
+## Keymanager service
+#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+# For PKCS11 provide Path of config file.
+# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
+# For Offline & JCE property can be left blank, specified value will be ignored.
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+# Passkey of keystore for PKCS11, PKCS12
+# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
+mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
+# Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
+mosip.kernel.client.crypto.use-resident-service-module-key=true
+
+## Auditmanager
+mosip.kernel.auditmanager-service-logs-location=logs/audit.log
+
+## Auth service
+auth.jwt.secret=authjwtsecret
+auth.jwt.base=Mosip-Token
+auth.jwt.expiry=6000000
+auth.token.header=Authorization
+auth.refreshtoken.header=RefreshToken
+auth.jwt.refresh.expiry=86400000
+auth.primary.language=eng
+
+otp.manager.api.generate=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
+otp.manager.api.verify=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/validate
+otp.sender.api.email.send=${mosip.kernel.notification.url}/v1/notifier/email/send
+otp.sender.api.sms.send=${mosip.kernel.notification.url}/v1/notifier/sms/send
+masterdata.api.template=${mosip.kernel.masterdata.url}/v1/masterdata/templates/
+masterdata.api.template.otp=/otp-sms-template
+idrepo.api.getuindetails=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
+
+mosip.kernel.auth.app.id=auth
+mosip.kernel.auth.client.id=mosip-auth-client
+mosip.kernel.auth.secret.key=${mosip.auth.client.secret}
+
+mosip.kernel.ida.app.id=ida
+mosip.kernel.ida.client.id=mosip-ida-client
+mosip.kernel.ida.secret.key=${mosip.ida.client.secret}
+
+## VID generator service
+mosip.kernel.vid.min-unused-threshold=100000
+mosip.kernel.vid.vids-to-generate=200000
+mosip.kernel.vid.time-to-release-after-expiry=5
+mosip.kernel.vid.pool-population-timeout=10000000
+kernel.vid.revoke-scheduler-type=cron
+kernel.vid.revoke-scheduler-seconds=0
+kernel.vid.revoke-scheduler-minutes=0
+kernel.vid.revoke-scheduler-hours=23
+kernel.vid.revoke-scheduler-days_of_month=*
+kernel.vid.revoke-scheduler-months=*
+kernel.vid.revoke-scheduler-days_of_week=*
+kernel.vid.isolator-scheduler-type=cron
+kernel.vid.isolator-scheduler-seconds=0
+kernel.vid.isolator-scheduler-minutes=0
+kernel.vid.isolator-scheduler-hours=*
+kernel.vid.isolator-scheduler-days_of_month=*
+kernel.vid.isolator-scheduler-months=*
+kernel.vid.isolator-scheduler-days_of_week=*
+
+## PRID properties
+mosip.kernel.prid.min-unused-threshold=1000
+mosip.kernel.prid.prids-to-generate=2000
+mosip.kernel.prid.pool-population-timeout=10000000
+mosip.kernel.prid.sequence-limit=3
+kernel.prid.revoke-scheduler-type=cron
+kernel.prid.revoke-scheduler-seconds=0
+kernel.prid.revoke-scheduler-minutes=0
+kernel.prid.revoke-scheduler-hours=23
+kernel.prid.revoke-scheduler-days_of_month=*
+kernel.prid.revoke-scheduler-months=*
+kernel.prid.revoke-scheduler-days_of_week=*
+
+## Database properties
+# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
+# If database is external to production, provide the DNS or ip of the host and port 
+mosip.kernel.database.hostname=postgres-postgresql.postgres
+mosip.kernel.database.port=5432
+
+javax.persistence.jdbc.driver=org.postgresql.Driver
+hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
+hibernate.jdbc.lob.non_contextual_creation=true
+hibernate.hbm2ddl.auto=none
+hibernate.show_sql=false
+hibernate.format_sql=false
+hibernate.connection.charSet=utf8
+hibernate.cache.use_second_level_cache=false
+hibernate.cache.use_query_cache=false
+hibernate.cache.use_structured_entries=false
+hibernate.generate_statistics=false
+
+logging.level.org.hibernate.SQL=ERROR
+logging.level.org.hibernate.type=ERROR
+
+admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+admin_database_username=kerneluser
+admin_database_password=${db.dbuser.password}
+
+syncjob_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
+syncjob_database_username=masteruser
+syncjob_database_password=${db.dbuser.password}
+
+audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_audit
+audit_database_username=audituser
+audit_database_password=${db.dbuser.password}
+
+masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
+masterdata_database_username=masteruser
+masterdata_database_password=${db.dbuser.password}
+
+uin.swagger.base-url=https://qa.mosip.io
+uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+uin_database_username=kerneluser
+uin_database_password=${db.dbuser.password}
+hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
+
+id_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+id_database_username=kerneluser
+id_database_password=${db.dbuser.password}
+
+vid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+vid_database_username=kerneluser
+vid_database_password=${db.dbuser.password}
+
+prid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+prid_database_username=kerneluser
+prid_database_password=${db.dbuser.password}
+
+keymanager.persistence.jdbc.driver=org.postgresql.Driver
+keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_keymgr_src
+keymanager_database_password=${db.dbuser.password}
+keymanager_database_username= keymgruser
+
+otpmanager_database_username = kerneluser
+otpmanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+otpmanager_database_password=${db.dbuser.password}
+
+syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
+syncdata_database_username=masteruser
+syncdata_database_password=${db.dbuser.password}
+
+ridgenerator_database_username =regprcuser
+ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
+ridgenerator_database_password=${db.dbuser.password}
+
+## Keycloak properties
+mosip.iam.base.url=${keycloak.internal.url}
+mosip.iam.base-url=${mosip.iam.base.url}
+mosip.iam.admin-realm-id=admin
+mosip.iam.default.realm-id=mosip
+mosip.iam.open-id-url=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/
+mosip.iam.realm.operations.base-url=${mosip.iam.base.url}/auth/admin/realms/{realmId}
+mosip.iam.admin-url=${mosip.iam.base.url}/auth/admin/
+mosip.iam.roles-extn-url=realms/mosip/roles
+mosip.iam.users-extn-url=realms/mosip/users
+mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
+mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
+keycloak.realm=registration-client
+keycloak.resource=account
+keycloak.auth-server-url=${mosip.iam.base.url}/auth
+keycloak.ssl-required=none
+keycloak.public-client=true
+keycloak.use-resource-role-mappings=true
+keycloak.verify-token-audience=true
+
+#This is the endpoint use by ui(browser) based applications to redirect to open-id system. This URL should be reachable through the browser.
+mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
+
+mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
+mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
+mosip.admin.login_flow.name=authorization_code
+mosip.admin.login_flow.response_type=code
+mosip.admin.login_flow.scope=cls
+mosip.admin.clientid=mosip-admin-client
+mosip.admin.clientsecret=${mosip.admin.client.secret}
+mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
+mosip.admin_realm_id=mosip
+mosip.iam.master.realm-id=master
+mosip.iam.pre-reg_user_password=mosip
+
+## TODO: Below config is not needed anymore.  Need to remove init of db_3_DS in authmanager code. For now, we just
+## point to a valid db.
+#db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
+db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
+db_3_DS.keycloak.port=${mosip.kernel.database.port}
+db_3_DS.keycloak.username=kerneluser
+db_3_DS.keycloak.password=${db.dbuser.password}
+db_3_DS.keycloak.driverClassName=org.postgresql.Driver
+
+mosip.keycloak.admin.client.id=admin-cli
+mosip.keycloak.admin.user.id=admin
+mosip.keycloak.admin.secret.key=${keycloak.admin.password}
+
+mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
+mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
+
+
+master.search.maximum.rows=50
+mosip.level=2
+mosip.kernel.masterdata.audit-url= ${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
+mosip.keycloak.max-no-of-users=20000
+
+## Register device
+# Keymanager runs in separate namespace "keymanager"
+mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/sign
+masterdata.registerdevice.timestamp.validate=+10
+
+## Prereg
+mosip.kernel.prereg.realm-id=mosip
+mosip.kernel.prereg.client.id=mosip-prereg-client
+mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
+
+## UIN scheduler
+kernel.uin.transfer-scheduler-type=cron
+kernel.uin.transfer-scheduler-seconds=0
+kernel.uin.transfer-scheduler-minutes=0
+kernel.uin.transfer-scheduler-hours=*
+kernel.uin.transfer-scheduler-days_of_month=*
+kernel.uin.transfer-scheduler-months=*
+kernel.uin.transfer-scheduler-days_of_week=*
+
+## UIN Auth adapter config
+auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
+
+
+## Proxy otp
+#mosip.kernel.auth.proxy-otp=false
+mosip.kernel.auth.proxy-otp-value=111111
+mosip.security.provider.name=SunPKCS11-pkcs11-proxy
+
+## identity schema backward compatability ########
+mosip.ui.spec.default.domain=registration-client
+
+## Security properties
+mosip.security.csrf-enable=false
+mosip.security.cors-enable=false
+mosip.security.origins=localhost:8080
+mosip.security.secure-cookie=false
+
+## ROOT key identifier
+mosip.root.key.applicationid=ROOT
+
+## Certificate signing algorithm
+mosip.kernel.certificate.sign.algorithm=SHA256withRSA
+
+## Default certificate params
+mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
+mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
+mosip.kernel.keymanager.certificate.default.organization=IITB
+mosip.kernel.keymanager.certificate.default.location=BANGALORE
+mosip.kernel.keymanager.certificate.default.state=KA
+mosip.kernel.keymanager.certificate.default.country=IN
+
+## Zero Knowledge Master & Public Key identifier.
+mosip.kernel.zkcrypto.masterkey.application.id=KERNEL
+mosip.kernel.zkcrypto.masterkey.reference.id=IDENTITY_CACHE
+mosip.kernel.zkcrypto.publickey.application.id=IDA
+mosip.kernel.zkcrypto.publickey.reference.id=PUBLIC_KEY
+mosip.kernel.zkcrypto.wrap.algorithm-name=AES/ECB/NoPadding
+mosip.kernel.zkcrypto.derive.encrypt.algorithm-name=AES/ECB/PKCS5Padding
+
+## Application Id for PMS master key.
+mosip.kernel.partner.sign.masterkey.application.id=PMS
+
+datastores=ldap_1_DS,db_1_DS,db_2_DS
+
+## Partner Management Service allowed partner domains
+mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
+
+## List of keys to auto generate.
+mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD,COMPLIANCE_TOOLKIT
+
+## Random keys required for ZK encrypt.
+zkcrypto.random.key.generate.count=10000
+
+
+
+mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident,COMPLIANCE_TOOLKIT:COMP-FIR
+
+# Keymanager service keystore cache properties
+mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
+
+# API to get machine based on machine id
+mosip.kernel.syncdata-service-machine-url=${mosip.kernel.masterdata.url}/v1/masterdata/machines/%s/eng
+
+# Flag added to choose client crypto implementation in syncdata service
+# Needs to be updated to true in prod deployments
+mosip.syncdata.tpm.required=false
+
+mosip.kernel.registrationclient.app.id=registrationclient
+mosip.kernel.registrationclient.client.id=mosip-reg-client
+# env variable
+mosip.kernel.registrationclient.secret.key=${mosip.reg.client.secret}
+
+# API to fetch auth token and refresh token used by syncdata-service
+mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
+mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/userotp
+mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
+mosip.kernel.auth.sendotp.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/sendotp
+
+# Sample Additional configuration required for real HSM configured though JCE.
+# Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
+# mosip.kernel.keymanager.hsm.jce.className=io.mosip.keymanager.hsm.impl.AnyHSMKeyStoreImpl
+# mosip.kernel.keymanager.hsm.jce.keyStoreType=HSMKeyStoreType
+# mosip.kernel.keymanager.hsm.jce.keyStoreFile=AnyRequiredKeyStoreFile
+# mosip.kernel.keymanager.hsm.jce.localKeyStorePwd=HSMPartitionPassword
+
+## syncdata-service websub configuration (cacert sync)
+syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
+# Secret for partner CA certificate CRUD callback
+syncdata.websub.callback.secret.ca-cert=secret
+# Callback url for partner CA certificate CRUD event
+syncdata.websub.callback.url.path.ca-cert=/callback/partner/ca_certificate
+syncdata.websub.callback.url.ca-cert=${mosip.kernel.syncdata.url}/v1/syncdata/callback/partner/ca_certificate
+# Number of retires on subscription failure
+syncdata.websub.resubscription.retry.count=3
+# Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
+subscriptions-delay-on-startup=120000
+
+
+# Pause & resume api proeprties
+PACKET_RESUME_API=${mosip.api.internal.url}/registrationprocessor/v1/workflowmanager/workflowaction
+PACKET_PAUSE_API=${mosip.api.internal.url}/registrationprocessor/v1/workflowmanager/workflow/search
+KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+
+## resubscription and subscription initial delay for masterdata service
+masterdata.websub.resubscription.delay.millis=48000000
+masterdata.subscriptions-delay-on-startup=120000
+
+# The time interval in seconds to schedule subscription of topics which is done as a
+# work-around for the bug: MOSIP-9496. By default the
+# this property value is set to 0 that disables this workaround.
+# To enable the resubscrition scheduling, this property should be assigned with a positive
+# number like 1 * 60 * 60 * 1000 = 3600000 for one hour
+syncdata.websub.resubscription.delay.millis=48000000
+
+## Admin UI
+## this pattern like --> display column : configKey. 
+## We can provide multiple values with ";" separated 
+mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns};filterValueMaxCount:{"default":${mosip.kernel.filtervalue.max_columns},"registrationcenters":500,"locations":300}
+
+# Flag to identify the support of no thumbprint in 1.1.3 version. 
+# Added this for backward compatability. default is false, means support is not required.
+# Make it to true if support is required.
+mosip.kernel.keymanager.113nothumbprint.support=false
+
+## Used to get IAM user details.
+mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
+mosip.kernel.masterdata.auth-user-details=/userdetails
+
+
+## scheduler do it's job at 2am
+scheduling.job.cron=0 0 2 * * ?
+
+# masterdata swagger openApi
+#openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
+#openapi.service.servers[0].description=For Swagger
+
+#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.iam.adapter.appid=admin
+mosip.iam.adapter.clientid=mosip-admin-client
+mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
+
+#AdminMaster endpoints to access without authentication
+mosip.service-context=/v1/masterdata
+mosip.service.end-points={cipher}dd5737cb38b0d354e925a031d1662cae45feb891135577d72d75017f71a3c72d38d157158eb9e12d8e51ffb3e66e1397eb0e20040939ad145363a00c458f247c53a712c564467770d08b0cab22b967ba71d09e75a4c53492f23bb29e4c529a87787e7652c720b8eb7ce61ffc4ea6efe89be9d85034fcb135582af662290eacc0392ea96c15fef0a20694cd24c553ec3325e1450e4fb6ea773b200fcdc5d097014e7ff1794d93330c40f50fce4c20d15fc9b0ddced67877cf51ecf38d7b3fb352e176fe12956e0e2e1d43ac77dd200085dac1d3e3fe49475d5077b6bff6162c53a2d00fdbc5cd12a0aa983165916cb9cd72b2eff9c8bf7bc92bea2619fc0900b5936655a16a96fe8b188fa06a625760f78b1273a66137228095305ca32093b1fda5faac87b1ae172caa990776fa6dc52f6f1863848b21e42eb1af5ee530f12af7ef94aa8bccb254fe65c69870338e7bae1a95f344c9fcb806ac7801466168c81de7262e1a0bf49c62ee0c3676babbc718ba790e7b9428482443f6e612c9ef497702a79c9a49d47ab98d97a868e7f2ce1b7febc3d09afadbf5555e21234290aaaef94681c78326d7c178316b7d211f2a72dfb5a39e6badda11d4ee42b79c003fdf1d83d72aee288f6c8ad6e5f66c2dae350d50f5aec39360b8cce5e3682ef6f8adb7a6377a9580d420944f98c98390d3a2f7a0682d26991a60e3ab79401c63233c5a18b1902f715ebf595107563d9a60d3280c1baed1777e894660ea1e05b6433e2653af499b286fdb6380b29d32953bd23de2ec8f2c441b0e22c3877f85aa23046e2830fb9f94dced2ee55f107c8160f05bfa5436620898b36d18ae26bd4c7400e3d51f85bad2a81665aa7baf7d10cb792067b600fb0277fb0119aa9186c3d1a2079c56ca999ce1d4930b9ea77f80d88bb2afbb93002b77c3d5f5a895822dacc6038112160bf280d392599c268d504aff4e933fa4308ab50d25793c93fd2a51b1c7d2938219ff84202ae286cb1b9650ec5dfd79dabad2acf2b44fbc08170c097c93a9d663b4c130392bd536d86a87cd11ab074d3db666dcf2f40349d1056ce2708cfcfbcdd868a8073acd9a2241159e64cae84eceabd8acb83afbeeafa822defd7616bfd5801f1976392872f61e637bc21c3db4fe30d6c1de644d2291ce9d48ff1afff9f1ab596620553fd669cfa38dc5ccea6286abbcd93ca8b434b2b6d42129d72e7daa91001d43005d781369c054b36a6158d4f2cc6c6136565733b13cd7d306c715809f2d9a5024abcffbc0ef3b58585b881f6509bd1876b923494445a2a430ddf5e517b49b65647f54a2e10a002224269c78a38b6ddbddc02176d93e1e280cfdefc317efe361babe0eb3688c9d3406c4ef7a1851ddc7d511703b1d4e2c449792abd523c6eadfbfea13cf862478d75196f8133deadc31222fa6be3cd1cac015f2af1865d834bda4e7f3352cc72116d732ed384a0b94237810bf5909ea453f9052aeb0ae6d492e7ed4d2c33145e38a79742ca23294f3dc89e3cafcfbc8349aae712172bd661137ad6179df3bcc1f03b80af7c82b8a1aa91140086e663ff257d8084680c00c9a31f9c96e0b3d350192851c0c279b8159070e5f1f06153d132447fddbbf1dbb7378b84c38dc1c5f2f8cbbfcd8a478f78b1ed6ed44a0d81a88be605b66a5caad776ab1ae7c8a88362efef9b43d261dd292324e173606fabd3b8ade5fce14671d274d33e93f975d12071473fa7b0289a99a151ce67b3070f44001b5d74b3087ad1fbd071605fd62fa5f86454b881fd1ad86bd565b33248d47100d862dcc57dc0e9f673e25b0845b27d06b38c30ca975efb8031444459d776f6221a90fa51b971a4054332411de943afd8b
+
+spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
+
+##validity time of mosip-signed certificates
+
+
+## Roles
+mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getapplicationtypeslangcode=PRE_REGISTRATION_ADMIN,RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.postapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postbiometricattributes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
+mosip.role.admin.masterdata.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
+mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,CENTRAL_ADMIN
+mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
+mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
+mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postpacketrejectionreasonsreasoncategory=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.postpacketresume=REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postpacketsearch=REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postregistereddevices=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
+mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,ID_REPOSITORY
+mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRINT_PARTNER,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettemplatefileformatslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchtemplatefileformats=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttemplatetypes=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitle=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.gettitleall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.postuispecpublish=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getuispecall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
+mosip.role.admin.masterdata.getusersid=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusers=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
+mosip.role.admin.masterdata.getusercentermapping=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserdetails=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getuserssearch=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
+mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
+mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
+mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
+mosip.role.admin.masterdata.deletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.patchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.postdynamicfieldsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
+mosip.role.admin.masterdata.putlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
+mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
+mosip.role.kernel.postotpgenerate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getotpvalidate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
+mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
+mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN,ID_REPOSITORY,HOTLIST_ADMIN
+mosip.role.keymanager.postcssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postcsverifysign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmsigningpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.posttpmencryptionpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST,HOTLIST_ADMIN
+mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST,HOTLIST_ADMIN
+mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
+mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postuploadotherdomaincertificate=PARTNER_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postmigratebasekey=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.getzktempcertificate=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.postlicensegenerate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postmigratezkkeys=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN
+mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
+mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_REQUEST
+mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
+mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postcwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postcwtdecode=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postcwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
+mosip.role.keymanager.postgenerateargon2hash=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
+
+mosip.kernel.keymanager.jwtsign.validate.json=false
+
+auth.allowed.urls=http://localhost:5000/
+
+##These properties are used for validation in kernel-masterdata-service
+#For example, Arabic needs to be added along with english
+#the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
+#the final value in this case might look like [^a-z\u0600-\u06FF]
+mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
+mosip.kernel.masterdata.name.validate.regex=[^a-z]
+# query param usd to refer url to redirect after logout
+mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
+# end session endpoint in OIDC
+mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
+mosip.kernel.keymgr.hsm.health.check.enabled=false
+
+# HSM Key-migration properties
+mosip.kernel.keymanager.keymigration.auth.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
+mosip.kernel.keymanager.keymigration.auth.appId=ida
+# <clientId with KEY_MIGRATION_ADMIN role>
+mosip.kernel.keymanager.keymigration.auth.cliendId=mosip-migration-client
+mosip.kernel.keymanager.keymigration.auth.secretKey=${mosip.migration.client.secret}
+mosip.kernel.keymanager.keymigration.getcertificate.url=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate
+mosip.kernel.keymanager.keymigration.uploadkey.url=${mosip.kernel.keymanager.url}/v1/keymanager/migrateBaseKey
+mosip.kernel.keymanager.keymigration.getzktempcertificate.url=${mosip.kernel.keymanager.url}/v1/keymanager/getZKTempCertificate
+mosip.kernel.keymanager.keymigration.zkkeys.migration.batch.size=500
+mosip.kernel.keymanager.keymigration.zkUploadkey.url=${mosip.kernel.keymanager.url}/v1/keymanager/migrateZKKeys

From ad10df72db18d39b951d912f8f9258a5baabc1d4 Mon Sep 17 00:00:00 2001
From: syed salman <syedsalman3753@gmail.com>
Date: Fri, 24 May 2024 22:48:24 +0530
Subject: [PATCH 1345/1358] [DSD-4578] Updated
 id-authentication-default.properties for PKCS12

Signed-off-by: syed salman <syedsalman3753@gmail.com>
---
 id-authentication-default.properties | 11 +++++++---
 migration-default.properties         | 32 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 690970bea5f..7f335febb1c 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -446,9 +446,14 @@ ida.credential.store.retry.backoff.exponential.max.interval.millisecs=120000
 ## Configurations needed for dependent libraries
 ## Softhsm
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
-mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
-mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+mosip.kernel.keymanager.hsm.config-path=/home/mosip/config/keys.p12
+mosip.kernel.keymanager.hsm.keystore-type=PKCS12
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.ida.security.pin}
+# keymigration role
+mosip.role.keymanager.postmigratebasekey=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.getzktempcertificate=KEY_MIGRATION_ADMIN
+mosip.role.keymanager.postmigratezkkeys=KEY_MIGRATION_ADMIN
+auth.server.admin.allowed.audience=mosip-migration-client,mpartner-default-auth
 
 ## Security - used in Internal Authentication Services by default Kernel Auth Adapter
 mosip.security.csrf-enable=false
@@ -501,7 +506,7 @@ keymanager_database_url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip
 keymanager_database_username=${mosip.ida.database.user}
 keymanager_database_password=${db.dbuser.password}
 mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING,IDA_VCI_EXCHANGE
-mosip.kernel.keymanager.autogen.basekeys.list=${application.id}:${internal.reference.id},${application.id}:${partner.reference.id},${application.id}:${partner.biometric.reference.id},${application.id}:${mosip.kernel.zkcrypto.publickey.reference.id},${application.id}:${ida-auth-partner-id}
+mosip.kernel.keymanager.autogen.basekeys.list=
 zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
diff --git a/migration-default.properties b/migration-default.properties
index 148af18732f..0f8609b0aea 100644
--- a/migration-default.properties
+++ b/migration-default.properties
@@ -201,9 +201,10 @@ prid_database_username=kerneluser
 prid_database_password=${db.dbuser.password}
 
 keymanager.persistence.jdbc.driver=org.postgresql.Driver
-keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_keymgr_src
+keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_ida_src
 keymanager_database_password=${db.dbuser.password}
-keymanager_database_username= keymgruser
+keymanager_database_username= idauser
+keymanager.persistence.jdbc.schema=ida
 
 otpmanager_database_username = kerneluser
 otpmanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
@@ -341,15 +342,16 @@ datastores=ldap_1_DS,db_1_DS,db_2_DS
 ## Partner Management Service allowed partner domains
 mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 
-## List of keys to auto generate.
-mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD,COMPLIANCE_TOOLKIT
-
+application.id=IDA
+application.name=ID-Authentication
+identity-cache.reference.id=IDENTITY_CACHE
+mosip.sign.applicationid=${application.id}
+mosip.sign.refid=SIGN
+# mosip.kernel.zkcrypto.masterkey.reference.id=IDENTITY_CACHE
+mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING,IDA_VCI_EXCHANGE
 ## Random keys required for ZK encrypt.
-zkcrypto.random.key.generate.count=10000
-
-
-
-mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident,COMPLIANCE_TOOLKIT:COMP-FIR
+zkcrypto.random.key.generate.count=0
+mosip.kernel.keymanager.autogen.basekeys.list=
 
 # Keymanager service keystore cache properties
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
@@ -759,14 +761,14 @@ mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
 mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
 mosip.kernel.keymgr.hsm.health.check.enabled=false
 
-# HSM Key-migration properties
+## HSM keymigration properties
 mosip.kernel.keymanager.keymigration.auth.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
 mosip.kernel.keymanager.keymigration.auth.appId=ida
 # <clientId with KEY_MIGRATION_ADMIN role>
 mosip.kernel.keymanager.keymigration.auth.cliendId=mosip-migration-client
 mosip.kernel.keymanager.keymigration.auth.secretKey=${mosip.migration.client.secret}
-mosip.kernel.keymanager.keymigration.getcertificate.url=${mosip.kernel.keymanager.url}/v1/keymanager/getCertificate
-mosip.kernel.keymanager.keymigration.uploadkey.url=${mosip.kernel.keymanager.url}/v1/keymanager/migrateBaseKey
-mosip.kernel.keymanager.keymigration.getzktempcertificate.url=${mosip.kernel.keymanager.url}/v1/keymanager/getZKTempCertificate
+mosip.kernel.keymanager.keymigration.getcertificate.url=http://keymanager-ida.ida/v1/keymanager/getCertificate
+mosip.kernel.keymanager.keymigration.uploadkey.url=http://keymanager-ida.ida/v1/keymanager/migrateBaseKey
+mosip.kernel.keymanager.keymigration.getzktempcertificate.url=http://keymanager-ida.ida/v1/keymanager/getZKTempCertificate
 mosip.kernel.keymanager.keymigration.zkkeys.migration.batch.size=500
-mosip.kernel.keymanager.keymigration.zkUploadkey.url=${mosip.kernel.keymanager.url}/v1/keymanager/migrateZKKeys
+mosip.kernel.keymanager.keymigration.zkUploadkey.url=http://keymanager-ida.ida/v1/keymanager/migrateZKKeys

From 6704f45f9492e70039fb90fdff18169207d1b089 Mon Sep 17 00:00:00 2001
From: syed salman <syedsalman3753@gmail.com>
Date: Fri, 24 May 2024 23:04:03 +0530
Subject: [PATCH 1346/1358] [DSD-4578] Updated
 id-authentication-default.properties for PKCS12

Signed-off-by: syed salman <syedsalman3753@gmail.com>
---
 id-authentication-default.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 7f335febb1c..7f577513479 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -664,3 +664,4 @@ mosip.ida.kafka.bootstrap.servers=kafka-0.kafka-headless.${kafka.profile}:${kafk
 spring.kafka.admin.properties.allow.auto.create.topics=true
 logging.level.org.apache.kafka=DEBUG
 #----------------------------------------------------end------------------------------------------
+mosip.kernel.keymgr.hsm.health.check.enabled=false
\ No newline at end of file

From 4163cba899a7aa0b8f64b8118fa5a44f1819359c Mon Sep 17 00:00:00 2001
From: syed salman <syedsalman3753@gmail.com>
Date: Fri, 24 May 2024 23:48:46 +0530
Subject: [PATCH 1347/1358] [DSD-4578] Updated esignet-default.properties for
 PKCS12

Signed-off-by: syed salman <syedsalman3753@gmail.com>
---
 esignet-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 432177de530..7eca6a656e5 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -369,11 +369,11 @@ mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 #mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
 
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
-mosip.kernel.keymanager.hsm.keystore-type=PKCS11
+mosip.kernel.keymanager.hsm.keystore-type=PKCS12
 # For PKCS11 provide Path of config file.
 # For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
 # For Offline & JCE property can be left blank, specified value will be ignored.
-mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+mosip.kernel.keymanager.hsm.config-path=/home/mosip/config/keys.p12
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.esignet.security.pin}

From 0e763dcfd5d83858ce76b7d206500433ab76cebc Mon Sep 17 00:00:00 2001
From: techno-467 <prafulrakhade02@gmail.com>
Date: Mon, 17 Jun 2024 16:13:06 +0530
Subject: [PATCH 1348/1358] [DSD-5498] revert back pkcs12 changes from
 esignet-default.properties, id-authentication-default.properties and
 kernel-default.properties

---
 esignet-default.properties           |  4 ++--
 id-authentication-default.properties | 11 +++--------
 kernel-default.properties            | 12 +++++-------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 7eca6a656e5..432177de530 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -369,11 +369,11 @@ mosip.kernel.certificate.sign.algorithm=SHA256withRSA
 #mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.idp.pin}
 
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
-mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 # For PKCS11 provide Path of config file.
 # For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
 # For Offline & JCE property can be left blank, specified value will be ignored.
-mosip.kernel.keymanager.hsm.config-path=/home/mosip/config/keys.p12
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.esignet.security.pin}
diff --git a/id-authentication-default.properties b/id-authentication-default.properties
index 7f577513479..198c3aab59e 100644
--- a/id-authentication-default.properties
+++ b/id-authentication-default.properties
@@ -446,14 +446,9 @@ ida.credential.store.retry.backoff.exponential.max.interval.millisecs=120000
 ## Configurations needed for dependent libraries
 ## Softhsm
 mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
-mosip.kernel.keymanager.hsm.config-path=/home/mosip/config/keys.p12
-mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.ida.security.pin}
-# keymigration role
-mosip.role.keymanager.postmigratebasekey=KEY_MIGRATION_ADMIN
-mosip.role.keymanager.getzktempcertificate=KEY_MIGRATION_ADMIN
-mosip.role.keymanager.postmigratezkkeys=KEY_MIGRATION_ADMIN
-auth.server.admin.allowed.audience=mosip-migration-client,mpartner-default-auth
 
 ## Security - used in Internal Authentication Services by default Kernel Auth Adapter
 mosip.security.csrf-enable=false
@@ -506,7 +501,7 @@ keymanager_database_url=jdbc:postgresql://${mosip.ida.database.hostname}:${mosip
 keymanager_database_username=${mosip.ida.database.user}
 keymanager_database_password=${db.dbuser.password}
 mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING,IDA_VCI_EXCHANGE
-mosip.kernel.keymanager.autogen.basekeys.list=
+mosip.kernel.keymanager.autogen.basekeys.list=${application.id}:${internal.reference.id},${application.id}:${partner.reference.id},${application.id}:${partner.biometric.reference.id},${application.id}:${mosip.kernel.zkcrypto.publickey.reference.id},${application.id}:${ida-auth-partner-id}
 zkcrypto.random.key.generate.count=0
 keymanager.persistence.jdbc.schema=ida
 
diff --git a/kernel-default.properties b/kernel-default.properties
index 5978d2a6e2c..ef448f4a506 100644
--- a/kernel-default.properties
+++ b/kernel-default.properties
@@ -73,11 +73,11 @@ spring.servlet.multipart.max-file-size=5MB
 
 ## Keymanager service
 #Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
-mosip.kernel.keymanager.hsm.keystore-type=PKCS12
+mosip.kernel.keymanager.hsm.keystore-type=PKCS11
 # For PKCS11 provide Path of config file.
 # For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
 # For Offline & JCE property can be left blank, specified value will be ignored.
-mosip.kernel.keymanager.hsm.config-path=/home/mosip/config/keys.p12
+mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
 # Passkey of keystore for PKCS11, PKCS12
 # For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
 mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
@@ -345,11 +345,9 @@ mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
 mosip.kernel.keymanager.autogen.appids.list=ROOT,KERNEL:SIGN,PRE_REGISTRATION,REGISTRATION,REGISTRATION_PROCESSOR,ID_REPO,KERNEL:IDENTITY_CACHE,RESIDENT,PMS,ADMIN_SERVICES,DIGITAL_CARD,COMPLIANCE_TOOLKIT
 
 ## Random keys required for ZK encrypt.
-zkcrypto.random.key.generate.count=0
+zkcrypto.random.key.generate.count=10000
 
-
-
-mosip.kernel.keymanager.autogen.basekeys.list=
+mosip.kernel.keymanager.autogen.basekeys.list=RESIDENT:mpartner-default-resident,COMPLIANCE_TOOLKIT:COMP-FIR
 
 # Keymanager service keystore cache properties
 mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
@@ -433,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-migration-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}

From b6b1586e4d273650478dbe9b162437a1fe962099 Mon Sep 17 00:00:00 2001
From: techno-467 <prafulrakhade02@gmail.com>
Date: Mon, 17 Jun 2024 16:16:24 +0530
Subject: [PATCH 1349/1358] [DSD-5498] revert back pkcs12 changes from
 esignet-default.properties, id-authentication-default.properties and
 kernel-default.properties

---
 migration-default.properties | 774 -----------------------------------
 1 file changed, 774 deletions(-)
 delete mode 100644 migration-default.properties

diff --git a/migration-default.properties b/migration-default.properties
deleted file mode 100644
index 0f8609b0aea..00000000000
--- a/migration-default.properties
+++ /dev/null
@@ -1,774 +0,0 @@
-# Follow properites have their values assigned via 'overrides' environment variables of config server docker.
-# DO NOT define these in any of the property files.  They must be passed as env variables.  Refer to config-server
-# helm chart:
-# db.dbuser.password 
-# keycloak.external.url
-# keycloak.internal.host
-# keycloak.internal.url
-# keycloak.admin.password
-# mosip.auth.client.secret   (convention: <realm>.<keycloak client name>.secret)
-# mosip.ida.client.secret
-# mosip.admin.client.secret
-# mosip.reg.client.secret
-# mosip.prereg.client.secret
-# softhsm.kernel.security.pin
-# softhsm-security-pin
-# email.smtp.host
-# email.smtp.username
-# email.smtp.secret
-# mosip.kernel.tokenid.uin.salt
-# mosip.kernel.tokenid.partnercode.salt
-# mosip.api.internal.url
-
-softhsm.kernel.security.pin=${softhsm.security.pin}
-
-## Sync data
-mosip.kernel.syncdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
-mosip.kernel.syncdata.auth-manager-roles=/roles
-mosip.kernel.syncdata.auth-user-details=/userdetails
-mosip.kernel.syncdata.syncdata-request-id=SYNCDATA.REQUEST
-mosip.kernel.syncdata.syncdata-version-id=v1.0
-# Name of the file that is present in the config server which has registration specific config.
-mosip.kernel.syncdata.registration-center-config-file=registration-${spring.profiles.active}.properties
-# Name of the file that is present in the config server which has global config.
-mosip.kernel.syncdata.global-config-file=application-${spring.profiles.active}.properties
-mosip.kernel.syncdata.syncjob-base-url=${mosip.kernel.syncdata.syncjob.url}/v1/syncjob/syncjobdef
-mosip.kernel.syncdata-service-idschema-url=${mosip.kernel.masterdata.url}/v1/masterdata/idschema/latest
-
-## SMS notification
-mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+91
-mosip.kernel.sms.number.length=10
-#mosip.kernel.sms.gateway : "infobip" or "msg91"
-mosip.kernel.sms.gateway=${sms.gateway.provider}
-## --msg91 gateway--
-mosip.kernel.sms.api=smsapi
-mosip.kernel.sms.authkey=${sms.authkey}
-mosip.kernel.sms.route=route
-mosip.kernel.sms.sender=sender
-mosip.kernel.sms.unicode=unicode
-
-mosip.kernel.sms.enabled=true
-mosip.kernel.sms.country.code=+91
-mosip.kernel.sms.number.length=10
-mosip.kernel.sms.api=http://${sms.host}:${sms.port}/sendsms
-mosip.kernel.sms.sender=AD-MOSIP
-mosip.kernel.sms.password=dummy
-mosip.kernel.sms.route=mock
-
-## Email notification
-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=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
-
-
-## Keymanager service
-#Type of keystore, Supported Types: PKCS11, PKCS12, Offline, JCE
-mosip.kernel.keymanager.hsm.keystore-type=PKCS11
-# For PKCS11 provide Path of config file.
-# For PKCS12 keystore type provide the p12/pfx file path. P12 file will be created internally so provide only file path & file name.
-# For Offline & JCE property can be left blank, specified value will be ignored.
-mosip.kernel.keymanager.hsm.config-path=/config/softhsm-application.conf
-# Passkey of keystore for PKCS11, PKCS12
-# For Offline & JCE proer can be left blank. JCE password use other JCE specific properties.
-mosip.kernel.keymanager.hsm.keystore-pass=${softhsm.kernel.security.pin}
-# Config to allow use of the resident service module keys for client crypto APIs which is used by resident service to sign uin update packets
-mosip.kernel.client.crypto.use-resident-service-module-key=true
-
-## Auditmanager
-mosip.kernel.auditmanager-service-logs-location=logs/audit.log
-
-## Auth service
-auth.jwt.secret=authjwtsecret
-auth.jwt.base=Mosip-Token
-auth.jwt.expiry=6000000
-auth.token.header=Authorization
-auth.refreshtoken.header=RefreshToken
-auth.jwt.refresh.expiry=86400000
-auth.primary.language=eng
-
-otp.manager.api.generate=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/generate
-otp.manager.api.verify=${mosip.kernel.otpmanager.url}/v1/otpmanager/otp/validate
-otp.sender.api.email.send=${mosip.kernel.notification.url}/v1/notifier/email/send
-otp.sender.api.sms.send=${mosip.kernel.notification.url}/v1/notifier/sms/send
-masterdata.api.template=${mosip.kernel.masterdata.url}/v1/masterdata/templates/
-masterdata.api.template.otp=/otp-sms-template
-idrepo.api.getuindetails=${mosip.idrepo.identity.url}/v1/identity/uin/{uin}
-
-mosip.kernel.auth.app.id=auth
-mosip.kernel.auth.client.id=mosip-auth-client
-mosip.kernel.auth.secret.key=${mosip.auth.client.secret}
-
-mosip.kernel.ida.app.id=ida
-mosip.kernel.ida.client.id=mosip-ida-client
-mosip.kernel.ida.secret.key=${mosip.ida.client.secret}
-
-## VID generator service
-mosip.kernel.vid.min-unused-threshold=100000
-mosip.kernel.vid.vids-to-generate=200000
-mosip.kernel.vid.time-to-release-after-expiry=5
-mosip.kernel.vid.pool-population-timeout=10000000
-kernel.vid.revoke-scheduler-type=cron
-kernel.vid.revoke-scheduler-seconds=0
-kernel.vid.revoke-scheduler-minutes=0
-kernel.vid.revoke-scheduler-hours=23
-kernel.vid.revoke-scheduler-days_of_month=*
-kernel.vid.revoke-scheduler-months=*
-kernel.vid.revoke-scheduler-days_of_week=*
-kernel.vid.isolator-scheduler-type=cron
-kernel.vid.isolator-scheduler-seconds=0
-kernel.vid.isolator-scheduler-minutes=0
-kernel.vid.isolator-scheduler-hours=*
-kernel.vid.isolator-scheduler-days_of_month=*
-kernel.vid.isolator-scheduler-months=*
-kernel.vid.isolator-scheduler-days_of_week=*
-
-## PRID properties
-mosip.kernel.prid.min-unused-threshold=1000
-mosip.kernel.prid.prids-to-generate=2000
-mosip.kernel.prid.pool-population-timeout=10000000
-mosip.kernel.prid.sequence-limit=3
-kernel.prid.revoke-scheduler-type=cron
-kernel.prid.revoke-scheduler-seconds=0
-kernel.prid.revoke-scheduler-minutes=0
-kernel.prid.revoke-scheduler-hours=23
-kernel.prid.revoke-scheduler-days_of_month=*
-kernel.prid.revoke-scheduler-months=*
-kernel.prid.revoke-scheduler-days_of_week=*
-
-## Database properties
-# Database hostname below is assuming postgres is running inside cluster in 'postgres' namespace
-# If database is external to production, provide the DNS or ip of the host and port 
-mosip.kernel.database.hostname=postgres-postgresql.postgres
-mosip.kernel.database.port=5432
-
-javax.persistence.jdbc.driver=org.postgresql.Driver
-hibernate.dialect=org.hibernate.dialect.PostgreSQL95Dialect
-hibernate.jdbc.lob.non_contextual_creation=true
-hibernate.hbm2ddl.auto=none
-hibernate.show_sql=false
-hibernate.format_sql=false
-hibernate.connection.charSet=utf8
-hibernate.cache.use_second_level_cache=false
-hibernate.cache.use_query_cache=false
-hibernate.cache.use_structured_entries=false
-hibernate.generate_statistics=false
-
-logging.level.org.hibernate.SQL=ERROR
-logging.level.org.hibernate.type=ERROR
-
-admin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-admin_database_username=kerneluser
-admin_database_password=${db.dbuser.password}
-
-syncjob_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-syncjob_database_username=masteruser
-syncjob_database_password=${db.dbuser.password}
-
-audit_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_audit
-audit_database_username=audituser
-audit_database_password=${db.dbuser.password}
-
-masterdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-masterdata_database_username=masteruser
-masterdata_database_password=${db.dbuser.password}
-
-uin.swagger.base-url=https://qa.mosip.io
-uin_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-uin_database_username=kerneluser
-uin_database_password=${db.dbuser.password}
-hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
-
-id_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-id_database_username=kerneluser
-id_database_password=${db.dbuser.password}
-
-vid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-vid_database_username=kerneluser
-vid_database_password=${db.dbuser.password}
-
-prid_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-prid_database_username=kerneluser
-prid_database_password=${db.dbuser.password}
-
-keymanager.persistence.jdbc.driver=org.postgresql.Driver
-keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_ida_src
-keymanager_database_password=${db.dbuser.password}
-keymanager_database_username= idauser
-keymanager.persistence.jdbc.schema=ida
-
-otpmanager_database_username = kerneluser
-otpmanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-otpmanager_database_password=${db.dbuser.password}
-
-syncdata_database_url=jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_master
-syncdata_database_username=masteruser
-syncdata_database_password=${db.dbuser.password}
-
-ridgenerator_database_username =regprcuser
-ridgenerator_database_url =jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_regprc
-ridgenerator_database_password=${db.dbuser.password}
-
-## Keycloak properties
-mosip.iam.base.url=${keycloak.internal.url}
-mosip.iam.base-url=${mosip.iam.base.url}
-mosip.iam.admin-realm-id=admin
-mosip.iam.default.realm-id=mosip
-mosip.iam.open-id-url=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/
-mosip.iam.realm.operations.base-url=${mosip.iam.base.url}/auth/admin/realms/{realmId}
-mosip.iam.admin-url=${mosip.iam.base.url}/auth/admin/
-mosip.iam.roles-extn-url=realms/mosip/roles
-mosip.iam.users-extn-url=realms/mosip/users
-mosip.iam.role-user-mapping-url=/{userId}/role-mappings/realm
-mosip.iam.role-based-user-url=realms/{realm}/roles/{role-name}/users
-keycloak.realm=registration-client
-keycloak.resource=account
-keycloak.auth-server-url=${mosip.iam.base.url}/auth
-keycloak.ssl-required=none
-keycloak.public-client=true
-keycloak.use-resource-role-mappings=true
-keycloak.verify-token-audience=true
-
-#This is the endpoint use by ui(browser) based applications to redirect to open-id system. This URL should be reachable through the browser.
-mosip.iam.authorization_endpoint=${keycloak.external.url}/auth/realms/{realmId}/protocol/openid-connect/auth
-
-mosip.iam.token_endpoint=${mosip.iam.base.url}/auth/realms/{realmId}/protocol/openid-connect/token
-mosip.authmanager.base-url=${mosip.kernel.authmanager.url}/v1/authmanager
-mosip.admin.login_flow.name=authorization_code
-mosip.admin.login_flow.response_type=code
-mosip.admin.login_flow.scope=cls
-mosip.admin.clientid=mosip-admin-client
-mosip.admin.clientsecret=${mosip.admin.client.secret}
-mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/
-mosip.admin_realm_id=mosip
-mosip.iam.master.realm-id=master
-mosip.iam.pre-reg_user_password=mosip
-
-## TODO: Below config is not needed anymore.  Need to remove init of db_3_DS in authmanager code. For now, we just
-## point to a valid db.
-#db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/keycloak
-db_3_DS.keycloak.ipaddress= jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel
-db_3_DS.keycloak.port=${mosip.kernel.database.port}
-db_3_DS.keycloak.username=kerneluser
-db_3_DS.keycloak.password=${db.dbuser.password}
-db_3_DS.keycloak.driverClassName=org.postgresql.Driver
-
-mosip.keycloak.admin.client.id=admin-cli
-mosip.keycloak.admin.user.id=admin
-mosip.keycloak.admin.secret.key=${keycloak.admin.password}
-
-mosip.iam.impl.basepackage=io.mosip.kernel.auth.defaultimpl
-mosip.auth.adapter.impl.basepackage=io.mosip.kernel.auth.defaultadapter
-
-
-master.search.maximum.rows=50
-mosip.level=2
-mosip.kernel.masterdata.audit-url= ${mosip.kernel.auditmanager.url}/v1/auditmanager/audits
-mosip.keycloak.max-no-of-users=20000
-
-## Register device
-# Keymanager runs in separate namespace "keymanager"
-mosip.kernel.sign-url=${mosip.kernel.keymanager.url}/v1/keymanager/sign
-masterdata.registerdevice.timestamp.validate=+10
-
-## Prereg
-mosip.kernel.prereg.realm-id=mosip
-mosip.kernel.prereg.client.id=mosip-prereg-client
-mosip.kernel.prereg.secret.key=${mosip.prereg.client.secret}
-
-## UIN scheduler
-kernel.uin.transfer-scheduler-type=cron
-kernel.uin.transfer-scheduler-seconds=0
-kernel.uin.transfer-scheduler-minutes=0
-kernel.uin.transfer-scheduler-hours=*
-kernel.uin.transfer-scheduler-days_of_month=*
-kernel.uin.transfer-scheduler-months=*
-kernel.uin.transfer-scheduler-days_of_week=*
-
-## UIN Auth adapter config
-auth.server.admin.validate.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/admin/validateToken
-
-
-## Proxy otp
-#mosip.kernel.auth.proxy-otp=false
-mosip.kernel.auth.proxy-otp-value=111111
-mosip.security.provider.name=SunPKCS11-pkcs11-proxy
-
-## identity schema backward compatability ########
-mosip.ui.spec.default.domain=registration-client
-
-## Security properties
-mosip.security.csrf-enable=false
-mosip.security.cors-enable=false
-mosip.security.origins=localhost:8080
-mosip.security.secure-cookie=false
-
-## ROOT key identifier
-mosip.root.key.applicationid=ROOT
-
-## Certificate signing algorithm
-mosip.kernel.certificate.sign.algorithm=SHA256withRSA
-
-## Default certificate params
-mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
-mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
-mosip.kernel.keymanager.certificate.default.organization=IITB
-mosip.kernel.keymanager.certificate.default.location=BANGALORE
-mosip.kernel.keymanager.certificate.default.state=KA
-mosip.kernel.keymanager.certificate.default.country=IN
-
-## Zero Knowledge Master & Public Key identifier.
-mosip.kernel.zkcrypto.masterkey.application.id=KERNEL
-mosip.kernel.zkcrypto.masterkey.reference.id=IDENTITY_CACHE
-mosip.kernel.zkcrypto.publickey.application.id=IDA
-mosip.kernel.zkcrypto.publickey.reference.id=PUBLIC_KEY
-mosip.kernel.zkcrypto.wrap.algorithm-name=AES/ECB/NoPadding
-mosip.kernel.zkcrypto.derive.encrypt.algorithm-name=AES/ECB/PKCS5Padding
-
-## Application Id for PMS master key.
-mosip.kernel.partner.sign.masterkey.application.id=PMS
-
-datastores=ldap_1_DS,db_1_DS,db_2_DS
-
-## Partner Management Service allowed partner domains
-mosip.kernel.partner.allowed.domains=AUTH,DEVICE,FTM,MISP
-
-application.id=IDA
-application.name=ID-Authentication
-identity-cache.reference.id=IDENTITY_CACHE
-mosip.sign.applicationid=${application.id}
-mosip.sign.refid=SIGN
-# mosip.kernel.zkcrypto.masterkey.reference.id=IDENTITY_CACHE
-mosip.kernel.keymanager.autogen.appids.list=ROOT,${application.id},${mosip.sign.applicationid}:${mosip.sign.refid},${application.id}:${mosip.kernel.zkcrypto.masterkey.reference.id},IDA_KYC_EXCHANGE,IDA_KEY_BINDING,IDA_VCI_EXCHANGE
-## Random keys required for ZK encrypt.
-zkcrypto.random.key.generate.count=0
-mosip.kernel.keymanager.autogen.basekeys.list=
-
-# Keymanager service keystore cache properties
-mosip.kernel.keymanager.keystore.keyreference.enable.cache=false
-
-# API to get machine based on machine id
-mosip.kernel.syncdata-service-machine-url=${mosip.kernel.masterdata.url}/v1/masterdata/machines/%s/eng
-
-# Flag added to choose client crypto implementation in syncdata service
-# Needs to be updated to true in prod deployments
-mosip.syncdata.tpm.required=false
-
-mosip.kernel.registrationclient.app.id=registrationclient
-mosip.kernel.registrationclient.client.id=mosip-reg-client
-# env variable
-mosip.kernel.registrationclient.secret.key=${mosip.reg.client.secret}
-
-# API to fetch auth token and refresh token used by syncdata-service
-mosip.kernel.authtoken.NEW.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/useridPwd
-mosip.kernel.authtoken.OTP.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/internal/userotp
-mosip.kernel.authtoken.REFRESH.internal.url=${mosip.kernel.authmanager.url}/v1/authmanager/authorize/internal/refreshToken/registrationclient
-mosip.kernel.auth.sendotp.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/sendotp
-
-# Sample Additional configuration required for real HSM configured though JCE.
-# Add the required JCE properties with prefix. - "mosip.kernel.keymanager.hsm.jce" for the property key
-# mosip.kernel.keymanager.hsm.jce.className=io.mosip.keymanager.hsm.impl.AnyHSMKeyStoreImpl
-# mosip.kernel.keymanager.hsm.jce.keyStoreType=HSMKeyStoreType
-# mosip.kernel.keymanager.hsm.jce.keyStoreFile=AnyRequiredKeyStoreFile
-# mosip.kernel.keymanager.hsm.jce.localKeyStorePwd=HSMPartitionPassword
-
-## syncdata-service websub configuration (cacert sync)
-syncdata.websub.topic.ca-cert=CA_CERTIFICATE_UPLOADED
-# Secret for partner CA certificate CRUD callback
-syncdata.websub.callback.secret.ca-cert=secret
-# Callback url for partner CA certificate CRUD event
-syncdata.websub.callback.url.path.ca-cert=/callback/partner/ca_certificate
-syncdata.websub.callback.url.ca-cert=${mosip.kernel.syncdata.url}/v1/syncdata/callback/partner/ca_certificate
-# Number of retires on subscription failure
-syncdata.websub.resubscription.retry.count=3
-# Delay (in milliseconds) for subscription on application startup to avoid failure during intent verification by hub.
-subscriptions-delay-on-startup=120000
-
-
-# Pause & resume api proeprties
-PACKET_RESUME_API=${mosip.api.internal.url}/registrationprocessor/v1/workflowmanager/workflowaction
-PACKET_PAUSE_API=${mosip.api.internal.url}/registrationprocessor/v1/workflowmanager/workflow/search
-KEYBASEDTOKENAPI=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
-
-## resubscription and subscription initial delay for masterdata service
-masterdata.websub.resubscription.delay.millis=48000000
-masterdata.subscriptions-delay-on-startup=120000
-
-# The time interval in seconds to schedule subscription of topics which is done as a
-# work-around for the bug: MOSIP-9496. By default the
-# this property value is set to 0 that disables this workaround.
-# To enable the resubscrition scheduling, this property should be assigned with a positive
-# number like 1 * 60 * 60 * 1000 = 3600000 for one hour
-syncdata.websub.resubscription.delay.millis=48000000
-
-## Admin UI
-## this pattern like --> display column : configKey. 
-## We can provide multiple values with ";" separated 
-mosip.admin.ui.configs=version:${aplication.configuration.level.version};locationHierarchyLevel:${mosip.recommended.centers.locCode};mandatoryLanguages:${mosip.mandatory-languages};optionalLanguages:${mosip.optional-languages};supportedLanguages: ${mosip.mandatory-languages},${mosip.optional-languages};leftToRightOrientation:${mosip.left_to_right_orientation};rightToLeftOrientation:${mosip.right_to_left_orientation};countryCode:${mosip.country.code};filterValueMaxRecords:${mosip.kernel.filtervalue.max_columns};filterValueMaxCount:{"default":${mosip.kernel.filtervalue.max_columns},"registrationcenters":500,"locations":300}
-
-# Flag to identify the support of no thumbprint in 1.1.3 version. 
-# Added this for backward compatability. default is false, means support is not required.
-# Make it to true if support is required.
-mosip.kernel.keymanager.113nothumbprint.support=false
-
-## Used to get IAM user details.
-mosip.kernel.masterdata.auth-manager-base-uri=${mosip.kernel.authmanager.url}/v1/authmanager
-mosip.kernel.masterdata.auth-user-details=/userdetails
-
-
-## scheduler do it's job at 2am
-scheduling.job.cron=0 0 2 * * ?
-
-# masterdata swagger openApi
-#openapi.service.servers[0].url=${mosip.api.internal.url}/${server.servlet.context-path:${server.servlet.path:}}
-#openapi.service.servers[0].description=For Swagger
-
-#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.iam.adapter.appid=admin
-mosip.iam.adapter.clientid=mosip-admin-client
-mosip.iam.adapter.clientsecret=${mosip.admin.client.secret}
-
-#AdminMaster endpoints to access without authentication
-mosip.service-context=/v1/masterdata
-mosip.service.end-points={cipher}dd5737cb38b0d354e925a031d1662cae45feb891135577d72d75017f71a3c72d38d157158eb9e12d8e51ffb3e66e1397eb0e20040939ad145363a00c458f247c53a712c564467770d08b0cab22b967ba71d09e75a4c53492f23bb29e4c529a87787e7652c720b8eb7ce61ffc4ea6efe89be9d85034fcb135582af662290eacc0392ea96c15fef0a20694cd24c553ec3325e1450e4fb6ea773b200fcdc5d097014e7ff1794d93330c40f50fce4c20d15fc9b0ddced67877cf51ecf38d7b3fb352e176fe12956e0e2e1d43ac77dd200085dac1d3e3fe49475d5077b6bff6162c53a2d00fdbc5cd12a0aa983165916cb9cd72b2eff9c8bf7bc92bea2619fc0900b5936655a16a96fe8b188fa06a625760f78b1273a66137228095305ca32093b1fda5faac87b1ae172caa990776fa6dc52f6f1863848b21e42eb1af5ee530f12af7ef94aa8bccb254fe65c69870338e7bae1a95f344c9fcb806ac7801466168c81de7262e1a0bf49c62ee0c3676babbc718ba790e7b9428482443f6e612c9ef497702a79c9a49d47ab98d97a868e7f2ce1b7febc3d09afadbf5555e21234290aaaef94681c78326d7c178316b7d211f2a72dfb5a39e6badda11d4ee42b79c003fdf1d83d72aee288f6c8ad6e5f66c2dae350d50f5aec39360b8cce5e3682ef6f8adb7a6377a9580d420944f98c98390d3a2f7a0682d26991a60e3ab79401c63233c5a18b1902f715ebf595107563d9a60d3280c1baed1777e894660ea1e05b6433e2653af499b286fdb6380b29d32953bd23de2ec8f2c441b0e22c3877f85aa23046e2830fb9f94dced2ee55f107c8160f05bfa5436620898b36d18ae26bd4c7400e3d51f85bad2a81665aa7baf7d10cb792067b600fb0277fb0119aa9186c3d1a2079c56ca999ce1d4930b9ea77f80d88bb2afbb93002b77c3d5f5a895822dacc6038112160bf280d392599c268d504aff4e933fa4308ab50d25793c93fd2a51b1c7d2938219ff84202ae286cb1b9650ec5dfd79dabad2acf2b44fbc08170c097c93a9d663b4c130392bd536d86a87cd11ab074d3db666dcf2f40349d1056ce2708cfcfbcdd868a8073acd9a2241159e64cae84eceabd8acb83afbeeafa822defd7616bfd5801f1976392872f61e637bc21c3db4fe30d6c1de644d2291ce9d48ff1afff9f1ab596620553fd669cfa38dc5ccea6286abbcd93ca8b434b2b6d42129d72e7daa91001d43005d781369c054b36a6158d4f2cc6c6136565733b13cd7d306c715809f2d9a5024abcffbc0ef3b58585b881f6509bd1876b923494445a2a430ddf5e517b49b65647f54a2e10a002224269c78a38b6ddbddc02176d93e1e280cfdefc317efe361babe0eb3688c9d3406c4ef7a1851ddc7d511703b1d4e2c449792abd523c6eadfbfea13cf862478d75196f8133deadc31222fa6be3cd1cac015f2af1865d834bda4e7f3352cc72116d732ed384a0b94237810bf5909ea453f9052aeb0ae6d492e7ed4d2c33145e38a79742ca23294f3dc89e3cafcfbc8349aae712172bd661137ad6179df3bcc1f03b80af7c82b8a1aa91140086e663ff257d8084680c00c9a31f9c96e0b3d350192851c0c279b8159070e5f1f06153d132447fddbbf1dbb7378b84c38dc1c5f2f8cbbfcd8a478f78b1ed6ed44a0d81a88be605b66a5caad776ab1ae7c8a88362efef9b43d261dd292324e173606fabd3b8ade5fce14671d274d33e93f975d12071473fa7b0289a99a151ce67b3070f44001b5d74b3087ad1fbd071605fd62fa5f86454b881fd1ad86bd565b33248d47100d862dcc57dc0e9f673e25b0845b27d06b38c30ca975efb8031444459d776f6221a90fa51b971a4054332411de943afd8b
-
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-##validity time of mosip-signed certificates
-
-
-## Roles
-mosip.role.admin.masterdata.getapplicationconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getconfigs=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getapplicationtypeslangcode=PRE_REGISTRATION_ADMIN,RESIDENT,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.getapplicationtypescodelangcode=RESIDENT,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.postapplicationtypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgetbiometricattributesbyauthtype=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postbiometricattributes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getbiometrictypes=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getbiometrictypeslangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getbiometrictypescodelangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postbiometrictypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordswords=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putblocklistedwordsdetails=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deleteblocklistedwordsword=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getblocklistedwordsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postblocklistedwordsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchblocklistedwords=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdeviceslanguagecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.getdeviceslanguagecodedevicetype=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postdevices=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdevices=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdevicesmappeddevicesregcenterid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdevicesdecommissiondeviceid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchdevices=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdeviceshistoriesidlangcodeeffdatetimes=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.putdeviceprovider=GLOBAL_ADMIN,ZONAL_ADMIN,PARTNER_ADMIN,PARTNER,AUTH_PARTNER,DEVICE_MANAGER,DEVICE_PROVIDER
-mosip.role.admin.masterdata.postdeviceprovidermanagementvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.deletedevicederegisterdevicecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putdeviceupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsdevicetypecode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deletedevicespecificationsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdevicespecificationsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicespecificationssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicespecificationsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchdevicespecifications=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdevicetypesall=ZONAL_ADMIN,GLOBAL_ADMIN,DEVICE_MANAGER,PRE_REGISTRATION_ADMIN,DEVICE_PROVIDER,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicetypessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdevicetypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchdevicetypes=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdocumentcategorieslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,DEVICE_MANAGER,DEVICE_PROVIDER,PARTNER,PARTNER_ADMIN,RESIDENT,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deletedocumentcategoriescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriesall=PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdocumentcategoriessearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdocumentcategoriesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchdocumentcategories=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deletedocumenttypescode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdocumenttypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdocumenttypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchdocumenttypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getdocumenttypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postdynamicfields=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putdynamicfields =ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchdynamicfieldsall=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchdynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deletedynamicfields=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletedynamicfieldsid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postdynamicfieldssearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.putfoundationaltrustprovider=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER
-mosip.role.admin.masterdata.postgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putgendertypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletegendertypescode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getgendertypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,CENTRAL_ADMIN
-mosip.role.admin.masterdata.postgendertypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postgendertypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidays=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayid=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getholidaysholidayidlangcode=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL,PRE_REGISTRATION,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchholidays=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deleteholidays=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getholidaysall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postholidayssearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postholidaysfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getholidaysmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postidtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getindividualtypesall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,CENTRAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postindividualtypessearch=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postindividualtypesfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putindividualtypes=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postlanguages=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocations=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchlocations=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.deletelocationslocationcode=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postlocationssearch=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postlocationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN,REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getlocationslevellangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationsmissingidslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getlocationhierarchylevels=INDIVIDUAL,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,default,GLOBAL_ADMIN,PRE_REGISTRATION,REGISTRATION_ADMIN,REGISTRATION_OPERATOR
-mosip.role.admin.masterdata.getmachinesidlangcode=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.admin.masterdata.getmachineslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getmachines=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.deletemachinesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmachinesmappedmachinesregcenterid=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_CLIENT,REGISTRATION_OFFICER
-mosip.role.admin.masterdata.postmachinessearch=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putmachinesdecommissionmachineid=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachines=GLOBAL_ADMIN,ZONAL_ADMIN,RESIDENT,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putmachines=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchmachines=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getmachineshistoriesidlangcode=REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchmachinespecifications=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deletemachinespecificationsid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getmachinespecificationsall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinespecificationssearch=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinespecificationsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchmachinetypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getmachinetypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinetypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postmachinetypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getmodulesidlangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getmoduleslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putmosipdeviceservice=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postpacketrejectionreasonsreasoncategory=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postpacketrejectionreasonsreasonlist=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getpacketrejectionreasonsreasoncategorycodelangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getpacketrejectionreasons=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.postpacketresume=REGISTRATION_ADMIN
-mosip.role.admin.masterdata.postpacketsearch=REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getpossiblevaluesfieldname=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.postregistereddevices=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postregistereddevicesderegister=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putregistereddevicesupdatestatus=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getgetlocspecificregistrationcenterslangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetregistrationcenterholidayslangcode=INDIVIDUAL,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getgetcoordinatespecificregistrationcenters=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getregistrationcentersidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getregistrationcenters=INDIVIDUAL,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcentersidlangcodehierarchylevel=INDIVIDUAL,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.getregistrationcenterspagelangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getregistrationcentersvalidateidlangcode=INDIVIDUAL,REGISTRATION_PROCESSOR,ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,PRE_REGISTRATION
-mosip.role.admin.masterdata.deleteregistrationcentersregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterslangcodehierarchylevelnames=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,INDIVIDUAL,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.getregistrationcentersall=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postregistrationcenterssearch=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN
-mosip.role.admin.masterdata.postregistrationcentersfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN,REGISTRATION_ADMIN
-mosip.role.admin.masterdata.postregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentersdecommission=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchregistrationcenters=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcenterslanguage=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putregistrationcentersnonlanguage=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentersmissingids=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.getgetzonespecificregistrationcenterslangcode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getregistrationcenterdevicehistoryregcenteriddeviceid=REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getregistrationcentershistoryregistrationcenterid=ZONAL_ADMIN,GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deleteregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getregistrationcentertypesall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,REGISTRATION_PROCESSOR,REGISTRATION_CLIENT,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postregistrationcentertypesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postregistrationcentertypessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchregistrationcentertypes=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getregistrationcentertypesmissingidslangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getgetregistrationmachineusermappinghistory=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_PROCESSOR,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putidschemapublish=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteidschema=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getidschemaall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getidschemalatest=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_CLIENT,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,RESIDENT,ID_REPOSITORY
-mosip.role.admin.masterdata.posttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.puttemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.deletetemplatesid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatestemplatetypecodescode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,INDIVIDUAL,PRE_REGISTRATION,ID_AUTHENTICATION,AUTH,PRE_REGISTRATION_ADMIN,RESIDENT,PARTNER,AUTH_PARTNER,PARTNER_ADMIN,DEVICE_PROVIDER,DEVICE_MANAGER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,PRINT_PARTNER,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.gettemplatesall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.posttemplatessearch=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.posttemplatesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.patchtemplates=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.gettemplatesmissingidslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.posttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttemplatefileformats=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletetemplatefileformatscode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatefileformatscodelangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettemplatefileformatslangcode=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchtemplatefileformats=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttemplatetypes=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttitle=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttitle=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.puttitlecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.gettitleall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttitlesearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.posttitlefiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.putuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.postuispecpublish=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.deleteuispec=GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getuispecall=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN,PRE_REGISTRATION_ADMIN
-mosip.role.admin.masterdata.getusersid=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getusers=PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,ZONAL_ADMIN,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_PROCESSOR
-mosip.role.admin.masterdata.getusercentermapping=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.patchusercentermapping=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deleteusersid=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getuserdetails=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getuserssearch=PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getusersideffdtimes=INDIVIDUAL,PRE_REGISTRATION_ADMIN,ID_AUTHENTICATION,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,ZONAL_ADMIN,PRE_REGISTRATION,RESIDENT
-mosip.role.admin.masterdata.postvaliddocuments=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletevaliddocumentsdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getvaliddocumentsall=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.postvaliddocumentssearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postvaliddocumentsfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putvaliddocumentsmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.putvaliddocumentsunmapdoccategorycode=GLOBAL_ADMIN,ZONAL_ADMIN,MASTERDATA_ADMIN
-mosip.role.admin.masterdata.getzoneshierarchylangcode=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneszonename=GLOBAL_ADMIN,ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
-mosip.role.admin.masterdata.getzonesauthorize=GLOBAL_ADMIN,PRE_REGISTRATION_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postzonesfiltervalues=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.putzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletezoneuseruseridzonecode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getzoneuserhistoryuserid=ZONAL_ADMIN,REGISTRATION_OFFICER,PRE_REGISTRATION_ADMIN,REGISTRATION_PROCESSOR,PRE_REGISTRATION,REGISTRATION_SUPERVISOR,RESIDENT,INDIVIDUAL,ID_AUTHENTICATION
-mosip.role.admin.masterdata.patchzoneuser=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.postzoneusersearch=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdocumentcategoriesmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.getdynamicfieldmissingidslangcode=GLOBAL_ADMIN,ZONAL_ADMIN
-mosip.role.admin.masterdata.deletelanguagescode=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.patchlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.postdynamicfieldsfiltervalues=ZONAL_ADMIN,GLOBAL_ADMIN
-mosip.role.admin.masterdata.putlanguages=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,GLOBAL_ADMIN
-mosip.role.kernel.postemailsend=ZONAL_ADMIN,PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postsmssend=PRE_REGISTRATION_ADMIN,AUTH,ID_AUTHENTICATION,RESIDENT,REGISTRATION_ADMIN,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,REGISTRATION_SUPERVISOR,INDIVIDUAL
-mosip.role.kernel.postotpgenerate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.getotpvalidate=PRE_REGISTRATION_ADMIN,INDIVIDUAL,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,ID_AUTHENTICATION,AUTH,RESIDENT,REGISTRATION_OFFICER
-mosip.role.kernel.getgenerateridcenteridmachineid=REGISTRATION_PROCESSOR,RESIDENT
-mosip.role.kernel.postaudits=MASTERDATA_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION,PRE_REGISTRATION_ADMIN,RESIDENT,ZONAL_ADMIN,GLOBAL_ADMIN,ID_REPOSITORY,HOTLIST_ADMIN
-mosip.role.keymanager.postcssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postcsverifysign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.posttpmencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.posttpmdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.posttpmsigningpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.posttpmencryptionpublickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST,HOTLIST_ADMIN
-mosip.role.keymanager.postdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,ID_REPOSITORY,CREDENTIAL_REQUEST,HOTLIST_ADMIN
-mosip.role.keymanager.postencryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptwithpin=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postencryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postdecryptdt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratemasterkeyobjecttype=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.getgetcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,KEY_MAKER
-mosip.role.keymanager.postgeneratecsr=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadcertificate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postuploadotherdomaincertificate=PARTNER_ADMIN,ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postgeneratesymmetrickey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.putrevokekey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postmigratebasekey=KEY_MIGRATION_ADMIN
-mosip.role.keymanager.getzktempcertificate=KEY_MIGRATION_ADMIN
-mosip.role.keymanager.postlicensegenerate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postmigratezkkeys=KEY_MIGRATION_ADMIN
-mosip.role.keymanager.postuploadcacertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN
-mosip.role.keymanager.postuploadpartnercertificate=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
-mosip.role.keymanager.getgetpartnercertificatepartnercertid=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
-mosip.role.keymanager.postverifycertificatetrust=ZONAL_ADMIN,GLOBAL_ADMIN,PARTNER_ADMIN,PARTNER
-mosip.role.keymanager.postsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postvalidate=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postpdfsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_REQUEST
-mosip.role.keymanager.postjwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.getuinpartnercode=ZONAL_ADMIN,GLOBAL_ADMIN,ID_AUTHENTICATION,RESIDENT
-mosip.role.keymanager.postzkencrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postzkdecrypt=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postzkreencryptrandomkey=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-mosip.role.keymanager.postjwssign=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT,CREDENTIAL_ISSUANCE
-mosip.role.keymanager.postcwtsign=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
-mosip.role.keymanager.postcwtdecode=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
-mosip.role.keymanager.postcwtverify=ZONAL_ADMIN,GLOBAL_ADMIN,RESIDENT,PRINT_PARTNER,CREDENTIAL_ISSUANCE
-mosip.role.keymanager.postgenerateargon2hash=ZONAL_ADMIN,GLOBAL_ADMIN,INDIVIDUAL,ID_AUTHENTICATION,TEST,REGISTRATION_ADMIN,REGISTRATION_SUPERVISOR,REGISTRATION_OFFICER,REGISTRATION_PROCESSOR,PRE_REGISTRATION_ADMIN,RESIDENT
-
-mosip.kernel.keymanager.jwtsign.validate.json=false
-
-auth.allowed.urls=http://localhost:5000/
-
-##These properties are used for validation in kernel-masterdata-service
-#For example, Arabic needs to be added along with english
-#the unicode range of Arabic (Range: 0600–06FF) has to be added inside the square brackets with \u tag
-#the final value in this case might look like [^a-z\u0600-\u06FF]
-mosip.kernel.masterdata.code.validate.regex=[^a-z0-9]
-mosip.kernel.masterdata.name.validate.regex=[^a-z]
-# query param usd to refer url to redirect after logout
-mosip.iam.post-logout-uri-param-key=post_logout_redirect_uri
-# end session endpoint in OIDC
-mosip.iam.end-session-endpoint-path=/protocol/openid-connect/logout
-mosip.kernel.keymgr.hsm.health.check.enabled=false
-
-## HSM keymigration properties
-mosip.kernel.keymanager.keymigration.auth.url=${mosip.kernel.authmanager.url}/v1/authmanager/authenticate/clientidsecretkey
-mosip.kernel.keymanager.keymigration.auth.appId=ida
-# <clientId with KEY_MIGRATION_ADMIN role>
-mosip.kernel.keymanager.keymigration.auth.cliendId=mosip-migration-client
-mosip.kernel.keymanager.keymigration.auth.secretKey=${mosip.migration.client.secret}
-mosip.kernel.keymanager.keymigration.getcertificate.url=http://keymanager-ida.ida/v1/keymanager/getCertificate
-mosip.kernel.keymanager.keymigration.uploadkey.url=http://keymanager-ida.ida/v1/keymanager/migrateBaseKey
-mosip.kernel.keymanager.keymigration.getzktempcertificate.url=http://keymanager-ida.ida/v1/keymanager/getZKTempCertificate
-mosip.kernel.keymanager.keymigration.zkkeys.migration.batch.size=500
-mosip.kernel.keymanager.keymigration.zkUploadkey.url=http://keymanager-ida.ida/v1/keymanager/migrateZKKeys

From 3e656aa2343d4d05133c0dc0a2c6e0cc70928d47 Mon Sep 17 00:00:00 2001
From: techno-467 <prafulrakhade02@gmail.com>
Date: Mon, 17 Jun 2024 18:30:11 +0530
Subject: [PATCH 1350/1358] [DSD-5498] revert back pkcs12 changes from
 esignet-default.properties, id-authentication-default.properties and
 kernel-default.properties

---
 esignet-default.properties | 165 ++++++++-----------------------------
 identity-mapping.json      |   4 +-
 2 files changed, 37 insertions(+), 132 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 432177de530..c3afba5b8ed 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -35,11 +35,11 @@ mosip.esignet.supported-id-regex=\\S*
 mosip.esignet.id-token-expire-seconds=3600
 mosip.esignet.access-token-expire-seconds=3600
 # By default, only 2 link codes can be active, and the time period it can be active is defined here, default value is 1 minute
-mosip.esignet.link-code-expire-in-secs=600
+mosip.esignet.link-code-expire-in-secs=60
 # Number of link code allowed to be generated in a transaction, the default value is 10
 mosip.esignet.generate-link-code.limit-per-transaction=10
 # Time to complete consent after successful authentication, the default value is 120
-mosip.esignet.authentication-expire-in-secs=600
+mosip.esignet.authentication-expire-in-secs=120
 
 # Auth challenge type & format mapping. Auth challenge length validations for each auth factor type.
 mosip.esignet.auth-challenge.OTP.format=alpha-numeric
@@ -56,7 +56,7 @@ mosip.esignet.auth-challenge.BIO.max-length=300000
 
 mosip.esignet.auth-challenge.WLA.format=jwt
 mosip.esignet.auth-challenge.WLA.min-length=100
-mosip.esignet.auth-challenge.WLA.max-length=800
+mosip.esignet.auth-challenge.WLA.max-length=1500
 
 mosip.esignet.auth-challenge.KBA.format=base64url-encoded-json
 mosip.esignet.auth-challenge.KBA.min-length=50
@@ -74,11 +74,8 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
   '${server.servlet.path}/authorization/v3/authenticate', \
   '${server.servlet.path}/authorization/auth-code'}
 
-#This property is used for captcha validation and allowed values are send-otp and pwd.
-#captcha validation is enabled for send-otp and pwd.
-mosip.esignet.captcha.required=
-
-
+# List of auth factors which require captcha validation.
+mosip.esignet.captcha.required.auth-factors={'PWD'}
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 
@@ -123,24 +120,16 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 ## ------------------------------------------- Integrations ------------------------------------------------------------
 
-mosip.esignet.integration.scan-base-package=io.mosip.esignet.mock.integration,io.mosip.authentication.esignet.integration
+mosip.esignet.integration.scan-base-package=io.mosip.authentication.esignet.integration,io.mosip.esignet.mock.integration
 mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
-mosip.esignet.integration.authenticator=MockAuthenticationService
 mosip.esignet.integration.authenticator=IdaAuthenticatorImpl
 mosip.esignet.integration.key-binder=IdaKeyBinderImpl
 mosip.esignet.integration.audit-plugin=IdaAuditPluginImpl
 mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
-#mosip.esignet.integration.scan-base-package=io.mosip.esignet.sunbirdrc.integration.service,io.mosip.esignet.mock.integration
-#mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl
-#mosip.esignet.integration.authenticator=SunbirdRCAuthenticationService
-#mosip.esignet.integration.key-binder=MockKeyBindingWrapperService
-#mosip.esignet.integration.audit-plugin=LoggerAuditService
-#mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
-#mosip.esignet.integration.vci-plugin=SunbirdRCVCIssuancePlugin
-
 # captcha validator
+mosip.esignet.send-otp.captcha-required=true
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}
@@ -185,8 +174,8 @@ mosip.esignet.mock.vciplugin.verification-method=${mosip.esignet.vci.authn.jwk-s
 mosip.esignet.supported.authorize.scopes={'Manage-Identity-Data','Manage-VID','Manage-Authentication','Manage-Service-Requests','Manage-Credentials'}
 mosip.esignet.supported.openid.scopes={'profile','email','phone'}
 mosip.esignet.openid.scope.claims={'profile' : {'name','address','gender','birthdate','picture','email','phone_number'},'email' : {'email'}, 'phone' : {'phone_number'}}
-mosip.esignet.supported.credential.scopes={'mock_identity_vc_ldp', 'mosip_identity_vc_ldp','sunbird_rc_insurance_vc_ldp'}
-mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'mosip_identity_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'sunbird_rc_insurance_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential'}
+mosip.esignet.supported.credential.scopes={'mock_identity_vc_ldp', 'mosip_identity_vc_ldp'}
+mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', 'mosip_identity_vc_ldp': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential'}
 
 ## supported authorization processing flow to be used, Currently only supports Authorization Code Flow.
 mosip.esignet.supported.response.types={'code'}
@@ -235,18 +224,17 @@ mosip.esignet.cache.security.algorithm-name=AES/ECB/PKCS5Padding
 
 mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction,vcissuance
 
-spring.cache.type=redis
-spring.cache.cache-names=${mosip.esignet.cache.names}
-spring.redis.host=redis-master-0.redis-headless.redis.svc.cluster.local
-spring.redis.port=6379
-spring.redis.password=${redis.password}
+#spring.cache.type=redis
+#spring.cache.cache-names=${mosip.esignet.cache.names}
+#spring.redis.host=localhost
+#spring.redis.port=6379
 management.health.redis.enabled=false
 
 # 'simple' cache type is only applicable only for Non-Production setup
-#spring.cache.type=simple
+spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
 
-# Cache size setup is applicable only for 'simple' cache type. 
+# Cache size setup is applicable only for 'simple' cache type.
 # Cache size configuration will not be considered with 'Redis' cache type
 mosip.esignet.cache.size={'clientdetails' : 200, \
 'preauth': 200, \
@@ -264,15 +252,15 @@ mosip.esignet.cache.size={'clientdetails' : 200, \
 
 # Cache expire in seconds is applicable for both 'simple' and 'Redis' cache type
 mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
-'preauth': 600,\
+'preauth': 300,\
 'authenticated': ${mosip.esignet.authentication-expire-in-secs}, \
-'authcodegenerated': 600, \
+'authcodegenerated': 60, \
 'userinfo': ${mosip.esignet.access-token-expire-seconds}, \
 'linkcodegenerated' : ${mosip.esignet.link-code-expire-in-secs}, \
-'linked': 600, \
+'linked': 120, \
 'linkedcode': ${mosip.esignet.link-code-expire-in-secs}, \
 'linkedauth' : ${mosip.esignet.authentication-expire-in-secs}, \
-'consented': 600, \
+'consented': 60, \
 'authtokens': 86400, \
 'bindingtransaction': 600, \
 'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
@@ -282,7 +270,7 @@ mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
 mosip.esignet.domain.url=https://${mosip.esignet.host}
 mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
 
-# This property holds ./wellknown/jwks.json URL, 
+# This property holds ./wellknown/jwks.json URL,
 # for local deployments without esignet-ui nginx change the value to ${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
 mosip.esignet.jwks-uri=${mosip.esignet.domain.url}/.well-known/jwks.json
 
@@ -318,7 +306,7 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'display_values_supported' : ${mosip.esignet.supported.ui.displays}, \
   \ 'subject_types_supported' : { 'pairwise' }, \
   \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
-  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics', 'mosip:idp:acr:knowledge'},\
+  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
   \ 'request_parameter_supported' : false, \
   \ 'claims_locales_supported' : {'en'}, \
   \ 'ui_locales_supported' : {'en'} }
@@ -411,40 +399,36 @@ mosip.kernel.keymgr.hsm.health.check.encrypt=true
 # 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property
 # 3. If esignet is deployed with MOSIP IDA, then 'resend.otp.delay.secs' must be the same as 'mosip.kernel.otp.expiry-time'
 
-mosip.esignet.ui.wallet.config={{'wallet.name': 'walletName', 'wallet.logo-url': '/images/qr_code.png', 'wallet.download-uri': '#', \
+mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
  'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}
 
 mosip.esignet.ui.signup.config={'signup.banner': true, 'signup.url': 'https://${mosip.signup.host}/signup'}
 
 mosip.esignet.ui.forgot-password.config={'forgot-password': true, 'forgot-password.url': 'https://${mosip.signup.host}/reset-password'}
 
-## Configuration required to display KBI form. 
-# individual-id-field is set with field id which should be considered as an individual ID in the authenticate request.
-# form-details holds the list of field details like below:
-# id -> unique field Id, type -> holds datatype, format -> only supported for date fields, regex -> pattern to validate the input value, maxLength -> number of allowed characters
-# Example: mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id': '${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^\\s*[+-]?(\\d+|\\d*\\.\\d+|\\d+\\.\\d*)([Ee][+-]?\\d*)?\\s*$'},{'id':'fullName', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^[A-Za-z\\s]{1,}[\\.]{0,1}[A-Za-z\\s]{0,}$'},{'id':'dob', 'type':'date', 'format':'dd/mm/yyyy'}}
-mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id':'policyNumber', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^\\s*[+-]?(\\d+|\\d*\\.\\d+|\\d+\\.\\d*)([Ee][+-]?\\d*)?\\s*$'},{'id':'fullName', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '\\S*'},{"id":"dob", "type":"date", "format":"dd/mm/yyyy"}}
-mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=policyNumber
-
-## Configuration Map input to UI at the start of every transaction.
+# username.prefix -> Prefix to be appended to the username, eg: if the username is phone_number then the prefix could be the country code
+# username.postfix -> This is required only when a postfix should be automatically appended to the input username
+# username.regex -> Regex to be used to validate the input username
+# auth.factor.kba.individual-id-field -> Field ID to be used as username in the authenticate API, Must be one of the field defined in `auth.factor.kba.field-details`
+# auth.factor.kba.field-details -> List of form fields used to display for Knowledge-based authentication. eg: {{"id":"policyNumber", "type":"text", "format":""},{"id":"fullName", "type":"text", "format":""}}
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
   'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
-  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : '${mosip.esignet.captcha.required}', \
+  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'otp,pwd', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': '4501-4600', \
-  'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \
-  'password.max-length': 20, \
+  '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': '^[0-9]{10,30}$',\
   'username.prefix': '', \
   'username.postfix': '', \
-  'username.max-length': 16, \
+  'username.max-length': 9, \
   '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}',\
-  'auth.factor.kba.field-details': ${mosip.esignet.authenticator.default.auth-factor.kba.field-details} }
+  'auth.factor.kba.individual-id-field' : '',\
+  'auth.factor.kba.field-details': {} }
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
 # Used to verify audience in the PoP JWT
@@ -463,7 +447,7 @@ mosip.esignet.vci.key-values={\
               'credential_issuer': '${mosip.esignet.vci.identifier}', 	\
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/vci/credential', \
               'credentials_supported': {\
-                     {\
+                    {\
                       'format': 'ldp_vc',\
                       'id': 'MockVerifiableCredential_ldp', \
                       'scope' : 'mock_identity_vc_ldp',\
@@ -482,34 +466,6 @@ mosip.esignet.vci.key-values={\
                                     'logo': {'url': '${mosipbox.public.url}/logo.png', 'alt_text': 'a square logo of a MOSIP'},\
                                     'background_color': '#12107c',\
                                     'text_color': '#FFFFFF'}}\
-                     },\
-                      {\
-                      'format': 'ldp_vc',\
-                      'id': 'InsuranceCredential', \
-                      'scope' : 'sunbird_rc_insurance_vc_ldp',\
-                      'cryptographic_binding_methods_supported': {'did:jwk'},\
-                      'cryptographic_suites_supported': {'Ed25519Signature2020'},\
-                      'proof_types_supported': {'jwt'},\
-                      'credential_definition': {\
-                        'type': {'VerifiableCredential','InsuranceCredential'},\
-                        'credentialSubject': {\
-                          'fullName': {'display': {{'name': 'Name','locale': 'en'}}}, \
-                          'mobile': {'display': {{'name': 'Phone Number','locale': 'en'}}},\
-                          'dob': {'display': {{'name': 'Date of Birth','locale': 'en'}}},\
-                          'gender': {'display': {{'name': 'Gender','locale': 'en'}}},\
-                          'benefits': {'display': {{'name': 'Benefits','locale': 'en'}}},\
-                          'email': {'display': {{'name': 'Email Id','locale': 'en'}}},\
-                          'policyIssuedOn': {'display': {{'name': 'Policy Issued On','locale': 'en'}}},\
-                          'policyExpiresOn': {'display': {{'name': 'Policy Expires On','locale': 'en'}}},\
-                          'policyName': {'display': {{'name': 'Policy Name','locale': 'en'}}},\
-                          'policyNumber': {'display': {{'name': 'Policy Number','locale': 'en'}}}\
-                         }},\
-                        'display': {{'name': 'Sunbird RC Insurance Verifiable Credential', \
-                                    'locale': 'en', \
-                                    'logo': {'url': 'https://sunbird.org/images/sunbird-logo-new.png', 'alt_text': 'a square logo of a Sunbird'},\
-                                    'background_color': '#FDFAF9',\
-                                    'text_color': '#7C4616'}},\
-                        'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
                       },\
                       {\
                           'format': 'ldp_vc',\
@@ -565,33 +521,6 @@ mosip.esignet.vci.key-values={\
                                   'background_color': '#12107c',\
                                   'text_color': '#FFFFFF'}}\
                  }, \
-                 'InsuranceCredential' : {\
-                    'format': 'ldp_vc',\
-                    'scope' : 'sunbird_rc_insurance_vc_ldp',\
-                    'cryptographic_binding_methods_supported': {'did:jwk'},\
-                    'cryptographic_suites_supported': {'Ed25519Signature2020'},\
-                    'proof_types_supported': {'jwt'},\
-                    'credential_definition': {\
-                      'type': {'VerifiableCredential','InsuranceCredential'},\
-                      'credentialSubject': {\
-                            'fullName': {'display': {{'name': 'Name','locale': 'en'}}}, \
-                            'mobile': {'display': {{'name': 'Phone Number','locale': 'en'}}},\
-                            'dob': {'display': {{'name': 'Date of Birth','locale': 'en'}}},\
-                            'gender': {'display': {{'name': 'Gender','locale': 'en'}}},\
-                            'benefits': {'display': {{'name': 'Benefits','locale': 'en'}}},\
-                            'email': {'display': {{'name': 'Email Id','locale': 'en'}}},\
-                            'policyIssuedOn': {'display': {{'name': 'Policy Issued On','locale': 'en'}}},\
-                            'policyExpiresOn': {'display': {{'name': 'Policy Expires On','locale': 'en'}}},\
-                            'policyName': {'display': {{'name': 'Policy Name','locale': 'en'}}},\
-                            'policyNumber': {'display': {{'name': 'Policy Number','locale': 'en'}}}\
-                     }},\
-                    'display': {{'name': 'Sunbird RC Insurance Verifiable Credential', \
-                                  'locale': 'en', \
-                                  'logo': {'url': 'https://sunbird.org/images/sunbird-logo-new.png','alt_text': 'a square logo of a Sunbird'},\
-                                  'background_color': '#FDFAF9',\
-                                  'text_color': '#7C4616'}},\
-                    'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
-                 },\
                 'MOSIPVerifiableCredential_ldp' : {\
                     'format': 'ldp_vc',\
                     'scope' : 'mosip_identity_vc_ldp',\
@@ -624,28 +553,4 @@ mosip.esignet.vci.key-values={\
 ## -------------------------------------------- Others ----------------------------------------------------------
 
 #logging.level.org.springframework.web.client.RestTemplate=DEBUG
-#logging.level.io.mosip.esignet=INFO
-
-##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
-
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.individual-id-field=policyNumber
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.field-details={{"id":"policyNumber", "type":"text", "format":""},{"id":"fullName", "type":"text", "format":""},{"id":"dob", "type":"date", "format":"dd/mm/yyyy"}}
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
-mosip.esignet.authenticator.sunbird-rc.kba.entity-id-field=osid
-
-mosip.esignet.vciplugin.sunbird-rc.enable-psut-based-registry-search=false
-mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
-mosip.esignet.vciplugin.sunbird-rc.issue-credential-url=http://10.3.148.107/credential/credentials/issue
-mosip.esignet.vciplugin.sunbird-rc.supported-credential-types=LifeInsuranceCredential,InsuranceCredential
-mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.static-value-map.issuerId=did:web:holashchand.github.io:test_project:32b08ca7-9979-4f42-aacc-1d73f3ac5322
-mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.template-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/insurance-credential.json
-mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.registry-get-url=http://10.3.148.107/registry/api/v1/Insurance/
-mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.cred-schema-id=did:schema:0d10a2cf-94de-4ffc-b32c-4f1a61ee05ba
-mosip.esignet.vciplugin.sunbird-rc.credential-type.InsuranceCredential.cred-schema-version=1.0.0
-
-mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.static-value-map.issuerId=did:web:holashchand.github.io:test_project:32b08ca7-9979-4f42-aacc-1d73f3ac5322
-mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.template-url=${spring_config_url_env}/*/${active_profile_env}/${spring_config_label_env}/life-insurance-credential.json
-mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.registry-get-url=http://10.3.148.107/registry/api/v1/Insurance/
-mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.cred-schema-id=did:schema:0d10a2cf-94de-4ffc-b32c-4f1a61ee05ba
-mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.cred-schema-version=1.0.0
-mosip.esignet.vciplugin.sunbird-rc.credential-type.LifeInsuranceCredential.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
+#logging.level.io.mosip.esignet=INFO
\ No newline at end of file
diff --git a/identity-mapping.json b/identity-mapping.json
index 9f8109612c9..567b1172a27 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -165,8 +165,8 @@
 	},
 	"attributeUpdateCountLimit": {
 		"fullName": 2,
-		"gender": 4,
-		"dateOfBirth": 3
+		"gender": 2,
+		"dateOfBirth": 2
 
 		
 		

From eb74c37c1a51c5ea65540114fb546759d31528ff Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 19 Jun 2024 19:29:20 +0530
Subject: [PATCH 1351/1358] DSD-5498 Update signup-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 signup-default.properties | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/signup-default.properties b/signup-default.properties
index 73604837bd0..5704bedae04 100644
--- a/signup-default.properties
+++ b/signup-default.properties
@@ -4,6 +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.default-language=khm
 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
@@ -19,6 +20,7 @@ mosip.signup.fullname.pattern=^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u
 ## so 250 seconds is the Generate and verify cookie max age.
 mosip.signup.unauthenticated.txn.timeout=250
 mosip.signup.challenge.resend-attempt=3
+mosip.signup.challenge.verification-attempt=3
 mosip.signup.challenge.resend-delay=${mosip.signup.challenge.timeout}
 
 ## Time given to complete registration and get back the status of the registration in seconds.
@@ -29,6 +31,8 @@ mosip.signup.verified.txn.timeout=300
 mosip.signup.status-check.txn.timeout=200
 mosip.signup.status.request.delay=20
 mosip.signup.status.request.limit=10
+mosip.signup.task.core.pool.size=2
+mosip.signup.task.max.pool.size=4
 
 ## ------------------------------------- challenge configuration -------------------------------------------------------
 
@@ -53,7 +57,7 @@ mosip.esignet.cache.size={'challenge_generated': 200, \
   'status_check': 200,\
   'blocked_identifier':2000,\
   'keystore' : 10, \
-  'key_alias' : 2 }
+  'key_alias' : 1 }
 
 ## Note: keystore TTL should be more than the key_alias cache TTL.
 ## So that key rotation happens before the actual key is removed from the keystore cache.
@@ -138,12 +142,14 @@ mosip.signup.ui.config.key-values={\
 'fullname.allowed.characters': '^[\\u1780-\\u17FF\\u19E0-\\u19FF\\u1A00-\\u1A9F\\u0020]', \
 'fullname.length.min': 1, \
 'fullname.length.max': 30, \
-'otp.blocked' : ${mosip.signup.generate-challenge.blocked.timeout} \
+'otp.blocked' : ${mosip.signup.generate-challenge.blocked.timeout}, \
+'send-challenge.captcha.required': ${mosip.signup.send-challenge.captcha-required}
 }
 
-## ----------------------------- SMS-message -----------------------------------------------------------------------------
+## ----------------------------- Notification templates -----------------------------------------------------------------------------
 
 # Default charset encoding ISO-8859-1 does not support khmer language characters, so templates in khm language are base64 encoded.
+mosip.signup.sms-notification-template.encoded-langcodes={'khm'}
 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
@@ -152,5 +158,5 @@ mosip.signup.sms-notification-template.forgot-password.khm=4Z6i4Z+S4Z6T4Z6A4Z6U4
 mosip.signup.sms-notification-template.forgot-password.eng=You successfully changed KhID password.
 
 #------------------------------------------ Others ---------------------------------------------------------------------
-logging.level.io.mosip.signup=INFO
-logging.level.org.springframework.web.client.RestTemplate=INFO
+#logging.level.io.mosip.signup=DEBUG
+#logging.level.org.springframework.web.client.RestTemplate=INFO

From aa48f07b8b3ffa6e002cc865accb976f480e9446 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 19 Jun 2024 19:30:11 +0530
Subject: [PATCH 1352/1358] DSD-5498 Update esignet-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 52 +++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index c3afba5b8ed..2f3c3f9c298 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -74,8 +74,13 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
   '${server.servlet.path}/authorization/v3/authenticate', \
   '${server.servlet.path}/authorization/auth-code'}
 
-# List of auth factors which require captcha validation.
-mosip.esignet.captcha.required.auth-factors={'PWD'}
+#This property is used for captcha validation and allowed values are send-otp, pwd and kba.
+#captcha validation is enabled for send-otp, pwd and kba.
+mosip.esignet.captcha.required=
+
+#Properties used to ratelimit the incoming requests
+mosip.esignet.send-otp.attempts=3
+mosip.esignet.authenticate.attempts=3
 
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 
@@ -129,7 +134,6 @@ mosip.esignet.integration.captcha-validator=GoogleRecaptchaValidatorService
 mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
 # captcha validator
-mosip.esignet.send-otp.captcha-required=true
 mosip.esignet.captcha-validator.url=https://www.google.com/recaptcha/api/siteverify
 mosip.esignet.captcha-validator.secret=${esignet.captcha.secret.key}
 mosip.esignet.captcha-validator.site-key=${esignet.captcha.site.key}
@@ -222,7 +226,7 @@ mosip.esignet.cache.store.individual-id=true
 mosip.esignet.cache.security.secretkey.reference-id=TRANSACTION_CACHE
 mosip.esignet.cache.security.algorithm-name=AES/ECB/PKCS5Padding
 
-mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction,vcissuance
+mosip.esignet.cache.names=clientdetails,preauth,authenticated,authcodegenerated,userinfo,linkcodegenerated,linked,linkedcode,linkedauth,consented,authtokens,bindingtransaction,vcissuance,apiRateLimit,blocked
 
 #spring.cache.type=redis
 #spring.cache.cache-names=${mosip.esignet.cache.names}
@@ -234,7 +238,7 @@ management.health.redis.enabled=false
 spring.cache.type=simple
 mosip.esignet.cache.key.hash.algorithm=SHA3-256
 
-# Cache size setup is applicable only for 'simple' cache type.
+# Cache size setup is applicable only for 'simple' cache type. 
 # Cache size configuration will not be considered with 'Redis' cache type
 mosip.esignet.cache.size={'clientdetails' : 200, \
 'preauth': 200, \
@@ -248,7 +252,9 @@ mosip.esignet.cache.size={'clientdetails' : 200, \
 'consented' :200, \
 'authtokens': 2, \
 'bindingtransaction': 200, \
-'vcissuance' : 200 }
+'vcissuance' : 200, \
+'apiRateLimit' : 500, \
+'blocked': 500 }
 
 # Cache expire in seconds is applicable for both 'simple' and 'Redis' cache type
 mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
@@ -263,14 +269,16 @@ mosip.esignet.cache.expire-in-seconds={'clientdetails' : 86400, \
 'consented': 60, \
 'authtokens': 86400, \
 'bindingtransaction': 600, \
-'vcissuance': ${mosip.esignet.access-token-expire-seconds}  }
+'vcissuance': ${mosip.esignet.access-token-expire-seconds}, \
+'apiRateLimit' : 180, \
+'blocked': 300  }
 
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 
 mosip.esignet.domain.url=https://${mosip.esignet.host}
 mosip.esignet.discovery.issuer-id=${mosip.esignet.domain.url}${server.servlet.path}
 
-# This property holds ./wellknown/jwks.json URL,
+# This property holds ./wellknown/jwks.json URL, 
 # for local deployments without esignet-ui nginx change the value to ${mosip.esignet.domain.url}${server.servlet.path}/oauth/.well-known/jwks.json
 mosip.esignet.jwks-uri=${mosip.esignet.domain.url}/.well-known/jwks.json
 
@@ -306,7 +314,7 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.domain.url}' ,\
   \ 'display_values_supported' : ${mosip.esignet.supported.ui.displays}, \
   \ 'subject_types_supported' : { 'pairwise' }, \
   \ 'claims_supported' : {'name','address','gender','birthdate','picture','email','phone_number','individual_id'}, \
-  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics'},\
+  \ 'acr_values_supported' : {'mosip:idp:acr:static-code', 'mosip:idp:acr:generated-code', 'mosip:idp:acr:linked-wallet', 'mosip:idp:acr:biometrics', 'mosip:idp:acr:knowledge'},\
   \ 'request_parameter_supported' : false, \
   \ 'claims_locales_supported' : {'en'}, \
   \ 'ui_locales_supported' : {'en'} }
@@ -399,18 +407,22 @@ mosip.kernel.keymgr.hsm.health.check.encrypt=true
 # 2. A new Qrcode will be autogenerated before the expiry of current qr-code, and the time difference in seconds for the same is defined in wallet.qr-code-buffer-in-secs property
 # 3. If esignet is deployed with MOSIP IDA, then 'resend.otp.delay.secs' must be the same as 'mosip.kernel.otp.expiry-time'
 
-mosip.esignet.ui.wallet.config={{'wallet.name': 'Inji Mobile App', 'wallet.logo-url': 'inji_logo.png', 'wallet.download-uri': '#', \
+mosip.esignet.ui.wallet.config={{'wallet.name': 'walletName', 'wallet.logo-url': '/images/qr_code.png', 'wallet.download-uri': '#', \
  'wallet.deep-link-uri': 'inji://landing-page-name?linkCode=LINK_CODE&linkExpireDateTime=LINK_EXPIRE_DT' }}
 
 mosip.esignet.ui.signup.config={'signup.banner': true, 'signup.url': 'https://${mosip.signup.host}/signup'}
 
 mosip.esignet.ui.forgot-password.config={'forgot-password': true, 'forgot-password.url': 'https://${mosip.signup.host}/reset-password'}
 
-# username.prefix -> Prefix to be appended to the username, eg: if the username is phone_number then the prefix could be the country code
-# username.postfix -> This is required only when a postfix should be automatically appended to the input username
-# username.regex -> Regex to be used to validate the input username
-# auth.factor.kba.individual-id-field -> Field ID to be used as username in the authenticate API, Must be one of the field defined in `auth.factor.kba.field-details`
-# auth.factor.kba.field-details -> List of form fields used to display for Knowledge-based authentication. eg: {{"id":"policyNumber", "type":"text", "format":""},{"id":"fullName", "type":"text", "format":""}}
+## Configuration required to display KBI form. 
+# individual-id-field is set with field id which should be considered as an individual ID in the authenticate request.
+# form-details holds the list of field details like below:
+# id -> unique field Id, type -> holds datatype, format -> only supported for date fields, regex -> pattern to validate the input value, maxLength -> number of allowed characters
+# Example: mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id': '${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^\\s*[+-]?(\\d+|\\d*\\.\\d+|\\d+\\.\\d*)([Ee][+-]?\\d*)?\\s*$'},{'id':'fullName', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^[A-Za-z\\s]{1,}[\\.]{0,1}[A-Za-z\\s]{0,}$'},{'id':'dob', 'type':'date', 'format':'dd/mm/yyyy'}}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=
+mosip.esignet.authenticator.default.auth-factor.kba.field-details={}
+
+## Configuration Map input to UI at the start of every transaction.
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 30, \
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
@@ -418,8 +430,8 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'otp,pwd', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': '4501-4600', \
-  '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}, \
+  'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \
+  'password.max-length': 20, \
   'username.regex': '^[0-9]{10,30}$',\
   'username.prefix': '', \
   'username.postfix': '', \
@@ -427,8 +439,8 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   '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' : '',\
-  'auth.factor.kba.field-details': {} }
+  'auth.factor.kba.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}',\
+  'auth.factor.kba.field-details': ${mosip.esignet.authenticator.default.auth-factor.kba.field-details} }
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
 # Used to verify audience in the PoP JWT
@@ -553,4 +565,4 @@ mosip.esignet.vci.key-values={\
 ## -------------------------------------------- Others ----------------------------------------------------------
 
 #logging.level.org.springframework.web.client.RestTemplate=DEBUG
-#logging.level.io.mosip.esignet=INFO
\ No newline at end of file
+#logging.level.io.mosip.esignet=INFO

From 6b19b1d8bb5c26383b5c3c989ca0f8ad3713d893 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 19 Jun 2024 19:37:11 +0530
Subject: [PATCH 1353/1358] ES-5498 Update esignet-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index 2f3c3f9c298..a1b67d8027f 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -427,15 +427,16 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   'sbi.timeout.DINFO': 30, 'sbi.timeout.CAPTURE': 30, 'sbi.capture.count.face': 1, 'sbi.capture.count.finger': 1, \
   'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70, \
   'resend.otp.delay.secs': ${mosip.kernel.otp.expiry-time}, 'send.otp.channels' : '${mosip.esignet.authenticator.ida.otp-channels}', \
-  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : 'otp,pwd', \
+  'captcha.sitekey' : '${mosip.esignet.captcha-validator.site-key}', 'captcha.enable' : '${mosip.esignet.captcha.required}', \
   'auth.txnid.length' : '${mosip.esignet.auth-txn-id-length}', 'consent.screen.timeout-in-secs':${mosip.esignet.authentication-expire-in-secs}, \
   'consent.screen.timeout-buffer-in-secs': 5, 'linked-transaction-expire-in-secs': 240, 'sbi.port.range': '4501-4600', \
-  'sbi.bio.subtypes.iris': 'UNKNOWN', 'sbi.bio.subtypes.finger': 'UNKNOWN', 'wallet.qr-code-buffer-in-secs': 10, 'otp.length': 6, \'password.regex': '^.{8,20}$', \
-  'password.max-length': 20, \
+  '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': '^[0-9]{10,30}$',\
   'username.prefix': '', \
   'username.postfix': '', \
-  'username.max-length': 9, \
+  '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,\

From 733742adcacf407c5e59d0dfe448222f63dec9e6 Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Wed, 19 Jun 2024 19:38:19 +0530
Subject: [PATCH 1354/1358] ES-5498 Update esignet-default.properties

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 esignet-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esignet-default.properties b/esignet-default.properties
index a1b67d8027f..e946e1573cc 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -76,7 +76,7 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
 
 #This property is used for captcha validation and allowed values are send-otp, pwd and kba.
 #captcha validation is enabled for send-otp, pwd and kba.
-mosip.esignet.captcha.required=
+mosip.esignet.captcha.required=send-otp,pwd
 
 #Properties used to ratelimit the incoming requests
 mosip.esignet.send-otp.attempts=3

From 889134f6134aecc0a6cdbdc3d6509f69d72bb86b Mon Sep 17 00:00:00 2001
From: swethan1718 <113496801+swethan1718@users.noreply.github.com>
Date: Fri, 5 Jul 2024 11:30:39 +0530
Subject: [PATCH 1355/1358] Update identity-mapping.json

Signed-off-by: swethan1718 <113496801+swethan1718@users.noreply.github.com>
---
 identity-mapping.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/identity-mapping.json b/identity-mapping.json
index 567b1172a27..b72368c67b3 100644
--- a/identity-mapping.json
+++ b/identity-mapping.json
@@ -164,9 +164,9 @@
 		}
 	},
 	"attributeUpdateCountLimit": {
-		"fullName": 2,
+		"fullName": 5,
 		"gender": 2,
-		"dateOfBirth": 2
+		"dateOfBirth": 3
 
 		
 		

From 6530562a42bb6549eb69314766f681976f6dfdc6 Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Wed, 7 Aug 2024 18:38:26 +0530
Subject: [PATCH 1356/1358] [MOSIP-34112] adding manual adjudication stage to
 update camel route (#7000)

* [MOSIP-34112] adding condition for manual adjudication stage

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>

* [MOSIP-34112] adding condition for manual adjudication stage

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>

---------

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-camel-routes-update-default.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/registration-processor-camel-routes-update-default.xml b/registration-processor-camel-routes-update-default.xml
index 733b5f8c969..27d4f6840bd 100644
--- a/registration-processor-camel-routes-update-default.xml
+++ b/registration-processor-camel-routes-update-default.xml
@@ -386,6 +386,10 @@
             <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'abis-handler-bus-in')]</jsonpath>
             <to uri="eventbus://abis-handler-bus-in" />
          </when>
+         <when>
+            <jsonpath suppressExceptions="true">$.[?(@['messageBusAddress']['address'] == 'manual-adjudication-bus-in')]</jsonpath>
+            <to uri="eventbus://manual-adjudication-bus-in" />
+         </when>
          <otherwise>
             <to uri="eventbus://uin-generator-bus-in" />
          </otherwise>

From ebbdde25d725f5188ec7901a5aa3f065c133c339 Mon Sep 17 00:00:00 2001
From: khuddus shariff <khuddusshariff0022@gmail.com>
Date: Thu, 8 Aug 2024 16:36:39 +0530
Subject: [PATCH 1357/1358] Update registration-processor-default.properties

Signed-off-by: khuddus shariff <khuddusshariff0022@gmail.com>
---
 registration-processor-default.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/registration-processor-default.properties b/registration-processor-default.properties
index 09c83318208..0cd79812b66 100644
--- a/registration-processor-default.properties
+++ b/registration-processor-default.properties
@@ -989,7 +989,7 @@ auth.server.admin.allowed.audience=mosip-regproc-client,mosip-admin-client,mosip
 mosip.regproc.cbeff-validation.mandatory.modalities=Right,Left,Left RingFinger,Left LittleFinger,Right RingFinger,Left Thumb,Left IndexFinger,Right IndexFinger,Right LittleFinger,Right MiddleFinger,Left MiddleFinger,Right Thumb,EXCEPTION_PHOTO
 #updated properties name with the prefix (mosip.regproc)
 mosip.regproc.landing.zone.account.name=landing-zone
-mosip.regproc.landing.zone.type=ObjectStore
+mosip.regproc.landing.zone.type=DMZServer
 
 mosip.regproc.landing.zone.fixed.delay.millisecs=120000
 mosip.regproc.landing.zone.inital.delay.millisecs=120000
@@ -1000,4 +1000,4 @@ mosip.registration.processor.lostrid.max-registration-date-filter-interval=30
 uingenerator.lost.packet.allowed.update.fields=phone,email,permanentAddress
 
 ##timeout in milliseconds for health check registrer
-mosip.regproc.health-check.handler-timeout=2000
\ No newline at end of file
+mosip.regproc.health-check.handler-timeout=2000

From ce4b20f61fed21648970490d517d48538a0d3a90 Mon Sep 17 00:00:00 2001
From: Malleshdappu <93384116+Malleshdappu@users.noreply.github.com>
Date: Thu, 14 Nov 2024 09:01:45 +0530
Subject: [PATCH 1358/1358] image-compressor property file adding

Signed-off-by: Malleshdappu <93384116+Malleshdappu@users.noreply.github.com>
---
 image-compressor-default.properties | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 image-compressor-default.properties

diff --git a/image-compressor-default.properties b/image-compressor-default.properties
new file mode 100644
index 00000000000..160eed54587
--- /dev/null
+++ b/image-compressor-default.properties
@@ -0,0 +1,7 @@
+#iam image-compressor-service config
+mosip.bio.image.compressor.resize.factor.fx=0.25
+mosip.bio.image.compressor.resize.factor.fy=0.25
+mosip.bio.image.compressor.compression.ratio=50
+biosdk_class=io.mosip.image.compressor.sdk.impl.ImageCompressorSDKV2
+mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
+biosdk_bioapi_impl=io.mosip.image.compressor.sdk.impl.ImageCompressorSDKV2