Move develop to develop2 (#856) · mosip/resident-services@2359255

Commit

Move develop to develop2 (#856)

Browse files

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per review comment.

* Mosip 24879 add event id in the response of the below stories (#606)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-24939 Improved code coverage of validator class. (#607)

* MOSIP-24939 Improved code coverage of Document validator.

* MOSIP-24939 Improved code coverage of Request validator.

* Fixed service history issue. (#609)

* [MOSIP-24630] Fixed Security Vulnerability in code (#608)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* email and phone added in profile info (#610)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

Co-authored-by: Neha Farheen <[email protected]>

* identity/info API method changed to get photo (#611)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

Co-authored-by: Neha Farheen <[email protected]>

* added masked VID (#612)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

Co-authored-by: Neha Farheen <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#613)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#614)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-25310 MOSIP-24730 MOSIP-25312 MOSIP-24731 Added grievance api (#615)

* Fixed service history issue.

* MOSIP-25310 Added resident_grievance_ticket.sql

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added service class of GrievanceController

* MOSIP-25310 Added entity and repository class of grievance table.

* MOSIP-25310 Added status in resident entity.

* MOSIP-25310 Fixed test case failure.

* MOSIP-25310 Get default name from profile.

* MOSIP-25310 Added card format to vid card.

* MOSIP-25310 made message max length configurable.

* MOSIP-25307 Created API to get DocumentType from masterdata (#617)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24784 Fixed download card api. (#619)

* Fixed service history issue.

* MOSIP-24784 Fixed download card api.

* Mosip 24879 add event id in the response of the below stories (#618)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#620)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 25307 api create the following proxy ap is from masterdata (#621)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-22046 change input LocalDateTime to LocalDate. (#622)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api. (#623)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api.

* Mosip 24879 add event id in the response of the below stories (#625)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-21674 Added custom response for download card api. (#624)

* Fixed service history issue.

* MOSIP-21674 Added getRidStatus method in utility.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* Revert "MOSIP-21674 Added junit for GrievanceServiceImpl."

This reverts commit a23e63350c411204694f9fd0d7b3322ad953793d.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* MOSIP-21674 Fixed getRidStatus Utilities.

* MOSIP-21674 Added custom response.

* MOSIP-21674 Fixed service history.

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for GrievanceServiceImpl

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Removed un-necessary enums.

* MOSIP-21674 Refactor code.

* Mosip 24879 add event id in the response of the below stories (#627)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

* updated the response of update my uin API

* added else statement

* added else exception

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in id and version (#626)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* [MOSIP-24670] Made corrections in id and version

* resolved conflicts

* updated PR

* MOSIP-24939 Improved code coverage. (#628)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api. (#629)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api.

* Mosip 21147 Upload document changes done (#630)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

* Upload document changes done

* Changes in validaton

* JUNIT fixed

* Catch clause removed

Co-authored-by: Neha Farheen <[email protected]>

* changes done (#631)

Co-authored-by: Ritik Jain <[email protected]>

* refactored-for-auth-adapter-changes (#632)

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25274 changes done (#616)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Fixed sonar bug. (#633)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage. (#634)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* Changes in identityserviceImpl to check UIN (#635)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

* changes in identityServiceimpl to check UIN

* Junit fixed

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Improved code coverage. (#636)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue. (#637)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed test case failure.

* updated id version for document APIs (#638)

* updated id version for document APIs

* fixed version and response msg

* fixed version for update uin API

* removed extra variable

* added junit

Co-authored-by: Ritik Jain <[email protected]>

* Handle client exception from auth codeflow proxy apis (#640)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Fixed placeholder issue. (#641)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* Refactored for auth adapter changes (#642)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

* Added flab based jwt verification of userinfo

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Performed null check for purpose. (#643)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value. (#644)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* removed idtype (#646)

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in API body, response code (#639)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* [MOSIP-24670] Made corrections in id and version

* resolved conflicts

* updated PR

* [MOSIP-24670] Made corrections n API body, response code

* updated PR

* updated dateTime

* updated PR

* MOSIP-25438 increased ref_id column value in otp_transaction.sql. (#647)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* MOSIP-25438 increased ref_id column value in otp_transaction.sql.

* Merge 1201b2 to develop (#650)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Import organization

Co-authored-by: kameshsr <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-24372 Fixed update my data api jpa issue. (#653)

* Fixed service history issue.

* MOSIP-24372 Fixed update my data api jpa issue.

* Mosip 25364 resident api we are able to request card of a vid of a different user that is not logged in (#652)

* checking logged in user with given vid

* fixed juit test cases

* removed else throw exception

Co-authored-by: Ritik Jain <[email protected]>

* return masked attributes (#645)

Co-authored-by: Ritik Jain <[email protected]>

* Latest develop fixes from 1201b2 merge (#656)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Merge develop 2 1201b2 4 (#651)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per review comment.

* Mosip 24879 add event id in the response of the below stories (#606)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-24939 Improved code coverage of validator class. (#607)

* MOSIP-24939 Improved code coverage of Document validator.

* MOSIP-24939 Improved code coverage of Request validator.

* Fixed service history issue. (#609)

* [MOSIP-24630] Fixed Security Vulnerability in code (#608)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* email and phone added in profile info (#610)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

Co-authored-by: Neha Farheen <[email protected]>

* identity/info API method changed to get photo (#611)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

Co-authored-by: Neha Farheen <[email protected]>

* added masked VID (#612)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

Co-authored-by: Neha Farheen <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#613)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#614)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-25310 MOSIP-24730 MOSIP-25312 MOSIP-24731 Added grievance api (#615)

* Fixed service history issue.

* MOSIP-25310 Added resident_grievance_ticket.sql

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added service class of GrievanceController

* MOSIP-25310 Added entity and repository class of grievance table.

* MOSIP-25310 Added status in resident entity.

* MOSIP-25310 Fixed test case failure.

* MOSIP-25310 Get default name from profile.

* MOSIP-25310 Added card format to vid card.

* MOSIP-25310 made message max length configurable.

* MOSIP-25307 Created API to get DocumentType from masterdata (#617)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24784 Fixed download card api. (#619)

* Fixed service history issue.

* MOSIP-24784 Fixed download card api.

* Mosip 24879 add event id in the response of the below stories (#618)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#620)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 25307 api create the following proxy ap is from masterdata (#621)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-22046 change input LocalDateTime to LocalDate. (#622)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api. (#623)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api.

* Mosip 24879 add event id in the response of the below stories (#625)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-21674 Added custom response for download card api. (#624)

* Fixed service history issue.

* MOSIP-21674 Added getRidStatus method in utility.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* Revert "MOSIP-21674 Added junit for GrievanceServiceImpl."

This reverts commit a23e63350c411204694f9fd0d7b3322ad953793d.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* MOSIP-21674 Fixed getRidStatus Utilities.

* MOSIP-21674 Added custom response.

* MOSIP-21674 Fixed service history.

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for GrievanceServiceImpl

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Removed un-necessary enums.

* MOSIP-21674 Refactor code.

* Mosip 24879 add event id in the response of the below stories (#627)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

* updated the response of update my uin API

* added else statement

* added else exception

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in id and version (#626)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* [MOSIP-24670] Made corrections in id and version

* resolved conflicts

* updated PR

* MOSIP-24939 Improved code coverage. (#628)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api. (#629)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api.

* Mosip 21147 Upload document changes done (#630)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

* Upload document changes done

* Changes in validaton

* JUNIT fixed

* Catch clause removed

Co-authored-by: Neha Farheen <[email protected]>

* changes done (#631)

Co-authored-by: Ritik Jain <[email protected]>

* refactored-for-auth-adapter-changes (#632)

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25274 changes done (#616)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Fixed sonar bug. (#633)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage. (#634)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* Changes in identityserviceImpl to check UIN (#635)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

* changes in identityServiceimpl to check UIN

* Junit fixed

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Improved code coverage. (#636)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue. (#637)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed test case failure.

* updated id version for document APIs (#638)

* updated id version for document APIs

* fixed version and response msg

* fixed version for update uin API

* removed extra variable

* added junit

Co-authored-by: Ritik Jain <[email protected]>

* Handle client exception from auth codeflow proxy apis (#640)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Fixed placeholder issue. (#641)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* Refactored for auth adapter changes (#642)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

* Added flab based jwt verification of userinfo

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Performed null check for purpose. (#643)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value. (#644)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* removed idtype (#646)

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in API body, response code (#639)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* [MOSIP-24670] Made corrections in id and version

* resolved conflicts

* updated PR

* [MOSIP-24670] Made corrections n API body, response code

* updated PR

* updated dateTime

* updated PR

* MOSIP-25438 increased ref_id column value in otp_transaction.sql. (#647)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* MOSIP-25438 increased ref_id column value in otp_transaction.sql.

* Merge 1201b2 to develop (#650)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Import organization

Co-authored-by: kameshsr <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* import fixes. fixes to get name, image from userinfo

Co-authored-by: Aiham Hasan <[email protected]>
Co-authored-by: kameshsr <[email protected]>
Co-authored-by: RitikJain4108 <[email protected]>
Co-authored-by: Ritik Jain <[email protected]>
Co-authored-by: Neha2365 <[email protected]>
Co-authored-by: Neha Farheen <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* Merge develop to 1201b2 6 (#654)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per review comment.

* Mosip 24879 add event id in the response of the below stories (#606)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-24939 Improved code coverage of validator class. (#607)

* MOSIP-24939 Improved code coverage of Document validator.

* MOSIP-24939 Improved code coverage of Request validator.

* Fixed service history issue. (#609)

* [MOSIP-24630] Fixed Security Vulnerability in code (#608)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* email and phone added in profile info (#610)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

Co-authored-by: Neha Farheen <[email protected]>

* identity/info API method changed to get photo (#611)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

Co-authored-by: Neha Farheen <[email protected]>

* added masked VID (#612)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

Co-authored-by: Neha Farheen <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#613)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#614)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-25310 MOSIP-24730 MOSIP-25312 MOSIP-24731 Added grievance api (#615)

* Fixed service history issue.

* MOSIP-25310 Added resident_grievance_ticket.sql

* MOSIP-25310 Added hasAttachment column to grievance table.

* MOSIP-25310 Added service class of GrievanceController

* MOSIP-25310 Added entity and repository class of grievance table.

* MOSIP-25310 Added status in resident entity.

* MOSIP-25310 Fixed test case failure.

* MOSIP-25310 Get default name from profile.

* MOSIP-25310 Added card format to vid card.

* MOSIP-25310 made message max length configurable.

* MOSIP-25307 Created API to get DocumentType from masterdata (#617)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24784 Fixed download card api. (#619)

* Fixed service history issue.

* MOSIP-24784 Fixed download card api.

* Mosip 24879 add event id in the response of the below stories (#618)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 24879 add event id in the response of the below stories (#620)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

Co-authored-by: Ritik Jain <[email protected]>

* Mosip 25307 api create the following proxy ap is from masterdata (#621)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-22046 change input LocalDateTime to LocalDate. (#622)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api. (#623)

* Fixed service history issue.

* MOSIP-22046 change input LocalDateTime to LocalDate.

* MOSIP-22046 Refactor code.

* MOSIP-22046 Fixed test case failure.

* MOSIP-22046 Covered edge case of fromDate.

* MOSIP-22046 corrected query param for service history api.

* Mosip 24879 add event id in the response of the below stories (#625)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

Co-authored-by: Ritik Jain <[email protected]>

* MOSIP-21674 Added custom response for download card api. (#624)

* Fixed service history issue.

* MOSIP-21674 Added getRidStatus method in utility.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* Revert "MOSIP-21674 Added junit for GrievanceServiceImpl."

This reverts commit a23e63350c411204694f9fd0d7b3322ad953793d.

* MOSIP-21674 Added junit for GrievanceServiceImpl.

* MOSIP-21674 Fixed getRidStatus Utilities.

* MOSIP-21674 Added custom response.

* MOSIP-21674 Fixed service history.

* MOSIP-21674 Added junit for RequestValidatorTest

* MOSIP-21674 Added junit for GrievanceServiceImpl

* MOSIP-21674 Added junit for NotificationServiceTest

* MOSIP-21674 Removed un-necessary enums.

* MOSIP-21674 Refactor code.

* Mosip 24879 add event id in the response of the below stories (#627)

* added error for invalid user

* added status in 2 apis

* changed response of auth-lock-unlock api

* updated response of validate otp

* added eventid and status in response

* added eventId in response header for download eventid api

* fixed service history pdf file name

* added eventid in response of download card api

* convert eventId to constant

* added eventId for error scenarios

* fixed reliability bug

* fixed response of share credential API

* fixed test failure

* updated response for auth lock unlock API

* covered code for one method

* updated response of request vid card

* updated response of validate otp API

* created contant for NA

* updated response of generate and revoke vid

* updated response of update data API and made entry to db

* set phone email id in status comment

* add phone/email in status comment

* updated the response of update my uin API

* added else statement

* added else exception

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in id and version (#626)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* [MOSIP-24670] Made corrections in id and version

* resolved conflicts

* updated PR

* MOSIP-24939 Improved code coverage. (#628)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api. (#629)

* Fixed service history issue.

* MOSIP-24939 Improved code coverage.

* added get status of individual id api.

* Mosip 21147 Upload document changes done (#630)

* MOSIP-25307 Created API to get DocumentType from masterdata

* JUNIT added for document API

* MOSIP-25307 done

* Changes done

* Upload document changes done

* Changes in validaton

* JUNIT fixed

* Catch clause removed

Co-authored-by: Neha Farheen <[email protected]>

* changes done (#631)

Co-authored-by: Ritik Jain <[email protected]>

* refactored-for-auth-adapter-changes (#632)

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25274 changes done (#616)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Fixed sonar bug. (#633)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage. (#634)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* Changes in identityserviceImpl to check UIN (#635)

* email and phone added in profile info

* validation added when claim is not available

* Changes done in identityservice

* log added

* sysout removed

* method changed

* Added masked VID

* MOSIP-25274 done

* changes in identityServiceimpl to check UIN

* Junit fixed

Co-authored-by: Neha Farheen <[email protected]>

* MOSIP-24939 Improved code coverage. (#636)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue. (#637)

* Fixed service history issue.

* MOSIP-24939 Fixed sonar bug.

* MOSIP-24939 Fixed validation for download card api.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Improved code coverage of GrievanceController.

* MOSIP-24939 Improved code coverage of DownloadCardService.

* MOSIP-24939 Removed un-used imports.

* MOSIP-24939 Improved code coverage of ResidentServiceImpl.

* MOSIP-24939 Improved code coverage of IdentityServiceImpl.

* MOSIP-24939 Improved code coverage of WebSubUpdateAuthTypeServiceTest.

* MOSIP-24939 Improved code coverage of IdentityServiceTest.

* MOSIP-24939 Removed un-necessary mockito stubbing.

* MOSIP-24939 Improved code coverage of IdentityService

* MOSIP-24939 Fixed aid otp issue.

* MOSIP-24939 Fixed test case failure.

* updated id version for document APIs (#638)

* updated id version for document APIs

* fixed version and response msg

* fixed version for update uin API

* removed extra variable

* added junit

Co-authored-by: Ritik Jain <[email protected]>

* Handle client exception from auth codeflow proxy apis (#640)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Fixed placeholder issue. (#641)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* Refactored for auth adapter changes (#642)

* refactored-for-auth-adapter-changes

* Fix to return kernel auth error code for auth failures

* corrected merge issues

* Handle client exception from auth codeflow proxy apis

* Added flab based jwt verification of userinfo

Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-25438 Performed null check for purpose. (#643)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value. (#644)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* removed idtype (#646)

Co-authored-by: Ritik Jain <[email protected]>

* [MOSIP-24670] Made corrections in API body, response code (#639)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* [MOSIP-24630] Fixed Security Vulnerability in code

* added error for isValidUrl method

* renamed vaildateURL method

* updated PR

* [MOSIP-24670] Made corrections in id and version

* resolved conflicts

* updated PR

* [MOSIP-24670] Made corrections n API body, response code

* updated PR

* updated dateTime

* updated PR

* MOSIP-25438 increased ref_id column value in otp_transaction.sql. (#647)

* Fixed service history issue.

* MOSIP-25438 Added default attribute for identity attributes.

* MOSIP-25438 Removed send otp from service history.

* MOSIP-25438 Added auth type to db in auth lock api.

* MOSIP-25438 Added authTypes placeholder value in description.

* MOSIP-25438 Added channel placeholder value in description.

* MOSIP-25438 Fixed junit failure.

* MOSIP-25438 Removed un used constant.

* MOSIP-25438 Performed null check for purpose.

* MOSIP-25438 increased purpose column value.

* MOSIP-25438 increased ref_id column value in otp_transaction.sql.

* Merge 1201b2 to develop (#650)

* MOSIP-25514 Fixed null pointer exception in event enum. (#648)

* MOSIP-25514 Fixed build failure. (#649)

* MOSIP-25514 Fixed null pointer exception in event enum.

* MOSIP-25514 Fixed build failure.

* MOSIP-25514 imported correct package in main class.

* Import organization

Co-authored-by: kameshsr <[email protected]>
Co-authored-by: Loganathan Sekar <[email protected]>

* MOSIP-24372 Fixed update my data api jpa issue. (#653)

* Fixed service history issue.

* MOSIP-24372 Fixed update my data api jpa issue.

* Mosip 25364 resident api we are able to request card of a vid of a different user that is not logged in (#652)

* checking logged in user with given vid

* fixed juit test cases

* removed else throw exception

Co-authored-by: Ritik Jain <[email protected]>

* Merge develop to 1201b2 7 (#655)

* [MOSIP-22639] Resolved security hotspots in code (#605)

* [MOSIP-24670] Updated API correction id and version

* [MOSIP-24670] Updated API body correction

* [MOSIP-22640] Fixed Sonar Bugs

* updated PR

* updated review code

* [MOSIP-22640] Fixed sonar bugs

* updated PR

* [MOSIP-22639] Resolved security hotspots in code

* MOSIP-24939 Improved code coverage. (#604)

* MOSIP-24939 Improved code coverage of utility.

* MOSIP-24939 Changed hard coded value from properties.

* MOSIP-24939 Improved code coverage of RequestValidator

* MOSIP-24939 Fixed test case failure.

* MOSIP-24939 Changed code as per re…

Loading branch information

11 people authored Apr 12, 2023

1 parent f3238ce commit 2359255

...esident-service/src/main/java/io/mosip/resident/batch/CredentialStatusUpdateBatchJob.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -113,7 +113,7 @@ private void handleWithTryCatch(RunnableWithException runnableWithException) {
  
    	}

    	private void logErrorForBatchJob(Exception e) {

    		logger.error(String.format("Error in batch job: %s : %s : %s", e.getClass().getSimpleName(), e.getMessage(),

    		logger.debug(String.format("Error in batch job: %s : %s : %s", e.getClass().getSimpleName(), e.getMessage(),

    				(e.getCause() != null ? "rootcause: " + e.getCause().getMessage() : "")));

    	}

    @@ -124,9 +124,9 @@ private void logErrorForBatchJob(Exception e) {
  
    	public void scheduleCredentialStatusUpdateJob() throws ResidentServiceCheckedException {

    		List<ResidentTransactionEntity> residentTxnList = repo.findByStatusCodeInAndRequestTypeCodeInAndCredentialRequestIdIsNotNullOrderByCrDtimesAsc(

    				getStatusCodesToProcess(), requestTypeCodesToProcessInBatchJob);

    		logger.info("Total records picked from resident_transaction table for processing is " + residentTxnList.size());

    		logger.debug("Total records picked from resident_transaction table for processing is " + residentTxnList.size());

    		for (ResidentTransactionEntity txn : residentTxnList) {

    			logger.info("Processing event:" + txn.getEventId());

    			logger.debug("Processing event:" + txn.getEventId());

    			if (txn.getIndividualId() == null) {

    				txn.setStatusCode(FAILED.name());

    				txn.setStatusComment("individualId is null");

    @@ -154,19 +154,19 @@ private void updateTransactionStatus(ResidentTransactionEntity txn) throws Resid
  
    					String newStatusCode = credentialStatus.get(STATUS_CODE);

    					//If the status did not change, don't process it

    					if (!txn.getStatusCode().equals(newStatusCode)) {

    						logger.info(String.format("updating status for : %s as %s", txn.getEventId(), newStatusCode));

    						logger.debug(String.format("updating status for : %s as %s", txn.getEventId(), newStatusCode));

    						txn.setStatusCode(newStatusCode);

    						// Save the reference link if any

    						String referenceLink = credentialStatus.get(URL);

    						if (referenceLink != null) {

    							logger.info(String.format("saving reference link for : %s", txn.getEventId()));

    							logger.debug(String.format("saving reference link for : %s", txn.getEventId()));

    							txn.setReferenceLink(referenceLink);

    						}

    						// Send Notification

    						if (requestType.isNotificationStatus(env, newStatusCode)) {

    							logger.info("invoking notifications for status: " + newStatusCode);

    							logger.debug("invoking notifications for status: " + newStatusCode);

    							requestType.preUpdateInBatchJob(env, utility, txn, credentialStatus, newStatusCode);

    							// For bell notification

    @@ -236,7 +236,7 @@ private Map<String, String> getCredentialEventDetails(String credentialRequestId
  
    				});

    		List<ServiceError> errors = responseWrapper.getErrors();

    		if (Objects.nonNull(errors) && !errors.isEmpty()) {

    			logger.error("CREDENTIAL_STATUS_URL returned error " + errors);

    			logger.debug("CREDENTIAL_STATUS_URL returned error " + errors);

    			throw new ResidentServiceCheckedException(ResidentErrorCode.UNKNOWN_EXCEPTION);

    		}

    		return responseWrapper.getResponse();

resident/resident-service/src/main/java/io/mosip/resident/config/ResidentFilterConfig.java

-Original file line number
+Diff line change
@@ -0,0 +1,45 @@
+    package io.mosip.resident.config;
+    import org.springframework.beans.factory.annotation.Autowired;
+    import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+    import org.springframework.boot.web.servlet.FilterRegistrationBean;
+    import org.springframework.context.annotation.Bean;
+    import org.springframework.context.annotation.Configuration;
+    import io.mosip.resident.filter.LoggingFilter;
+    import io.mosip.resident.filter.WebsubCallbackRequestDecoratorFilter;
+    /**
+     * The configuration for adding filters.
+     *
+     * @author Loganathan S
+     */
+    @Configuration
+    public class ResidentFilterConfig {
+    	/**
+    	 * Gets the auth filter.
+    	 *
+    	 * @return the auth filter
+    	 */
+    	@Bean
+    	@ConditionalOnProperty(value = "resident.logging.filter.enabled", havingValue = "true", matchIfMissing = false)
+    	public FilterRegistrationBean<LoggingFilter> getLoggingFilter(LoggingFilter loggingFilter) {
+    		FilterRegistrationBean<LoggingFilter> registrationBean = new FilterRegistrationBean<>();
+    		registrationBean.setFilter(loggingFilter);
+    		registrationBean.addUrlPatterns("/*");
+    		return registrationBean;
+    	}
+    	@Bean
+    	@ConditionalOnProperty(value = "resident.websub.request.decorator.filter.enabled", havingValue = "true", matchIfMissing = true)
+    	public FilterRegistrationBean<WebsubCallbackRequestDecoratorFilter> getWebsubCallbackRequestDecoratorFilter(
+    			@Autowired(required = false) WebsubCallbackRequestDecoratorFilter loggingFilter) {
+    		FilterRegistrationBean<WebsubCallbackRequestDecoratorFilter> registrationBean = new FilterRegistrationBean<>();
+    		registrationBean.setFilter(loggingFilter);
+    		registrationBean.addUrlPatterns("/callback/*");
+    		return registrationBean;
+    	}
+    }

resident/resident-service/src/main/java/io/mosip/resident/constant/ApiName.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ public enum ApiName { @@
     	GET_ORDER_STATUS_URL,
     	TEMPLATES_BY_LANGCODE_AND_TEMPLATETYPECODE_URL,
     	IDREPO_IDENTITY_UPDATE_COUNT,
-    	GENDER_TYPE_BY_LANGCODE,
+    	DYNAMIC_FIELD_BASED_ON_LANG_CODE_AND_FIELD_NAME,
     	GET_RID_BY_INDIVIDUAL_ID,
     	PDFSIGN,
     	PARTNER_DETAILS_NEW_URL,
@@ Expand Down @@

resident/resident-service/src/main/java/io/mosip/resident/constant/ResidentConstants.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ private ResidentConstants() { @@
         public static final String SUBSCRIPTIONS_DELAY_ON_STARTUP = "subscriptions-delay-on-startup_millisecs";
+    	public static final String RESUBSCRIPTIONS_INTERVAL_SECS = "re-subscription-interval-in-seconds";
         public static final String CREDENTIAL_UPDATE_STATUS_UPDATE_INITIAL_DELAY = "mosip.resident.update.service.status.job.initial-delay";
         public static final String CREDENTIAL_UPDATE_STATUS_UPDATE_INITIAL_DELAY_DEFAULT = "60000";
@@ Expand Down Expand Up / @@ -241,6 +243,8 @@ private ResidentConstants() { @@
         public static final String RESIDENT_VIEW_HISTORY_DEFAULT_PAGE_SIZE = "resident.view-history.default.page.size";
         public static final String LANGUAGE = "language";
         public static final String VALUE = "value";
+        public static final String RESIDENT_REGISTRATION_CENTERS_DOWNLOAD_MAX_COUNT = "resident.registration-centers.download.max.count";
     }

resident/resident-service/src/main/java/io/mosip/resident/constant/ServiceType.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,8 @@ public enum ServiceType { @@
         ID_MANAGEMENT_REQUEST(List.of(RequestType.GENERATE_VID, RequestType.REVOKE_VID,
                 RequestType.VALIDATE_OTP, RequestType.AUTH_TYPE_LOCK_UNLOCK)),
         DATA_SHARE_REQUEST(List.of(RequestType.SHARE_CRED_WITH_PARTNER)),
-        ASYNC(List.of(RequestType.VID_CARD_DOWNLOAD,RequestType.ORDER_PHYSICAL_CARD,RequestType.SHARE_CRED_WITH_PARTNER,RequestType.UPDATE_MY_UIN)),
+    	ASYNC(List.of(RequestType.VID_CARD_DOWNLOAD, RequestType.ORDER_PHYSICAL_CARD, RequestType.SHARE_CRED_WITH_PARTNER,
+    			RequestType.UPDATE_MY_UIN, RequestType.AUTH_TYPE_LOCK_UNLOCK)),
         ALL(List.of(RequestType.VALIDATE_OTP, RequestType.DOWNLOAD_PERSONALIZED_CARD, RequestType.ORDER_PHYSICAL_CARD,
                 RequestType.GET_MY_ID, RequestType.BOOK_AN_APPOINTMENT, RequestType.VID_CARD_DOWNLOAD, RequestType.UPDATE_MY_UIN,
                 RequestType.GENERATE_VID, RequestType.REVOKE_VID, RequestType.AUTH_TYPE_LOCK_UNLOCK,
@@ Expand Down @@

...dent-service/src/main/java/io/mosip/resident/controller/DownLoadMasterDataController.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,6 @@
  
    import java.io.InputStream;

    import java.time.LocalDateTime;

    import java.time.format.DateTimeFormatter;

    import java.util.List;

    import java.util.Objects;

    import org.springframework.beans.factory.annotation.Autowired;

    @@ -73,7 +72,7 @@ public class DownLoadMasterDataController {
  
    	 */

    	@GetMapping("/download/registration-centers-list")

    	public ResponseEntity<Object> downloadRegistrationCentersByHierarchyLevel(@RequestParam(name="langcode") String langCode,

    			@RequestParam(name="hierarchylevel") Short hierarchyLevel, @RequestParam("name") List<String> name,

    			@RequestParam(name="hierarchylevel") Short hierarchyLevel, @RequestParam("name") String name,

    			@RequestHeader(name = "time-zone-offset", required = false, defaultValue = "0") int timeZoneOffset)

    			throws ResidentServiceCheckedException, IOException, Exception {

    		logger.debug("DownLoadMasterDataController::getRegistrationCentersByHierarchyLevel()::entry");

...esident-service/src/main/java/io/mosip/resident/controller/ProxyMasterdataController.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -376,21 +376,23 @@ public ResponseWrapper<?> getAllTemplateBylangCodeAndTemplateTypeCode(@PathVaria
  
    	 * @throws ResidentServiceCheckedException

    	 */

    	@ResponseFilter

    	@GetMapping("/auth-proxy/masterdata/gendertypes/{langcode}")

    	@Operation(summary = "getGenderTypesByLangCode", description = "getGenderTypesByLangCode", tags = {

    	@GetMapping("/auth-proxy/masterdata/dynamicfields/{fieldName}/{langCode}")

    	@Operation(summary = "getDynamicFieldBasedOnLangCodeAndFieldName", description = "Service to fetch  dynamic field based on langcode and field name", tags = {

    			"proxy-masterdata-controller" })

    	@ApiResponses(value = { @ApiResponse(responseCode = "200", description = "OK"),

    			@ApiResponse(responseCode = "201", description = "Created", content = @Content(schema = @Schema(hidden = true))),

    			@ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(hidden = true))),

    			@ApiResponse(responseCode = "403", description = "Forbidden", content = @Content(schema = @Schema(hidden = true))),

    			@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(schema = @Schema(hidden = true))) })

    	public ResponseWrapper<?> getGenderTypesByLangCode(@PathVariable("langcode") String langCode)

    	public ResponseWrapper<?> getDynamicFieldBasedOnLangCodeAndFieldName(@PathVariable("fieldName") String fieldName,

    																		 @PathVariable("langCode") String langCode,

    																		 @RequestParam(value = "withValue", defaultValue = "false") boolean withValue)

    			throws ResidentServiceCheckedException {

    		logger.debug("ProxyMasterdataController::getGenderTypesByLangCode()::entry");

    		auditUtil.setAuditRequestDto(EventEnum.GET_GENDER_TYPES);

    		ResponseWrapper<?> responseWrapper = proxyMasterdataService.getGenderTypesByLangCode(langCode);

    		logger.debug("ProxyMasterdataController::getDynamicFieldBasedOnLangCodeAndFieldName()::entry");

    		auditUtil.setAuditRequestDto(EventEnum.GET_DYNAMIC_FIELD_BASED_ON_LANG_CODE_AND_FIELD_NAME);

    		ResponseWrapper<?> responseWrapper = proxyMasterdataService.getDynamicFieldBasedOnLangCodeAndFieldName(fieldName, langCode, withValue);

    		auditUtil.setAuditRequestDto(EventEnum.GET_GENDER_TYPES_SUCCESS);

    		logger.debug("ProxyMasterdataController::getGenderTypesByLangCode()::exit");

    		logger.debug("ProxyMasterdataController::getDynamicFieldBasedOnLangCodeAndFieldName()::exit");

    		return responseWrapper;

    	}

...sident-service/src/main/java/io/mosip/resident/dto/RegistrationCenterInfoResponseDto.java

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    package io.mosip.resident.dto;
+    import java.util.List;
+    import lombok.AllArgsConstructor;
+    import lombok.Data;
+    import lombok.NoArgsConstructor;
+    /**
+     * @author Ritik Jain
+     */
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public class RegistrationCenterInfoResponseDto extends RegistrationCenterResponseDto {
+    	/** The registration centers data. */
+    	private List<RegistrationCenterDto> data;
+    }

...nt/resident-service/src/main/java/io/mosip/resident/entity/ResidentTransactionEntity.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ @@
     import lombok.AllArgsConstructor;
     import lombok.Builder;
     import lombok.Data;
+    import lombok.EqualsAndHashCode;
     import lombok.NoArgsConstructor;
     /**
@@ Expand All / @@ -28,10 +29,12 @@ @@
     @Builder
     @NoArgsConstructor
     @AllArgsConstructor
+    @EqualsAndHashCode(onlyExplicitlyIncluded = true)
     public class ResidentTransactionEntity {
     	@Id
     	@Column(name = "event_id")
+    	@EqualsAndHashCode.Include
     	private String eventId;
     	@Column(name = "request_trn_id")
@@ Expand Down @@

resident/resident-service/src/main/java/io/mosip/resident/filter/LoggingFilter.java

-Original file line number
+Diff line change
@@ -0,0 +1,87 @@
+    package io.mosip.resident.filter;
+    import java.io.IOException;
+    import java.util.Iterator;
+    import java.util.stream.Collectors;
+    import javax.servlet.Filter;
+    import javax.servlet.FilterChain;
+    import javax.servlet.FilterConfig;
+    import javax.servlet.ServletException;
+    import javax.servlet.ServletRequest;
+    import javax.servlet.ServletResponse;
+    import javax.servlet.http.HttpServletRequest;
+    import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+    import org.springframework.stereotype.Component;
+    import io.mosip.kernel.core.logger.spi.Logger;
+    import io.mosip.kernel.core.util.DateUtils;
+    import io.mosip.resident.config.LoggerConfiguration;
+    /**
+     * Logging filter - used to log the request for debugging purpose
+     *
+     * @author Loganathan S
+     *
+     */
+    @Component
+    @ConditionalOnProperty(value = "resident.logging.filter.enabled", havingValue = "true", matchIfMissing = false)
+    public class LoggingFilter implements Filter {
+    	private static final Logger logger = LoggerConfiguration.logConfig(LoggingFilter.class);
+    	@Override
+    	public void init(FilterConfig filterConfig) throws ServletException {
+    	}
+    	@Override
+    	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+    			throws IOException, ServletException {
+    		logger.debug("Beginning to process request at: " + DateUtils.getUTCCurrentDateTime());
+    		ServletRequest requestRef;
+    		if (!(request instanceof RepeatableStreamHttpServletRequest) && request instanceof HttpServletRequest) {
+    			//Since it is already RepeatableStreamHttpServletRequest, we can use the same
+    			HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+    			RepeatableStreamHttpServletRequest reusableRequest = new RepeatableStreamHttpServletRequest(
+    					httpServletRequest);
+    			logger.debug("URI: " + httpServletRequest.getRequestURI());
+    			requestRef = reusableRequest;
+    			printHeaders(reusableRequest);
+    			printBody(reusableRequest);
+    		} else {
+    			requestRef = request;
+    		}
+    		chain.doFilter(requestRef, response);
+    		logger.debug("Request processed at: " + DateUtils.getUTCCurrentDateTime());
+    	}
+    	private void printBody(ServletRequest request) throws IOException {
+    		if(request instanceof HttpServletRequest) {
+    			HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+    			String body = httpServletRequest.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+    			if(!body.isEmpty()) {
+    				logger.debug(String.format("Body: %s", body));
+    			}
+    		}
+    	}
+    	private void printHeaders(ServletRequest request) {
+    		if(request instanceof HttpServletRequest) {
+    			HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+    			Iterator<String> headerNames = httpServletRequest.getHeaderNames().asIterator();
+    			StringBuffer headers = new StringBuffer();
+    			headerNames.forEachRemaining(header -> headers.append(String.format("%s -> %s; ", header, httpServletRequest.getHeader(header))));
+    			logger.debug(String.format("Headers: %s", headers));
+    			String headersTxt = headers.toString();
+    			if(!headersTxt.isEmpty()) {
+    				logger.debug(String.format("Headers: %s", headersTxt));
+    			}
+    		}
+    	}
+    	@Override
+    	public void destroy() {
+    	}
+    }

0 comments on commit `2359255`

Please sign in to comment.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

0 comments on commit `2359255`

Commit

There are no files selected for viewing

0 comments on commit 2359255

0 comments on commit `2359255`