Merge release-3.6.3 into main: data sync user validation - #461
Merged
Conversation
Added providerServiceMapID validation in data sync login flow. After successful authentication, the data sync user's PSM is compared against the main session's PSM. If they differ (e.g., Mysuru nurse trying to sync a Vizag van), an alert is shown and sync is blocked. - Alert: 'Data sync user does not belong to the same VAN' - Clears serverKey so the sync screen remains locked - Applies to both normal and concurrent-login (doLogout) flows Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This reverts commit 3ea1285.
Block data sync login if the authenticated data sync user is different from the logged-in MMU session user. Compares userID from the userAuthenticate API response against the session's stored userID. Shows alert 'Sync user is not valid' and clears serverKey if mismatch. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Fix/data sync van validation
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
vishwab1
approved these changes
Aug 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges the remaining
release-3.6.3work back intomain. Release 3.6.3 was previously merged via #375; these are the commits landed on the branch afterwards.Net effect is a single change: data sync user validation.
getDataSyncMMUnow compares the data-syncuserIDagainst theuserIDin the main session and, on mismatch, clearsserverKey, hides the progress bar, and alerts instead of proceeding — so a sync cannot run under a different user's credentials than the logged-in session.Commits
3ea12852d606c67d1289c20d59ddThe first commit is reverted by the second, so the net diff is only the third: 1 file, +17 / −0 in
data-sync-login.component.ts.Notes
main.data-sync-login.component.tswas also touched onmainby implement standard Reactive Forms validation in DataSyncLoginComponent #350 (fix/data-sync-login-validation), but the two changes auto-merge without conflict — worth a reviewer's eye on the combined validation logic ingetDataSyncMMU, since both PRs harden the same method.mainis 31 commits ahead ofrelease-3.6.3; this PR only carries the 4 above in the other direction.🤖 Generated with Claude Code