Skip to content
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: SAML login redirects to incorrect room when using an invite #34873

Merged
merged 16 commits into from
Jan 16, 2025

Conversation

matheusbsilva137
Copy link
Member

@matheusbsilva137 matheusbsilva137 commented Jan 3, 2025

Proposed changes (including videos or screenshots)

  • Remove id and redirectUrl from SAML's global ServiceProvideOptions (since they're actually meant to relate to each client/request);
  • Handle invite token redirect on the client side when using SAML (with localStorage).

Issue(s)

Steps to test or reproduce

Further comments

SUP-719

@matheusbsilva137 matheusbsilva137 added this to the 7.3.0 milestone Jan 3, 2025
Copy link
Contributor

dionisio-bot bot commented Jan 3, 2025

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link
Contributor

github-actions bot commented Jan 3, 2025

PR Preview Action v1.6.0

🚀 View preview at
https://RocketChat.github.io/Rocket.Chat/pr-preview/pr-34873/

Built to branch gh-pages at 2025-01-16 20:05 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

Copy link

codecov bot commented Jan 3, 2025

Codecov Report

Attention: Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 59.13%. Comparing base (4c4020e) to head (b3f1dba).
Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           develop   #34873    +/-   ##
=========================================
  Coverage    59.12%   59.13%            
=========================================
  Files         2819     2819            
  Lines        67867    67341   -526     
  Branches     15117    15006   -111     
=========================================
- Hits         40129    39822   -307     
+ Misses       24907    24710   -197     
+ Partials      2831     2809    -22     
Flag Coverage Δ
unit 75.00% <66.66%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link

changeset-bot bot commented Jan 7, 2025

🦋 Changeset detected

Latest commit: b3f1dba

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 35 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/api-client Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/ddp-client Patch
@rocket.chat/freeswitch Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/models Patch
@rocket.chat/network-broker Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/ui-voip Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

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

@matheusbsilva137 matheusbsilva137 changed the title Fix/global options saml requests fix: SAML login redirects to incorrect room when using an invite Jan 7, 2025
@matheusbsilva137 matheusbsilva137 marked this pull request as ready for review January 7, 2025 20:21
@matheusbsilva137 matheusbsilva137 requested review from a team as code owners January 7, 2025 20:21
MarcosSpessatto
MarcosSpessatto previously approved these changes Jan 8, 2025
@jessicaschelly jessicaschelly added the stat: QA assured Means it has been tested and approved by a company insider label Jan 13, 2025
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jan 13, 2025
Copy link
Contributor

dionisio-bot bot commented Jan 17, 2025

Pull request #34959 added to Project: "Patch 7.2.1"

@matheusbsilva137
Copy link
Member Author

/backport 7.1.1

Copy link
Contributor

dionisio-bot bot commented Jan 17, 2025

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.1.1-34873
git cherry-pick f777d9eed959d42d99b645ae8e12a19e966b5256
// solve the conflict
git push

after that just run /backport 7.1.1 again

@matheusbsilva137
Copy link
Member Author

/backport 7.1.1

Copy link
Contributor

dionisio-bot bot commented Jan 17, 2025

Pull request #34961 added to Project: "Patch 7.1.1"

@matheusbsilva137
Copy link
Member Author

/backport 7.0.5

Copy link
Contributor

dionisio-bot bot commented Jan 17, 2025

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.0.5-34873
git cherry-pick f777d9eed959d42d99b645ae8e12a19e966b5256
// solve the conflict
git push

after that just run /backport 7.0.5 again

@matheusbsilva137
Copy link
Member Author

/backport 7.0.5

Copy link
Contributor

dionisio-bot bot commented Jan 17, 2025

Pull request #34962 added to Project: "Patch 7.0.5"

@matheusbsilva137 matheusbsilva137 deleted the fix/global-options-saml-requests branch January 17, 2025 15:37
@matheusbsilva137 matheusbsilva137 restored the fix/global-options-saml-requests branch January 20, 2025 12:15
@matheusbsilva137
Copy link
Member Author

/backport 7.1.2

Copy link
Contributor

dionisio-bot bot commented Jan 20, 2025

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.1.2-34873
git cherry-pick f777d9eed959d42d99b645ae8e12a19e966b5256
// solve the conflict
git push

after that just run /backport 7.1.2 again

@matheusbsilva137
Copy link
Member Author

/backport 7.1.2

Copy link
Contributor

dionisio-bot bot commented Jan 20, 2025

Pull request #34971 added to Project: "Patch 7.1.2"

@matheusbsilva137
Copy link
Member Author

/backport 7.2.2

Copy link
Contributor

dionisio-bot bot commented Jan 20, 2025

Sorry, I couldn't do that backport because of conflicts. Could you please solve them?

you can do so by running the following commands:

git fetch
git checkout backport-7.2.2-34873
git cherry-pick f777d9eed959d42d99b645ae8e12a19e966b5256
// solve the conflict
git push

after that just run /backport 7.2.2 again

@matheusbsilva137
Copy link
Member Author

/backport 7.2.2

Copy link
Contributor

dionisio-bot bot commented Jan 20, 2025

Pull request #34973 added to Project: "Patch 7.2.2"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants