Skip to content

fix(ras-acc): re-add recaptcha to the WooCommerce checkout #3605

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
Merged
laurelfulford merged 2 commits into from
Dec 9, 2024
Merged

fix(ras-acc): re-add recaptcha to the WooCommerce checkout #3605

laurelfulford merged 2 commits into from
Dec 9, 2024

Conversation

@laurelfulford
Copy link
Contributor

@laurelfulford laurelfulford commented Dec 7, 2024

All Submissions:

Changes proposed in this Pull Request:

The code that adds the g-recaptcha field to the WooCommerce cart checkout was removed as part of this PR.

Unfortunately this causes the regular cart not to be able to process orders when reCAPTCHA v3 is enabled. V2 still seems to work, but it's possibly because reCAPTCHA doesn't work at all. I've reinstated both.

How to test the changes in this Pull Request:

  1. Set up your site to use reCAPTCHA v3.
  2. Run through a regular modal checkout of a subscription product.
  3. Go to My Account > Subscriptions, and edit the monthly amount for your subscription.
  4. On the final step of trying to checkout, note the reCAPTCHA error.
  5. Apply this PR.
  6. Repeat steps 3 and 4 and confirm that the reCAPTCHA error doesn't return.
  7. Try a modal checkout purchase and confirm there are no errors.
  8. Try a regular /shop to /cart purchase and confirm there are no errors.
  9. Switch to reCAPTCHA v2, and repeat all the tests.

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?

@laurelfulford laurelfulford added [Status] Needs Review The issue or pull request needs to be reviewed ras-acc testing labels Dec 7, 2024
@laurelfulford laurelfulford requested a review from a team as a code owner December 7, 2024 01:42
chickenn00dle
chickenn00dle approved these changes Dec 9, 2024
View reviewed changes
Copy link
Contributor

@chickenn00dle chickenn00dle left a comment

Choose a reason for hiding this comment

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

Looks good. Good catch @laurelfulford!

@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 Dec 9, 2024
@laurelfulford
Copy link
Contributor Author

laurelfulford commented Dec 9, 2024

Thanks @chickenn00dle! Updating the alphas...

@laurelfulford laurelfulford merged commit f42a75b into trunk Dec 9, 2024
1 check passed
@laurelfulford laurelfulford deleted the fix/readd-recaptcha-to-checkout branch December 9, 2024 15:05
@github-actions
Copy link

github-actions bot commented Dec 9, 2024

Hey @laurelfulford, 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 our shared document, with screenshots and testing instructions if applicable, then remove the label.

Thank you! ❤️

