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

Paid content block: swap login flow to magic link flow intead of code login flow #37178

Merged
merged 2 commits into from
May 6, 2024

Conversation

simison
Copy link
Member

@simison simison commented May 2, 2024

Proposed changes:

  • Adds magic link flow to paid content block, replacing the emailed code -flow

Methods copied from subscriber login block.

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:

As already logged in subscriber, but not a paid customer, you won't see login button but will see subscribe button:

Screenshot 2024-05-02 at 15 29 55

As logged out at site, but logged in at WP.com, login button simply logs you in:

Screen.Recording.2024-05-02.at.15.31.51.mov

As logged out at the site and logged out at WP.com, you'll go through the WP.com magic link flow and land back at the site:

Screenshot 2024-05-02 at 15 32 39 Screenshot 2024-05-02 at 15 32 47 Screenshot 2024-05-02 at 15 32 57 Screenshot 2024-05-02 at 15 33 14

@simison simison requested a review from millerf May 2, 2024 12:39
Copy link
Contributor

github-actions bot commented May 2, 2024

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/paid-content-auth-url branch.

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

    bin/jetpack-downloader test jetpack update/paid-content-auth-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 [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ labels May 2, 2024
Copy link
Contributor

github-actions bot commented May 2, 2024

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 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:

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

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for June 4, 2024 (scheduled code freeze on May 27, 2024).

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

@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 May 2, 2024
@simison simison added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels May 2, 2024
Copy link
Contributor

@millerf millerf left a comment

Choose a reason for hiding this comment

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

LGTM

*
* @return string
*/
function get_subscriber_login_url( $redirect ) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Next up this would be good to move to a central place and share between the login block and this block:

/**
* Returns subscriber log in URL.
*
* @param string $redirect Path to redirect to on login.
*
* @return string
*/
function get_subscriber_login_url( $redirect ) {
$redirect = ! empty( $redirect ) ? $redirect : get_site_url();
if ( ( new Host() )->is_wpcom_simple() ) {
// On WPCOM we will redirect immediately
return wpcom_logmein_redirect_url( $redirect, false, null, 'link', get_current_blog_id() );
}
// On self-hosted we will save and hide the token
$redirect_url = get_site_url() . '/wp-json/jetpack/v4/subscribers/auth';
$redirect_url = add_query_arg( 'redirect_url', $redirect, $redirect_url );
return add_query_arg(
array(
'site_id' => intval( Jetpack_Options::get_option( 'id' ) ),
'redirect_url' => rawurlencode( $redirect_url ),
),
'https://subscribe.wordpress.com/memberships/jwt/'
);
}

@simison simison merged commit 63cdb3f into trunk May 6, 2024
59 checks passed
@simison simison deleted the update/paid-content-auth-url branch May 6, 2024 16:20
@github-actions github-actions bot removed the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label May 6, 2024
@github-actions github-actions bot added this to the jetpack/13.3.2 milestone May 6, 2024
pkuliga pushed a commit that referenced this pull request May 9, 2024
@jeherve jeherve modified the milestones: jetpack/13.3.2, jetpack/13.5 May 10, 2024
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 [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.

3 participants