-
Notifications
You must be signed in to change notification settings - Fork 10k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: CAS user merge not working #32444
Conversation
Looks like this PR is ready to merge! 🎉 |
🦋 Changeset detectedLatest commit: 9ce276e The changes in this PR will be included in the next version bump. This PR includes changesets to release 32 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## develop #32444 +/- ##
===========================================
- Coverage 56.00% 55.95% -0.06%
===========================================
Files 2431 2431
Lines 53557 53555 -2
Branches 11029 11029
===========================================
- Hits 29996 29968 -28
- Misses 20929 20952 +23
- Partials 2632 2635 +3
Flags with carried forward coverage won't be shown. Click here to find out more. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You think it's there a way to write tests for this one?
Not at this moment; I'll try to bundle a CAS container so we can write unit tests for it but this PR is meant to be merged into older releases as well so adding that here would only overcomplicate things. |
…retention * 'develop' of github.com:RocketChat/Rocket.Chat: (36 commits) refactor: IntegrationHistory out of DB Watcher (#32502) fix: Message update being broadcasted without updated values (#32472) test: make api teams test fully independent (#31756) test: Fix test name (#32490) fix: streams being called with no logged user (#32489) feat: Un-encrypted messages not allowed in E2EE rooms (#32040) feat(UiKit): Users select (#31455) fix: Re-login same browser tab issues (#32479) chore: move all webclient code out of the COSS folders (#32273) chore(deps): bump thehanimo/pr-title-checker from 1.3.7 to 1.4.1 (#30619) fix: Don't show join default channels option for edit user form (#31750) fix: CAS user merge not working (#32444) fix: Overriding Retention Policy not working (#32454) fix: `rooms.export` endpoint generates an empty export when given an invalid date (#32364) fix: "Allow Password Change for OAuth Users" setting is not honored in the "Forgot Password" flow (#32398) fix: Bypass trash when removing OTR system messages and read receipts (#32269) fix: Monitors dissapearing from Unit upon edit (#32393) fix: Link image preview not opening in gallery (#32391) feat: Allow visitors & integrations to access downloaded files after a room has closed (#32439) regression: Users tab misaligned (#32451) ...
Proposed changes (including videos or screenshots)
This PR fixes an issue introduced on 6.6 where the CAS login process failed to find existing users with the same user as the one currently logging in if they had been created by a different login process.
Issue(s)
SUP-576
Steps to test or reproduce
Further comments