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

Licensing: exclude revoked licenses from unattached license filter #40215

Open
wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Licensing: exclude revoked licenses from unattached license filter #40215

wants to merge 2 commits into from
+38 −2

Conversation

Initsogar
Copy link
Contributor

@Initsogar Initsogar commented Nov 15, 2024 •
edited
Loading

Fixes https://github.com/Automattic/jetpack-roadmap/issues/2010

This will prevent users with only revoked unattached licenses from being redirected to the license activation page after connecting their site to Jetpack.

Proposed changes:

  • Updated the get_user_licenses method in the Licensing class to exclude licenses marked as revoked (revoked_at !== null) when filtering unattached licenses.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

p1HpG7-uUZ-p2#comment-74755

Does this pull request change what data or activity we track or use?

No

Testing instructions:

  • Spin up a Jurassic Ninja site with Jetpack VaultPress Backup using this branch
  • Ensure your user has no licenses available, and has at least one revoked license
  • Navigate to Jetpack > VaultPress Backup
  • Click on Get VaultPress Backup
  • Approve the Jetpack Connection
  • Validate you are redirected to the checkout page instead of the license activation page
backup-licensing-fixed.mp4

If you want to reproduce the bug reported, you can follow the steps described in https://github.com/Automattic/jetpack-roadmap/issues/2010.

@Initsogar
Ensure revoked licenses are excluded when filtering unattached licenses
c34850b 
The `get_user_licenses` method now excludes licenses with `revoked_at !== null` when filtering unattached licenses (`$unattached_only = true`). This ensures that only valid, unattached licenses are returned, improving the reliability of the method's output.

- Updated the parameter docblock to reflect the new behavior.
- Adjusted the filtering logic to include a check for `revoked_at`.
@Initsogar
changelog
9ed92f8
@Initsogar Initsogar self-assigned this Nov 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 15, 2024 •
edited
Loading

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the update/fetch-available-licenses branch.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack update/fetch-available-licenses

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions github-actions bot added [Package] Licensing [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. [Status] In Progress labels Nov 15, 2024
@github-actions GitHub Actions
Copy link
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for none scheduled (scheduled code freeze on undefined).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Backup plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Boost plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Search plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Social plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Starter Plugin plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Protect plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Videopress plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@Initsogar Initsogar added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] In Progress labels Nov 16, 2024
@Initsogar Initsogar marked this pull request as ready for review November 16, 2024 00:07
@Initsogar Initsogar requested review from keoshi, ilonagl and a team November 16, 2024 00:08
keoshi
keoshi approved these changes Nov 18, 2024
View reviewed changes
Copy link
Contributor

@keoshi keoshi left a comment

Choose a reason for hiding this comment

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

Yessss! Thanks for making this change. The flow is now almost* perfect.

*It's a very minor thing but starting from the VaultPress Backup page, we take users to user connection and then checkout. Not sure if we need to change anything in the connection step, but notice we say “Returning to your site” (code in Calypso) before the checkout redirect.

Screenshot 2024-11-18 at 11 35 38

By the way, this is not how upgrading from the My Jetpack page works. In that flow we send users first to the checkout, then to the user connection, then we assign the license to the correct site.

Either way, this is already an awesome improvement over the current flow — thank you so much @Initsogar!

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

@ilonagl ilonagl ilonagl approved these changes

@keoshi keoshi keoshi approved these changes

Assignees

@Initsogar Initsogar

Labels
[Package] Licensing [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. [Status] Design Review Complete [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Initsogar @keoshi @ilonagl