From c308daf07bf1bfce5f8c1c8390be14e63b8c8acb Mon Sep 17 00:00:00 2001 From: Saumya Saumya Date: Thu, 12 Dec 2019 19:07:40 +0530 Subject: [PATCH] Adding config --- config-templates/application-env.properties | 3 +- .../id-authentication-env.properties | 2 +- config-templates/kernel-env.properties | 139 +++++++++++++----- .../pre-registration-env.properties | 21 ++- config-templates/registration-env.properties | 9 ++ 5 files changed, 130 insertions(+), 44 deletions(-) diff --git a/config-templates/application-env.properties b/config-templates/application-env.properties index 67588818863..680853cf46a 100644 --- a/config-templates/application-env.properties +++ b/config-templates/application-env.properties @@ -7,6 +7,7 @@ mosip.base.url={{ base_url }} 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.kernel.idobjectvalidator.masterdata.languages.rest.uri=${mosip.base.url}/v1/masterdata/languages mosip.kernel.idobjectvalidator.masterdata.gendertypes.rest.uri=${mosip.base.url}/v1/masterdata/gendertypes @@ -27,7 +28,7 @@ mosip.kernel.idobjectvalidator.mandatory-attributes.reg-processor.child-registra mosip.id.validation.identity.dateOfBirth=^(1869|18[7-9][0-9]|19\\d\\d|20\\d\\d)/([0][1-9]|1[0-2])/([0][1-9]|[1-2]\\d|3[01])$ mosip.id.validation.identity.phone=^([6-9]{1})([0-9]{9})$ mosip.id.validation.identity.email=^[\\w-\\+]+(\\.[\\w]+)*@[\\w-]+(\\.[\\w]+)*(\\.[a-zA-Z]{2,})$ -mosip.id.validation.identity.postalCode=^[(?i)A-Z0-9]{5}$ +mosip.id.validation.identity.postalCode=^[(?i)A-Z0-9]{5}$|^NA$ mosip.id.validation.identity.age=^(150|1[0-4][0-9]|[1-9]?[0-9])$ mosip.id.validation.identity.fullName.[*].value=^(?=.{0,50}$).* mosip.id.validation.identity.addressLine1.[*].value=^(?=.{0,50}$).* diff --git a/config-templates/id-authentication-env.properties b/config-templates/id-authentication-env.properties index c7a4491bd2f..a93fb383006 100644 --- a/config-templates/id-authentication-env.properties +++ b/config-templates/id-authentication-env.properties @@ -9,7 +9,7 @@ mosip.ida.database.user=idauser mosip.ida.database.password={{ idauser_password }} # Kernel auth client ID for IDA -mosip.ida.auth.clientId=ida_app_user +mosip.ida.auth.clientId=ida # Kernel auth secret key for IDA mosip.ida.auth.secretKey= # Kernel auth application ID for IDA diff --git a/config-templates/kernel-env.properties b/config-templates/kernel-env.properties index c126b553305..4b0ed427dec 100644 --- a/config-templates/kernel-env.properties +++ b/config-templates/kernel-env.properties @@ -143,6 +143,56 @@ ldap.roles.class=(objectClass=organizationalRole) mosip.kernel.tokenid.uin.salt=zHuDEAbmbxiUbUShgy6pwUhKh9DE0EZn9kQDKPPKbWscGajMwf mosip.kernel.tokenid.partnercode.salt=yS8w5Wb6vhIKdf1msi4LYTJks7mqkbmITk2O63Iq8h0bkRlD0d +#------------------------VID Generator Service--------------------------------------- +#minimum threshold of unused vid +mosip.kernel.vid.min-unused-threshold=100000 +#number of vids to generate +mosip.kernel.vid.vids-to-generate=200000 +#time to renew after expiry(in days) +mosip.kernel.vid.time-to-renew-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=* + +#------------------------PRID Properties-------------------------------------------- + +#minimum threshold of unused prid +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 seconds configuration +kernel.prid.revoke-scheduler-seconds=0 +#schedular minutes configuration +kernel.prid.revoke-scheduler-minutes=0 +#schedular hours configuration +kernel.prid.revoke-scheduler-hours=23 +#schedular days configuration +kernel.prid.revoke-scheduler-days_of_month=* +#schedular months configuration +kernel.prid.revoke-scheduler-months=* +#schedular weeks configuration +kernel.prid.revoke-scheduler-days_of_week=* + + #------------------------DataBase Properties----------------------------------------- javax.persistence.jdbc.driver=org.postgresql.Driver @@ -189,6 +239,16 @@ uin_database_username=kerneluser uin_database_password={{ kerneluser_password }} hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext +#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={{ kerneluser_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={{ kerneluser_password }} + #Database mappings keymanager keymanager_database_url = jdbc:postgresql://${mosip.kernel.database.hostname}:${mosip.kernel.database.port}/mosip_kernel @@ -246,49 +306,50 @@ db_2_DS.datastore.schema=GOVT_OFFICERS #-------------------------------------------------------------------------------------------------# -#------------------------KeyCloak Config changes--------------------------- - -mosip.keycloak.authorization_endpoint={{ keyclock endpoint }} -mosip.keycloak.token_endpoint={{ keyclock token endpoint }} -mosip.admin.login_flow.name=authorization_code -mosip.admin.login_flow.response_type=code -mosip.admin.login_flow.scope=cls -mosip.admin.clientid=mosip-local -mosip.admin.clientsecret={{ keyclock client secret }} -mosip.admin.redirecturi={{ authmanager dns }}/v1/authmanager/login-redirect/ -mosip.admin_realm_id=mosip -auth.server.admin.validate.url={{ authmanager dns }}/v1/authmanager/authorize/admin/validateToken - -keycloak.realm=registration-client +#------------------------KeyCloak Config changes---------------------------# + +mosip.kernel.admin-realm-id={{admin realm id}} +mosip.kernel.realm-id={{kernel realm id}} +mosip.kernel.open-id-url={{ keyclock endpoint }}/auth/realms/{realmId}/protocol/openid-connect/ +mosip.kernel.base-url={{ keyclock endpoint }}/auth/realms/{realmId} +mosip.kernel.admin-url={{ keyclock endpoint }}/auth/admin/ +mosip.kernel.roles-url=realms/mosip/roles +mosip.kernel.users-url=realms/mosip/users +mosip.kernel.role-user-mapping-url=/{userId}/role-mappings/realm +keycloak.realm={{keycloak ui realm}} keycloak.resource=account -keycloak.auth-server-url={{ keyclock server url }} +keycloak.auth-server-url={{ keyclock endpoint }}/auth keycloak.ssl-required=none keycloak.public-client=true keycloak.use-resource-role-mappings=true keycloak.verify-token-audience=true -mosip.kernel.open-id-uri={{ keyclock open id uri }} -#-------------------------------------------------------------------------------------------------# -#------------------------VID Generator Service--------------------------------------- -#minimum threshold of unused vid -mosip.kernel.vid.min-unused-threshold=100000 -#number of vids to generate -mosip.kernel.vid.vids-to-generate=200000 -#time to renew after expiry(in days) -mosip.kernel.vid.time-to-renew-after-expiry=5 -#for genaration on init vids timeout -mosip.kernel.vid.pool-population-timeout=10000000 +mosip.keycloak.base-url={{ keyclock endpoint }} +mosip.authmanager.base-url={{auth endpoint}} + +mosip.keycloak.authorization_endpoint=${mosip.keycloak.base-url}/auth/realms/mosip/protocol/openid-connect/auth +mosip.keycloak.token_endpoint=${mosip.keycloak.base-url}/auth/realms/mosip/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 client id}} +mosip.admin.clientsecret={{secret}} +mosip.admin.redirecturi=${mosip.authmanager.base-url}/login-redirect/ +mosip.admin_realm_id={{admin realm id}} + +mosip.master.realm-id={{master realm id}} + +mosip.admin.individual_role_id={{individual role id}} +mosip.admin.pre-reg_user_password={{pre reg user default password}} + +db_3_DS.keycloak.ipaddress=jdbc:postgresql://:/keycloak +db_3_DS.keycloak.port= +db_3_DS.keycloak.username= +db_3_DS.keycloak.password= +db_3_DS.keycloak.driverClassName=org.postgresql.Driver + +mosip.keycloak.admin.client.id= +mosip.keycloak.admin.user.id= +mosip.keycloak.admin.secret.key= + -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=* diff --git a/config-templates/pre-registration-env.properties b/config-templates/pre-registration-env.properties index 8394cf750e9..8a29dbe34c2 100644 --- a/config-templates/pre-registration-env.properties +++ b/config-templates/pre-registration-env.properties @@ -109,6 +109,9 @@ crypto.service.contextpath=cryptomanager kernel.auth.env=http://kernel-auth-service:8091 kernel.auth.contextpath=authmanager +kernel.prid.env=http://kernel-pridgenerator-service:8100 +kernel.prid.contextpath=pridgenerator + #----------Auth------------------- sendOtp.resource.url=${kernel.auth.env}/${masterdata.service.version}/${kernel.auth.contextpath} otpChannel.mobile=mobile @@ -125,7 +128,7 @@ mosip.preregistration.config.id=mosip.pre-registration.login.config mosip.preregistration.login.service.version=1.0 validationStatus=success context=auth-otp -clientId=pre_reg_client_id +clientId=pre-registration secretKey= #----------------------- Json Validator -------------------------------------------------- @@ -165,7 +168,7 @@ mosip.pregistration.pagesize=20 mosip.kernel.idobjectvalidator.file-storage-uri=${spring.cloud.config.uri}/${spring.application.name}/${spring.profiles.active}/${spring.cloud.config.label}/ # Plug in property source as either 'LOCAL' or 'CONFIG_SERVER' or 'APPLICATION_CONTEXT' through this key -mosip.kernel.idobjectvalidator.property-source=CONFIG_SERVER +mosip.kernel.idobjectvalidator.property-source=APPLICATION_CONTEXT mosip.kernel.idobjectvalidator.referenceValidator=io.mosip.kernel.idobjectvalidator.impl.IdObjectReferenceValidator @@ -179,6 +182,8 @@ mosip.kernel.idobjectvalidator.masterdata.locationhierarchy.rest.uri=${masterdat mosip.kernel.idobjectvalidator.masterdata.documentcategories.lang.rest.uri=${masterdata.resource.url}/documentcategories/{langcode} mosip.kernel.idobjectvalidator.schema-name=mosip-identity-json-schema.json +mosip.io.prid.url=${kernel.prid.env}/${masterdata.service.version}/${kernel.prid.contextpath}/prid + #Pre-reg identity config file name preregistartion.config.identityjson=PreRegistrationIdentitiyMapping.json @@ -380,7 +385,7 @@ mosip.pre-registration.transliteration.transliterate.id=mosip.pre-registration.t #--------UI params--------- #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.CNIENumber,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 +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.CNIENumber,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.kernel.idobjectvalidator.masterdata.locations.locationNotAvailable preregistration.recommended.centers.locCode=5 preregistration.nearby.centers=2000 @@ -411,3 +416,13 @@ 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.preregistration.booking.id.book=mosip.pre-registration.booking.book + +mosip.preregistration.demographic.id.create=mosip.pre-registration.demographic.create +mosip.preregistration.demographic.id.update=mosip.pre-registration.demographic.update +mosip.preregistration.demographic.id.retrieve.date=mosip.pre-registration.demographic.retrieve.date + +mosip.pre-registration.notification.id.send=mosip.pre-registration.notification.notify +mosip.pre-registration.qrcode.id.generate=mosip.pre-registration.qrcode.generate +mosip.preregistration.document.id.upload=mosip.pre-registration.document.upload diff --git a/config-templates/registration-env.properties b/config-templates/registration-env.properties index da86543defb..0f85298943b 100644 --- a/config-templates/registration-env.properties +++ b/config-templates/registration-env.properties @@ -361,3 +361,12 @@ current_mdm_spec=0.9.2 #Admin Setting to turn local deduplication check On or Off. If y, dedupe check is turned on. Else, turned off. mosip.registration.mds.deduplication.enable.flag=n + +#Admin Setting to turn local deduplication check for finger print On or Off. If y, dedupe check is turned on. Else, turned off. +mosip.registration.mds.fingerprint.dedup.enable.flag=Y + +#Admin Setting to turn local deduplication check Iris On or Off. If y, dedupe check is turned on. Else, turned 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. Else, turned off. +mosip.registration.mds.face.dedup.enable.flag=n