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

[memberships] Remove token from url #33561

Merged
merged 5 commits into from
Oct 16, 2023

Conversation

millerf
Copy link
Contributor

@millerf millerf commented Oct 11, 2023

Fixes https://github.com/Automattic/gold/issues/169

Proposed changes:

  • Remove adding the token to the URL for no reason
  • Do not rely on subscribe=success to know the subscription status of the current user
  • Small refactor

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

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

Testing instructions:

WPCOM

  • Push this branch on your sandbox and sandbox bestmemberships.wordpress.com
  • Open https://bestmemberships.wordpress.com/2023/08/31/access-only-for-free-subscribers/
  • From incognito, subscribe for free with a new user
  • Do not confirm the email
  • Make sure the token is not in the URL
  • Make sure you see this:
    Uploading Screenshot 2023-10-11 at 18.23.53.png…
  • Reload the page, you should see the same thing, as the cookie should be
  • Close the window
  • Open a new incognito and re-enter the email, you should see the same
  • Answer the confirmation email, you now should have access

Self-hosted

  • Create a new JN instance
  • Connect Earn to Stripe
  • Create a post with Newsletter access and one with a paid-content block
  • Pay for the access and when clicking "Continue" make sure the URL does not contain the token

@github-actions
Copy link
Contributor

github-actions bot commented Oct 11, 2023

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 add/memberships-remove-token-from-url branch.

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

    bin/jetpack-downloader test jetpack add/memberships-remove-token-from-url
    

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 [Block] Paid Content aka Premium Content [Block] Subscriptions [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels Oct 11, 2023
@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.


Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.


Jetpack plugin:

  • Next scheduled release: November 7, 2023.
  • Scheduled code freeze: October 30, 2023.

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Oct 11, 2023
@millerf millerf requested a review from pottedmeat October 11, 2023 14:41
@millerf millerf force-pushed the add/memberships-remove-token-from-url branch from 7379ac8 to 3086d17 Compare October 11, 2023 16:42
Fix issue when subscription is pending and do not rely on subscribe=success
@millerf millerf force-pushed the add/memberships-remove-token-from-url branch from 3086d17 to 787777a Compare October 11, 2023 16:44
@millerf millerf force-pushed the add/memberships-remove-token-from-url branch from c1abd68 to 7d423d9 Compare October 11, 2023 16:52
@chrismccluskey
Copy link
Contributor

I'm not able to see the screenshot you've uploaded to this PR, so I'm guessing a bit as to what the flow is. For some reason, opening a new private window in firefox seems to retain my cookie information, so I augmented the test a bit, changing the last two steps:

  • Open a new incognito and re-enter the email, you should see the same
  • Answer the confirmation email, you now should have access

To:

  • Open a new private window in a separate browser and re-enter the email. (Note: at this point, I got a "Verify your email to continue reading" after entering my login code after entering my email).
  • Answer the confirmation email, return to the original post and refresh the page, you should now have access. (Note: at this point, after opening the confirmation link I saw the content; however, when I returned to the original tab where it asked me to verify my email and refreshed that page, I was still greeted with a "Verify your email to continue reading". When I entered my email again on this page, it had me login again, which would repeat the process).

I'm not sure if this behavior is expected or if this just needs to be addressed in another patch. As far as being able to see the content, I am able to do so, because the confirmation page shows the content.

Copy link
Contributor

@pottedmeat pottedmeat left a comment

Choose a reason for hiding this comment

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

Code looks good and tested successfully.

@millerf millerf enabled auto-merge (squash) October 16, 2023 13:46
@millerf millerf merged commit 3d71a28 into trunk Oct 16, 2023
51 checks passed
@millerf millerf deleted the add/memberships-remove-token-from-url branch October 16, 2023 13:47
@github-actions github-actions bot removed the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Oct 16, 2023
@github-actions github-actions bot added this to the jetpack/12.7.1 milestone Oct 16, 2023
@ice9js ice9js modified the milestones: jetpack/12.7.1, jetpack/12.8 Oct 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Paid Content aka Premium Content [Block] Subscriptions [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants