From c441073d7cfca18ae46ccb7bd89848724e99ffeb Mon Sep 17 00:00:00 2001 From: Aiham Date: Wed, 17 Jul 2024 12:59:57 +0530 Subject: [PATCH 1/2] MOSIP-34325 updated captcha property Signed-off-by: Aiham --- .../src/main/resources/application.properties | 2 +- .../src/test/resources/application.properties | 2 +- .../src/main/resources/bootstrap.properties | 2 +- .../src/main/resources/application.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pre-registration/pre-registration-application-service/src/main/resources/application.properties b/pre-registration/pre-registration-application-service/src/main/resources/application.properties index cdbb07be414..d0a20272a52 100644 --- a/pre-registration/pre-registration-application-service/src/main/resources/application.properties +++ b/pre-registration/pre-registration-application-service/src/main/resources/application.properties @@ -349,7 +349,7 @@ 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} -mosip.preregistration.captcha.resourse.url=${mosip.base.url}/preregistration/v1/captcha/validatecaptcha +mosip.preregistration.captcha.resourse.url=${mosip.base.url}/v1/captcha/validatecaptcha mosip.role.prereg.postapplications=INDIVIDUAL,REGISTRATION_OFFICER,REGISTRATION_SUPERVISOR,REGISTRATION_ADMIN diff --git a/pre-registration/pre-registration-application-service/src/test/resources/application.properties b/pre-registration/pre-registration-application-service/src/test/resources/application.properties index 41baab29237..0ffcb00660d 100644 --- a/pre-registration/pre-registration-application-service/src/test/resources/application.properties +++ b/pre-registration/pre-registration-application-service/src/test/resources/application.properties @@ -703,7 +703,7 @@ mosip.optional-languages=fra,ara mosip.kernel.otp.expiry-time=1800 mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j mosip.preregistration.sendotp.allowapi=false -mosip.preregistration.captcha.resourse.url=${mosip.base.url}/preregistration/v1/captcha/validatecaptcha +mosip.preregistration.captcha.resourse.url=${mosip.base.url}/v1/captcha/validatecaptcha mosip.preregistration.captcha.enable=true mosip.preregistration.captcha.sitekey=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverify diff --git a/pre-registration/pre-registration-captcha-service/src/main/resources/bootstrap.properties b/pre-registration/pre-registration-captcha-service/src/main/resources/bootstrap.properties index 6907d061c04..c371c15fd73 100644 --- a/pre-registration/pre-registration-captcha-service/src/main/resources/bootstrap.properties +++ b/pre-registration/pre-registration-captcha-service/src/main/resources/bootstrap.properties @@ -14,7 +14,7 @@ security.basic.enabled=false mosip.preregistration.captcha.sitekey=6Lc4pewUAAAAANr3JkwuSVNCzQi9Z31g-NVKMXBX mosip.preregistration.captcha.recaptcha.verify.url=https://www.google.com/recaptcha/api/siteverifymosip.preregistration.captcha.secretkey=6Lc4pewUAAAAAOq_6rlW8HcGX36rF9vVla32TvqI mosip.preregistration.captcha.id.validate = mosip.preregistration.captcha.id.validate -mosip.preregistration.captcha.resourse.url=${mosip.base.url}/preregistration/v1/captcha/validatecaptcha +mosip.preregistration.captcha.resourse.url=${mosip.base.url}/v1/captcha/validatecaptcha openapi.info.title=Pre-Registration-captcha openapi.info.description=Pre-Registration captcha Service diff --git a/pre-registration/pre-registration-datasync-service/src/main/resources/application.properties b/pre-registration/pre-registration-datasync-service/src/main/resources/application.properties index 8ef7ec5802c..456ef3c695a 100644 --- a/pre-registration/pre-registration-datasync-service/src/main/resources/application.properties +++ b/pre-registration/pre-registration-datasync-service/src/main/resources/application.properties @@ -438,7 +438,7 @@ mosip.preregistration.anonymous-profile-username:admin spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER prereg.auth.jwt.audience = "account"; mosip.lang.traslate.adapter.impl.basepackage = io.mosip.kernel.transliteration.icu4j -mosip.preregistration.captcha.resourse.url=${mosip.base.url}/preregistration/v1/captcha/validatecaptcha +mosip.preregistration.captcha.resourse.url=${mosip.base.url}/v1/captcha/validatecaptcha prereg.auth.jwt.secret=Yn2kjibddFAWtnPJ2AFlL8WXmohJMCvigQggaEypa5E= prereg.auth.jwt.token.expiration=1800 prereg.auth.jwt.token.roles=INDIVIDUAL From cdee719940410d6fc666ab5be43aeb1582cdc7d4 Mon Sep 17 00:00:00 2001 From: Aiham Date: Thu, 25 Jul 2024 13:43:53 +0530 Subject: [PATCH 2/2] [MOSIP-32507] Updated db scripts name Signed-off-by: Aiham --- .../{1.2.0.1_to_1_revoke.sql => 1.2.0.1_to_1.2.1.0_revoke.sql} | 0 .../{1.2.0.1_to_1_upgrade.sql => 1.2.0.1_to_1.2.1.0_upgrade.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename db_upgrade_scripts/mosip_prereg/sql/{1.2.0.1_to_1_revoke.sql => 1.2.0.1_to_1.2.1.0_revoke.sql} (100%) rename db_upgrade_scripts/mosip_prereg/sql/{1.2.0.1_to_1_upgrade.sql => 1.2.0.1_to_1.2.1.0_upgrade.sql} (100%) diff --git a/db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1_revoke.sql b/db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1.2.1.0_revoke.sql similarity index 100% rename from db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1_revoke.sql rename to db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1.2.1.0_revoke.sql diff --git a/db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1_upgrade.sql b/db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1.2.1.0_upgrade.sql similarity index 100% rename from db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1_upgrade.sql rename to db_upgrade_scripts/mosip_prereg/sql/1.2.0.1_to_1.2.1.0_upgrade.sql