MOSIP-39024 : Merge code from develop-pmp-revamp to release-1.3.x for…

… 1.3.0-beta1 (#1118) * updated pom version. (#789) Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() (#792) * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : Junit-getAllSBIDetails() (#793) Signed-off-by: sudeep <[email protected]> * MOSIP-34823 : API Development: getAllApprovedDeviceProviderIds() (#794) Signed-off-by: sudeep <[email protected]> * MOSIP-34823 : Junit: getAllApprovedDeviceProviderIds() (#797) * MOSIP-34823 : Junit: getAllApprovedDeviceProviderIds() Signed-off-by: sudeep <[email protected]> * MOSIP-34823 : Junit: getAllApprovedDeviceProviderIds() Signed-off-by: sudeep <[email protected]> * MOSIP-34823 : Junit: getAllApprovedDeviceProviderIds() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-34623: updated the role in properties (#802) * MOSIP-34623: updated the role in properties Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34623: updated the role in properties Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34935 : API Development: getAllDevicesForSBI() (#805) Signed-off-by: sudeep <[email protected]> * MOSIP-34935 : API Development: getAllDevicesForSBI() (#806) Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() (#807) * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> * MOSIP-34711 : API Development: getAllSBIDetails() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * corrected exception handling (#808) * corrected exception handling Signed-off-by: sudeep <[email protected]> * corrected exception handling Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * corrected exception handling (#809) Signed-off-by: sudeep <[email protected]> * MOSIP-34605 fixed date validation issues (#810) * MOSIP-34108, MOSIP-34276: OIDC update issues fixed Signed-off-by: Mayura Deshmukh <[email protected]> * junit Signed-off-by: Mayura Deshmukh <[email protected]> * updated method name Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-34430 checking status before deactivating API key Signed-off-by: Mayura Deshmukh <[email protected]> * commented Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-34605 fixed date validation issues Signed-off-by: Mayura Deshmukh <[email protected]> * fixed JUNIT Signed-off-by: Mayura Deshmukh <[email protected]> --------- Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() (#811) * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() (#813) * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> * MOSIP-34943 : API Development: addInactiveDeviceMappingToSbi() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP:34944 - API Development: approveDeviceWithSbiMapping() (#817) * MOSIP:34944 - API Development: approveDeviceWithSbiMapping() Signed-off-by: sudeep <[email protected]> * MOSIP:34944 - API Development: approveDeviceWithSbiMapping() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP:34944 - Junits: approveDeviceWithSbiMapping() (#819) * MOSIP:34944 - Junits: approveDeviceWithSbiMapping() Signed-off-by: sudeep <[email protected]> * Updated MultiPartnerAdminServiceContollerTest.java Signed-off-by: Sudeep7353 <[email protected]> --------- Signed-off-by: sudeep <[email protected]> Signed-off-by: Sudeep7353 <[email protected]> * MOSIP:34944 - API Development: rejectDeviceWithSbiMapping() (#820) * MOSIP:34944 - API Development: rejectDeviceWithSbiMapping() Signed-off-by: sudeep <[email protected]> * MOSIP:34944 - API Development: rejectDeviceWithSbiMapping() Signed-off-by: sudeep <[email protected]> * MOSIP:34944 - API Development: rejectDeviceWithSbiMapping() Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35264: Added isActive field in SbiDetailsDto (#821) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35264: Updated the count of devices approved and pending_approval (#822) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35262: API development - deactivateDevice (#823) * MOSIP-35262: API development - deactivateDevice Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35262: API development - deactivateDevice Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35262: API development - deactivateDevice Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35262: Added junit tests for deactivateDevice (#824) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35319: Fixed the data validations (#825) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-32075 dp1 properties refactoring (#827) * MOSIP-34108, MOSIP-34276: OIDC update issues fixed Signed-off-by: Mayura Deshmukh <[email protected]> * junit Signed-off-by: Mayura Deshmukh <[email protected]> * updated method name Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-34430 checking status before deactivating API key Signed-off-by: Mayura Deshmukh <[email protected]> * commented Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-34605 fixed date validation issues Signed-off-by: Mayura Deshmukh <[email protected]> * fixed JUNIT Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-32075 dp1 properties refactoring Signed-off-by: Mayura Deshmukh <[email protected]> --------- Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-35264: API development - deactivateSbi (#829) * MOSIP-35264: API development - deactivateSBI Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35264: API development - deactivateSBI Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35264: Junit tests for deactivateSbi() (#830) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35264: Added request id validations in deactivateSbi and deactivateDevice (#831) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35355: Updated the validateSbiDeviceMapping() (#832) * MOSIP-35355: Updated the validateSbiDeviceMapping() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35355: Updated the validateSbiDeviceMapping() Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * added definePolicyGroup test cases (#796) * added definePolicyGroup test cases Signed-off-by: ckesiraju <[email protected]> * Added Activate and deactivate partner and Approvemapping test cases Signed-off-by: ckesiraju <[email protected]> * Updated negative test cases Signed-off-by: ckesiraju <[email protected]> * Updated negative test cases Signed-off-by: ckesiraju <[email protected]> --------- Signed-off-by: ckesiraju <[email protected]> * MOSIP-35355: Bug fixes (#834) * MOSIP-35355: Bug fixes Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35314: Updated the error message Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34947: Deprecated Edit Sbi, Edit Device and Unmap device to SBI… (#838) * MOSIP-34947: Deprecated edit sbi, edit device and unmap device to sbi endpoints Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34947: Deprecated edit sbi, edit device and unmap device to sbi endpoints Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34947: Deprecated edit sbi, edit device and unmap device to sbi endpoints Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34947: Deprecated edit sbi, edit device and unmap device to sbi endpoints Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign key mapping in device_detail_sbi table (#840) * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * Rename 1.2.1.0_to_1.2.2.0_upgrade.sql to 1.2.1.0_to_1.3.0-dp.1_upgrade.sql.sql Signed-off-by: Mayura Deshmukh <[email protected]> * Rename 1.2.1.0_to_1.2.2.0_rollback.sql to 1.2.1.0_to_1.3.0-dp.1_rollback.sql.sql Signed-off-by: Mayura Deshmukh <[email protected]> * DSD-6112 Renamed the upgrade SH & properties file Signed-off-by: Mayura Deshmukh <[email protected]> * Rename pms_release_db_deploy.sh to pms_old_release_db_deploy.sh Signed-off-by: Mayura Deshmukh <[email protected]> * Rename pms_release_deploy.properties to pms_old_release_deploy.properties Signed-off-by: Mayura Deshmukh <[email protected]> * Rename pms_revoke_db_deploy.sh to pms_old_revoke_db_deploy.sh Signed-off-by: Mayura Deshmukh <[email protected]> * MOSIP-35330: Updated the SBI created date and expiry date validation (#847) * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: Added foreign mapping in device_detail_sbi table Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35330: Updated the SBI created date and expiry date validation Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35330: Updated the SBI created date and expiry date validation Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * [MOSIP-35571, MOSIP-35560]: API Development of ftm-chip-details() & approved-ftm-provider-ids() (#852) * MOSIP-35571: API Development - ftm-chip-details() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35571: API Development - ftm-chip-details() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35560: API Development of approved-ftm-provider-ids() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35560: API Development of approved-ftm-provider-ids() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35571: API Development - ftm-chip-details() Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35571: Removed certificateName field (#855) Signed-off-by: SwethaKrish4 <[email protected]> * cleaned up Api Response codes. (#854) Signed-off-by: sudeep <[email protected]> * MOSIP-35598 : PMP API: Response id is not as per the id given in request (#853) * MOSIP-35598 : PMP API: Response id is not as per the id given in request Signed-off-by: sudeep <[email protected]> * MOSIP-35598 : PMP API: Response id is not as per the id given in request Signed-off-by: sudeep <[email protected]> * MOSIP-35598 : PMP API: Response id is not as per the id given in request Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-34986: Junit tests (#857) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35655 : The error message is not user-friendly fix. (#856) Signed-off-by: sudeep <[email protected]> * MOSIP-35655 : The error message is not user-friendly fix. (#858) Signed-off-by: sudeep <[email protected]> * MOSIP-35671 -Merging java21 with develop (#862) * MOSIP-35671 -Merging java21 with develop Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-35671 -Merging java21 with develop Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-35671 -Merging java21 Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-34986: Removed partnerTypes field from ftm-chip-details() and approved-ftm-provider-ids() (#864) * MOSIP-34986: Removed partnerTypes field from ftm-chip-details() and approved-ftm-provider-ids() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34986: Removed partnerTypes field from ftm-chip-details() and approved-ftm-provider-ids() Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35689: added RequestWrapperV2 and ResponseWrapperV2. (#865) * MOSIP-35689: added RequestWrapperV2 and ResponseWrapperV2. Signed-off-by: sudeep <[email protected]> * MOSIP-35689: added RequestWrapperV2 and ResponseWrapperV2. Signed-off-by: sudeep <[email protected]> * MOSIP-35689: added RequestWrapperV2 and ResponseWrapperV2. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-33115: renamed the Device Provider API endpoints (#869) * MOSIP-33115: renamed the API endpoints. Signed-off-by: sudeep <[email protected]> * MOSIP-33115: renamed the API endpoints. Signed-off-by: sudeep <[email protected]> * MOSIP-33115: renamed the API endpoints. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35533 (#868) Signed-off-by: Anup Nehe <[email protected]> * MOSIP-33115: renamed the API endpoints. (#870) * MOSIP-33115: renamed the API endpoints. Signed-off-by: sudeep <[email protected]> * MOSIP-33115: renamed the API endpoints. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35533 fix the failures for the pmp revamp. (#872) * MOSIP-35533 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-35533 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP-35581: API development of deactivate-ftm() (#874) * MOSIP-35581: API development- deactivate-ftm() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35581: API development- deactivate-ftm() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35581: API development- deactivate-ftm() Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35690 : API endpoints update as per review. (#875) Signed-off-by: sudeep <[email protected]> * MOSIP-35581: Junit tests (#877) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35690 : API endpoints Ids and role update (#878) * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> * MOSIP-35690 : API endpoints Ids and role update Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35876: API development of original-ftm-certificate() (#880) * MOSIP-35876: API development of original-ftm-certificate() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35876: API development of original-ftm-certificate() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35876: API development of original-ftm-certificate() Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35788 : bug fix. (#881) * MOSIP-35788 : bug fix. Signed-off-by: sudeep <[email protected]> * MOSIP-35788 : bug fix. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35541: Updated the SBI expiry date validation in UTC (#882) * MOSIP-35332: Updated the SBI expiry date validation in UTC Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35332: Updated the SBI expiry date validation in UTC Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35876: Junit test for original-ftm-certificate() (#883) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35541: reverting the PR(882) (#884) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-34432 negative testcase (#790) * negative testcase Signed-off-by: Likhitha R L <[email protected]> * negative testcases Signed-off-by: Likhitha R L <[email protected]> * Negative Testcases Signed-off-by: Likhitha R L <[email protected]> * negative testcases Signed-off-by: Likhitha R L <[email protected]> * negative testcase Signed-off-by: Likhitha R L <[email protected]> * MOSIP-34432 Signed-off-by: Likhitha R L <[email protected]> * MOSIP-34432 Signed-off-by: Likhitha R L <[email protected]> * MOSIP-34432 negative testcase Signed-off-by: Likhitha R L <[email protected]> * MOSIP-34432 negative testcases Signed-off-by: Likhitha R L <[email protected]> * MOSIP-34432 negative testcases Signed-off-by: Likhitha R L <[email protected]> --------- Signed-off-by: Likhitha R L <[email protected]> Co-authored-by: Likhitha R L <[email protected]> * MOSIP-35330: Added maximun year validation for SBI Created Date (#888) * MOSIP-35330: Added maximun year validation for SBI Created Date Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35330: Added maximun year validation for SBI Created Date Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36023 (#889) Signed-off-by: Jayesh Kharode <[email protected]> Co-authored-by: Jayesh Kharode <[email protected]> * MOSIP-35916 - Renamed the apitest folder to api-test (#894) Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-35723: Added unique index for same make and model (#891) * MOSIP-35723: Added unique index for same make and model Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35723: Added unique index for same make and model Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35092: removed foreign key mapping in device_detail_sbi table (#898) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-35895,MOSIP-35655 - updated error messages. (#899) Signed-off-by: sudeep <[email protected]> * MOSIP-35416 (#904) Signed-off-by: Anup Nehe <[email protected]> * ES-836 : Get oauth client endpoint should return client name language map. (#901) * ES-836 : Get oauth client endpoint should return client name language map. Signed-off-by: sudeep <[email protected]> * ES-836 : Get oauth client endpoint should return client name language map. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35916 - Renamed the apitest folder to api-test (#906) Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-36037 : Sonar coverage. (#907) Signed-off-by: sudeep <[email protected]> * MOSIP-36044: Updated the error message for inactive-mapping-device-to_sbi() (#908) * MOSIP-36044: Updated the error message for inactive-mapping-device-to-sbi() Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36044: Updated the error message for inactive-mapping-device-to-sbi() Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36089: partner admin role bug fix. (#909) Signed-off-by: sudeep <[email protected]> * Revert "MOSIP-36089: partner admin role bug fix. (#909)" (#912) This reverts commit 438c422f4ee6cd3bff5d4f92498c76a4c9c0cef5. * MOSIP-35404 | Move component specific test code from common to component api test rigs (#918) * MOSIP-35916 - Renamed the apitest folder to api-test Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-35404 | Move component specific test code from common to component api test rigs Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-36285 : The FTM Chip status is not updating in the Admin portal after re-uploading the FTM certificate. (#919) Signed-off-by: sudeep <[email protected]> * MOSIP-35404 Signed-off-by: Nandhukumar <[email protected]> * MOSIP-35404 Signed-off-by: Nandhukumar <[email protected]> * MOSIP:35655, MOSIP:36406 - bug fixes. (#923) Signed-off-by: sudeep <[email protected]> * MOSIP-35416 fix automation failure (#924) * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP-36411: Updated the field isActive in deactivate APIs (#926) Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP:36283-Partner is able to reupload the Certificate for Deactivated FTM. (#925) * MOSIP:36283-Partner is able to reupload the Certificate for Deactivated FTM. Signed-off-by: sudeep <[email protected]> * MOSIP:36283-Partner is able to reupload the Certificate for Deactivated FTM. Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-35416 fix for automation (#927) * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP-36089: PMS API-Error messages are not user friendly (#930) Signed-off-by: sudeep <[email protected]> * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key (#928) * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key Signed-off-by: sudeep <[email protected]> * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key Signed-off-by: sudeep <[email protected]> * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key Signed-off-by: sudeep <[email protected]> * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key Signed-off-by: sudeep <[email protected]> * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-36679 - Added db delete queries (#936) * MOSIP-36679 - Added db delete queries Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-36679 - Added db delete queries Signed-off-by: Mohanachandran S <[email protected]> --------- Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-36506:Partners' details (Partner Admin) : API GET /partners/v3/{partnerId} (#935) * MOSIP-36506:Partners' details (Partner Admin) : API GET /partners/v3/{partnerId} (#937) Signed-off-by: sudeep <[email protected]> * MOSIP-35797 : Unable to re upload a partner certificate for FTM partner (#940) Signed-off-by: sudeep <[email protected]> * MOSIP-36467: Created new endpoint v3 to fetch all partners details (#942) * MOSIP-36467: Created new endpoint v3 to fetch all partners details Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36467: Created new endpoint v3 to fetch all partners details Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36506:Partners' details (Partner Admin) : API GET /partners/v3/{partnerId} (#943) Signed-off-by: sudeep <[email protected]> * MOSIP-36321: Added validation for PARTNER_ADMIN role (#945) * MOSIP-36321: Added validation for PARTNER_ADMIN role Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36321: Added validation for PARTNER_ADMIN role Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: SwethaKrish4 <[email protected]> * MOSIP-36810 Error message is not appropriate for mapping same device and same SBI details (#948) * MOSIP-36810: Error message is not appropriate for mapping same device and same SBI details Signed-off-by: sudeep <[email protected]> * MOSIP-36810: Error message is not appropriate for mapping same device and same SBI details Signed-off-by: sudeep <[email protected]> * MOSIP-36810: Error message is not appropriate for mapping same device and same SBI details Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * [MOSIP-36516] : Automate PMS Revamp for FTM Provider services (#944) * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-35416 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * MOSIP-36516 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> * MOSIP-36516 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-36516 Signed-off-by: Anup Nehe <[email protected]> * resolve conflicts Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP:36804 - Filter related changes in API GET /partners/v3 (#950) Signed-off-by: sudeep <[email protected]> * MOSIP:36804 - Filter related changes in API GET /partners/v3 (#952) * MOSIP:36804 - Filter related changes in API GET /partners/v3 Signed-off-by: sudeep <[email protected]> * MOSIP:36804 - Filter related changes in API GET /partners/v3 Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-36423 - Automated Negative Scenarios for PMS (#939) * MOSIP-36423 Signed-off-by: Prathmesh Jadhav <[email protected]> * [MOSIP-36423] - Automated GetAllDeviceListMappedWithSbi Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36423 - Automated Negative Scenarios for PMS Signed-off-by: Prathmesh Jadhav <[email protected]> --------- Signed-off-by: Prathmesh Jadhav <[email protected]> Signed-off-by: prathmeshj12 <[email protected]> * MOSIP:36804 - Filter related changes in API GET /partners/v3 (#953) * MOSIP:36804 - Filter related changes in API GET /partners/v3 Signed-off-by: sudeep <[email protected]> * MOSIP:36804 - Filter related changes in API GET /partners/v3 Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-36506: removed isCertificateExpired in PartnerDetailsV3Dto (#954) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-33297: Added a check to verify partner activation status before deactivating the API key. (#956) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-33297: Added a check to verify partner activation status before deactivating the API key. (#958) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-36219 - The PMS (and eSignet) Create OIDC endpoints allow duplicate public key (#959) Signed-off-by: sudeep <[email protected]> * MOSIP:36506: Partners' details (Partner Admin) : API GET /partners/{partnerId}/v2 (#960) * MOSIP:36506: Partners' details (Partner Admin) : API GET /partners/{partnerId}/v2 Signed-off-by: sudeep <[email protected]> * MOSIP:36506: Partners' details (Partner Admin) : API GET /partners/{partnerId}/v2 Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-36917,MOSIP-36916 : UI and Integration with API: Create Datashare Policy (#962) Signed-off-by: sudeep <[email protected]> * MOSIP-37141: Created new v2 endpoint for policies (#963) * MOSIP-37141: Created new v2 endpoint for policies Signed-off-by: Swetha K <[email protected]> * MOSIP-37141: Created new v2 endpoint for policies Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-36580: Handled missing 'Empty Array and Empty String' Schema Validation (#965) Signed-off-by: sudeep <[email protected]> * MOSIP-37141: Junit tests (#966) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * removed certificateIssuedTo field from /{partnerId}/v2 (#968) Signed-off-by: sudeep <[email protected]> * MOSIP-36832 - Automated FTM Negative Scenarios (#967) * MOSIP-36423 Signed-off-by: Prathmesh Jadhav <[email protected]> * [MOSIP-36423] - Automated GetAllDeviceListMappedWithSbi Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36423 - Automated Negative Scenarios for PMS Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36832 - Automated FTM Scenarios Signed-off-by: Prathmesh Jadhav <[email protected]> --------- Signed-off-by: Prathmesh Jadhav <[email protected]> Signed-off-by: prathmeshj12 <[email protected]> * MOSIP-37273 : API GET /partners/partner-policy-requests (#971) * MOSIP-37273 : API GET /partners/partner-policy-requests Signed-off-by: sudeep <[email protected]> * MOSIP-37273 : API GET /partners/partner-policy-requests Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37273 : API GET /partners/partner-policy-requests (#972) Signed-off-by: sudeep <[email protected]> * changed length validation for create policy (#973) Signed-off-by: sudeep <[email protected]> * MOSIP-37273 : API GET /partners/partner-policy-requests (#974) Signed-off-by: sudeep <[email protected]> * MOSIP-35326: Updated time in LocalDateTime (#975) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * Update bootstrap.properties Signed-off-by: SwethaKrish4 <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Signed-off-by: SwethaKrish4 <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37012,MOSIP:37107 : bug fixes (#976) Signed-off-by: sudeep <[email protected]> * MOSIP-37101: Added items per page in config (#978) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37017 : Disable the Download button in Partner Certificate (#980) * MOSIP-37017 : Disable the Download button in Partner Certificate Signed-off-by: sudeep <[email protected]> * MOSIP-37017 : Disable the Download button in Partner Certificate Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37434 : (Policy Manager): API PATCH /policies/{policyId} (#981) * MOSIP-37434 : (Policy Manager): API PATCH /policies/{policyId} Signed-off-by: sudeep <[email protected]> * MOSIP-37434 : (Policy Manager): API PATCH /policies/{policyId} Signed-off-by: sudeep <[email protected]> * MOSIP-37434 : (Policy Manager): API PATCH /policies/{policyId} Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37476 - updated the docker file (#986) Signed-off-by: Mohanachandran S <[email protected]> * MOSIP-37273: Added policy id field in filters (#988) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * MOSIP-37273: Added policy id field in filters Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37409 : Statuses and Action Menus in Tabular View of Authentication and Datashare Policies (#989) * Statuses and Action Menus in Tabular View of Authentication and Datashare Policies Signed-off-by: sudeep <[email protected]> * Statuses and Action Menus in Tabular View of Authentication and Datashare Policies Signed-off-by: sudeep <[email protected]> * Statuses and Action Menus in Tabular View of Authentication and Datashare Policies Signed-off-by: sudeep <[email protected]> * Statuses and Action Menus in Tabular View of Authentication and Datashare Policies Signed-off-by: sudeep <[email protected]> * Statuses and Action Menus in Tabular View of Authentication and Datashare Policies Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * [MOSIP-37383, MOSIP-37384, MOSIP-37373, MOSIP-37374]: corrected websub url in properties (#991) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * [MOSIP-37383, MOSIP-37384, MOSIP-37373, MOSIP-37374]: corrected websub url in properties Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-36832 Automated Negative scenarios for Deactivate FTM and Get Original FTM cert (#982) * MOSIP-36423 Signed-off-by: Prathmesh Jadhav <[email protected]> * [MOSIP-36423] - Automated GetAllDeviceListMappedWithSbi Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36423 - Automated Negative Scenarios for PMS Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36832 - Automated FTM Scenarios Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36832 Automated Negative scenarios for Deactivate FTM and Get Original FTM cert Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36832 Automated Negative scenarios for Deactivate FTM and Get Original FTM cert Signed-off-by: Prathmesh Jadhav <[email protected]> * MOSIP-36832 Automated Negative scenarios for Deactivate FTM and Get Original FTM cert Signed-off-by: Prathmesh Jadhav <[email protected]> --------- Signed-off-by: Prathmesh Jadhav <[email protected]> Signed-off-by: prathmeshj12 <[email protected]> * MOSIP-37636: API Development of oauth/partners/clients (#994) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * MOSIP-37636: API Development of oauth/partners/clients Signed-off-by: Swetha K <[email protected]> * MOSIP-37636: API Development of oauth/partners/clients Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37636: Added policyGroupDescription in partner details v2 endpoint (#995) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * MOSIP-37636: Added policyGroupDescription in partner details v2 endpoint Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37636: renamed clientId and clientName (#996) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * MOSIP-37636: renamed clientId and clientName Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37771 : API GET /partners/apikey/search/v2 (#997) * MOSIP-37771 : API GET /partners/apikey/search/v2 Signed-off-by: sudeep <[email protected]> * MOSIP-37771 : API GET /partners/apikey/search/v2 Signed-off-by: sudeep <[email protected]> * MOSIP-37771 : API GET /partners/apikey/search/v2 Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37771 : API GET /partners/apikey/search/v2 (#998) Signed-off-by: sudeep <[email protected]> * MOSIP-37771 : API GET /partners/apikey/search/v2 (#1000) Signed-off-by: sudeep <[email protected]> * MOSIP-37326: Added user id and partner id validation in create, update and get oidc endpoints (#999) * MOSIP-35326: Updated time in LocalDateTime Signed-off-by: Swetha K <[email protected]> * MOSIP-37101: Added items per page in config Signed-off-by: Swetha K <[email protected]> * MOSIP-37326: Added user validation in create, update and get oidc endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37636: renamed clientId and clientName Signed-off-by: Swetha K <[email protected]> * MOSIP-37326: Added user validation in create, update and get oidc endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37326: Added user validation in create, update and get oidc endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37326: Added user validation in create, update and get oidc endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37326: Added user validation in create, update and get oidc endpoints Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37326: Added checks for partner deactivation in update oidc (#1001) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * corrected PolicyGroupUpdateRequestDto (#1002) Signed-off-by: sudeep <[email protected]> * MOSIP-37771 : removed apiKeyId field from dto (#1003) Signed-off-by: sudeep <[email protected]> * MOSIP-36647 (#1005) Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37771 : Junit (#1004) Signed-off-by: sudeep <[email protected]> * MOSIP-37875: Created v2 endpoint for ftpChipDetails (#1006) * MOSIP-37875: Created v2 endpoint for ftpChipDetails Signed-off-by: Swetha K <[email protected]> * MOSIP-37875: Created v2 endpoint for ftpChipDetails Signed-off-by: Swetha K <[email protected]> * MOSIP-37875: Created v2 endpoint for ftpChipDetails Signed-off-by: Swetha K <[email protected]> * MOSIP-37875: Created v2 endpoint for ftpChipDetails Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37601 : Deactivate FTM Chip details (#1007) * MOSIP-37601 : Deactivate FTM Chip details Signed-off-by: sudeep <[email protected]> * MOSIP-37601 : Deactivate FTM Chip details Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37875: Junit Tests (#1008) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37915 updated the db query (#1009) * MOSIP-36647 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37915 Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37581 : added caSignedCertTimeOfUpload, caSignedCertExpiryDateTime fields (#1010) * MOSIP-37581 : added caSignedCertTimeOfUpload, caSignedCertExpiryDateTime fields Signed-off-by: sudeep <[email protected]> * MOSIP-37581 : added caSignedCertTimeOfUpload, caSignedCertExpiryDateTime fields Signed-off-by: sudeep <[email protected]> * MOSIP-37581 : added caSignedCertTimeOfUpload, caSignedCertExpiryDateTime fields Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37581 : added CertExpiryDateTime, CertUploadDateTime fields for CA and MOSIP signed certs. (#1011) Signed-off-by: sudeep <[email protected]> * MOSIP-37875 : handled sorting for status field (#1012) Signed-off-by: sudeep <[email protected]> * MOSIP-37212 updated db query before and afte the suite (#1013) * MOSIP-36647 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37915 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-34116 Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37875 : handled sorting for status field (#1014) Signed-off-by: sudeep <[email protected]> * MOSIP-37854 : Deactivation of Policy Group is not allowed if there draft policies associated to it (#1015) Signed-off-by: sudeep <[email protected]> * MOSIP-37854 : Deactivation of Policy Group is not allowed if there draft policies associated to it (#1017) Signed-off-by: sudeep <[email protected]> * MOSIP-38077: created new search/v2 endpoint for SBI (#1016) * MOSIP-38077: created new search/v2 endpoint for SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-38077: created new search/v2 endpoint for SBI Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38092 : Partner Admin: SBI - Device: API GET /devicedetail/search/v2 (#1018) * MOSIP-38092 : Partner Admin: SBI - Device: API GET /devicedetail/search/v2 Signed-off-by: sudeep <[email protected]> * MOSIP-38092 : Partner Admin: SBI - Device: API GET /devicedetail/search/v2 Signed-off-by: sudeep <[email protected]> * MOSIP-38092 : Partner Admin: SBI - Device: API GET /devicedetail/search/v2 Signed-off-by: sudeep <[email protected]> * MOSIP-38092 : Partner Admin: SBI - Device: API GET /devicedetail/search/v2 Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37854 : Deactivation of Policy Group is not allowed if there draft policies associated to it (#1019) Signed-off-by: sudeep <[email protected]> * MOSIP-38077: Added sbiExpiryStatus in search v2 (#1020) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38077: Added sorting for countOfAssociatedDevices (#1021) * MOSIP-38077: Added sorting for countOfAssociatedDevices Signed-off-by: Swetha K <[email protected]> * MOSIP-38077: Added sorting for countOfAssociatedDevices Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37727, MOSIP-37728 : UI and Integration with API: Tabular View of Devices (#1022) Signed-off-by: sudeep <[email protected]> * MOSIP-37748: Removed checks in deactivate SBI and device for PARTNER_ADMIN (#1024) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38077: Added countOfApprovedDevices and countOfPendingDevices fields (#1025) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38087 : Edit Authentication Policy/Data share policy is throwing a errror message -' Missing Input parameter (#1027) Signed-off-by: sudeep <[email protected]> * MOSIP-38092 : Partner Admin: SBI - Device: API GET /devicedetail/search/v2 (#1026) Signed-off-by: sudeep <[email protected]> * MOSIP-38077: removed partnerType field (#1028) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38077: Junit tests (#1029) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38092, MOSIP-37854 : added Junit (#1030) * MOSIP-38092, MOSIP-37854 : added Junit Signed-off-by: sudeep <[email protected]> * MOSIP-38092, MOSIP-37854 : added Junit Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37718: Updated the error message if the device doesn't have any SBI (#1031) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-38092 : API GET /devicedetail/search/v2 (#1032) Signed-off-by: sudeep <[email protected]> * MOSIP-38201: Added new getCaCertificates endpoint (#1033) * MOSIP-38201: Added new getCaCertificates endpoint Signed-off-by: Swetha K <[email protected]> * MOSIP-38201: Added new getCaCertificates endpoint Signed-off-by: Swetha K <[email protected]> * MOSIP-36642: getCaCertificates() moved to PartnerManagementController Signed-off-by: Swetha K <[email protected]> * MOSIP-36642: getCaCertificates() moved to PartnerManagementController Signed-off-by: Swetha K <[email protected]> * MOSIP-36642: getCaCertificates() moved to PartnerManagementController Signed-off-by: Swetha K <[email protected]> * MOSIP-36642: Junit test Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-33206: Skip logged in user belongs to the partner check for PAR… (#1036) * MOSIP-33206: Skip logged in user belongs to the partner check for PARTNER_ADMIN Signed-off-by: Swetha K <[email protected]> * MOSIP-33206: Fixed test case failures Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * Rename 1.3.0-DP.1_to_1.3.0_upgrade.sql to 1.3.0-dp.1_to_1.3.0_upgrade.sql Signed-off-by: Mayura Deshmukh <[email protected]> * Rename 1.3.0-DP.1_to_1.3.0_rollback.sql to 1.3.0-dp.1_to_1.3.0_rollback.sql Signed-off-by: Mayura Deshmukh <[email protected]> * updated README.md files (#1040) Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail (#1037) * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> * MOSIP-36805 : Partners' details (Partner Admin) : First Name and Last Name of Partner to be displayed in View individual Partner detail Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37857 Partner Admin API automation (#1041) * MOSIP-37857 with correct branch merged * MOSIP-37857 Signed-off-by: Sohan Kumar Dey <[email protected]> * MOSIP-37857 Signed-off-by: Sohan Kumar Dey <[email protected]> * MOSIP-37857 Signed-off-by: Sohan Kumar Dey <[email protected]> * MOSIP-37857 Signed-off-by: Sohan Kumar Dey <[email protected]> * Delete et --soft d2d5be7e Signed-off-by: Sohan Kumar Dey <[email protected]> --------- Signed-off-by: Sohan Kumar Dey <[email protected]> * MOSIP-38211: Created new download-root-certificate endpoint (#1042) * MOSIP-38211: Created new download-root-certificate endpoint Signed-off-by: Swetha K <[email protected]> * MOSIP-38211: Created new download-root-certificate endpoint Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37889 updated invalid Token (#1034) * MOSIP-36647 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37915 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-34116 Signed-off-by: Anup Nehe <[email protected]> * MOSIP-37889 Signed-off-by: Anup Nehe <[email protected]> --------- Signed-off-by: Anup Nehe <[email protected]> * MOSIP-36422 - negative test case automation (#990) * MOSIP-36422 API PMP revamp negative test case automation Signed-off-by: gopalaswin <[email protected]> * MOSIP-36422 - negative test case automation Signed-off-by: gopalaswin <[email protected]> * MOSIP-36422 - negative test case automation Signed-off-by: gopalaswin <[email protected]> * Update pmsApi.xml resolved conflicts Signed-off-by: gopalaswin <[email protected]> --------- Signed-off-by: gopalaswin <[email protected]> Signed-off-by: gopalaswin <[email protected]> * MOSIP-38211: handled error cases for KM download certificate endpoint (#1043) * MOSIP-38211: handled code for KM error cases Signed-off-by: Swetha K <[email protected]> * MOSIP-38211: handled code for KM error cases Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37899: API Review Comments (#1045) * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - API review comment changes (#1046) * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes (#1047) * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * [MOSIP-37899, MOSIP-35739]: created new API for add device to SBI (#1048) * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: created new API for add device to SBI Signed-off-by: Swetha K <[email protected]> --------- Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP-37899: Updated request dto for approve or reject device (#1049) Signed-off-by: Swetha K <[email protected]> Co-authored-by: Swetha K <[email protected]> * MOSIP:37899 - APi review comment changes (#1051) * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> * MOSIP:37899 - APi review comment changes Signed-off-by: sudeep <[email protected]> --------- Signed-off-by: sudeep <[email protected]> * MOSIP-37899: Added request body for deactivate PATCH endpoints (#1050) * MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off-by: Swetha K <[email protected]> * MOSIP-37899: Added request body for deactivate PATCH endpoints Signed-off…
mosip · Jan 22, 2025 · 702ec9c · 702ec9c
1 parent 7702a3f
commit 702ec9c
Show file tree

Hide file tree

Showing 180 changed files with 12,452 additions and 2,807 deletions.
diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?branch=release-1.3.x&project=mosip_partner-management-services&metric=alert_status)](https://sonarcloud.io/dashboard?branch=release-1.3.x&id=mosip_partner-management-services)
 
 ## Overview
-This repository contains the source code MOSIP Partner Management module. For an overview refer [here](https://docs.mosip.io/1.2.0/modules/partner-management-services).  The module exposes API endpoints. For a reference front-end UI implementation refer to PMS Revamp UI [Partner-management UI github repo](https://github.com/mosip/partner-management-portal/tree/release-1.3.x/pmp-reactjs-ui)
+This repository contains the source code MOSIP Partner Management module. For an overview refer [here](https://docs.mosip.io/1.2.0/modules/partner-management-services).  The module exposes API endpoints. For a reference front-end UI implementation refer to [Partner-management UI GitHub repo](https://github.com/mosip/partner-management-portal)
 
-Partnermanagement module contains following services:
+Partner management module contains following services:
 1. Partner management service
 2. Policy management service
 
@@ -16,20 +16,40 @@ Refer to [SQL scripts](db_scripts).
 The project requires JDK 1.11. 
 1. Build and install:
     ```
-    $ cd kernel
+    $ cd partner
     $ mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true
     ```
+
 1. Build Docker for a service:
     ```
     $ cd <service folder>
     $ docker build -f Dockerfile
     ```
 
+## Deploy
+To deploy PMS on Kubernetes cluster using Dockers refer to [Sandbox Deployment](https://docs.mosip.io/1.2.0/deployment/sandbox-deployment).
+
+### Configuration
+[partner-management-default.properties](https://github.com/mosip/mosip-config/blob/master/partner-management-default.properties) 
+
+[application-default.properties](https://github.com/mosip/mosip-config/blob/master/application-default.properties) 
+
+defined here.
+
+### Add auth-adapter in a class-path to run a services
+   ```
+   <dependency>
+       <groupId>io.mosip.kernel</groupId>
+       <artifactId>kernel-auth-adapter</artifactId>
+       <version>${kernel.auth.adapter.version}</version>
+   </dependency>
+   ```
+
 ## Deployment in K8 cluster with other MOSIP services:
 ### Pre-requisites
 * Set KUBECONFIG variable to point to existing K8 cluster kubeconfig file:
-  * ```
-    export KUBECONFIG=~/.kube/<my-cluster.config>
+    ```
+    export KUBECONFIG=~/.kube/<k8s-cluster.config>
     ```
 ### Install
   ```
@@ -47,15 +67,8 @@ The project requires JDK 1.11.
     $ ./restart.sh
    ```
 
-## Config
-Add below property to ```partner-management-default.properties``` file in mosip-config repository to Deploy PMS Revamp 1.3.0-DP.1 release in your env.
-```
-## This property is used by kernel-authcodeflowproxy-api to check request is coming from allowed urls not.
-auth.allowed.urls=https://${mosip.pmp.host}/,https://${mosip.pmp.reactjs.ui.host}/
-```
-
 ## Test
-Automated functional tests available in [Functional Tests repo](https://github.com/mosip/mosip-functional-tests).
+Automated functional tests available in [Functional Tests](api-test).
 
 ## APIs
 API documentation is available [here](https://mosip.github.io/documentation/).

diff --git a/db_scripts/mosip_pms/ddl/pms-device_detail.sql b/db_scripts/mosip_pms/ddl/pms-device_detail.sql
@@ -28,8 +28,7 @@ CREATE TABLE pms.device_detail(
 	upd_dtimes timestamp,
 	is_deleted boolean DEFAULT FALSE,
 	del_dtimes timestamp,
-	CONSTRAINT pk_devdtl_id PRIMARY KEY (id),
-	CONSTRAINT uk_devdtl_id UNIQUE (dprovider_id,dtype_code,dstype_code,make,model)
+	CONSTRAINT pk_devdtl_id PRIMARY KEY (id)
 
 );
 -- ddl-end --

diff --git a/db_scripts/mosip_pms/ddl/pms-fk.sql b/db_scripts/mosip_pms/ddl/pms-fk.sql
@@ -44,4 +44,14 @@ ON DELETE NO ACTION ON UPDATE NO ACTION;
 
 ALTER TABLE pms.reg_device_sub_type ADD CONSTRAINT fk_rdstyp_dtype_code FOREIGN KEY (dtyp_code)
 REFERENCES pms.reg_device_type (code) MATCH FULL
-ON DELETE NO ACTION ON UPDATE NO ACTION;
+ON DELETE NO ACTION ON UPDATE NO ACTION;
+
+-- Creating unique index for make, model, and approval status
+CREATE UNIQUE INDEX uk_devdtl_make_model_approval_status
+ON pms.device_detail (dprovider_id,dtype_code,dstype_code,make,model)
+WHERE approval_status != 'rejected' AND NOT (approval_status = 'approved' AND is_active = false);
+
+-- Creating unique index for make, model, and approval status
+CREATE UNIQUE INDEX uk_fcdtl_make_model_approval_status
+ON pms.ftp_chip_detail (foundational_trust_provider_id, make, model)
+WHERE approval_status != 'rejected' AND NOT (approval_status = 'approved' AND is_active = false);
diff --git a/db_scripts/mosip_pms/ddl/pms-ftp_chip_detail.sql b/db_scripts/mosip_pms/ddl/pms-ftp_chip_detail.sql
@@ -27,8 +27,7 @@ CREATE TABLE pms.ftp_chip_detail(
 	is_deleted boolean DEFAULT FALSE,
 	del_dtimes timestamp,
 	approval_status character varying(36) NOT NULL,
-	CONSTRAINT pk_fcdtl_id PRIMARY KEY (id),
-	CONSTRAINT uk_fcdtl_id UNIQUE (foundational_trust_provider_id,make,model)
+	CONSTRAINT pk_fcdtl_id PRIMARY KEY (id)
 
 );
 -- ddl-end --

diff --git a/...cripts/mosip_pms/pms_release_db_deploy.sh → ...ts/mosip_pms/pms_old_release_db_deploy.sh b/...cripts/mosip_pms/pms_release_db_deploy.sh → ...ts/mosip_pms/pms_old_release_db_deploy.sh
diff --git a/...s/mosip_pms/pms_release_deploy.properties → ...sip_pms/pms_old_release_deploy.properties b/...s/mosip_pms/pms_release_deploy.properties → ...sip_pms/pms_old_release_deploy.properties
diff --git a/...scripts/mosip_pms/pms_revoke_db_deploy.sh → ...pts/mosip_pms/pms_old_revoke_db_deploy.sh b/...scripts/mosip_pms/pms_revoke_db_deploy.sh → ...pts/mosip_pms/pms_old_revoke_db_deploy.sh
diff --git a/db_upgrade_scripts/mosip_pms/sql/1.2.0.1_to_1.2.1.0_rollback.sql b/db_upgrade_scripts/mosip_pms/sql/1.2.0.1_to_1.2.1.0_rollback.sql
@@ -1,3 +1,4 @@
+\c mosip_pms
 UPDATE pms.auth_policy
 SET policy_file_id='{"dataSharePolicies":{"typeOfShare":"direct","validForInMinutes":"30","transactionsAllowed":"2","encryptionType":"Partner Based","shareDomain":"datashare.datashare","source":"ID Repository"},"shareableAttributes":[{"attributeName":"fullName","source":[{"attribute":"fullName"}],"encrypted":true},{"attributeName":"dateOfBirth","source":[{"attribute":"dateOfBirth"}],"encrypted":false,"format":"YYYY"},{"attributeName":"gender","source":[{"attribute":"gender"}],"encrypted":false},{"attributeName":"phone","source":[{"attribute":"phone"}],"encrypted":false},{"attributeName":"email","source":[{"attribute":"email"}],"encrypted":false},{"attributeName":"addressLine1","source":[{"attribute":"addressLine1"}],"encrypted":false},{"attributeName":"addressLine2","source":[{"attribute":"addressLine2"}],"encrypted":false},{"attributeName":"addressLine3","source":[{"attribute":"addressLine3"}],"encrypted":false},{"attributeName":"region","source":[{"attribute":"region"}],"encrypted":false},{"attributeName":"province","source":[{"attribute":"province"}],"encrypted":false},{"attributeName":"city","source":[{"attribute":"city"}],"encrypted":false},{"attributeName":"UIN","source":[{"attribute":"UIN"}],"encrypted":false},{"attributeName":"PCN","source":[{"attribute":"VID","filter":[{"type":"PERPETUAL"}]}],"encrypted":false,"format":"RETRIEVE"},{"attributeName":"postalCode","source":[{"attribute":"postalCode"}],"encrypted":false},{"attributeName":"bestTwoFingers","group":"CBEFF","source":[{"attribute":"individualBiometrics","filter":[{"type":"Finger"}]}],"encrypted":false,"format":"bestTwoFingers"},{"attributeName":"Signature","source":[{"attribute":"proofOfAddress"}],"encrypted":false},{"attributeName":"biometrics","group":"CBEFF","source":[{"attribute":"individualBiometrics","filter":[{"type":"Face"},{"type":"Finger","subType":["Left Thumb","Right Thumb"]}]}],"encrypted":false,"format":"extraction"}]}'
 WHERE id='mpolicy-default-PDFCard';
diff --git a/db_upgrade_scripts/mosip_pms/sql/1.2.0.1_to_1.2.1.0_upgrade.sql b/db_upgrade_scripts/mosip_pms/sql/1.2.0.1_to_1.2.1.0_upgrade.sql
@@ -1,3 +1,4 @@
+\c mosip_pms
 UPDATE pms.auth_policy
 SET  policy_file_id='{"dataSharePolicies":{"typeOfShare":"Data Share","validForInMinutes":"30","transactionsAllowed":"2","encryptionType":"Partner Based","shareDomain":"datashare.datashare","source":"ID Repository"},"shareableAttributes":[{"attributeName":"fullName","source":[{"attribute":"fullName","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"dateOfBirth","source":[{"attribute":"dateOfBirth"}],"encrypted":false},{"attributeName":"dob","source":[{"attribute":"dateOfBirth"}],"encrypted":false},{"attributeName":"gender","source":[{"attribute":"gender","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"phone","source":[{"attribute":"phone"}],"encrypted":false},{"attributeName":"email","source":[{"attribute":"email"}],"encrypted":false},{"attributeName":"addressLine1","source":[{"attribute":"addressLine1","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"addressLine2","source":[{"attribute":"addressLine2","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"addressLine3","source":[{"attribute":"addressLine3","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"region","source":[{"attribute":"region","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"province","source":[{"attribute":"province","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"city","source":[{"attribute":"city","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"UIN","source":[{"attribute":"UIN"}],"encrypted":false},{"attributeName":"postalCode","source":[{"attribute":"postalCode"}],"encrypted":false},{"attributeName":"biometrics","group":"CBEFF","source":[{"attribute":"individualBiometrics","filter":[{"type":"Face"},{"type":"Finger","subType":["Left Thumb","Right Thumb"]}]}],"encrypted":true,"format":"extraction"}]}'
 WHERE id='mpolicy-default-PDFCard';
diff --git a/db_upgrade_scripts/mosip_pms/sql/1.2.1.0_to_1.3.0-dp.1_rollback.sql b/db_upgrade_scripts/mosip_pms/sql/1.2.1.0_to_1.3.0-dp.1_rollback.sql
@@ -1,2 +1,3 @@
+\c mosip_pms
 -- user_details
 DROP TABLE IF EXISTS pms.user_details;
diff --git a/db_upgrade_scripts/mosip_pms/sql/1.2.1.0_to_1.3.0-dp.1_upgrade.sql b/db_upgrade_scripts/mosip_pms/sql/1.2.1.0_to_1.3.0-dp.1_upgrade.sql
@@ -1,3 +1,4 @@
+\c mosip_pms
 -- This table has consents of users.
 CREATE TABLE pms.user_details(
     id character varying(36) NOT NULL,

diff --git a/db_upgrade_scripts/mosip_pms/sql/1.3.0-dp.1_to_1.3.0_rollback.sql b/db_upgrade_scripts/mosip_pms/sql/1.3.0-dp.1_to_1.3.0_rollback.sql
@@ -1,3 +1,29 @@
+-- -------------------------------------------------------------------------------------------------
+-- Database Name    : mosip_pms
+-- Release Version 	: 1.4.0
+-- Purpose    		: Database Alter scripts for the release for PMS DB.       
+-- Create By   		: Swetha K
+-- Created Date		: Aug-2024
+-- 
+-- Modified Date        Modified By         Comments / Remarks
+-- -------------------------------------------------------------------------------------------------
+\c mosip_pms
+--Dropping unique index from pms.device_detail table
+DROP INDEX IF EXISTS pms.uk_devdtl_make_model_approval_status;
+
+--Creating unique constraint for dprovider_id, dtype_code, dstype_code, make and model
+ALTER TABLE pms.device_detail
+ADD CONSTRAINT uk_devdtl_id 
+UNIQUE (dprovider_id,dtype_code,dstype_code,make,model);
+
+--Dropping unique index from pms.ftp_chip_detail table
+DROP INDEX IF EXISTS pms.uk_fcdtl_make_model_approval_status;
+
+--Creating unique constraint for foundational_trust_provider_id, make and model
+ALTER TABLE pms.ftp_chip_detail
+ADD CONSTRAINT uk_fcdtl_id 
+UNIQUE (foundational_trust_provider_id, make, model);
+
 UPDATE pms.auth_policy
 SET policy_file_id='{"dataSharePolicies":{"typeOfShare":"Data Share","validForInMinutes":"30","transactionsAllowed":"2","encryptionType":"Partner Based","shareDomain":"datashare.datashare","source":"ID Repository"},"shareableAttributes":[{"attributeName":"fullName","source":[{"attribute":"fullName","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"dateOfBirth","source":[{"attribute":"dateOfBirth"}],"encrypted":false,"format":"YYYY"},{"attributeName":"gender","source":[{"attribute":"gender"}],"encrypted":false},{"attributeName":"phone","source":[{"attribute":"phone"}],"encrypted":false},{"attributeName":"email","source":[{"attribute":"email"}],"encrypted":false},{"attributeName":"addressLine1","source":[{"attribute":"addressLine1"}],"encrypted":false},{"attributeName":"addressLine2","source":[{"attribute":"addressLine2"}],"encrypted":false},{"attributeName":"addressLine3","source":[{"attribute":"addressLine3"}],"encrypted":false},{"attributeName":"region","source":[{"attribute":"region"}],"encrypted":false},{"attributeName":"province","source":[{"attribute":"province"}],"encrypted":false},{"attributeName":"city","source":[{"attribute":"city"}],"encrypted":false},{"attributeName":"UIN","source":[{"attribute":"UIN"}],"encrypted":false},{"attributeName":"postalCode","source":[{"attribute":"postalCode"}],"encrypted":false},{"attributeName":"biometrics","group":"CBEFF","source":[{"attribute":"individualBiometrics","filter":[{"type":"Face"},{"type":"Finger","subType":["Left Thumb","Right Thumb"]}]}],"encrypted":true,"format":"extraction"}]}'
 WHERE id='mpolicy-default-qrcode';

diff --git a/db_upgrade_scripts/mosip_pms/sql/1.3.0-dp.1_to_1.3.0_upgrade.sql b/db_upgrade_scripts/mosip_pms/sql/1.3.0-dp.1_to_1.3.0_upgrade.sql
@@ -1,3 +1,28 @@
+-- -------------------------------------------------------------------------------------------------
+-- Database Name    : mosip_pms
+-- Release Version 	: 1.4.0
+-- Purpose    		: Database Alter scripts for the release for PMS DB.       
+-- Create By   		: Swetha K
+-- Created Date		: Aug-2024
+-- 
+-- Modified Date        Modified By         Comments / Remarks
+-- -------------------------------------------------------------------------------------------------
+\c mosip_pms
+-- Dropping unique constraint from pms.device_detail table
+ALTER TABLE pms.device_detail DROP CONSTRAINT uk_devdtl_id;
+
+-- Creating unique index for make, model, and approval status
+CREATE UNIQUE INDEX uk_devdtl_make_model_approval_status
+ON pms.device_detail (dprovider_id,dtype_code,dstype_code,make,model)
+WHERE approval_status != 'rejected' AND NOT (approval_status = 'approved' AND is_active = false);
+
+-- Dropping unique constraint from pms.ftp_chip_detail table
+ALTER TABLE pms.ftp_chip_detail DROP CONSTRAINT uk_fcdtl_id;
+
+-- Creating unique index for make, model, and approval status
+CREATE UNIQUE INDEX uk_fcdtl_make_model_approval_status
+ON pms.ftp_chip_detail (foundational_trust_provider_id, make, model)
+WHERE approval_status != 'rejected' AND NOT (approval_status = 'approved' AND is_active = false);
 UPDATE pms.auth_policy
 SET policy_file_id='{"dataSharePolicies":{"typeOfShare":"Data Share","validForInMinutes":"30","transactionsAllowed":"2","encryptionType":"Partner Based","shareDomain":"datashare.datashare","source":"ID Repository"},"shareableAttributes":[{"attributeName":"fullName","source":[{"attribute":"fullName","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"dateOfBirth","source":[{"attribute":"dateOfBirth"}],"encrypted":false,"format":"YYYY"},{"attributeName":"gender","source":[{"attribute":"gender","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"phone","source":[{"attribute":"phone"}],"encrypted":false},{"attributeName":"email","source":[{"attribute":"email"}],"encrypted":false},{"attributeName":"addressLine1","source":[{"attribute":"addressLine1","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"addressLine2","source":[{"attribute":"addressLine2","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"addressLine3","source":[{"attribute":"addressLine3","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"region","source":[{"attribute":"region","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"province","source":[{"attribute":"province","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"city","source":[{"attribute":"city","filter":[{"language":"eng"}]}],"encrypted":false},{"attributeName":"UIN","source":[{"attribute":"UIN"}],"encrypted":false},{"attributeName":"postalCode","source":[{"attribute":"postalCode"}],"encrypted":false},{"attributeName":"biometrics","group":"CBEFF","source":[{"attribute":"individualBiometrics","filter":[{"type":"Face"},{"type":"Finger","subType":["Left Thumb","Right Thumb"]}]}],"encrypted":true,"format":"extraction"}]}'
 WHERE id='mpolicy-default-qrcode';

diff --git a/db_upgrade_scripts/mosip_pms/upgrade.properties b/db_upgrade_scripts/mosip_pms/upgrade.properties
@@ -0,0 +1,12 @@
+MOSIP_DB_NAME=
+DB_SERVERIP=
+DB_PORT=
+SU_USER=postgres
+SU_USER_PWD=
+SYS_ADMIN_USER=
+SYS_ADMIN_PWD=
+DEFAULT_DB_NAME=postgres
+DBUSER_PWD=
+ACTION=
+CURRENT_VERSION=
+UPGRADE_VERSION=
diff --git a/db_upgrade_scripts/mosip_pms/upgrade.sh b/db_upgrade_scripts/mosip_pms/upgrade.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+set -e
+SOURCE_DB1_NAME=mosip_authdevice
+SOURCE_DB2_NAME=mosip_regdevice
+SOURCE_DB1_SUPPORT_FILE=sql/1.1.5.5_to_1.2.0.1-B1_pms-authdevice-support.sql
+SOURCE_DB2_SUPPORT_FILE=sql/1.1.5.5_to_1.2.0.1-B1_pms-regdevice-support.sql
+properties_file="$1"
+echo `date "+%m/%d/%Y %H:%M:%S"` ": $properties_file"
+if [ -f "$properties_file" ];
+then
+     echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file \"$properties_file\" found."
+    while IFS='=' read -r key value || [ -n "$key" ];
+    do
+        # Trim spaces
+        key=$(echo "$key" | tr -d ' ')
+        value=$(echo "$value" | xargs) # Trim spaces around the value
+
+        # Set the variable dynamically
+        eval "${key}=\"${value}\""
+    done < "$properties_file"
+else
+     echo `date "+%m/%d/%Y %H:%M:%S"` ": Property file not found, Pass property file name as argument."
+fi
+
+echo "Current version: $CURRENT_VERSION"
+echo "UPGRADE version: $UPGRADE_VERSION"
+echo "Action: $ACTION"
+
+# Terminate existing connections
+echo "Terminating active connections"
+CONN=$(PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -t -c "SELECT count(pg_terminate_backend(pg_stat_activity.pid)) FROM pg_stat_activity WHERE datname = '$MOSIP_DB_NAME' AND pid <> pg_backend_pid()";exit;)
+echo "Terminated connections"
+
+# Execute upgrade or rollback
+if [ "$ACTION" == "upgrade" ]; then
+  echo "Upgrading database from $CURRENT_VERSION to $UPGRADE_VERSION"
+  UPGRADE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_upgrade.sql"
+  if [ -f "$UPGRADE_SCRIPT_FILE" ]; then
+    echo "Executing upgrade script $UPGRADE_SCRIPT_FILE"
+    if [[ "$UPGRADE_VERSION" == "1.2.0.1-B1"  &&  "$CURRENT_VERSION" == "1.1.5.5" ]]; then
+    		echo "Creating dml directory."
+    		mkdir dml
+		PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$SOURCE_DB1_NAME -a -b -f $SOURCE_DB1_SUPPORT_FILE
+		PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$SOURCE_DB2_NAME -a -b -f $SOURCE_DB2_SUPPORT_FILE
+	fi
+    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $UPGRADE_SCRIPT_FILE
+  else
+    echo "Upgrade script not found, exiting."
+    exit 1
+  fi
+elif [ "$ACTION" == "rollback" ]; then
+  echo "Rolling back database for $CURRENT_VERSION to $UPGRADE_VERSION"
+  REVOKE_SCRIPT_FILE="sql/${CURRENT_VERSION}_to_${UPGRADE_VERSION}_rollback.sql"
+  if [ -f "$REVOKE_SCRIPT_FILE" ]; then
+    echo "Executing rollback script $REVOKE_SCRIPT_FILE"
+    PGPASSWORD=$SU_USER_PWD psql -v ON_ERROR_STOP=1 --username=$SU_USER --host=$DB_SERVERIP --port=$DB_PORT --dbname=$DEFAULT_DB_NAME -a -b -f $REVOKE_SCRIPT_FILE
+  else
+    echo "rollback script not found, exiting."
+    exit 1
+  fi
+else
+  echo "Unknown action: $ACTION, must be 'upgrade' or 'rollback'."
+  exit 1
+fi
diff --git a/partner/partner-management-service/Dockerfile b/partner/partner-management-service/Dockerfile
@@ -35,9 +35,6 @@ ENV spring_config_label_env=${spring_config_label}
 
 ENV spring_config_url_env=${spring_config_url}
 
-# environment variable to pass iam_adapter url, at docker runtime
-ENV iam_adapter_url_env=${iam_adapter_url}
-
 # can be passed during Docker build as build time environment for github branch to pickup configuration from.
 ARG container_user=mosip
 
@@ -68,5 +65,8 @@ RUN chown -R ${container_user}:${container_user} /home/${container_user}
 USER ${container_user_uid}:${container_user_gid}
 
 EXPOSE 9109
-CMD wget -q --show-progress "${iam_adapter_url_env}" -O kernel-auth-adapter.jar; \
-	java -jar -Dloader.path=./kernel-auth-adapter.jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" partner-management-service.jar ; \
+CMD java -jar \
+    -Dspring.cloud.config.label="${spring_config_label_env}" \
+    -Dspring.profiles.active="${active_profile_env}" \
+    -Dspring.cloud.config.uri="${spring_config_url_env}" \
+    partner-management-service.jar