← All changes
|
json-endpoints/class.wpcom-json-api-get-site-endpoint.php
+233
-44
12.7.3
→
16.3-a.5
View file →
| @@ -1,6 +1,10 @@ | ||
| 1 | 1 | <?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName |
| 2 | 2 | |
| 3 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 4 | + exit( 0 ); | |
| 5 | +} | |
| 6 | + | |
| 3 | 7 | new WPCOM_JSON_API_GET_Site_Endpoint( |
| 4 | 8 | array( |
| 5 | 9 | 'description' => 'Get information about a site.', |
| 6 | 10 | 'group' => 'sites', |
| @@ -12,8 +16,10 @@ | ||
| 12 | 16 | 'path' => '/sites/%s', |
| 13 | 17 | 'path_labels' => array( |
| 14 | 18 | '$site' => '(int|string) Site ID or domain', |
| 15 | 19 | ), |
| 20 | + 'rest_route' => '/site', | |
| 21 | + 'rest_min_jp_version' => '15.9', | |
| 16 | 22 | 'allow_jetpack_site_auth' => true, |
| 17 | 23 | |
| 18 | 24 | 'allow_fallback_to_jetpack_blog_token' => true, |
| 19 | 25 | |
| @@ -29,8 +35,10 @@ | ||
| 29 | 35 | ); |
| 30 | 36 | |
| 31 | 37 | /** |
| 32 | 38 | * GET Site endpoint class. |
| 39 | + * | |
| 40 | + * @phan-constructor-used-for-side-effects | |
| 33 | 41 | */ |
| 34 | 42 | class WPCOM_JSON_API_GET_Site_Endpoint extends WPCOM_JSON_API_Endpoint { |
| 35 | 43 | |
| 36 | 44 | /** |
| @@ -39,8 +47,9 @@ | ||
| 39 | 47 | * @var array $site_format |
| 40 | 48 | */ |
| 41 | 49 | public static $site_format = array( |
| 42 | 50 | 'ID' => '(int) Site ID', |
| 51 | + 'slug' => '(string) Slug of site', | |
| 43 | 52 | 'name' => '(string) Title of site', |
| 44 | 53 | 'description' => '(string) Tagline or description of site', |
| 45 | 54 | 'URL' => '(string) Full URL to the site', |
| 46 | 55 | 'user_can_manage' => '(bool) The current user can manage this site', // deprecated. |
| @@ -78,11 +87,24 @@ | ||
| 78 | 87 | 'is_wpcom_atomic' => '(bool) If the site is a WP.com Atomic one.', |
| 79 | 88 | 'is_wpcom_staging_site' => '(bool) If the site is a WP.com staging site.', |
| 80 | 89 | 'user_interactions' => '(array) An array of user interactions with a site.', |
| 81 | 90 | 'was_ecommerce_trial' => '(bool) If the site ever used an eCommerce trial.', |
| 91 | + 'was_upgraded_from_trial' => '(bool) If the site ever upgraded to a paid plan from a trial.', | |
| 82 | 92 | 'was_migration_trial' => '(bool) If the site ever used a migration trial.', |
| 83 | 93 | 'was_hosting_trial' => '(bool) If the site ever used a hosting trial.', |
| 84 | 94 | 'wpcom_site_setup' => '(string) The WP.com site setup identifier.', |
| 95 | + 'is_deleted' => '(bool) If the site flagged as deleted.', | |
| 96 | + 'is_a4a_client' => '(bool) If the site is an A4A client site.', | |
| 97 | + 'is_a4a_dev_site' => '(bool) If the site is an A4A dev site.', | |
| 98 | + 'is_garden' => '(bool) If the site is a Garden site.', | |
| 99 | + 'garden_name' => '(string) The name of the Garden site.', | |
| 100 | + 'garden_partner' => '(string) The partner of the Garden site.', | |
| 101 | + 'garden_is_provisioned' => '(bool) If the Garden site is provisioned.', | |
| 102 | + 'is_wpcom_flex' => '(bool) If the site is a Flex site', | |
| 103 | + 'big_sky_enabled' => '(bool) Whether the Big Sky AI assistant is enabled for this site.', | |
| 104 | + 'atomic_email_block' => '(object) State of the block on the site\'s outgoing email, with `status` (`blocked` while a block is active, `at_risk` once it has expired), `reason` and `expires_on` keys, or null when the site has no block history. WordPress.com platform only.', | |
| 105 | + 'hosting_provider_guess' => '(string) Guess of the hosting provider. WordPress.com platform only; only returned when explicitly requested via the fields parameter.', | |
| 106 | + 'environment_type' => '(string) The WP_ENVIRONMENT_TYPE of the site as synced by Jetpack. WordPress.com platform only; only returned when explicitly requested via the fields parameter.', | |
| 85 | 107 | ); |
| 86 | 108 | |
| 87 | 109 | /** |
| 88 | 110 | * No member fields. |
| @@ -114,8 +136,15 @@ | ||
| 114 | 136 | 'is_fse_eligible', |
| 115 | 137 | 'is_core_site_editor_enabled', |
| 116 | 138 | 'is_wpcom_atomic', |
| 117 | 139 | 'is_wpcom_staging_site', |
| 140 | + 'is_deleted', | |
| 141 | + 'is_wpcom_flex', | |
| 142 | + 'is_a4a_client', | |
| 143 | + 'is_a4a_dev_site', | |
| 144 | + 'is_garden', | |
| 145 | + 'big_sky_enabled', | |
| 146 | + 'garden_name', | |
| 118 | 147 | ); |
| 119 | 148 | |
| 120 | 149 | /** |
| 121 | 150 | * Site options. |
| @@ -134,8 +163,9 @@ | ||
| 134 | 163 | 'is_redirect', |
| 135 | 164 | 'unmapped_url', |
| 136 | 165 | 'featured_images_enabled', |
| 137 | 166 | 'theme_slug', |
| 167 | + 'theme_errors', | |
| 138 | 168 | 'header_image', |
| 139 | 169 | 'background_color', |
| 140 | 170 | 'image_default_link_type', |
| 141 | 171 | 'image_thumbnail_width', |
| @@ -195,37 +225,41 @@ | ||
| 195 | 225 | 'was_created_with_blank_canvas_design', |
| 196 | 226 | 'videopress_storage_used', |
| 197 | 227 | 'is_difm_lite_in_progress', |
| 198 | 228 | 'difm_lite_site_options', |
| 229 | + 'is_gating_business_q1', | |
| 230 | + 'is_legacy_gating_site', | |
| 199 | 231 | 'site_intent', |
| 232 | + 'site_partner_bundle', | |
| 233 | + 'onboarding_segment', | |
| 200 | 234 | 'site_vertical_id', |
| 201 | 235 | 'blogging_prompts_settings', |
| 202 | 236 | 'launchpad_screen', |
| 203 | 237 | 'launchpad_checklist_tasks_statuses', |
| 238 | + 'migration_source_site_domain', | |
| 204 | 239 | 'wpcom_production_blog_id', |
| 205 | 240 | 'wpcom_staging_blog_ids', |
| 206 | 241 | 'can_blaze', |
| 207 | 242 | 'wpcom_site_setup', |
| 208 | 243 | 'is_commercial', |
| 244 | + 'is_commercial_reasons', | |
| 245 | + 'wpcom_admin_interface', | |
| 246 | + 'wpcom_classic_early_release', | |
| 247 | + 'jetpack_recovery_mode_status', | |
| 248 | + 'jetpack_sso_require_two_step', | |
| 249 | + 'apm_enabled', | |
| 250 | + 'wpcom_ai_launchpad_enabled', | |
| 251 | + 'wpcom_ai_launchpad_dismissed', | |
| 252 | + 'wpcom_ai_launchpad_completed', | |
| 209 | 253 | ); |
| 210 | 254 | |
| 211 | 255 | /** |
| 212 | - * List of DIFM Lite options to be displayed | |
| 213 | - * | |
| 214 | - * @var array $displayed_difm_lite_site_options | |
| 215 | - */ | |
| 216 | - protected static $displayed_difm_lite_site_options = array( | |
| 217 | - 'site_category', | |
| 218 | - 'is_website_content_submitted', | |
| 219 | - 'selected_page_titles', | |
| 220 | - ); | |
| 221 | - | |
| 222 | - /** | |
| 223 | 256 | * Jetpack response fields. |
| 224 | 257 | * |
| 225 | 258 | * @var array $jetpack_response_field_additions |
| 226 | 259 | */ |
| 227 | 260 | protected static $jetpack_response_field_additions = array( |
| 261 | + 'slug', | |
| 228 | 262 | 'subscribers_count', |
| 229 | 263 | 'site_migration', |
| 230 | 264 | 'site_owner', |
| 231 | 265 | 'is_wpcom_staging_site', |
| @@ -231,8 +265,17 @@ | ||
| 231 | 265 | 'is_wpcom_staging_site', |
| 232 | 266 | 'was_ecommerce_trial', |
| 233 | 267 | 'was_migration_trial', |
| 234 | 268 | 'was_hosting_trial', |
| 269 | + 'was_upgraded_from_trial', | |
| 270 | + 'is_a4a_dev_site', | |
| 271 | + 'is_garden', | |
| 272 | + 'garden_name', | |
| 273 | + 'garden_partner', | |
| 274 | + 'garden_is_provisioned', | |
| 275 | + 'is_wpcom_flex', | |
| 276 | + 'big_sky_enabled', | |
| 277 | + 'atomic_email_block', | |
| 235 | 278 | ); |
| 236 | 279 | |
| 237 | 280 | /** |
| 238 | 281 | * Jetpack response field member additions. |
| @@ -248,9 +291,9 @@ | ||
| 248 | 291 | |
| 249 | 292 | /** |
| 250 | 293 | * Jetpack response option additions. |
| 251 | 294 | * |
| 252 | - * @var array $jetpack_response_field_member_additions | |
| 295 | + * @var array $jetpack_response_option_additions | |
| 253 | 296 | */ |
| 254 | 297 | protected static $jetpack_response_option_additions = array( |
| 255 | 298 | 'publicize_permanently_disabled', |
| 256 | 299 | 'ak_vp_bundle_enabled', |
| @@ -274,8 +317,14 @@ | ||
| 274 | 317 | 'blogging_prompts_settings', |
| 275 | 318 | 'wpcom_production_blog_id', |
| 276 | 319 | 'wpcom_staging_blog_ids', |
| 277 | 320 | 'is_commercial', |
| 321 | + 'is_commercial_reasons', | |
| 322 | + 'wpcom_admin_interface', | |
| 323 | + 'wpcom_classic_early_release', | |
| 324 | + 'jetpack_recovery_mode_status', | |
| 325 | + 'jetpack_sso_require_two_step', | |
| 326 | + 'apm_enabled', | |
| 278 | 327 | ); |
| 279 | 328 | |
| 280 | 329 | /** |
| 281 | 330 | * Current enabled trials. |
| @@ -288,11 +337,11 @@ | ||
| 288 | 337 | 'was_hosting_trial' => 'hosting', |
| 289 | 338 | ); |
| 290 | 339 | |
| 291 | 340 | /** |
| 292 | - * Site | |
| 341 | + * Site. | |
| 293 | 342 | * |
| 294 | - * @var $site. | |
| 343 | + * @var SAL_Site $site. | |
| 295 | 344 | */ |
| 296 | 345 | private $site; |
| 297 | 346 | |
| 298 | 347 | /** |
| @@ -315,10 +364,12 @@ | ||
| 315 | 364 | * |
| 316 | 365 | * /sites/mine |
| 317 | 366 | * /sites/%s -> $blog_id\ |
| 318 | 367 | * |
| 319 | - * @param string $path - the path. | |
| 320 | - * @param int $blog_id - the blog ID. | |
| 368 | + * @param string $path - the path. | |
| 369 | + * @param int|string $blog_id - the blog ID or the string 'mine'. | |
| 370 | + * | |
| 371 | + * @return array|\WP_Error Site response array on success, or WP_Error on failure. | |
| 321 | 372 | */ |
| 322 | 373 | public function callback( $path = '', $blog_id = 0 ) { |
| 323 | 374 | if ( 'mine' === $blog_id ) { |
| 324 | 375 | $api = WPCOM_JSON_API::init(); |
| @@ -454,8 +505,11 @@ | ||
| 454 | 505 | switch ( $key ) { |
| 455 | 506 | case 'ID': |
| 456 | 507 | $response[ $key ] = $this->site->blog_id; |
| 457 | 508 | break; |
| 509 | + case 'slug': | |
| 510 | + $response[ $key ] = $this->site->get_slug(); | |
| 511 | + break; | |
| 458 | 512 | case 'name': |
| 459 | 513 | $response[ $key ] = $this->site->get_name(); |
| 460 | 514 | break; |
| 461 | 515 | case 'description': |
| @@ -561,13 +615,9 @@ | ||
| 561 | 615 | case 'products': |
| 562 | 616 | $response[ $key ] = $this->site->get_products(); |
| 563 | 617 | break; |
| 564 | 618 | case 'zendesk_site_meta': |
| 565 | - // D59613-code only added this function to the wpcom SAL subclasses. Absent any better idea, | |
| 566 | - // we'll just omit the key entirely in Jetpack. | |
| 567 | - if ( is_callable( array( $this->site, 'get_zendesk_site_meta' ) ) ) { | |
| 568 | - $response[ $key ] = $this->site->get_zendesk_site_meta(); | |
| 569 | - } | |
| 619 | + $response[ $key ] = $this->site->get_zendesk_site_meta(); | |
| 570 | 620 | break; |
| 571 | 621 | case 'quota': |
| 572 | 622 | $response[ $key ] = $this->site->get_quota(); |
| 573 | 623 | break; |
| @@ -603,8 +653,57 @@ | ||
| 603 | 653 | break; |
| 604 | 654 | case 'was_hosting_trial': |
| 605 | 655 | $response[ $key ] = $this->site->was_trial( self::$jetpack_enabled_trials['was_hosting_trial'] ); |
| 606 | 656 | break; |
| 657 | + case 'was_upgraded_from_trial': | |
| 658 | + $response[ $key ] = $this->site->was_upgraded_from_trial(); | |
| 659 | + break; | |
| 660 | + case 'is_deleted': | |
| 661 | + $response[ $key ] = $this->site->is_deleted(); | |
| 662 | + break; | |
| 663 | + case 'is_a4a_client': | |
| 664 | + $response[ $key ] = $this->site->is_a4a_client(); | |
| 665 | + break; | |
| 666 | + case 'is_a4a_dev_site': | |
| 667 | + $response[ $key ] = $this->site->is_a4a_dev_site(); | |
| 668 | + break; | |
| 669 | + case 'is_garden': | |
| 670 | + $response[ $key ] = $this->site->is_garden(); | |
| 671 | + break; | |
| 672 | + case 'garden_name': | |
| 673 | + $response[ $key ] = $this->site->garden_name(); | |
| 674 | + break; | |
| 675 | + case 'garden_partner': | |
| 676 | + $response[ $key ] = $this->site->garden_partner(); | |
| 677 | + break; | |
| 678 | + case 'garden_is_provisioned': | |
| 679 | + $response[ $key ] = $this->site->garden_is_provisioned(); | |
| 680 | + break; | |
| 681 | + case 'is_wpcom_flex': | |
| 682 | + $response[ $key ] = $this->site->is_wpcom_flex(); | |
| 683 | + break; | |
| 684 | + case 'big_sky_enabled': | |
| 685 | + $response[ $key ] = $this->site->is_big_sky_enabled(); | |
| 686 | + break; | |
| 687 | + case 'atomic_email_block': | |
| 688 | + $response[ $key ] = $this->site->get_atomic_email_block(); | |
| 689 | + break; | |
| 690 | + case 'hosting_provider_guess': | |
| 691 | + // WordPress.com platform decoration, computed only when explicitly requested | |
| 692 | + // via `fields` so default `_all` responses are unchanged. | |
| 693 | + if ( $this->is_wpcom() | |
| 694 | + && function_exists( 'get_jetpack_hosting_provider' ) | |
| 695 | + && is_array( $this->fields_to_include ) ) { | |
| 696 | + $response[ $key ] = get_jetpack_hosting_provider( get_current_blog_id() ); | |
| 697 | + } | |
| 698 | + break; | |
| 699 | + case 'environment_type': | |
| 700 | + // WordPress.com platform decoration, computed only when explicitly requested | |
| 701 | + // via `fields` so default `_all` responses are unchanged. | |
| 702 | + if ( $this->is_wpcom() && is_array( $this->fields_to_include ) ) { | |
| 703 | + $response[ $key ] = $this->get_site_environment_type(); | |
| 704 | + } | |
| 705 | + break; | |
| 607 | 706 | } |
| 608 | 707 | |
| 609 | 708 | do_action( 'post_render_site_response_key', $key ); |
| 610 | 709 | } |
| @@ -654,8 +753,11 @@ | ||
| 654 | 753 | break; |
| 655 | 754 | case 'theme_slug': |
| 656 | 755 | $options[ $key ] = $site->get_theme_slug(); |
| 657 | 756 | break; |
| 757 | + case 'theme_errors': | |
| 758 | + $options[ $key ] = $site->get_theme_errors(); | |
| 759 | + break; | |
| 658 | 760 | case 'header_image': |
| 659 | 761 | $options[ $key ] = $site->get_header_image(); |
| 660 | 762 | break; |
| 661 | 763 | case 'background_color': |
| @@ -814,13 +916,9 @@ | ||
| 814 | 916 | case 'import_engine': |
| 815 | 917 | $options[ $key ] = $site->get_import_engine(); |
| 816 | 918 | break; |
| 817 | 919 | case 'is_pending_plan': |
| 818 | - // D40032-code only added this function to the wpcom SAL subclasses. Absent any better idea, | |
| 819 | - // we'll just omit the key entirely in Jetpack. | |
| 820 | - if ( is_callable( array( $site, 'is_pending_plan' ) ) ) { | |
| 821 | - $options[ $key ] = $site->is_pending_plan(); | |
| 822 | - } | |
| 920 | + $options[ $key ] = $site->is_pending_plan(); | |
| 823 | 921 | break; |
| 824 | 922 | |
| 825 | 923 | case 'is_wpforteams_site': |
| 826 | 924 | $options[ $key ] = $site->is_wpforteams_site(); |
| @@ -862,25 +960,31 @@ | ||
| 862 | 960 | case 'is_difm_lite_in_progress': |
| 863 | 961 | $options[ $key ] = $site->is_difm_lite_in_progress(); |
| 864 | 962 | break; |
| 865 | 963 | case 'difm_lite_site_options': |
| 866 | - $difm_lite_options = $site->get_difm_lite_site_options(); | |
| 867 | - $visible_options = self::$displayed_difm_lite_site_options; | |
| 868 | - $filtered_difm_lite_options = new stdClass(); | |
| 869 | - if ( $difm_lite_options ) { | |
| 870 | - $filtered_difm_lite_options = array_filter( | |
| 871 | - $difm_lite_options, | |
| 872 | - function ( $key ) use ( $visible_options ) { | |
| 873 | - return in_array( $key, $visible_options, true ); | |
| 874 | - }, | |
| 875 | - ARRAY_FILTER_USE_KEY | |
| 876 | - ); | |
| 964 | + $difm_lite_site_options = $site->get_difm_lite_site_options(); | |
| 965 | + if ( null !== $difm_lite_site_options ) { | |
| 966 | + $options[ $key ] = (object) $difm_lite_site_options; | |
| 877 | 967 | } |
| 878 | - $options[ $key ] = $filtered_difm_lite_options; | |
| 879 | 968 | break; |
| 969 | + case 'is_gating_business_q1': | |
| 970 | + $options[ $key ] = $site->is_gating_business_q1(); | |
| 971 | + break; | |
| 972 | + case 'is_legacy_gating_site': | |
| 973 | + $options[ $key ] = $site->is_legacy_gating_site(); | |
| 974 | + break; | |
| 880 | 975 | case 'site_intent': |
| 881 | 976 | $options[ $key ] = $site->get_site_intent(); |
| 882 | 977 | break; |
| 978 | + case 'site_partner_bundle': | |
| 979 | + $options[ $key ] = $site->get_site_partner_bundle(); | |
| 980 | + break; | |
| 981 | + case 'site_goals': | |
| 982 | + $options[ $key ] = $site->get_site_goals(); | |
| 983 | + break; | |
| 984 | + case 'onboarding_segment': | |
| 985 | + $options[ $key ] = $site->get_onboarding_segment(); | |
| 986 | + break; | |
| 883 | 987 | case 'site_vertical_id': |
| 884 | 988 | $options[ $key ] = $site->get_site_vertical_id(); |
| 885 | 989 | break; |
| 886 | 990 | case 'blogging_prompts_settings': |
| @@ -893,8 +997,11 @@ | ||
| 893 | 997 | break; |
| 894 | 998 | case 'launchpad_checklist_tasks_statuses': |
| 895 | 999 | $options[ $key ] = $site->get_launchpad_checklist_tasks_statuses(); |
| 896 | 1000 | break; |
| 1001 | + case 'migration_source_site_domain': | |
| 1002 | + $options[ $key ] = $site->get_migration_source_site_domain(); | |
| 1003 | + break; | |
| 897 | 1004 | case 'wpcom_production_blog_id': |
| 898 | 1005 | $options[ $key ] = $site->get_wpcom_production_blog_id(); |
| 899 | 1006 | break; |
| 900 | 1007 | case 'wpcom_staging_blog_ids': |
| @@ -908,8 +1015,35 @@ | ||
| 908 | 1015 | break; |
| 909 | 1016 | case 'is_commercial': |
| 910 | 1017 | $options[ $key ] = $site->is_commercial(); |
| 911 | 1018 | break; |
| 1019 | + case 'is_commercial_reasons': | |
| 1020 | + $options[ $key ] = $site->get_is_commercial_reasons(); | |
| 1021 | + break; | |
| 1022 | + case 'wpcom_admin_interface': | |
| 1023 | + $options[ $key ] = $site->get_wpcom_admin_interface(); | |
| 1024 | + break; | |
| 1025 | + case 'wpcom_classic_early_release': | |
| 1026 | + $options[ $key ] = $site->get_wpcom_classic_early_release(); | |
| 1027 | + break; | |
| 1028 | + case 'jetpack_recovery_mode_status': | |
| 1029 | + $options[ $key ] = $site->get_jetpack_recovery_mode_status(); | |
| 1030 | + break; | |
| 1031 | + case 'jetpack_sso_require_two_step': | |
| 1032 | + $options[ $key ] = $site->get_jetpack_sso_require_two_step(); | |
| 1033 | + break; | |
| 1034 | + case 'apm_enabled': | |
| 1035 | + $options[ $key ] = $site->get_apm_enabled(); | |
| 1036 | + break; | |
| 1037 | + case 'wpcom_ai_launchpad_enabled': | |
| 1038 | + $options[ $key ] = $site->is_ai_launchpad_enabled(); | |
| 1039 | + break; | |
| 1040 | + case 'wpcom_ai_launchpad_dismissed': | |
| 1041 | + $options[ $key ] = $site->is_ai_launchpad_dismissed(); | |
| 1042 | + break; | |
| 1043 | + case 'wpcom_ai_launchpad_completed': | |
| 1044 | + $options[ $key ] = $site->is_ai_launchpad_completed(); | |
| 1045 | + break; | |
| 912 | 1046 | } |
| 913 | 1047 | } |
| 914 | 1048 | |
| 915 | 1049 | return $options; |
| @@ -941,14 +1075,20 @@ | ||
| 941 | 1075 | |
| 942 | 1076 | /** |
| 943 | 1077 | * Apply any WPCOM-only response components to a Jetpack site response. |
| 944 | 1078 | * |
| 945 | - * @param array $response - the response. | |
| 1079 | + * @param object $response - the response. | |
| 946 | 1080 | */ |
| 947 | 1081 | public function decorate_jetpack_response( &$response ) { |
| 1082 | + $this->filter_fields_and_options(); | |
| 948 | 1083 | $this->site = $this->get_platform()->get_site( $response->ID ); |
| 949 | 1084 | switch_to_blog( $this->site->get_id() ); |
| 950 | 1085 | |
| 1086 | + // Allow the SAL site to apply its own overrides to the proxied response. | |
| 1087 | + if ( method_exists( $this->site, 'decorate_jetpack_response' ) ) { | |
| 1088 | + $this->site->decorate_jetpack_response( $response ); // @phan-suppress-current-line PhanUndeclaredMethod -- checked via method_exists(). | |
| 1089 | + } | |
| 1090 | + | |
| 951 | 1091 | $wpcom_response = $this->render_response_keys( self::$jetpack_response_field_additions ); |
| 952 | 1092 | |
| 953 | 1093 | foreach ( $wpcom_response as $key => $value ) { |
| 954 | 1094 | $response->{ $key } = $value; |
| @@ -953,9 +1093,11 @@ | ||
| 953 | 1093 | foreach ( $wpcom_response as $key => $value ) { |
| 954 | 1094 | $response->{ $key } = $value; |
| 955 | 1095 | } |
| 956 | 1096 | |
| 957 | - if ( $this->has_user_access() || $this->has_blog_access( $this->api->token_details ) ) { | |
| 1097 | + $has_site_access = $this->has_user_access() || $this->has_blog_access( $this->api->token_details ); | |
| 1098 | + | |
| 1099 | + if ( $has_site_access ) { | |
| 958 | 1100 | $wpcom_member_response = $this->render_response_keys( self::$jetpack_response_field_member_additions ); |
| 959 | 1101 | |
| 960 | 1102 | foreach ( $wpcom_member_response as $key => $value ) { |
| 961 | 1103 | $response->{ $key } = $value; |
| @@ -974,22 +1116,28 @@ | ||
| 974 | 1116 | unset( $response->site_owner ); |
| 975 | 1117 | unset( $response->plan ); |
| 976 | 1118 | unset( $response->products ); |
| 977 | 1119 | unset( $response->zendesk_site_meta ); |
| 1120 | + unset( $response->atomic_email_block ); | |
| 978 | 1121 | } |
| 979 | 1122 | |
| 980 | 1123 | // render additional options. |
| 981 | - if ( $response->options ) { | |
| 1124 | + if ( isset( $response->options ) && $response->options ) { | |
| 982 | 1125 | $wpcom_options_response = $this->render_option_keys( self::$jetpack_response_option_additions ); |
| 983 | 1126 | |
| 984 | 1127 | // Remove heic from jetpack (and atomic) sites so that the iOS app know to convert the file format into a JPEG. |
| 985 | 1128 | // heic fromat is currently not supported by for uploading. |
| 986 | 1129 | // See https://jetpackp2.wordpress.com/2020/08/19/image-uploads-in-the-wp-ios-app-broken |
| 987 | - if ( $this->site->is_jetpack() && isset( $response->options['allowed_file_types'] ) ) { | |
| 1130 | + if ( | |
| 1131 | + $this->site->is_jetpack() | |
| 1132 | + && isset( $response->options['allowed_file_types'] ) | |
| 1133 | + && is_array( $response->options['allowed_file_types'] ) | |
| 1134 | + ) { | |
| 1135 | + $allowed_file_types = (array) $response->options['allowed_file_types']; | |
| 988 | 1136 | $remove_file_types = array( |
| 989 | 1137 | 'heic', |
| 990 | 1138 | ); |
| 991 | - $response->options['allowed_file_types'] = array_values( array_diff( $response->options['allowed_file_types'], $remove_file_types ) ); | |
| 1139 | + $response->options['allowed_file_types'] = array_values( array_diff( $allowed_file_types, $remove_file_types ) ); | |
| 992 | 1140 | } |
| 993 | 1141 | |
| 994 | 1142 | foreach ( $wpcom_options_response as $key => $value ) { |
| 995 | 1143 | $response->options[ $key ] = $value; |
| @@ -995,11 +1143,44 @@ | ||
| 995 | 1143 | $response->options[ $key ] = $value; |
| 996 | 1144 | } |
| 997 | 1145 | } |
| 998 | 1146 | |
| 1147 | + // WordPress.com platform fields are not part of proxied Jetpack responses; | |
| 1148 | + // add them only when explicitly requested. | |
| 1149 | + if ( $this->is_wpcom() && $has_site_access && is_array( $this->fields_to_include ) ) { | |
| 1150 | + if ( function_exists( 'get_jetpack_hosting_provider' ) && in_array( 'hosting_provider_guess', $this->fields_to_include, true ) ) { | |
| 1151 | + $response->hosting_provider_guess = get_jetpack_hosting_provider( get_current_blog_id() ); | |
| 1152 | + } | |
| 1153 | + if ( in_array( 'environment_type', $this->fields_to_include, true ) ) { | |
| 1154 | + $response->environment_type = $this->get_site_environment_type(); | |
| 1155 | + } | |
| 1156 | + } | |
| 1157 | + | |
| 999 | 1158 | restore_current_blog(); |
| 1000 | 1159 | return $response; // possibly no need since it's modified in place. |
| 1001 | 1160 | } |
| 1161 | + | |
| 1162 | + /** | |
| 1163 | + * Whether this request is running on the WordPress.com platform. | |
| 1164 | + * | |
| 1165 | + * @return bool | |
| 1166 | + */ | |
| 1167 | + protected function is_wpcom() { | |
| 1168 | + return ( new \Automattic\Jetpack\Status\Host() )->is_wpcom_platform(); | |
| 1169 | + } | |
| 1170 | + | |
| 1171 | + /** | |
| 1172 | + * Get the site's synced WP_ENVIRONMENT_TYPE. | |
| 1173 | + * | |
| 1174 | + * @return string|null | |
| 1175 | + */ | |
| 1176 | + protected function get_site_environment_type() { | |
| 1177 | + if ( function_exists( 'get_blog_option' ) ) { | |
| 1178 | + return get_blog_option( get_current_blog_id(), 'jetpack_callable_wp_get_environment_type', null ); | |
| 1179 | + } | |
| 1180 | + | |
| 1181 | + return get_option( 'jetpack_callable_wp_get_environment_type', null ); | |
| 1182 | + } | |
| 1002 | 1183 | } |
| 1003 | 1184 | |
| 1004 | 1185 | new WPCOM_JSON_API_List_Post_Formats_Endpoint( |
| 1005 | 1186 | array( |
| @@ -1025,9 +1206,11 @@ | ||
| 1025 | 1206 | ) |
| 1026 | 1207 | ); |
| 1027 | 1208 | |
| 1028 | 1209 | /** |
| 1029 | - * List Post Formates endpoint class. | |
| 1210 | + * List Post Formats endpoint class. | |
| 1211 | + * | |
| 1212 | + * @phan-constructor-used-for-side-effects | |
| 1030 | 1213 | */ |
| 1031 | 1214 | class WPCOM_JSON_API_List_Post_Formats_Endpoint extends WPCOM_JSON_API_Endpoint { // phpcs:ignore |
| 1032 | 1215 | /** |
| 1033 | 1216 | * |
| @@ -1036,8 +1219,10 @@ | ||
| 1036 | 1219 | * /sites/%s/post-formats -> $blog_id |
| 1037 | 1220 | * |
| 1038 | 1221 | * @param string $path - the path. |
| 1039 | 1222 | * @param int $blog_id - the blog ID. |
| 1223 | + * | |
| 1224 | + * @return array|\WP_Error Array with 'formats' on success, or WP_Error on failure. | |
| 1040 | 1225 | */ |
| 1041 | 1226 | public function callback( $path = '', $blog_id = 0 ) { |
| 1042 | 1227 | $blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) ); |
| 1043 | 1228 | if ( is_wp_error( $blog_id ) ) { |
| @@ -1091,8 +1276,10 @@ | ||
| 1091 | 1276 | ); |
| 1092 | 1277 | |
| 1093 | 1278 | /** |
| 1094 | 1279 | * List page templates endpoint class. |
| 1280 | + * | |
| 1281 | + * @phan-constructor-used-for-side-effects | |
| 1095 | 1282 | */ |
| 1096 | 1283 | class WPCOM_JSON_API_List_Page_Templates_Endpoint extends WPCOM_JSON_API_Endpoint { // phpcs:ignore |
| 1097 | 1284 | /** |
| 1098 | 1285 | * |
| @@ -1100,8 +1287,10 @@ | ||
| 1100 | 1287 | * /sites/%s/page-templates -> $blog_id |
| 1101 | 1288 | * |
| 1102 | 1289 | * @param string $path - the path. |
| 1103 | 1290 | * @param int $blog_id - the blog ID. |
| 1291 | + * | |
| 1292 | + * @return array|\WP_Error Array with 'templates' on success, or WP_Error on failure. | |
| 1104 | 1293 | */ |
| 1105 | 1294 | public function callback( $path = '', $blog_id = 0 ) { |
| 1106 | 1295 | $blog_id = $this->api->switch_to_blog_and_validate_user( $this->api->get_blog_id( $blog_id ) ); |
| 1107 | 1296 | if ( is_wp_error( $blog_id ) ) { |