[MOSIP-18494] Client names updated.

Author: Puneet Joshi

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,15 +207,15 @@ 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
 
 # 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

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

credential-request-default.properties

@@ -1,11 +1,11 @@
 #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 ----------------------------#
 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}
 
-mosip.auth.filter_disable=false
+mosip.auth.filter_disable=false

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/

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

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

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

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'

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

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

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

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

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

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