Merged in feature/MAW-855-import-code-into-aws (pull request #2)

code import from pantheon

* code import from pantheon

wp/wp-content/plugins/woocommerce/includes/admin/helper/class-wc-helper-admin.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * WooCommerce Admin Helper - React admin interface
+ *
+ * @package WooCommerce\Admin\Helper
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * WC_Helper Class
+ *
+ * The main entry-point for all things related to the Helper.
+ * The Helper manages the connection between the store and
+ * an account on WooCommerce.com.
+ */
+class WC_Helper_Admin {
+
+	/**
+	 * Loads the class, runs on init
+	 *
+	 * @return void
+	 */
+	public static function load() {
+		add_filter( 'woocommerce_admin_shared_settings', array( __CLASS__, 'add_marketplace_settings' ) );
+		add_filter( 'rest_api_init', array( __CLASS__, 'register_rest_routes' ) );
+	}
+
+	/**
+	 * Pushes settings onto the WooCommerce Admin global settings object (wcSettings).
+	 *
+	 * @param mixed $settings The settings object we're amending.
+	 *
+	 * @return mixed $settings
+	 */
+	public static function add_marketplace_settings( $settings ) {
+		$auth_user_data  = WC_Helper_Options::get( 'auth_user_data', array() );
+		$auth_user_email = isset( $auth_user_data['email'] ) ? $auth_user_data['email'] : '';
+
+		$settings['wccomHelper'] = array(
+			'isConnected' => WC_Helper::is_site_connected(),
+			'connectURL'  => self::get_connection_url(),
+			'userEmail'   => $auth_user_email,
+			'userAvatar'  => get_avatar_url( $auth_user_email, array( 'size' => '48' ) ),
+			'storeCountry' => wc_get_base_location()['country'],
+			'inAppPurchaseURLParams' => WC_Admin_Addons::get_in_app_purchase_url_params(),
+		);
+
+		return $settings;
+	}
+
+	/**
+	 * Generates the URL for connecting or disconnecting the store to/from WooCommerce.com.
+	 * Approach taken from existing helper code that isn't exposed.
+	 *
+	 * @return string
+	 */
+	public static function get_connection_url() {
+		// No active connection.
+		if ( ! WC_Helper::is_site_connected() ) {
+			$connect_url = add_query_arg(
+				array(
+					'page'              => 'wc-addons',
+					'section'           => 'helper',
+					'wc-helper-connect' => 1,
+					'wc-helper-nonce'   => wp_create_nonce( 'connect' ),
+				),
+				admin_url( 'admin.php' )
+			);
+
+			return $connect_url;
+		}
+
+		$connect_url = add_query_arg(
+			array(
+				'page'                 => 'wc-addons',
+				'section'              => 'helper',
+				'wc-helper-disconnect' => 1,
+				'wc-helper-nonce'      => wp_create_nonce( 'disconnect' ),
+			),
+			admin_url( 'admin.php' )
+		);
+
+		return $connect_url;
+	}
+
+	/**
+	 * Registers the REST routes for the featured products endpoint.
+	 * This endpoint is used by the WooCommerce > Extensions > Discover
+	 * page.
+	 */
+	public static function register_rest_routes() {
+		register_rest_route(
+			'wc/v3',
+			'/marketplace/featured',
+			array(
+				'methods'             => 'GET',
+				'callback'            => array( __CLASS__, 'get_featured' ),
+				'permission_callback' => array( __CLASS__, 'get_permission' ),
+			)
+		);
+	}
+
+	/**
+	 * The Extensions page can only be accessed by users with the manage_woocommerce
+	 * capability. So the API mimics that behavior.
+	 */
+	public static function get_permission() {
+		return current_user_can( 'manage_woocommerce' );
+	}
+
+	/**
+	 * Fetch featured procucts from WooCommerce.com and serve them
+	 * as JSON.
+	 */
+	public static function get_featured() {
+		$featured = WC_Admin_Addons::fetch_featured();
+
+		if ( is_wp_error( $featured ) ) {
+			wp_send_json_error( array( 'message' => $featured->get_error_message() ) );
+		}
+
+		wp_send_json( $featured );
+	}
+
+}
+
+WC_Helper_Admin::load();

wp/wp-content/plugins/woocommerce/includes/admin/helper/class-wc-helper-updater.php

@@ -68,17 +68,21 @@ class WC_Helper_Updater {
 				$item['package'] = 'woocommerce-com-expired-' . $plugin['_product_id'];
 			}
 
-			if ( version_compare( $plugin['Version'], $data['version'], '<' ) ) {
-				$transient->response[ $filename ] = (object) $item;
-				unset( $transient->no_update[ $filename ] );
-			} else {
-				$transient->no_update[ $filename ] = (object) $item;
-				unset( $transient->response[ $filename ] );
+			if ( $transient instanceof stdClass ) {
+				if ( version_compare( $plugin['Version'], $data['version'], '<' ) ) {
+					$transient->response[ $filename ] = (object) $item;
+					unset( $transient->no_update[ $filename ] );
+				} else {
+					$transient->no_update[ $filename ] = (object) $item;
+					unset( $transient->response[ $filename ] );
+				}
 			}
 		}
 
-		$translations = self::get_translations_update_data();
-		$transient->translations = array_merge( isset( $transient->translations ) ? $transient->translations : array(), $translations );
+		if ( $transient instanceof stdClass ) {
+			$translations            = self::get_translations_update_data();
+			$transient->translations = array_merge( isset( $transient->translations ) ? $transient->translations : array(), $translations );
+		}
 
 		return $transient;
 	}

