@automattic/newspack-blocks 2.6.0 → 2.6.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.6.1](https://github.com/Automattic/newspack-blocks/compare/v2.6.0...v2.6.1) (2024-01-31)
+
+
+### Bug Fixes
+
+* **modal-checkout:** treat express checkouts as modal checkouts ([#1654](https://github.com/Automattic/newspack-blocks/issues/1654)) ([a352511](https://github.com/Automattic/newspack-blocks/commit/a3525115aab8f0c6de8038de6e94c1705c7afe9e))
+
 # [2.6.0](https://github.com/Automattic/newspack-blocks/compare/v2.5.0...v2.6.0) (2024-01-25)
 
 

package/includes/class-modal-checkout.php

@@ -965,6 +965,21 @@ final class Modal_Checkout {
 		if ( ! $is_modal_checkout && isset( $_REQUEST['post_data'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			$is_modal_checkout = strpos( $_REQUEST['post_data'], 'modal_checkout=1' ) !== false; // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
 		}
+
+		// Express checkout payment requests are separate requests, so they won't have the modal checkout flag. We'll have to check the HTTP_REFERER insteaad.
+		$payment_request_type = filter_input( INPUT_POST, 'payment_request_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
+		$is_express_checkout  = ! empty( $payment_request_type ) && in_array( $payment_request_type, [ 'apple_pay', 'google_pay', 'payment_request_api' ], true ); // Validate payment request types: https://github.com/woocommerce/woocommerce-gateway-stripe/blob/develop/includes/payment-methods/class-wc-stripe-payment-request.php#L529-L548.
+		if ( $is_express_checkout ) {
+			$referrer = isset( $_SERVER['HTTP_REFERER'] ) ? \esc_url_raw( \wp_unslash( $_SERVER['HTTP_REFERER'] ) ) : false; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+			if ( $referrer ) {
+				$referrer_query = \wp_parse_url( $referrer, PHP_URL_QUERY );
+				\wp_parse_str( $referrer_query, $referrer_query_params );
+				if ( isset( $referrer_query_params['modal_checkout'] ) && $referrer_query_params['modal_checkout'] ) {
+					$is_modal_checkout = true;
+				}
+			}
+		}
+
 		return $is_modal_checkout;
 	}
 

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         2.6.0
+ * Version:         2.6.1
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '2.6.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '2.6.1' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "2.6.0",
+	"version": "2.6.1",
 	"author": "Automattic",
 	"devDependencies": {
 		"@rushstack/eslint-patch": "^1.5.1",

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit41f0d87ca16800f448aaf1e29adfd07d::getLoader();
+return ComposerAutoloaderInit7ef41f9eb95af44578d9e3aa646cd364::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit41f0d87ca16800f448aaf1e29adfd07d
+class ComposerAutoloaderInit7ef41f9eb95af44578d9e3aa646cd364
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInit41f0d87ca16800f448aaf1e29adfd07d
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit41f0d87ca16800f448aaf1e29adfd07d', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit7ef41f9eb95af44578d9e3aa646cd364', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit41f0d87ca16800f448aaf1e29adfd07d', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit7ef41f9eb95af44578d9e3aa646cd364', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit41f0d87ca16800f448aaf1e29adfd07d::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit7ef41f9eb95af44578d9e3aa646cd364::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit41f0d87ca16800f448aaf1e29adfd07d
+class ComposerStaticInit7ef41f9eb95af44578d9e3aa646cd364
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInit41f0d87ca16800f448aaf1e29adfd07d
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInit41f0d87ca16800f448aaf1e29adfd07d::$classMap;
+            $loader->classMap = ComposerStaticInit7ef41f9eb95af44578d9e3aa646cd364::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '43be7d96bfc75c62175bee790275b7b9bf76c215',
+        'reference' => 'a3525115aab8f0c6de8038de6e94c1705c7afe9e',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '43be7d96bfc75c62175bee790275b7b9bf76c215',
+            'reference' => 'a3525115aab8f0c6de8038de6e94c1705c7afe9e',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),