Skip to content

Forms: Use JWT for passing the Contact_Form object around - Try 2#44399

Merged
enejb merged 10 commits intotrunkfrom
revert-44397-revert-44360-update/add-jwt-form-encode-decode
Jul 22, 2025
Merged

Forms: Use JWT for passing the Contact_Form object around - Try 2#44399
enejb merged 10 commits intotrunkfrom
revert-44397-revert-44360-update/add-jwt-form-encode-decode

Conversation

@enejb
Copy link
Copy Markdown
Member

@enejb enejb commented Jul 21, 2025

This PR implements #44360 but with fixes that caused us to revert it. Please see the original PR -

The revert can be found here. #44397

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

No

Testing instructions:

Add a form. Does it submit as expected?
Add a form in a widget. Does it submit as expected?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 21, 2025

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 WoA dev 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 (Jetpack), and enable the revert-44397-revert-44360-update/add-jwt-form-encode-decode branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack revert-44397-revert-44360-update/add-jwt-form-encode-decode

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 [Feature] Forms [Package] Forms [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Tests] Includes Tests labels Jul 21, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 21, 2025

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 Review, ...).
  • ✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ 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 🤖


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, 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 as soon as you deploy your changes after merging this PR (PCYsg-Jjm-p2).
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly:
    • Scheduled release: August 5, 2025
    • Code freeze: August 4, 2025

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 need more details from you. This label will be auto-added until the PR meets all requirements. label Jul 21, 2025
@jp-launch-control
Copy link
Copy Markdown

jp-launch-control bot commented Jul 21, 2025

Code Coverage Summary

Coverage changed in 3 files.

File Coverage Δ% Δ Uncovered
projects/packages/jwt/src/class-jwt.php 82/136 (60.29%) 0.45% 3 ❤️‍🩹
projects/packages/forms/src/contact-form/class-contact-form.php 619/1121 (55.22%) 0.77% 0 💚
projects/packages/forms/src/contact-form/class-contact-form-plugin.php 450/1186 (37.94%) 1.96% -20 💚

Full summary · PHP report · JS report

enejb and others added 8 commits July 21, 2025 13:25
Updated unesc_attr to support object values by casting them to arrays before processing. Added a unit test to verify JWT recovery with salesforceData included in the form.
Added logic to convert the jetpackCRM attribute to a boolean if it is a string in Contact_Form. Updated unit test to verify all attribute data, including jetpackCRM, is preserved and correctly restored from JWT.
The JWT::decode method now accepts an $as_array parameter to return the payload as an associative array. Updated contact form code to use this feature, simplifying attribute handling. Added corresponding tests to ensure array decoding works as expected and removed legacy object-to-array conversion logic.
@enejb enejb force-pushed the revert-44397-revert-44360-update/add-jwt-form-encode-decode branch from a285170 to 0cff570 Compare July 21, 2025 20:26
@dhasilva dhasilva added Bug When a feature is broken and / or not performing as intended [Status] In Progress and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Jul 21, 2025
Adjusted the @return annotations in docblocks to indicate that methods may return either an object or an array, improving accuracy and clarity for developers using these methods.

Fixes PHP Phan issue
@enejb enejb merged commit 7c66393 into trunk Jul 22, 2025
67 checks passed
@enejb enejb deleted the revert-44397-revert-44360-update/add-jwt-form-encode-decode branch July 22, 2025 14:40
@github-actions github-actions bot added this to the jetpack/14.9 milestone Jul 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bug When a feature is broken and / or not performing as intended [Feature] Forms [Package] Forms [Package] Jwt [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Tests] Includes Tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants