From e27e44df707832b37aad4f3fa7a8f724aa871555 Mon Sep 17 00:00:00 2001
From: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com>
Date: Fri, 28 Jun 2024 18:37:41 +0530
Subject: [PATCH 1/7] Update mock-identity-system-default.properties (#6619)

Signed-off-by: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com>
Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 mock-identity-system-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
index e4530c97b5c..7585e449ff3 100644
--- a/mock-identity-system-default.properties
+++ b/mock-identity-system-default.properties
@@ -102,7 +102,7 @@ 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
 
-mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
+#mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
 
 #Related to health check of hsm
 mosip.kernel.keymgr.hsm.health.check.enabled=false

From 8dbf89ab53b3525ad7b253316c8b61c9629005aa Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 28 Jun 2024 21:48:16 +0530
Subject: [PATCH 2/7] Update esignet-mock.properties

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 esignet-mock.properties | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/esignet-mock.properties b/esignet-mock.properties
index 2f04ef19bf4..dadebcdc42f 100644
--- a/esignet-mock.properties
+++ b/esignet-mock.properties
@@ -48,7 +48,10 @@ mosip.esignet.header-filter.paths-to-validate={'${server.servlet.path}/authoriza
   '${server.servlet.path}/authorization/auth-code'}
 
 mosip.esignet.captcha.required.auth-factors={'PWD'}
+mosip.esignet.captcha.required=
 
+mosip.esignet.send-otp.attempts=30
+mosip.esignet.authenticate.attempts=30
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 
 mosip.esignet.binding.salt-length=16
@@ -194,7 +197,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}
@@ -220,7 +223,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, \
@@ -235,7 +240,9 @@ 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 -------------------------------------------
 
@@ -375,8 +382,11 @@ 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.authenticator.default.auth-factor.kbi.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details}
-mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field}
+#mosip.esignet.authenticator.default.auth-factor.kbi.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details}
+#mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field}
+
+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
 
 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, \
@@ -532,8 +542,8 @@ logging.level.io.mosip.esignet=DEBUG
 
 ##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
 
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field=policyNumber
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.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.kbi.individual-id-field=${mosip.esignet.authenticator.default.auth-factor.kba.individual-id}
+mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details=${mosip.esignet.authenticator.default.auth-factor.kba.field-details}
 mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
 mosip.esignet.authenticator.sunbird-rc.kbi.entity-id-field=osid
 

From 40334ef2e73cf5dc77993dfcb738503e21e79a76 Mon Sep 17 00:00:00 2001
From: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:04:23 +0530
Subject: [PATCH 3/7] Update esignet-mock.properties

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 esignet-mock.properties | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/esignet-mock.properties b/esignet-mock.properties
index dadebcdc42f..7525fdd95d7 100644
--- a/esignet-mock.properties
+++ b/esignet-mock.properties
@@ -52,6 +52,8 @@ mosip.esignet.captcha.required=
 
 mosip.esignet.send-otp.attempts=30
 mosip.esignet.authenticate.attempts=30
+mosip.esignet.send-otp.invocation-gap-secs=10
+mosip.esignet.authenticate.invocation-gap-secs=50
 ## ------------------------------------------ e-Signet binding ---------------------------------------------------------
 
 mosip.esignet.binding.salt-length=16
@@ -97,11 +99,11 @@ mosip.esignet.kafka.linked-auth-code.topic=esignet-consented
 
 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=SunbirdRCAuthenticationService
+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.vci-plugin=SunbirdRCVCIssuancePlugin
+mosip.esignet.integration.vci-plugin=IdaVCIssuancePluginImpl
 
 # captcha validator
 mosip.esignet.send-otp.captcha-required=false

