Skip to content

Update/connection banner multisite url redirection#43594

Merged
darssen merged 8 commits intotrunkfrom
update/connection-banner-multisite-url-redirection
Jun 6, 2025
Merged

Update/connection banner multisite url redirection#43594
darssen merged 8 commits intotrunkfrom
update/connection-banner-multisite-url-redirection

Conversation

@darssen
Copy link
Copy Markdown
Contributor

@darssen darssen commented May 23, 2025

Fixes VULCAN-101

Proposed changes:

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:

Same as #39865
And also #43340

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 23, 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:

No scheduled milestone found for this plugin.

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 May 23, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 23, 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 update/connection-banner-multisite-url-redirection branch.
  • To test on Simple, run the following command on your sandbox:
bin/jetpack-downloader test jetpack update/connection-banner-multisite-url-redirection

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

@darssen darssen self-assigned this May 23, 2025
@darssen darssen added Bug When a feature is broken and / or not performing as intended 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 May 23, 2025
@darssen darssen marked this pull request as ready for review May 23, 2025 11:49
@jp-launch-control
Copy link
Copy Markdown

jp-launch-control Bot commented May 23, 2025

Code Coverage Summary

This PR did not change code coverage!

That could be good or bad, depending on the situation. Everything covered before, and still is? Great! Nothing was covered before? Not so great. 🤷

Full summary · PHP report · JS report

@github-actions github-actions Bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label May 23, 2025
@darssen darssen requested a review from a team May 23, 2025 15:02
@darssen darssen added the [Status] Needs Review This PR is ready for review. label May 23, 2025
@darssen
Copy link
Copy Markdown
Contributor Author

darssen commented May 23, 2025

Definitely not familiar with the codebase, but I think this started being an issue with #39865, which didn't consider multisites when replacing only wp-admin/ I'm not 100% sure if that would be an issue for other places where the component is used although I doubt it.

I opted for a regex in the same ConnectBanner to avoid other issues, but another option would be to be more defensive down the road here and check for multisites and replace the site_url. I think it's not the best option.

Copy link
Copy Markdown
Contributor

@coder-karen coder-karen left a comment

Choose a reason for hiding this comment

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

Nice!!
This works well, thank you.

@chrisbliss18
Copy link
Copy Markdown
Contributor

I wondered how the logic change would affect non-multisite sites using WordPress in its own directory. I tested using both methods listed on that page. I didn't run into any complications with method 1 (without URL change). However, I ran into something odd when testing with method 2 (with URL change).

When testing without WordPress in its own directory and when using method 1, I got the following prompt when following the "Connect Jetpack" button on the Blogroll block as the non-connected user:
url-redirection-test-no-subdirectory

However, when testing with WordPress in its own directory using method 2, I got something different:
url-redirection-test-with-subdirectory

Notice that "Connected as" changes to "Connecting as" and "Return to your site" changes to "Approve". I tested this repeatedly, sometimes creating new connections before starting the tests and sometimes reusing the existing connection. I always got this result despite getting to the prompt using a different user as per the instructions.

This means that I can't actually test this fix properly for such sites as somehow the connection flow is not properly identifying that the requesting user is different than the user logged in to wp.com.

Given this complication, I can't properly give a review to this PR.

@darssen
Copy link
Copy Markdown
Contributor Author

darssen commented Jun 5, 2025

Thanks for reviewing @chrisbliss18

Notice that "Connected as" changes to "Connecting as" and "Return to your site" changes to "Approve". I tested this repeatedly, sometimes creating new connections before starting the tests and sometimes reusing the existing connection. I always got this result despite getting to the prompt using a different user as per the instructions.

This means that I can't actually test this fix properly for such sites as somehow the connection flow is not properly identifying that the requesting user is different than the user logged in to wp.com.

Given this complication, I can't properly give a review to this PR.

Is this different from what happens in trunk? What happens when you Approve in the 2nd scenario, does it take you back to the post before, or it takes you to a wrong URL?

Copy link
Copy Markdown
Contributor

@darssen The same thing happens in both this branch and in trunk. Sorry for not clarifying before. So, this is a preexisting issue.

That being the case, I don't want to hold up this fix, but I do want to make sure that we 1) create a new issue for the problem that I found, and 2) ensure that we retest for this issue once we fix the issue that I identified.

@darssen darssen merged commit d84c90a into trunk Jun 6, 2025
67 checks passed
@darssen darssen deleted the update/connection-banner-multisite-url-redirection branch June 6, 2025 06:49
@github-actions github-actions Bot removed [Status] Needs Review This PR is ready for review. [Status] In Progress labels Jun 6, 2025
@github-actions github-actions Bot added this to the jetpack/14.8 milestone Jun 6, 2025
@darssen
Copy link
Copy Markdown
Contributor Author

darssen commented Jun 6, 2025

@darssen The same thing happens in both this branch and in trunk. Sorry for not clarifying before. So, this is a preexisting issue.

That being the case, I don't want to hold up this fix, but I do want to make sure that we 1) create a new issue for the problem that I found, and 2) ensure that we retest for this issue once we fix the issue that I identified.

Since it is a separate issue, I went ahead and merged this one.

@chrisbliss18 Would it be possible for you to create the issue with the steps to test on non-multisite sites using WordPress in its own directory for method 2?

mikestottuk pushed a commit that referenced this pull request Jun 26, 2025
* Debugging commit for testing inside multisite JN

* Debugging commit for testing inside multisite JN

* Changelog

* Remove debugging

* Use regex to replace all before wp-admin due to multisites not working as expected

* changelog

* Remove changelog since change is in jetpack and not in the connection package
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 [Package] Connection [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