Merge sonar fix develop to rc2 1 (#819)

* MOSIP-18085: Upgraded swagger2 to openapi3 for authentication service * MOSIP-18085: Upgraded swagger2 to openapi3 for Id Authentication Internal Service * MOSIP-18085: Added Authorization headers * MOSIP-18085: Added Authorization headers in internal service * MOSIP-18085: Upgraded swagger to openapi for otp services. * MOSIP-18085: Added header in kyc and fixed sorting tags. * MOSIP-18085: Removed common properties for sorting of openapi tags. * Added default filter attributes to configuration (#596) * Added default filter attributes to configuration * Code updated * Mosip 18119 auto allow new dynamic attributes for authentication (#598) * Fixes in demo auth dynamic attributes * Fixed error message for decoding failure * Fix in fetching postal code for auth anonym profile * WIP for dynamic attribute auto match * Allow new dynamic attrib for auth without mapping * Removed unwanted comment * Fix age not match err msg (#599) * Fixes in demo auth dynamic attributes * Fixed error message for decoding failure * Fix in fetching postal code for auth anonym profile * WIP for dynamic attribute auto match * Allow new dynamic attrib for auth without mapping * Removed unwanted comment * Fix in age not match error msg * Fix bio auth type check issue due to case sensitive check (#600) * Fix bio auth type check issue due to case sensitive check * Minor fix * junit test cases for AuthAnonymousProfileServiceImpl.java (#604) * Mosip 18252 dsl bio auth fix (#609) * Fix bio auth type check issue due to case sensitive check * Minor fix * Added missing Face for ekyc request in filter * Fixed otp kyc filter NPE issue due to null bio (#615) * Fixed multi modal auth cbeff load issue (#617) * Fixed ekyc face retrival issue (#619) * MOSIP-18366,MOSIP-18370 bio type subtype error message correction (#621) * Fixed biotype,biosubtype related error messages * Fix NPE for null idtype * Test fixes * Revert debug code for idserviceimpl * test cases updated (#620) * IdInfoHelper Test cases updated (#623) * Fix dynamic attribute language code issue (#624) * KycController updated with test cases (#625) * Fixed test case failure (#626) * updated test cases (#627) * Revert "updated test cases" (#628) This reverts commit 5cb0b79758ede70509ff7e0cbe864e9589434cff. * Mosip 18411,MOSIP-17587 fix filter attrip for ekyc (#632) * Fixed keymanager bean loading issue * MOSIP-18411 fixed kyc attribute filtered out issue * MOSIP-17587-Fix status for ekyc auth in anonym profile * Mosip 18191 fix bio auth segment timestamp validation issue (#633) * Fix duplicate type code in kyc auth txn entry * MOSIP-18191 fix segment timestamp validation not working * Added null check for auth type code duplicate condition * MOSIP-18265 Added column to key alias table (#638) * CredentialServiceImplTest (#636) Co-authored-by: Vipul Dhurve <[email protected]> * MOSIP-18053-fixed duplicate match inputs for multiple dynamic attrib in auth req (#640) * MOSIP-18053-fixed duplicate match inputs for multiple dynamic attrib in req * added jdoc * [MOSIP-18119] Updated Notification timestamp based on timezone in prop (#641) * [MOSIP-18119] Updated Notification timestamp based on timezone in prop (#643) * [MOSIP-18119] Updated Notification timestamp based on timezone in prop * [MOSIP-18119] Fixed test case failures * Removed unnecessary db call (#645) * MOSIP-18377 Column addition to indices (#649) * MOSIP-16182 Add unique constraint to cert thumbprint column (#651) * CredentialStoreServiceImplTest (#654) * CredentialStoreServiceImplTest update * CredentialStoreServiceImplTest update Co-authored-by: Vipul Dhurve <[email protected]> * MatchInputBuilderTest test cases (#655) * [MOSIP-17776] added temp logging for debugging (#658) * [MOSIP-17776] reverted debugging code (#659) * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] reverted debugging code * AuthTransactionHelperTest updated with test cases (#657) * [MOSIP-9803] Updated swagger to accept Authorization header (#661) * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] reverted debugging code * [MOSIP-9803] Updated swagger to accept Authorization header * [MOSIP-17776] added temp logging for debugging * [MOSIP-9803] Updated swagger to accept Authorization header * Created test class for HotlistServiceImpl (#660) * CredentialStoreServiceImplTest update * CredentialStoreServiceImplTest update * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 18419 integrate with auth adapter for offline token validation (#656) * Using RestHelper from ID Repo Core * Fixes in rest helper config * Added auth adapter download in docker cmd * Fix compilation issue * Mosip 18419 integrate with auth adapter for offline token validation 2 (#662) * Using RestHelper from ID Repo Core * Fixes in rest helper config * Added auth adapter download in docker cmd * Fix compilation issue * Fixed missing env declaration in dockerfile * Mosip 18419 integrate with auth adapter for offline token validation 3 (#663) * Using RestHelper from ID Repo Core * Fixes in rest helper config * Added auth adapter download in docker cmd * Fix compilation issue * Fixed missing env declaration in dockerfile * Added jar to classpath * Mosip 18523 perf fixes (#665) * Add cacheable to uin hash salt repo * Minor refactor * Fix to cache key * MOSIP-16182 Composite unique key for ca cert store (#667) * Created test class for WebSubHelper (#669) * CredentialStoreServiceImplTest update * CredentialStoreServiceImplTest update * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for HotlistServiceImpl: HotlistServiceImplTest * Created Test class for WebSubHelper: WebSubHelperTest * Created Test class for WebSubHelper: WebSubHelperTest * Created Test class for WebSubHelper: WebSubHelperTest Co-authored-by: Vipul Dhurve <[email protected]> * Integrate with resthelper-issue-fix (#671) * Fix perf issue to use substring based logic for salt key calculation instead of modulo (#670) * Added @transactional to handle duplicate requests (#678) * Merge sonar coverage (#680) * updated test cases * updated test cases * KycFacadeImplTest class test cases updated * Test fix Co-authored-by: Neosoft_MamtaA <[email protected]> * Merge sonar coverage 2 (#681) * updated test cases * updated test cases * KycFacadeImplTest class test cases updated * Test fix * Added json to classpath Co-authored-by: Neosoft_MamtaA <[email protected]> * Merge sonar coverage 2 (#682) * updated test cases * updated test cases * KycFacadeImplTest class test cases updated * Test fix * Added json to classpath * Test fix Co-authored-by: Neosoft_MamtaA <[email protected]> * Created Test class for MissingCredentialsItemReader => MissingCredentialsItemReaderTest (#683) Co-authored-by: Vipul Dhurve <[email protected]> * Created Test Class for IdAuthFraudAnalysisEventManager (#684) * Created Test class for MissingCredentialsItemReader => MissingCredentialsItemReaderTest * Created Test Class for IdAuthFraudAnalysisEventManager =>IdAuthFraudAnalysisEventManagerTest Co-authored-by: Vipul Dhurve <[email protected]> * Created Test class for PartnerServiceCallbackController (#685) * Created Test class for MissingCredentialsItemReader => MissingCredentialsItemReaderTest * Created Test Class for IdAuthFraudAnalysisEventManager =>IdAuthFraudAnalysisEventManagerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest Co-authored-by: Vipul Dhurve <[email protected]> * Created test class for PartnerServiceEventsInitializer (#686) * Created Test class for MissingCredentialsItemReader => MissingCredentialsItemReaderTest * Created Test Class for IdAuthFraudAnalysisEventManager =>IdAuthFraudAnalysisEventManagerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created test class for PartnerServiceEventsInitializer => PartnerServiceEventsInitializerTest Co-authored-by: Vipul Dhurve <[email protected]> * Fix in setting the policy metadata for authToken issue (#687) * Mosip 18612 perf fix resp to map conversion 3 (#690) * Fixed repeated request body parsing * WIP - updated controller side * Added missing class * setting id version on respnse obj creation * Fixed respTime, transaction ID Store, send Error * Store auth txn and anonym profile * Test fixes * Fix to load missing bean * WIP - Fixes in id version and anonym prof * Fix in errors in anonym prof * Reverted debug idserviceimpl * Fix for error code in anonym prof for match failure * Fixes to store auth txn and anonym prof on err * Revert debug idserviceimpl * Fix test failure * reated test class for IdChangeEventsInitializer (#692) * Created Test class for MissingCredentialsItemReader => MissingCredentialsItemReaderTest * Created Test Class for IdAuthFraudAnalysisEventManager =>IdAuthFraudAnalysisEventManagerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created test class for PartnerServiceEventsInitializer => PartnerServiceEventsInitializerTest * Created test class for IdChangeEventsInitializer => IdChangeEventsInitializerTest Co-authored-by: Vipul Dhurve <[email protected]> * Moved test classes to test src (#693) * Mosip 17586 sonar fix (#694) * Moved test classes to test src * fix package * Fix unique ID creation logic (#696) * [MOSIP-18119] Fixed send otp timestamp mismatch (#695) * [MOSIP-18119] Updated Notification timestamp based on timezone in prop * [MOSIP-18119] Fixed test case failures * [MOSIP-18119] Fixed send otp timestamp mismatch * [MOSIP-18119] Fixed send otp timestamp mismatch * [MOSIP-1819] Updated test cases * [MOSIP-18119] Fixed send otp timestamp mismatch * removed debug code (#699) * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-18119] removed debug code * Test coverage for websub initializers (#700) * MOSIP-18606-purging cache on ca cert update event (#703) * [MOSIP-18893] Fixed comment as valid json string in fraud analytics (#705) * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-18119] removed debug code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-17776] added temp logging for debugging * [MOSIP-17776] reverted debugging code * [MOSIP-18893] Fixed comment as valid json string in fraud analytics * Fixed internal otp notif issue due to internal rest helper issue (#707) * Fixed internal otp notif issue due to internal rest helper issue * Test Fix * Created test class for CredentialRequestManager (#702) * Created Test class for MissingCredentialsItemReader => MissingCredentialsItemReaderTest * Created Test Class for IdAuthFraudAnalysisEventManager =>IdAuthFraudAnalysisEventManagerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created Test Class for PartnerServiceCallbackController =>PartnerServiceCallbackControllerTest * Created test class for PartnerServiceEventsInitializer => PartnerServiceEventsInitializerTest * Created test class for IdChangeEventsInitializer => IdChangeEventsInitializerTest * Created test class for CredentialRequestManager => CredentialRequestManagerTest Co-authored-by: Vipul Dhurve <[email protected]> * Corrected salt modulo logic to last digits of use hash of id (#709) * MOSIP-18085: Generated openapi.json for IDA- Authentication Service * MOSIP-18085: Code Reformat * Fix keymanager role bean issue (#715) * Fix for internal auth issue * Imported keymgr auth roles beans * Updated Test class for IdInfoHelper (#713) * Updated Test class for IdInfoHelper => IdInfoHelperTest * Updated Test class for IdInfoHelper => IdInfoHelperTest * Updated Test class for IdInfoHelper => IdInfoHelperTest Co-authored-by: Vipul Dhurve <[email protected]> * MOSIP-18085: Generate openapi.json for IDA-OTP service. * MOSIP-18085: Generate openapi.json for IDA-Internal service. * MOSIP-18085: Removed extra properties from authentication-internal-service test folder. * MOSIP-18085: Removed extra properties from authentication-internal-service test folder. * MOSIP-18085: Generated openapi.json for IDA- Authentication, Internal, OTP Service (#714) * MOSIP-18085: Upgraded swagger2 to openapi3 for authentication service * MOSIP-18085: Upgraded swagger2 to openapi3 for Id Authentication Internal Service * MOSIP-18085: Added Authorization headers * MOSIP-18085: Added Authorization headers in internal service * MOSIP-18085: Upgraded swagger to openapi for otp services. * MOSIP-18085: Added header in kyc and fixed sorting tags. * MOSIP-18085: Removed common properties for sorting of openapi tags. * MOSIP-18085: Generated openapi.json for IDA- Authentication Service * MOSIP-18085: Code Reformat * MOSIP-18085: Generate openapi.json for IDA-OTP service. * MOSIP-18085: Generate openapi.json for IDA-Internal service. * MOSIP-18085: Removed extra properties from authentication-internal-service test folder. * MOSIP-18085: Removed extra properties from authentication-internal-service test folder. * Update KycFilterTest.java (#717) * Mosip 18908 integrate with websub client fix for callback url (#718) * Integrated with new websubclient to load callback url from properties * Temporariy ignoring failing test * fix in json databind version for test failure due to open api dependency * Created test class for IdValidationUtil (#719) * Updated Test class for IdInfoHelper => IdInfoHelperTest * Updated Test class for IdInfoHelper => IdInfoHelperTest * Updated Test class for IdInfoHelper => IdInfoHelperTest * Created Test class for IdValidationUtil => idValidationUtilTest * Created Test class for IdValidationUtil => idValidationUtilTest Co-authored-by: Vipul Dhurve <[email protected]> * MOSIP-15286 changed openapi.json name * MOSIP-15286 changed openapi.json name * MOSIP-15286 changed openapi.json name * MOSIP-15286 Removed extra properties * Mosip 18908 integrate with websub client fix for callback url 1 (#721) * Integrated with new websubclient to load callback url from properties * Temporariy ignoring failing test * fix in json databind version for test failure due to open api dependency * Skip registering non-pubishing topics * Mosip 18792 afterburner in objectmapper (#723) * Integrated with new websubclient to load callback url from properties * Temporariy ignoring failing test * fix in json databind version for test failure due to open api dependency * Skip registering non-pubishing topics * Added afterburner in objectmapper * Update db script for key alias and key policy tables (#725) * Update db script for key alias and key policy tables * Minor format * Revert and fix object mapper and test fix (#726) * Fixed dependency conflict due to jackson-databind (#727) * Mosip 18406 add separator config support for full address (#729) * Added separator config support for full address. Fix fetch non lang value * Test fixes * Updated test class * Corrected bio subtype sep * Minor refactoring * Mosip 18406 add separator config support for full address 1 (#731) * Added separator config support for full address. Fix fetch non lang value * Test fixes * Updated test class * Corrected bio subtype sep * Minor refactoring * Added test case for full address matching * [MOSIP-19008] Added property to enable/disable fraud analysis (#730) * [MOSIP-19008] updated auth txn query to return count instead of object (#732) * [MOSIP-19008] Added property to enable/disable fraud analysis * [MOSIP-19008] updated auth txn query to return count instead of object * [MOSIP-19008] updated auth txn query to return count instead of object * [MOSIP-19008]Disabled fraud analysis websub based on property * [MOSIP-19008]Disabled fraud analysis websub based on property * [MOSIP-19008]Disabled fraud analysis websub based on property * Mosip 18407 fix ekyc respononse identity (#733) * Added separator config support for full address. Fix fetch non lang value * Test fixes * Updated test class * Corrected bio subtype sep * Minor refactoring * Added test case for full address matching * MOSIP-18407-fixed-kyc-attributes-fetch-logic * Update push_trigger.yml (#734) * Ida test fixes (#736) * Test fix * Fix partner subscription log * MOSIP-19297-corrected auth type in notification by correcting the count predicate logic for disabled bio finger minutiea * Test fix * Updated test class for OtpServiceImpl => OtpServiceImplTest (#735) Co-authored-by: Vipul Dhurve <[email protected]> * [MOSIP-18655] Optimized env.getProperty method call to static for performance * [MOSIP-18655] Imported constants as static * [MOSIP-18655] Optimized env.getProperty call to static for performance (#737) * [MOSIP-18655] Optimized env.getProperty method call to static for performance * [MOSIP-18655] Imported constants as static * Added a Bean to get Service Names as a Arraylist to RestRequestBuilder (#739) * MOSIP-19360 Add uni_ident column with unq constraint (#741) * MOSIP-19360 Add uni_ident column with unq constraint * MOSIP-19370 Added 2 columns to key_policy_def * [MOSIP-18655] Made EnvUtil as primary environment * [MOSIP-18655] Optimized env.getProperty method call to static for performance * [MOSIP-18655] Added a Bean to get Service Names as a Arraylist to RestRequestBuilder * [MOSIP-18655] Made EnvUtil as primary environment (#742) * [MOSIP-18655] Optimized env.getProperty method call to static for performance * [MOSIP-18655] Imported constants as static * [MOSIP-18655] Made EnvUtil as primary environment * [MOSIP-18655] Optimized env.getProperty method call to static for performance * [MOSIP-18655] Added a Bean to get Service Names as a Arraylist to RestRequestBuilder * MOSIP-19018-fix err msg if name is part of full address (#744) * [MOSIP-18655] Updated EnvUtil with RefreshScope * Created Test class for MosipAuthFilterFactory (#743) * Created Test class for MosipAuthFilterFactory => MosipAuthFilterFactoryTest * Created Test Class for IdServiceImpl => IdServiceImplTest Co-authored-by: Vipul Dhurve <[email protected]> * [MOSIP-18655] reverted EnvUtil as RefreshScope (#745) * [MOSIP-18655] Ignoring test cases temporarily (#746) * [MOSIP-18655] reverted EnvUtil as RefreshScope * [MOSIP-18655] Ignoring test cases temporarily * Mosip 17586 sonar coverage (#747) * junit tests * Added debug print for maven build * Mosip 17586 sonar coverage 1 (#748) * junit tests * Added debug print for maven build * Added print trace * Revert ignore (#749) * Removed Vulnerability of Regular expressions to DoS(Denial of Service) (#751) * Added a Bean to get Service Names as a Arraylist to RestRequestBuilder * Removed vulnerability of Regular expression to DoS(Denial of Service) * Revert "Removed vulnerability of Regular expression to DoS(Denial of Service)" This reverts commit 49e2a73. * Removed Vulnerability of Regular Expression to DoS(Denial of Service) * Revert "Removed Vulnerability of Regular Expression to DoS(Denial of Service)" This reverts commit 8922fb0. * Revert "Merge branch 'develop' of https://github.com/balaji-alluru/id-authentication-1 into develop" This reverts commit 00b5eb5, reversing changes made to 34bb5b5. * Removed Vulnerability of Regular expressions to DoS(Denial of Service) * Added New Test cases (#752) * [MOSIP-18655] Updated EnvUtil to implement env methods (#754) * [MOSIP-18655] reverted EnvUtil as RefreshScope * [MOSIP-18655] Ignoring test cases temporarily * [MOSIP-18655] Updated EnvUtil to implement env methods * Update push_trigger.yml * Update push_trigger.yml * fix duplicate key issue (#756) * Fix env val for internal otp req validator (#757) * Removed test unwanted (#759) * Updated gpg signing keys. * Created Test Class for IdServiceImpl (#762) * Created Test CLass For IdServiceImpl => IdServiceImplTest * Created Test CLass For IdServiceImpl => IdServiceImplTest * Created Test CLass For IdServiceImpl => IdServiceImplTest Co-authored-by: Vipul Dhurve <[email protected]> * Revert "Created Test Class for IdServiceImpl (#762)" (#764) This reverts commit 9e689ff. * Added New Test case (#763) * Mosip 18208 fix anonym prof data (#765) * fix partner name in anon prof * Minor refactoring, test corrections with assertions * Fix in column length limit in code * Fix in photo attribute check * Fix in bio time property * Corrected attribute lengths, removed size for audit * Added new test cases (#767) * Updated test class for IdServiceImpl (#766) * Updated test class for IdServiceImpl => IdServiceImplTest * Updated test class for IdServiceImpl * Updated test class for IdServiceImpl Co-authored-by: Vipul Dhurve <[email protected]> * ignoring failed new tests (#768) * Updated Test cases for AuthRequestValidator class (#770) * Added a Bean to get Service Names as a Arraylist to RestRequestBuilder * Removed vulnerability of Regular expression to DoS(Denial of Service) * Revert "Removed vulnerability of Regular expression to DoS(Denial of Service)" This reverts commit 49e2a73. * Removed Vulnerability of Regular Expression to DoS(Denial of Service) * Revert "Removed Vulnerability of Regular Expression to DoS(Denial of Service)" This reverts commit 8922fb0. * Revert "Merge branch 'develop' of https://github.com/balaji-alluru/id-authentication-1 into develop" This reverts commit 00b5eb5, reversing changes made to 34bb5b5. * Removed Vulnerability of Regular expressions to DoS(Denial of Service) * Updated TestCases to AuthRequestValidator Class * Update AuthRequestValidatorTest.java * [MOSIP-19429] added thread pool with config prop and logic to monitor (#771) * [MOSIP-19429] added thread pool with config prop and logic to monitor * [MOSIP-19429] updated thread group count * Added debug log (#772) * Revert "Added debug log" (#773) This reverts commit 1b2d328. * Created test class for UpdateAythtypeStatusServiceImpl (#769) * Created test class for UpdateAythtypeStatusServiceImpl => pdateAythtypeStatusServiceImplTest * Created test class for UpdateAythtypeStatusServiceImpl => pdateAythtypeStatusServiceImplTest * Created test class for UpdateAythtypeStatusServiceImpl => pdateAythtypeStatusServiceImplTest * Created test class for UpdateAythtypeStatusServiceImpl => pdateAythtypeStatusServiceImplTest * Created test class for UpdateAythtypeStatusServiceImpl => pdateAythtypeStatusServiceImplTest Co-authored-by: Vipul Dhurve <[email protected]> * Updated Test class for InternalAuthController (#775) * Updated Test class for InternalAuthController => InternalAUthCOntrollerTest * Updated Test class for InternalAuthController => InternalAuthControllerTest * Updated Test class for InternalAuthController => InternalAuthControllerTest Co-authored-by: Vipul Dhurve <[email protected]> * New test cases added (#777) * Ignoring failed tests (#779) * Created test class for IdTypeUtil (#778) * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest Co-authored-by: Vipul Dhurve <[email protected]> * Resolved @ignore test cases (#781) * Updated test case (#782) * Created Test class for BytesUtil (#783) * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for HotlistScheduledCleanupJob => HotlistScheduledCleanupJobTest Co-authored-by: Vipul Dhurve <[email protected]> * Created test class for HotlistScheduledCleanupJob (#785) * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for HotlistScheduledCleanupJob => HotlistScheduledCleanupJobTest Co-authored-by: Vipul Dhurve <[email protected]> * Resolved ignore test cases (#786) * Updated test cases (#788) * Created test class for MasterDataCacheInitializer (#787) * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for IdTypeUtil => IdTypeUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for BytesUtil => BytesUtilTest * Created test class for HotlistScheduledCleanupJob => HotlistScheduledCleanupJobTest * Created test class for MasterDataCacheInitializer => MasterDataCacheInitializerTest Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 19313 allow norm for name id attribs (#789) * Added support to dynamic attrib norm if in name or fulladdr * Added tests * Minor refactoring * Created test class for CredentialIssueanceCallbackController => CredentialIssueanceCallbackControllerTest (#791) Co-authored-by: Vipul Dhurve <[email protected]> * Created Test class for InternalAuthWebSubInitializer (#792) * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Revert "Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest" This reverts commit 3c5fe5d. * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 17586 sonar coverage 6 (#793) * Updated test case * WIP-idservimpl-tests * Updated test cases * Created Test class for IdInfoFetcherImpl class (#795) * Added a Bean to get Service Names as a Arraylist to RestRequestBuilder * Removed vulnerability of Regular expression to DoS(Denial of Service) * Revert "Removed vulnerability of Regular expression to DoS(Denial of Service)" This reverts commit 49e2a73. * Removed Vulnerability of Regular Expression to DoS(Denial of Service) * Revert "Removed Vulnerability of Regular Expression to DoS(Denial of Service)" This reverts commit 8922fb0. * Revert "Merge branch 'develop' of https://github.com/balaji-alluru/id-authentication-1 into develop" This reverts commit 00b5eb5, reversing changes made to 34bb5b5. * Removed Vulnerability of Regular expressions to DoS(Denial of Service) * Updated TestCases to AuthRequestValidator Class * Update AuthRequestValidatorTest.java * Created Test class for IdInfoFetcherImpl class * Mosip 17586 sonar coverage 10 (#797) * WIP-idservimpl-tests * Added test case * Mosip 17586 sonar coverage 14 (#799) * WIP-idservimpl-tests * Added test case * Test fix * Created Test class for IdaRequestResponsConsumerUtil (#800) * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Revert "Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest" This reverts commit 3c5fe5d. * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for IdaRequestResponseConsumerUtil => IdaRequestResponseConsumerUtilTest Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 17586 sonar coverage 17 (#803) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Mosip 17586 sonar coverage 18 (#804) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Minor refactoring * Added tests * Updated testcases for IdServiceImpl class (#805) * Added a Bean to get Service Names as a Arraylist to RestRequestBuilder * Removed vulnerability of Regular expression to DoS(Denial of Service) * Revert "Removed vulnerability of Regular expression to DoS(Denial of Service)" This reverts commit 49e2a73. * Removed Vulnerability of Regular Expression to DoS(Denial of Service) * Revert "Removed Vulnerability of Regular Expression to DoS(Denial of Service)" This reverts commit 8922fb0. * Revert "Merge branch 'develop' of https://github.com/balaji-alluru/id-authentication-1 into develop" This reverts commit 00b5eb5, reversing changes made to 34bb5b5. * Removed Vulnerability of Regular expressions to DoS(Denial of Service) * Updated TestCases to AuthRequestValidator Class * Update AuthRequestValidatorTest.java * Created Test class for IdInfoFetcherImpl class * Updated test cases for IdServiceImpl class * Update IdServiceImplTest.java * Mosip 17586 sonar coverage 19 (#806) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Minor refactoring * Added tests * Fix failed test * Created Test class for AuthTypeLockFilterImpl (#807) * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Revert "Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest" This reverts commit 3c5fe5d. * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for IdaRequestResponseConsumerUtil => IdaRequestResponseConsumerUtilTest * Created Test class for AuthTypeLockFilterImpl => AuthTypeLockFilterImplTest * Created Test class for AuthTypeLockFilterImpl => AuthTypeLockFilterImplTest Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 17586 sonar coverage 22 (#809) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Minor refactoring * Added tests * Fix failed test * Fixed test * Mosip 17586 sonar coverage 23 (#810) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Minor refactoring * Added tests * Fix failed test * Fixed test * Added tests * Minor refactoring for performance * Created Test class for MasterDataCache (#811) * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Revert "Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest" This reverts commit 3c5fe5d. * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for InternalAuthWebSubInitializer => InternalAuthWebSubInitializerTest * Created Test class for IdaRequestResponseConsumerUtil => IdaRequestResponseConsumerUtilTest * Created Test class for AuthTypeLockFilterImpl => AuthTypeLockFilterImplTest * Created Test class for AuthTypeLockFilterImpl => AuthTypeLockFilterImplTest * Created Test class for MasterDataCache => MasterDataCacheTest Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 17586 sonar coverage 24 (#812) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Minor refactoring * Added tests * Fix failed test * Fixed test * Added tests * Minor refactoring for performance * Added tests * Mosip 17586 sonar coverage 25 (#813) * WIP-idservimpl-tests * Added test case * Test fix * Added tests * Minor refactoring * Added tests * Fix failed test * Fixed test * Added tests * Minor refactoring for performance * Added tests * Sonar issue fix 1 * Sonar fixes * Created test class for CredentialStoreJobExecutionListener => (#814) CredentialStoreJobExecutionListenerTest Co-authored-by: Vipul Dhurve <[email protected]> * New test cases added (#815) * Added tests (#816) * Created test class for LanguageComparator => LanguageComparatorTest (#817) Co-authored-by: Vipul Dhurve <[email protected]> * Mosip 17586 sonar coverage 27 (#818) * Added tests * Minor fix in parse decrypted data to String * Added tests for datasharemanager * Updated pom versions Co-authored-by: kameshsr <[email protected]> Co-authored-by: kameshsr <[email protected]> Co-authored-by: Nagarjuna K <[email protected]> Co-authored-by: mamta-344 <[email protected]> Co-authored-by: rambhatt1591 <[email protected]> Co-authored-by: vipuldhurve02 <[email protected]> Co-authored-by: Vipul Dhurve <[email protected]> Co-authored-by: Manoj SP <[email protected]> Co-authored-by: Neosoft_MamtaA <[email protected]> Co-authored-by: Mandeep Dhiman <[email protected]> Co-authored-by: Manoj SP <[email protected]> Co-authored-by: Balaji Alluru <[email protected]> Co-authored-by: Aiham Hasan <[email protected]> Co-authored-by: mandeepdhiman123 <[email protected]>
mosip · Jan 24, 2022 · c2e20c0 · c2e20c0
1 parent f0a613d
commit c2e20c0
Show file tree

Hide file tree

Showing 31 changed files with 3,746 additions and 407 deletions.
diff --git a/...test/java/io/mosip/authentication/authtypelockfilter/impl/AuthTypeLockFilterImplTest.java b/...test/java/io/mosip/authentication/authtypelockfilter/impl/AuthTypeLockFilterImplTest.java
@@ -6,6 +6,9 @@
 import java.util.List;
 import java.util.Map;
 
+import io.mosip.authentication.authfilter.exception.IdAuthenticationFilterException;
+import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants;
+import io.mosip.authentication.core.indauth.dto.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,11 +26,6 @@
 import io.mosip.authentication.common.service.impl.match.BioAuthType;
 import io.mosip.authentication.common.service.impl.match.BioMatchType;
 import io.mosip.authentication.core.exception.IdAuthenticationBusinessException;
-import io.mosip.authentication.core.indauth.dto.AuthRequestDTO;
-import io.mosip.authentication.core.indauth.dto.BioIdentityInfoDTO;
-import io.mosip.authentication.core.indauth.dto.DataDTO;
-import io.mosip.authentication.core.indauth.dto.IdentityDTO;
-import io.mosip.authentication.core.indauth.dto.RequestDTO;
 import io.mosip.authentication.core.spi.indauth.match.IdInfoFetcher;
 import io.mosip.authentication.core.spi.indauth.match.MatchType;
 import io.mosip.idrepository.core.dto.AuthtypeStatus;
@@ -146,5 +144,65 @@ public void TestvalidateAuthTypeStatusPinLocked() throws Throwable {
 		}
 	}
 
+	@Test(expected = IdAuthenticationFilterException.class)
+	public void validateExceptionTest1() throws IdAuthenticationBusinessException {
+		AuthRequestDTO authRequestDTO = new AuthRequestDTO();
+		RequestDTO request = new RequestDTO();
+		request.setStaticPin("123");
+		authRequestDTO.setRequest(request);
+		Map<String, List<IdentityInfoDTO>> identityData = new HashMap<>();
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("TOKEN", "1122");
+		AuthtypeStatus status = new AuthtypeStatus();
+		status.setAuthType(MatchType.Category.SPIN.getType());
+		status.setLocked(true);
+		List<AuthtypeStatus> authtypeStatusList = new ArrayList<>();
+		authtypeStatusList.add(status);
+		Mockito.when(authTypeStatusService.fetchAuthtypeStatus("1122")).thenReturn(authtypeStatusList);
+		authTypeLockFilterImpl.validate(authRequestDTO, identityData, properties);
+	}
+
+	@Test(expected = IdAuthenticationFilterException.class)
+	public void validateExceptionTest2() throws IdAuthenticationBusinessException {
+		AuthRequestDTO authRequestDTO = new AuthRequestDTO();
+		RequestDTO request = new RequestDTO();
+		request.setStaticPin("123");
+		authRequestDTO.setRequest(request);
+		Map<String, List<IdentityInfoDTO>> identityData = new HashMap<>();
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("TOKEN", "1122");
+		AuthtypeStatus status = new AuthtypeStatus();
+		status.setAuthType(MatchType.Category.SPIN.getType());
+		status.setLocked(true);
+		List<AuthtypeStatus> authtypeStatusList = new ArrayList<>();
+		authtypeStatusList.add(status);
+		System.out.println("1= "+authtypeStatusList);
+		IdAuthenticationBusinessException exception = new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorCode(),
+				String.format(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorMessage(),
+						MatchType.Category.SPIN.getType()));
+		Mockito.doThrow(exception).when(authTypeStatusService).fetchAuthtypeStatus("1122");
+//		Mockito.when(authTypeStatusService.fetchAuthtypeStatus("1122")).thenReturn(authtypeStatusList);
+		authTypeLockFilterImpl.validate(authRequestDTO, identityData, properties);
+	}
+
+	@Test
+	public void validateTest() throws IdAuthenticationBusinessException {
+		AuthRequestDTO authRequestDTO = new AuthRequestDTO();
+		RequestDTO request = new RequestDTO();
+		request.setStaticPin("123");
+		authRequestDTO.setRequest(request);
+		Map<String, List<IdentityInfoDTO>> identityData = new HashMap<>();
+		Map<String, Object> properties = new HashMap<>();
+		properties.put("TOKEN", "1122");
+		AuthtypeStatus status = new AuthtypeStatus();
+		status.setAuthType(MatchType.Category.SPIN.getType());
+		status.setLocked(false);
+		List<AuthtypeStatus> authtypeStatusList = new ArrayList<>();
+		Mockito.when(authTypeStatusService.fetchAuthtypeStatus("1122")).thenReturn(authtypeStatusList);
+		authTypeLockFilterImpl.validate(authRequestDTO, identityData, properties);
+
+		authtypeStatusList.add(status);
+		authTypeLockFilterImpl.validate(authRequestDTO, identityData, properties);
+	}
 
 }