From 493daadee0cbf3a7c1de6b56e84b549e5e15edd5 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:19:43 +0530
Subject: [PATCH 4/7] Revert "Update mock-identity-system-default.properties
 (#6619)"

This reverts commit 377ccd75c02452f28ff72a2c0671bc1023cb6337.

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 mock-identity-system-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
index 7585e449ff3..e4530c97b5c 100644
--- a/mock-identity-system-default.properties
+++ b/mock-identity-system-default.properties
@@ -102,7 +102,7 @@ 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
 
-#mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
+mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
 
 #Related to health check of hsm
 mosip.kernel.keymgr.hsm.health.check.enabled=false

From 16c490b04e9675b1b235e3d50d8c6b4d81feebf2 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:26:00 +0530
Subject: [PATCH 5/7] Reapply "Update mock-identity-system-default.properties
 (#6619)"

This reverts commit 6266f05e928bf02527fa056b5abe223c22927fb1.

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 mock-identity-system-default.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mock-identity-system-default.properties b/mock-identity-system-default.properties
index e4530c97b5c..7585e449ff3 100644
--- a/mock-identity-system-default.properties
+++ b/mock-identity-system-default.properties
@@ -102,7 +102,7 @@ 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
 
-mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
+#mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
 
 #Related to health check of hsm
 mosip.kernel.keymgr.hsm.health.check.enabled=false

From 28f65457f806073d345c5bba232278939ddd695e Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:29:38 +0530
Subject: [PATCH 6/7] Revert "[ES-1233] Updated properties from KBA to KBI"

This reverts commit 5f9306dd63397512a0a711917642fd673e4c31c3.

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 amr-acr-mapping.json         | 2 +-
 esignet-injiweb.properties   | 3 +--
 esignet-insurance.properties | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/amr-acr-mapping.json b/amr-acr-mapping.json
index 7c6aecede64..ec41b569dbf 100644
--- a/amr-acr-mapping.json
+++ b/amr-acr-mapping.json
@@ -5,7 +5,7 @@
     "OTP" :  [{ "type": "OTP" }],
     "Wallet" :  [{ "type": "WLA" }],
     "L1-bio-device" :  [{ "type": "BIO", "count": 1 }],
-    "Knowledge" : [{"type":"KBI"}]
+    "Knowledge" : [{"type":"kbi"}]
   },
   "acr_amr" : {
     "mosip:idp:acr:password" : ["PWD"],
diff --git a/esignet-injiweb.properties b/esignet-injiweb.properties
index 0f9f40ef7b7..44e726b9e4d 100644
--- a/esignet-injiweb.properties
+++ b/esignet-injiweb.properties
@@ -153,8 +153,7 @@ mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mos
 mosip.esignet.supported.response.types={'code'}
 
 ## supported format for auth factor type
-## The authentication factor can be referred to as termed either Knowledge-Based Authentication (KBA) or Knowledge-Based Identification (KBI). However, from the eSignets perspective, we will specifically refer to the authentication method as KBI.
-mosip.esignet.supported-formats={'OTP': 'alpha-numeric', 'PWD': 'alpha-numeric', 'BIO': 'encoded-json', 'WLA': 'jwt', 'PIN': 'number', 'KBI': 'base64url-encoded-json'}
+mosip.esignet.supported-formats={'OTP': 'alpha-numeric', 'PWD': 'alpha-numeric', 'BIO': 'encoded-json', 'WLA': 'jwt', 'PIN': 'number', 'kbi': 'base64url-encoded-json'}
 
 ## Form of Authorization Grant presented to token endpoint
 mosip.esignet.supported.grant.types={'authorization_code'}
diff --git a/esignet-insurance.properties b/esignet-insurance.properties
index ce6c1b7cf22..b6fdad5cc3d 100644
--- a/esignet-insurance.properties
+++ b/esignet-insurance.properties
@@ -59,9 +59,9 @@ mosip.esignet.auth-challenge.WLA.format=jwt
 mosip.esignet.auth-challenge.WLA.min-length=100
 mosip.esignet.auth-challenge.WLA.max-length=1500
 
-mosip.esignet.auth-challenge.KBI.format=base64url-encoded-json
-mosip.esignet.auth-challenge.KBI.min-length=50
-mosip.esignet.auth-challenge.KBI.max-length=500
+mosip.esignet.auth-challenge.kbi.format=base64url-encoded-json
+mosip.esignet.auth-challenge.kbi.min-length=50
+mosip.esignet.auth-challenge.kbi.max-length=500
 
 mosip.esignet.auth-challenge.PIN.format=number
 mosip.esignet.auth-challenge.PIN.min-length=4

From 886ce704003e46987b8c8788194d536382769306 Mon Sep 17 00:00:00 2001
From: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Date: Fri, 28 Jun 2024 22:33:46 +0530
Subject: [PATCH 7/7] reverted KBA to KBI changes

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
---
 amr-acr-mapping.json         |  2 +-
 esignet-default.properties   | 22 +++++++++++-----------
 esignet-dev.properties       |  8 ++++----
 esignet-injiweb.properties   | 18 +++++++++---------
 esignet-insurance.properties | 26 +++++++++++++-------------
 esignet-mock.properties      |  4 ++--
 esignet-mosipid.properties   | 16 ++++++++--------
 7 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/amr-acr-mapping.json b/amr-acr-mapping.json
index ec41b569dbf..1af2a3c4c42 100644
--- a/amr-acr-mapping.json
+++ b/amr-acr-mapping.json
@@ -5,7 +5,7 @@
     "OTP" :  [{ "type": "OTP" }],
     "Wallet" :  [{ "type": "WLA" }],
     "L1-bio-device" :  [{ "type": "BIO", "count": 1 }],
-    "Knowledge" : [{"type":"kbi"}]
+    "Knowledge" : [{"type":"KBA"}]
   },
   "acr_amr" : {
     "mosip:idp:acr:password" : ["PWD"],
diff --git a/esignet-default.properties b/esignet-default.properties
index 72a9f6ed681..1794331092c 100644
--- a/esignet-default.properties
+++ b/esignet-default.properties
@@ -58,9 +58,9 @@ 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.KBI.format=base64url-encoded-json
-mosip.esignet.auth-challenge.KBI.min-length=50
-mosip.esignet.auth-challenge.KBI.max-length=500
+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
@@ -411,8 +411,8 @@ mosip.kernel.keymgr.hsm.health.check.encrypt=true
 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.authenticator.default.auth-factor.kbi.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details}
-mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field}
+mosip.esignet.authenticator.default.auth-factor.kba.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.field-details}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.individual-id-field}
 
 mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', \
   'sbi.timeout.DISC': 30, \
@@ -439,8 +439,8 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', \
   'otp.length': 6, \
   'password.regex': '\\S*', \
   'wallet.config': ${mosip.esignet.ui.wallet.config},\
