* Issue #SB-25932 feat:removed update password call while unblocking user

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:removed update password call while unblocking user

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* Issue #SB-25932 feat:unblock user fix

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Renaming service module to controller

* SC-2299 Fixing Testcases

* SC-2299 Fixing Testcases

* SC-2299 Fixing Testcases

* Updating jenkins file

* Issue #SB-25932 feat:unblock user while resetting password

* SC-2299 Renaming service module to controller

* SC-2299 Fixing Testcases

* Issue#SC-2206 feat:refactored user apis (#856)

Issue#SC-2206 feat:refactored user apis

* SB-24953 added user-read api v5 (#853)

* SB-24953 Added user-read api v5

* SB-24954 user-search v3 added which contains roles in user entity (#854)

* SB-24954 user-search v3 added which contains roles in user entity

* Issue #SC-2206 feat: refactored user apis (#858)

* SC-2206 UserManagement Refactoring - User create and update APIs (#862)

* Issue SC-2206-new2 feat:Refactored user sso and ssu user apis

* Issue #SC-2206 feat:cache issue fixed (#863)

* SB-23721 Added assign user role API V2 (#865)

* SB-23721 Added assign role Api v2

* Issue #SC-2126 feat:refactored user apis (#864)

* Issue #SC-2126 feat:refactored user apis

* SB-25389 Adding scope to existing role is not working as expected (#866)

* SB-25389 Adding scope to existing role is not working as expected.

* Merging release-4.0.0 fix to release-4.1.0 (#868)

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* SB-25433 (#870)

* Issue #SB-23849 feat:fixed user update api issue

* SB-25389 Removed duplicate scope from request (#873)

* SB-25389 Remove duplicate scope from request

* Issue #SB-25433 feat:fix error msg for empty email & phone (#874)

* SB-25389 Fix for updating ES with user roles (#875)

* SB-23169 draft changes of assign role api
* SB-23169 modified existing assign roles api inorder to support old request changes
* Fixing testcases

* SB-25389 Fixing testcase issues (#877)

* Fixing testcases

* SB-25389 Fixing testcases (#878)

* Fixing testcases

* Issue #SC-2206 feat:fixed create user v4 issue (#879)

* Issue #SC-2206 feat:fixed create user v4 issue

* SB-25314 user-read api changes for roles (#876)

* SB-25314 user-read api changes for roles

* SC-2206 Refactoring user flows (#880)

* Issue #SC-2206 feat:removed duplicate code

* Issue #SB-25439 feat:fixed framework issue (#881)

* Lms restructure (#882)

* adding core module

* SB-25485 fix for search for version v1/v2 roles not popuped when unassociated org added (#883)

* Issue #SC-2185 feat:Project restructuring (#884)

* Issue #SC-2185 feat:Project restructuring

* Issue SC-2167 feat:removed package-info file (#886)

* Assign v1 failing to add existing role when sent for update (#887)

Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* If user location has already school, update location without school is not working (#857)

* SB-23169 draft changes of assign role api

* SB-23169 modified existing assign roles api inorder to support old request changes

* SB-23169 removed test case

* Merging from 3.9.0 to master (#820) (#829)

merge 3.9 to master

* Issue #SB-23899 feat:added new sms provider (#783)

* Issue #SB-23899 feat:added new sms provider

* Issue #SB-23899 feat:nic sms provider impl

* Issue #SB-22988 feat:fixed jsonKey for associationType (#830)

* Issue #SB-22988 feat:fixed jsonKey for associationType

* SC-2209 Removing phoneverified and email verified flags and updating 'flags value' logic (#811)

* Merge release-3.9.0

* SB-24240 (#807)

* SB-24240 added for better logging

* Sb 24446 (#809)

* Issue #SB-24446 feat:reverted logs for sms issue

* SC-2209 Remove phoneverified and email verified flags and update 'flags value' logic

* SB-24240 added logs (#810)

Fix for SB-24240 form api caching issue

* Update Util.java

* Update UserUtil.java

* SC-2209 Adding testcase for coverage

* SC-2209 Adding testcase for coverage

* SC-2209 Adding testcase for coverage

* Update UserTypeActor.java

* Update UserRequestValidator.java

* Update UserRequestValidator.java

* Update UserManagementActor.java

* Fixing Testcases

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>

* SB-23169 roles save part in ES

* SB-23169 modified existing assign roles api in-order to support request changes (#824)

* SB-23169 modified existing assign roles api inorder to support old request changes

* SB-23169 roles save part in ES

* SB-23171 user-read api changes for roles attribute (#831)

* SB-23169 modified existing assign roles api inorder to support old request changes

* SC-2214 (#832)

Purge unnecessary attributes from user and organisation tables

* SC-2266 Remove 4 unused APIs from learners (#833)

* SC-2266 Remove 4 unused APIs from learner

* Testcase fixes

Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>

* SB-24689 changed user-mapping for roles sub-entity (#836)


* SB-24689 updating mapping

* SB-24689 user-mapping final change for roles sub-entity

* Issue #SB-000 feat:changed sync api for user roles (#835)

* Issue #SB-000 feat:changed sync api for user roles

* Issue #SB-000 feat:changed sync api for user roles

* Issue #SB-000 feat:changed sync api for user roles

* Sb 24762 (#834)

* Issue #SB-24762 feat:fix for association type

* Issue #SB-24762 feat:removed association type from remove org code (#837)

* SB-23169 added changes wrto bulkupload update part

* Issue #SB-000 feat:user search api change to incorporate role changes (#839)

* Issue #SB-24861 feat:added try catch block for null roles (#841)

* Sb 24762 v2 (#842)

* Issue #SB-24861 feat:added try catch block for null roles

* Issue #SB-24762 feat:validate location code after generating it

* SB-23169 added test-case for code-coverage

* SB-23169 added test-case for code-coverage

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected (#840)

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected

* SB-24905 [Role assign API] Role updated via API and UI are not getting updated as expected

* SB-24905 Fixing testcases

* Adding requestedby

* Fixing update user roles

* SB-24905 Fixing testcases

* SB-24909 code changes for create-api for roles (#843)

* SB-24909 code changes for create-api for roles

* SB-24909 roles saved to user-table is removed (#848)

* SB-24909 roles saved to user-table is removed from create user api

* SB-22982 Tnc accept api change to support new role structure (#849)

* SB-22982 Tnc accept api change to support new role structure

* SB-22982 Tnc accept api change to support new role structure

* SB-22982 Testcase fix

* SB-24909 calling assign roles actor from bulkuserbackround actor (#850)

* SB-24909 assign roles pointed to wrong actor, rectified it

* SB-24909 adding new usermap while updating user (#851)

* SB-24909 adding new usermap while updating user

* Issue SB-24861 feat:fixed password issue (#852)

Co-authored-by: Harikumar Palemkota <harip@ilimi.in>
Co-authored-by: AMIT KUMAR <amit.kumar@tarento.com>
Co-authored-by: Hari-stackroute <40484996+Hari-stackroute@users.noreply.github.com>
Co-authored-by: Mathew Jose Pallan <mathewjpallan@gmail.com>

merge 3.9 to master

* Issue #SB-22988 feat:addedasociationType for user upload

* Issue #SB-22988 feat:added null check

* Issue #SB-22988 feat:added null check

* Issue #SB-22988 feat:addedasociationType for user upload

* Issue #SB-22988 feat:added null check

SB-22988 sso user_organisation association type api changes

Merge branch 'release-4.0.0' of https://github.com/project-sunbird/sunbird-lms-service into SB-229888

SC-2272 API to capture and store TnC acceptance for report viewer role

Merge branch 'release-4.0.0' of https://github.com/project-sunbird/sunbird-lms-service into SB-229888

SB-22988 - SSU User Create with associationMechanism