diff --git a/...on-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java b/...on-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java
@@ -134,7 +134,7 @@ public class AuthFacadeImpl implements AuthFacade {
 	 * AuthRequestDTO, boolean, java.lang.String)
 	 */
 	@Override
-	public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequestDTO, boolean isAuth, String partnerId,
+	public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequestDTO, boolean isExternalAuth, String partnerId,
 			String partnerApiKey, boolean markVidConsumed, ObjectWithMetadata requestWrapperMetadata) throws IdAuthenticationBusinessException {
 
 		String idvid = authRequestDTO.getIndividualId();
@@ -150,7 +150,7 @@ public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequestDTO, boo
 			KycAuthRequestDTO kycAuthRequestDTO = (KycAuthRequestDTO) authRequestDTO;
 			// In case of ekyc request and photo also needed we need to add face to get it
 			// filtered
-			if(idInfoHelper.isKycAttributeHasPhoto(kycAuthRequestDTO)) {
+			if(IdInfoHelper.isKycAttributeHasPhoto(kycAuthRequestDTO)) {
 				filterAttributes.add(CbeffDocType.FACE.getType().value());
 			}
 
@@ -176,14 +176,14 @@ public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequestDTO, boo
 		try {
 			idInfo = IdInfoFetcher.getIdInfo(idResDTO);
 			authResponseBuilder.setTxnID(transactionID);
-			authTokenId = authTokenRequired && isAuth ? getToken(authRequestDTO, partnerId, partnerApiKey, idvid, token)
+			authTokenId = authTokenRequired && isExternalAuth ? getToken(authRequestDTO, partnerId, partnerApiKey, idvid, token)
 					: null;
 
 			LinkedHashMap<String, Object> properties = new LinkedHashMap<>(authRequestDTO.getMetadata());
 			properties.put(IdAuthCommonConstants.TOKEN, token);
 			authFiltersValidator.validateAuthFilters(authRequestDTO, idInfo, properties);
 
-			List<AuthStatusInfo> authStatusList = processAuthType(authRequestDTO, idInfo, token, isAuth, authTokenId,
+			List<AuthStatusInfo> authStatusList = processAuthType(authRequestDTO, idInfo, token, isExternalAuth, authTokenId,
 					partnerId, authTxnBuilder);
 			authStatusList.stream().filter(Objects::nonNull).forEach(authResponseBuilder::addAuthStatusInfo);
 		} catch (IdAuthenticationBusinessException e) {
@@ -219,7 +219,7 @@ public AuthResponseDTO authenticateIndividual(AuthRequestDTO authRequestDTO, boo
 		}
 
 		if (idInfo != null && idvid != null) {
-			notificationService.sendAuthNotification(authRequestDTO, idvid, authResponseDTO, idInfo, isAuth);
+			notificationService.sendAuthNotification(authRequestDTO, idvid, authResponseDTO, idInfo, isExternalAuth);
 		}
 
 		return authResponseDTO;

diff --git a/...n-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java b/...n-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java
@@ -261,8 +261,8 @@ public Map<String, Entry<String, List<IdentityInfoDTO>>> getCbeffValues(Map<Stri
 			List<String> identityBioAttributes = getBioAttributeNames(type, matchType, idEntity);
 			for (String bioAttribute : identityBioAttributes) {
 				Optional<String> identityValue = getIdentityValue(bioAttribute, null, idEntity).findAny();
-				if (!identityValue.isEmpty()) {
-					cbeffValuesForTypes.putAll(getCbeffValuesForCbeffDocType(type, matchType, identityValue));
+				if (identityValue.isPresent()) {
+					cbeffValuesForTypes.putAll(getCbeffValuesForCbeffDocType(type, matchType, identityValue.get()));
 				} else {
 					throw new IdAuthenticationBusinessException(
 							IdAuthenticationErrorConstants.BIOMETRIC_MISSING.getErrorCode(), String.format(
@@ -314,10 +314,10 @@ private List<String> getBioAttributeNames(CbeffDocType type, MatchType matchType
 	 * @throws IdAuthenticationBusinessException the id authentication business exception
 	 */
 	private Map<String, Entry<String, List<IdentityInfoDTO>>> getCbeffValuesForCbeffDocType(CbeffDocType type,
-			MatchType matchType, Optional<String> identityValue) throws IdAuthenticationBusinessException {
+			MatchType matchType, String identityValue) throws IdAuthenticationBusinessException {
 		Map<String, String> bdbBasedOnType;
 		try {
-			bdbBasedOnType = cbeffUtil.getBDBBasedOnType(identityValue.get().getBytes(), type.getName(),
+			bdbBasedOnType = cbeffUtil.getBDBBasedOnType(identityValue.getBytes(), type.getName(),
 					null);
 		} catch (Exception e) {
 			throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.BIOMETRIC_MISSING.getErrorCode(),

diff --git a/...on/src/main/java/io/mosip/authentication/common/service/integration/DataShareManager.java b/...on/src/main/java/io/mosip/authentication/common/service/integration/DataShareManager.java
@@ -46,33 +46,47 @@ public class DataShareManager {
 	@Value("${" + IDA_DATASHARE_THUMBPRINT_VALIDATION_REQUIRED + ":true}")
 	private boolean thumbprintValidationRequired;
 
-	public <R> R downloadObject(String dataShareUrl, Class<R> clazz, boolean decryptionRequred) throws  RestServiceException, IdAuthenticationBusinessException {
+	@SuppressWarnings("unchecked")
+	public <R> R downloadObject(String dataShareUrl, Class<R> clazz, boolean decryptionRequired) throws  RestServiceException, IdAuthenticationBusinessException {
 		RestRequestDTO request = restRequestFactory.buildRequest(RestServicesConstants.DATA_SHARE_GET, null, String.class);
 		request.setUri(dataShareUrl);
 		String responseStr = restHelper.requestSync(request);
 		Optional<Entry<String, Object>> errorOpt = RestUtil.getError(responseStr, mapper);
-		byte[] data;
-		if(errorOpt.isEmpty()) {
-			if(decryptionRequred) {
-				//Decrypt data
-				data = securityManager.decrypt(responseStr, dataShareGetDecryptRefId, null, null, thumbprintValidationRequired);
+
+		if (errorOpt.isEmpty()) {
+			R result;
+			if (decryptionRequired) {
+				// Decrypt data
+				byte[] dataBytes = securityManager.decrypt(responseStr, dataShareGetDecryptRefId, null, null,
+						thumbprintValidationRequired);
+				if (clazz.equals(String.class)) {
+					result = (R) new String(dataBytes);
+				} else {
+					result = readToObject(clazz, dataBytes);
+				}
 			} else {
-				if(clazz.equals(String.class)) {
-					return (R) responseStr;
+				if (clazz.equals(String.class)) {
+					result = (R) responseStr;
 				} else {
-					data = responseStr.getBytes();
+					byte[] dataBytes = responseStr.getBytes();
+					result = readToObject(clazz, dataBytes);
 				}
 			}
 
-			try {
-				return mapper.readValue(data, clazz);
-			} catch (IOException e) {
-				throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e);
-			}
+			return result;
+
 		} else {
 			//Unchecked exception is thrown so that retry will not be performed on this.
 			throw new IdAuthUncheckedException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorCode(), IdAuthenticationErrorConstants.UNABLE_TO_PROCESS.getErrorMessage() + " : " + errorOpt.get().toString());
 		}
 	}
+
+	private <R> R readToObject(Class<R> clazz, byte[] dataBytes) throws IdAuthenticationBusinessException {
+		try {
+			return mapper.readValue(dataBytes, clazz);
+		} catch (IOException e) {
+			throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS, e);
+		}
+	}
 
 }
diff --git a/...c/main/java/io/mosip/authentication/common/service/integration/PartnerServiceManager.java b/...c/main/java/io/mosip/authentication/common/service/integration/PartnerServiceManager.java
@@ -148,8 +148,9 @@ private void validatePartnerMappingDetails(Optional<PartnerMapping> partnerMappi
 						IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_ACTIVE.getErrorCode(),
 						IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_ACTIVE.getErrorMessage());
 			}
-			if (!(partnerMapping.getPolicyData().getPolicyCommenceOn().isBefore(DateUtils.getUTCCurrentDateTime())
-					&& partnerMapping.getPolicyData().getPolicyExpiresOn().isAfter(DateUtils.getUTCCurrentDateTime()))) {
+			if (partnerMapping.getPolicyData().getPolicyCommenceOn().isAfter(DateUtils.getUTCCurrentDateTime())
+					|| partnerMapping.getPolicyData().getPolicyExpiresOn()
+							.isBefore(DateUtils.getUTCCurrentDateTime())) {
 				throw new IdAuthenticationBusinessException(
 						IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_ACTIVE.getErrorCode(),
 						IdAuthenticationErrorConstants.PARTNER_POLICY_NOT_ACTIVE.getErrorMessage());
@@ -162,8 +163,9 @@ private void validatePartnerMappingDetails(Optional<PartnerMapping> partnerMappi
 				throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.PARTNER_DEACTIVATED.getErrorCode(),
 						IdAuthenticationErrorConstants.PARTNER_DEACTIVATED.getErrorMessage());
 			}
-			if (!(partnerMapping.getApiKeyData().getApiKeyCommenceOn().isBefore(DateUtils.getUTCCurrentDateTime())
-					&& partnerMapping.getApiKeyData().getApiKeyExpiresOn().isAfter(DateUtils.getUTCCurrentDateTime()))) {
+			if (partnerMapping.getApiKeyData().getApiKeyCommenceOn().isAfter(DateUtils.getUTCCurrentDateTime())
+					|| partnerMapping.getApiKeyData().getApiKeyExpiresOn()
+							.isBefore(DateUtils.getUTCCurrentDateTime())) {
 				throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.PARTNER_NOT_REGISTERED.getErrorCode(),
 						IdAuthenticationErrorConstants.PARTNER_NOT_REGISTERED.getErrorMessage());
 			}

diff --git a/...ommon/src/test/java/io/mosip/authentication/common/service/cache/MasterDataCacheTest.java b/...ommon/src/test/java/io/mosip/authentication/common/service/cache/MasterDataCacheTest.java
@@ -0,0 +1,98 @@
+package io.mosip.authentication.common.service.cache;
+
+import io.mosip.authentication.common.service.factory.RestRequestFactory;
+import io.mosip.authentication.core.constant.RestServicesConstants;
+import io.mosip.authentication.core.exception.IDDataValidationException;
+import io.mosip.authentication.core.exception.IdAuthenticationBusinessException;
+import io.mosip.idrepository.core.dto.RestRequestDTO;
+import io.mosip.idrepository.core.helper.RestHelper;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.context.WebApplicationContext;
+
+import java.util.Map;
+
+@WebMvcTest
+@ContextConfiguration(classes = {TestContext.class, WebApplicationContext.class})
+@RunWith(SpringRunner.class)
+public class MasterDataCacheTest {
+
+    @InjectMocks
+    private MasterDataCache masterDataCache;
+
+    @Mock
+    private RestHelper restHelper;
+
+    @Mock
+    private RestRequestFactory restFactory;
+
+    /**
+     * This class tests the getMasterDataTitles method
+     */
+    @Test
+    public void getMasterDataTitlesTest() throws IdAuthenticationBusinessException {
+        masterDataCache.getMasterDataTitles();
+    }
+
+    /**
+     * This class tests the getMasterDataTitlesException method
+     *
+     * @throws IdAuthenticationBusinessException the id authentication business
+     *                                           exception
+     */
+    @Test(expected = IdAuthenticationBusinessException.class)
+    public void getMasterDataTitlesExceptionTest1() throws IdAuthenticationBusinessException {
+        Object[] args = {};
+        IDDataValidationException exception = new IDDataValidationException("kj","as",args);
+        Mockito.doThrow(exception).when(restFactory).buildRequest(RestServicesConstants.TITLE_SERVICE, null, Map.class);
+        masterDataCache.getMasterDataTitles();
+    }
+
+    /**
+     * This class tests the getMasterDataTemplate method
+     *
+     * @throws IdAuthenticationBusinessException the id authentication business
+     *                                           exception
+     */
+    @Test
+    public void getMasterDataTemplateTest() throws IdAuthenticationBusinessException {
+        String template = "1122";
+        RestRequestDTO request = new RestRequestDTO();
+        request.setUri("aaaaa");
+        Mockito.when(restFactory.buildRequest(RestServicesConstants.ID_MASTERDATA_TEMPLATE_SERVICE_MULTILANG, null, Map.class)).thenReturn(request);
+        masterDataCache.getMasterDataTemplate(template);
+    }
+
+    /**
+     * This class tests the getMasterDataTemplateException method
+     *
+     * @throws IdAuthenticationBusinessException the id authentication business
+     *                                           exception
+     */
+    @Test(expected = IdAuthenticationBusinessException.class)
+    public void getMasterDataTemplateExceptionTest() throws IdAuthenticationBusinessException {
+        String template = "1122";
+        Object[] args = {};
+        IDDataValidationException exception = new IDDataValidationException("kj","as",args);
+        Mockito.doThrow(exception).when(restFactory).buildRequest(RestServicesConstants.ID_MASTERDATA_TEMPLATE_SERVICE_MULTILANG, null, Map.class);
+        masterDataCache.getMasterDataTemplate(template);
+    }
+
+    /**
+     * This class tests the clearMasterDataTemplateCache method
+     * This class tests the clearMasterDataTitlesCache method
+     */
+    @Test
+    public void clearMasterData_CacheTest(){
+        masterDataCache.clearMasterDataTemplateCache("1122");
+        masterDataCache.clearMasterDataTitlesCache();
+    }
+
+}