-  'auth.factor.kbi.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field}',\
-  'auth.factor.kbi.field-details':${mosip.esignet.authenticator.default.auth-factor.kbi.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
@@ -534,10 +534,10 @@ logging.level.io.mosip.esignet=DEBUG
 
 ##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
 
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field=policyNumber
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.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": "^[A-Za-z\\s]{1,}[\\.]{0,1}[A-Za-z\\s]{0,}$"},{"id":"dob", "type":"date", "format":"dd/mm/yyyy"}}
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
-mosip.esignet.authenticator.sunbird-rc.kbi.entity-id-field=osid
+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":"", "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.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.issue-credential-url=http://10.3.148.107/credential/credentials/issue
 mosip.esignet.vciplugin.sunbird-rc.supported-credential-types=InsuranceCredential
diff --git a/esignet-dev.properties b/esignet-dev.properties
index 54b087df582..e077caae6b4 100644
--- a/esignet-dev.properties
+++ b/esignet-dev.properties
@@ -356,8 +356,8 @@ crypto.PrependThumbprint.enable=true
 
 ## -------------------------------------------- IDP-UI config ----------------------------------------------------------
 
-mosip.esignet.authenticator.default.auth-factor.kbi.field-details={{'id':'policyNumber', 'type':'text', 'format':''},{'id':'name', 'type':'text', 'format':''},{'id':'dob', 'type':'date', 'format':'dd/mm/yyyy'}}
-mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field='policyNumber'
+mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id':'policyNumber', 'type':'text', 'format':''},{'id':'name', 'type':'text', 'format':''},{'id':'dob', 'type':'date', 'format':'dd/mm/yyyy'}}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field='policyNumber'
 
 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, \
@@ -365,8 +365,8 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   '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}', \
-  'auth.factor.kbi.individual-id-field' : ${mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field},\
-   'auth.factor.kbi.field-details':${mosip.esignet.authenticator.default.auth-factor.kbi.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}}
 
 
 logging.level.org.springframework.web.client.RestTemplate=DEBUG
diff --git a/esignet-injiweb.properties b/esignet-injiweb.properties
index 44e726b9e4d..a671a000dc3 100644
--- a/esignet-injiweb.properties
+++ b/esignet-injiweb.properties
@@ -153,7 +153,7 @@ mosip.esignet.credential.scope-resource-mapping={'mock_identity_vc_ldp' : '${mos
 mosip.esignet.supported.response.types={'code'}
 
 ## supported format for auth factor type
-mosip.esignet.supported-formats={'OTP': 'alpha-numeric', 'PWD': 'alpha-numeric', 'BIO': 'encoded-json', 'WLA': 'jwt', 'PIN': 'number', 'kbi': 'base64url-encoded-json'}
+mosip.esignet.supported-formats={'OTP': 'alpha-numeric', 'PWD': 'alpha-numeric', 'BIO': 'encoded-json', 'WLA': 'jwt', 'PIN': 'number', 'KBA': 'base64url-encoded-json'}
 
 ## Form of Authorization Grant presented to token endpoint
 mosip.esignet.supported.grant.types={'authorization_code'}
@@ -378,8 +378,8 @@ 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.authenticator.default.auth-factor.kbi.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details}
-mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field}
+mosip.esignet.authenticator.default.auth-factor.kba.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.field-details}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.individual-id-field}
 
 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, \