wp/wp-content/plugins/woocommerce/includes/admin/helper/class-wc-helper.php

@@ -58,6 +58,7 @@ class WC_Helper {
 		include_once dirname( __FILE__ ) . '/class-wc-helper-updater.php';
 		include_once dirname( __FILE__ ) . '/class-wc-helper-plugin-info.php';
 		include_once dirname( __FILE__ ) . '/class-wc-helper-compat.php';
+		include_once dirname( __FILE__ ) . '/class-wc-helper-admin.php';
 	}
 
 	/**
@@ -1198,6 +1199,11 @@ class WC_Helper {
 				continue;
 			}
 
+			// Omit the WooCommerce plugin used on Woo Express sites.
+			if ( 'WooCommerce' === $data['Name'] ) {
+				continue;
+			}
+
 			$data['_filename']        = $filename;
 			$data['_product_id']      = absint( $product_id );
 			$data['_file_id']         = $file_id;

wp/wp-content/plugins/woocommerce/includes/admin/helper/views/html-main.php

@@ -60,7 +60,8 @@
 			$class_html = $current_filter === $key ? 'class="current"' : '';
 			?>
 			<li>
-				<a <?php echo esc_html( $class_html ); ?> href="<?php echo esc_url( $url ); ?>">
+				<?php // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+				<a <?php echo $class_html; ?> href="<?php echo esc_url( $url ); ?>">
 					<?php echo esc_html( $label ); ?>
 					<span class="count">(<?php echo absint( $counts[ $key ] ); ?>)</span>
 				</a>

wp/wp-content/plugins/woocommerce/includes/admin/helper/views/html-section-nav.php

@@ -7,10 +7,17 @@
  * @deprecated 5.7.0
  */
 
+use Automattic\WooCommerce\Utilities\FeaturesUtil;
+
+$addons_url = admin_url( 'admin.php?page=wc-addons' );
+if ( FeaturesUtil::feature_is_enabled( 'marketplace' ) ) {
+	$addons_url = admin_url( 'admin.php?page=wc-admin&path=/extensions&tab=extensions' );
+}
+
 defined( 'ABSPATH' ) || exit(); ?>
 
 <nav class="nav-tab-wrapper woo-nav-tab-wrapper">
-	<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons' ) ); ?>" class="nav-tab"><?php esc_html_e( 'Browse Extensions', 'woocommerce' ); ?></a>
+	<a href="<?php echo esc_url( $addons_url ); ?>" class="nav-tab"><?php esc_html_e( 'Browse Extensions', 'woocommerce' ); ?></a>
 
 	<?php
 		$count_html = WC_Helper_Updater::get_updates_count_html();