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.

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

Fix DIY migration failing to fetch migration key and throwing 403 on page reload #40270

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Fix DIY migration failing to fetch migration key and throwing 403 on page reload #40270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aaa3ad
Remove check for read flag from migration key get api checks
Imran92 Nov 20, 2024
94abe6d
Changelog - Remove read check from migration key access checks
Imran92 Nov 20, 2024
2871fce
Remove key_is_read_option_name altogether
Imran92 Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/packages/jetpack-mu-wpcom/changelog/fix-migration-diy-throws-403-on-page-reload
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Fix migration key fetch failing when DIY migration page is reloaded
13 changes: 0 additions & 13 deletions ...s/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-site-migration-wpcom-migration-key.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
* @hide-in-jetpack
*/
class WPCOM_REST_API_V2_Endpoint_Site_Migration_WPCOM_Migration_Key extends WP_REST_Controller {
/**
* Option name that tracks wether the key has been read or not.
* The only possible value for the option is 'read'.
*
* @var string
*/
protected $key_is_read_option_name = 'wpcom_site_migration_wpcom_migration_key_read';

/**
* Class constructor
Expand Down Expand Up @@ -73,10 +66,6 @@ public function can_access() {
return false;
}

if ( 'read' === get_option( $this->key_is_read_option_name, false ) ) {
Copy link
Member

Choose a reason for hiding this comment

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

It looks like the key_is_read_option_name option is not used anymore. What do you think of cleaning up the related logic (removing the variable and the update_option call)?

Copy link
Contributor Author

@Imran92 Imran92 Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I was thinking that it can be useful to keep this data around maybe? 🤔 Just in case we want to bring this logic back or use it elsewhere? Just a thought, no strong opinion

Copy link
Member

@m1r0 m1r0 Dec 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I would prefer it if we could clean it up. I see it as technical debt otherwise. If we ever need it again, it would be very easy to add it back. 🙂

Maybe a more relatable example would be overengineering a feature with things that may potentially come in handy. It’s a common pitfall and I confess of being guilty there as well. 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Makes sense, removed it here 2871fce

return false;
}

return true;
}

Expand All @@ -89,8 +78,6 @@ private function get_migration_key() {
$wpcom_migration_settings = new WPCOMWPSettings();
$wpcom_migration_info = new WPCOMInfo( $wpcom_migration_settings );

update_option( $this->key_is_read_option_name, 'read' );

return $wpcom_migration_info->getConnectionKey();
}

Expand Down
Loading