@@ -389,8 +389,8 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   '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},'auth.factor.kbi.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field}',\
-   'auth.factor.kbi.field-details':${mosip.esignet.authenticator.default.auth-factor.kbi.field-details} }
+  'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config},'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
@@ -520,10 +520,10 @@ logging.level.io.mosip.esignet=DEBUG
 
 ##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
 
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field=policyNumber
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.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.kbi.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
-mosip.esignet.authenticator.sunbird-rc.kbi.entity-id-field=osid
+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.issue-credential-url=http://10.3.148.107/credential/credentials/issue
diff --git a/esignet-insurance.properties b/esignet-insurance.properties
index b6fdad5cc3d..33158c05f86 100644
--- a/esignet-insurance.properties
+++ b/esignet-insurance.properties
@@ -59,9 +59,9 @@ mosip.esignet.auth-challenge.WLA.format=jwt
 mosip.esignet.auth-challenge.WLA.min-length=100
 mosip.esignet.auth-challenge.WLA.max-length=1500
 
-mosip.esignet.auth-challenge.kbi.format=base64url-encoded-json
-mosip.esignet.auth-challenge.kbi.min-length=50
-mosip.esignet.auth-challenge.kbi.max-length=500
+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
@@ -407,8 +407,8 @@ mosip.kernel.keymgr.hsm.health.check.encrypt=true
 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.authenticator.default.auth-factor.kbi.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details}
-mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field}
+mosip.esignet.authenticator.default.auth-factor.kba.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.field-details}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.individual-id-field}
 
 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, \
@@ -418,11 +418,11 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   '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},'auth.factor.kbi.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field}',\
-   'auth.factor.kbi.field-details':${mosip.esignet.authenticator.default.auth-factor.kbi.field-details} }
+  'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config},'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} }
 
-mosip.esignet.authenticator.default.auth-factor.kbi.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.kbi.individual-id-field=policyNumber
+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
 
 ##  ---------------------------------------------- VCI ------------------------------------------------------------------
 # Used to verify audience in the PoP JWT
@@ -634,10 +634,10 @@ logging.level.io.mosip.esignet=DEBUG
 
 ##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
 
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field=policyNumber
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.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.kbi.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
-mosip.esignet.authenticator.sunbird-rc.kbi.entity-id-field=osid
+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
diff --git a/esignet-mock.properties b/esignet-mock.properties
index 7525fdd95d7..b4cad248094 100644
--- a/esignet-mock.properties
+++ b/esignet-mock.properties
@@ -398,8 +398,8 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC':
   '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},'auth.factor.kbi.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field}',\
-   'auth.factor.kbi.field-details':${mosip.esignet.authenticator.default.auth-factor.kbi.field-details} }
+  'password.regex': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config},'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
diff --git a/esignet-mosipid.properties b/esignet-mosipid.properties
index 07df536aea1..d45d4acea06 100644
--- a/esignet-mosipid.properties
+++ b/esignet-mosipid.properties
@@ -377,8 +377,8 @@ 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.authenticator.default.auth-factor.kbi.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.field-details}
-mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field}
+mosip.esignet.authenticator.default.auth-factor.kba.field-details=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.field-details}
+mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=${mosip.esignet.authenticator.sunbird-rc.auth-factor.kba.individual-id-field}
 
 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, \
@@ -389,8 +389,8 @@ 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': '\\S*', 'wallet.config': ${mosip.esignet.ui.wallet.config},\
-  'auth.factor.kbi.individual-id-field' : '${mosip.esignet.authenticator.default.auth-factor.kbi.individual-id-field}',\
-  'auth.factor.kbi.field-details':${mosip.esignet.authenticator.default.auth-factor.kbi.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
@@ -535,10 +535,10 @@ logging.level.io.mosip.esignet=DEBUG
 
 ##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
 
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.individual-id-field=policyNumber
-mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.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.kbi.registry-search-url=http://10.3.148.107/registry/api/v1/Insurance/search
-mosip.esignet.authenticator.sunbird-rc.kbi.entity-id-field=osid
+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