laurelfulford added a commit that referenced this pull request Dec 9, 2024
@laurelfulford
fix(ras-acc): re-add recaptcha to the WooCommerce checkout (#3605)
07f46b3
matticbot pushed a commit that referenced this pull request Dec 9, 2024
@semantic-release-bot
chore(release): 5.9.0-alpha.3 [skip ci]
b7b9a20 
# [5.9.0-alpha.3](v5.9.0-alpha.2...v5.9.0-alpha.3) (2024-12-09)

### Bug Fixes

* **ras-acc:** re-add recaptcha to the WooCommerce checkout ([#3605](#3605)) ([07f46b3](07f46b3))
matticbot pushed a commit that referenced this pull request Dec 9, 2024
@semantic-release-bot
chore(release): 5.9.0 [skip ci]
460e716 
# [5.9.0](v5.8.2...v5.9.0) (2024-12-09)

### Bug Fixes

* **emails:** account for false order value ([#3590](#3590)) ([a2e4042](a2e4042))
* **ras-acc:** correct My Account custom font sizing clash ([#3588](#3588)) ([080f1ce](080f1ce))
* **ras-acc:** make helper text size more specific ([#3584](#3584)) ([5bcc688](5bcc688))
* **ras-acc:** re-add recaptcha to the WooCommerce checkout ([#3605](#3605)) ([07f46b3](07f46b3))
* undefined var ([#3585](#3585)) ([00d8bc7](00d8bc7))
* **woocommerce-emails:** use the default email payload if there are no donation products ([#3545](#3545)) ([60c21f3](60c21f3))

### Features

* mark perfmatters as a required plugin ([#3578](#3578)) ([f20291c](f20291c))
* **ras-acc:** add reader account creation and login improvements ([#3582](#3582)) ([b66de08](b66de08))
* **reader-data:** add a CLI command to align reader membership data ([#3548](#3548)) ([8e49bf0](8e49bf0))
* **subscriptions:** add setting to reattempt payment after final retry ([#3560](#3560)) ([553c3ac](553c3ac))
* **woocommerce:** remove internal metadata from REST API response ([6b659a6](6b659a6))
matticbot pushed a commit that referenced this pull request Dec 12, 2024
@semantic-release-bot
chore(release): 5.10.0-alpha.1 [skip ci]
222aee9 
# [5.10.0-alpha.1](v5.9.1...v5.10.0-alpha.1) (2024-12-12)

### Bug Fixes

* duplicate orders save on cron ([#3604](#3604)) ([ec69167](ec69167))
* **ras-acc:** re-add recaptcha to the WooCommerce checkout ([#3605](#3605)) ([f42a75b](f42a75b))
* **ras:** do not require Woo plugins if using NRH ([#3614](#3614)) ([363a834](363a834))
* **wcs:** remove subscriptions expiration feature flag ([#3618](#3618)) ([7c175d9](7c175d9))
* **wcs:** update subscription expiration feature ([#3613](#3613)) ([ebf6e6d](ebf6e6d))
* **wcs:** update subscriptions expiration cli behavior ([#3617](#3617)) ([07e768c](07e768c))

### Features

* **subscriptions:** add cancellation reason metadata ([#3568](#3568)) ([de83e02](de83e02))
* **wc:** duplicate orders admin notice ([#3555](#3555)) ([cb764e3](cb764e3))
* **wcs:** add expired subscription cli tool ([#3593](#3593)) ([5d39398](5d39398))
* **webhooks:** filter request priority ([#3587](#3587)) ([1928a6a](1928a6a))
* **woocommerce-subscriptions:** add url redirect for wc subscription renewals ([#3525](#3525)) ([5b14aeb](5b14aeb))

### Reverts

* Revert "feat: command to initialize cron job to slowly backfill CAP term data (#3425)" (#3620) ([c9a9d45](c9a9d45)), closes [#3425](#3425) [#3620](#3620)
@matticbot
Copy link
Contributor

matticbot commented Dec 12, 2024

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

The release is available on GitHub release

Your semantic-release bot 📦🚀

matticbot pushed a commit that referenced this pull request Dec 16, 2024
@semantic-release-bot
chore(release): 5.10.0 [skip ci]
359f743 
# [5.10.0](v5.9.2...v5.10.0) (2024-12-16)

### Bug Fixes

* dont load textdomain too early ([#3629](#3629)) ([76c1f97](76c1f97))
* duplicate orders save on cron ([#3604](#3604)) ([ec69167](ec69167))
* hide duplicate notices if all was dismissed ([#3630](#3630)) ([cf48188](cf48188))
* **ras-acc:** re-add recaptcha to the WooCommerce checkout ([#3605](#3605)) ([f42a75b](f42a75b))
* **ras:** do not require Woo plugins if using NRH ([#3614](#3614)) ([363a834](363a834))
* **wcs:** remove subscriptions expiration feature flag ([#3618](#3618)) ([7c175d9](7c175d9))
* **wcs:** update subscription expiration feature ([#3613](#3613)) ([ebf6e6d](ebf6e6d))
* **wcs:** update subscriptions expiration cli behavior ([#3617](#3617)) ([07e768c](07e768c))

### Features

* **subscriptions:** add cancellation reason metadata ([#3568](#3568)) ([de83e02](de83e02))
* **wc:** duplicate orders admin notice ([#3555](#3555)) ([cb764e3](cb764e3))
* **wcs:** add expired subscription cli tool ([#3593](#3593)) ([5d39398](5d39398))
* **webhooks:** filter request priority ([#3587](#3587)) ([1928a6a](1928a6a))
* **woocommerce-subscriptions:** add url redirect for wc subscription renewals ([#3525](#3525)) ([5b14aeb](5b14aeb))

### Reverts

* Revert "feat: command to initialize cron job to slowly backfill CAP term data (#3425)" (#3620) ([c9a9d45](c9a9d45)), closes [#3425](#3425) [#3620](#3620)
@matticbot
Copy link
Contributor

matticbot commented Dec 16, 2024

🎉 This PR is included in version 5.10.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

@chickenn00dle chickenn00dle chickenn00dle approved these changes

Assignees

No one assigned

Labels

ras-acc testing 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.

4 participants

@laurelfulford @matticbot @chickenn00dle