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.

Sign up for GitHub

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

Jump to bottom

fix(wc-memberships): prevent RAS from hijacking WC for Teams links #3540

Merged
merged 2 commits into from
Nov 13, 2024
Merged

fix(wc-memberships): prevent RAS from hijacking WC for Teams links #3540

merged 2 commits into from
Nov 13, 2024

Conversation

adekbadek
Copy link
Member

@adekbadek adekbadek commented Nov 12, 2024 •
edited
Loading

All Submissions:

Changes proposed in this Pull Request:

Prevents this plugin from hijacking custom WC templates from woocommerce-memberships-for-teams plugin, allowing this plugin to add handling of "join team" links.

Note that failing tests on CI are due to network-dependent unit tests: here's a proposition to remove these.

How to test the changes in this Pull Request:

  1. On trunk,
  2. Ensure RAS is activated
  3. Activate woocommerce-memberships-for-teams plugin and create a team with unlimited seats. Log in as the team owner.
  4. In "My Account" -> "Team" -> "Add Member" tab and copy the registration link
  5. Visit that link in a new session, observe the RAS registration UI is presented
  6. Switch to this branch, reload the page, observe a UI allowing to join a team ("Hey there! You've been invited to join…")
  7. Visit "My Account" page in that new session, observe that in this case, the RAS registration UI is presented

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully ran tests with your changes locally?

@adekbadek adekbadek added the [Status] Needs Review The issue or pull request needs to be reviewed label Nov 12, 2024
@adekbadek adekbadek requested a review from a team as a code owner November 12, 2024 09:10
dkoo
dkoo approved these changes Nov 12, 2024
View reviewed changes
Copy link
Contributor

@dkoo dkoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adekbadek works as described! While testing this I also noticed that as an invited team member, there's no indication of my team membership or any way to manage it in My Account. I opened #3542 against this branch to restore the "My Membership" menu items for team members only, as this is the menu the Teams extension uses to let team members view and manage their team memberships.

@github-actions github-actions bot added [Status] Approved The pull request has been reviewed and is ready to merge and removed [Status] Needs Review The issue or pull request needs to be reviewed labels Nov 12, 2024
@adekbadek
Copy link
Member Author

@dkoo – Thank you for fixing this!

@adekbadek adekbadek merged commit 489ce0f into trunk Nov 13, 2024
7 checks passed
@adekbadek adekbadek deleted the fix/wc-teams-join-link branch November 13, 2024 09:20
@github-actions GitHub Actions
Copy link

Hey @, good job getting this PR merged! 🎉

Now, the needs-changelog label has been added to it.

Please check if this PR needs to be included in the "Upcoming Changes" and "Release Notes" doc. If it doesn't, simply remove the label.

If it does, please add an entry to it to our shared document, with screenshots and testing instructions if applicable, then remove the label.

Thank you! ❤️

matticbot pushed a commit that referenced this pull request Nov 15, 2024
@semantic-release-bot
chore(release): 5.8.0-alpha.1 [skip ci]
18c11dd 
# [5.8.0-alpha.1](v5.7.0...v5.8.0-alpha.1) (2024-11-15)

### Bug Fixes

* **reader-registration-block:** fix styles of newsletter lists ([1e1d7a4](1e1d7a4))
* **salesforce:** handle woocommerce inactive ([#3521](#3521)) ([bf868a4](bf868a4))
* use user email for esp sync purposes ([#3520](#3520)) ([d6925ff](d6925ff))
* **wc-memberships:** WC for Teams join-team link; team in my-account ([#3540](#3540)) ([489ce0f](489ce0f))

### Features

* also trigger subscription change events on switch ([#3514](#3514)) ([5a84949](5a84949))
* **pwa:** enable SW file caching ([82af7d4](82af7d4))
* **starter-content:** e2e improvements; removal CLI command ([35431ac](35431ac))
* update Stripe Settings dashboard UI ([#3488](#3488)) ([7974fac](7974fac))
* **wc-memberships:** support team data in import ([63c78b2](63c78b2))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 5.8.0-alpha.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Nov 25, 2024
@semantic-release-bot
chore(release): 5.8.0 [skip ci]
bb045b8 
# [5.8.0](v5.7.0...v5.8.0) (2024-11-25)

### Bug Fixes

* **reader-registration-block:** fix styles of newsletter lists ([1e1d7a4](1e1d7a4))
* **salesforce:** handle woocommerce inactive ([#3521](#3521)) ([bf868a4](bf868a4))
* use user email for esp sync purposes ([#3520](#3520)) ([d6925ff](d6925ff))
* **wc-memberships:** WC for Teams join-team link; team in my-account ([#3540](#3540)) ([489ce0f](489ce0f))

### Features

* also trigger subscription change events on switch ([#3514](#3514)) ([5a84949](5a84949))
* **pwa:** enable SW file caching ([82af7d4](82af7d4))
* **starter-content:** e2e improvements; removal CLI command ([35431ac](35431ac))
* update Stripe Settings dashboard UI ([#3488](#3488)) ([7974fac](7974fac))
* **wc-memberships:** support team data in import ([63c78b2](63c78b2))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 5.8.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkoo dkoo dkoo approved these changes

Assignees
No one assigned
Labels
released on @alpha released [Status] Approved The pull request has been reviewed and is ready to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adekbadek @matticbot @dkoo