Changeset 3060848

Timestamp:

03/28/2024 11:57:46 PM (12 months ago)

Author:

kilbot

Message:

Update to version 1.4.16 from GitHub

Location:

woocommerce-pos

Files:

• tags/1.4.16 (copied) (copied from woocommerce-pos/trunk)
• tags/1.4.16/includes/Form_Handler.php (modified) (2 diffs)
• tags/1.4.16/includes/Templates/Payment.php (modified) (2 diffs)
• tags/1.4.16/readme.txt (modified) (2 diffs)
• tags/1.4.16/vendor/autoload.php (modified) (1 diff)
• tags/1.4.16/vendor/composer/autoload_real.php (modified) (2 diffs)
• tags/1.4.16/vendor/composer/autoload_static.php (modified) (2 diffs)
• tags/1.4.16/vendor/composer/installed.php (modified) (2 diffs)
• tags/1.4.16/woocommerce-pos.php (modified) (3 diffs)
• trunk/includes/Form_Handler.php (modified) (2 diffs)
• trunk/includes/Templates/Payment.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/vendor/autoload.php (modified) (1 diff)
• trunk/vendor/composer/autoload_real.php (modified) (2 diffs)
• trunk/vendor/composer/autoload_static.php (modified) (2 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)
• trunk/woocommerce-pos.php (modified) (3 diffs)

woocommerce-pos/tags/1.4.16/includes/Form_Handler.php

@@ -36 +36 @@
         global $wp;
 
-        if ( woocommerce_pos_request() && isset( $_POST['woocommerce_pay'], $_GET['key'], $_GET['token'] ) ) {
+        if ( woocommerce_pos_request() && isset( $_POST['woocommerce_pay'], $_GET['key'] ) ) {
             $order_id  = absint( $wp->query_vars['order-pay'] );
             $order     = wc_get_order( $order_id );
@@ -59 +59 @@
             }
 
+            // Check for 'wcpos_jwt' and fall back to 'token' if not present.
+            // remove 'token' when wcpos_jwt is fully implemented.
+            $token_key = isset( $_GET['wcpos_jwt'] ) ? 'wcpos_jwt' : ( isset( $_GET['token'] ) ? 'token' : null );
+
+            if ( $token_key === null || ! isset( $_GET[ $token_key ] ) ) {
+                wp_die(
+                    esc_html__( 'Token not provided.', 'woocommerce-pos' ),
+                    esc_html__( 'Error', 'woocommerce-pos' ),
+                    array( 'response' => 403 )
+                );
+            }
+
             // Verify the cashier is authorized to access the order.
-            $provided_token = sanitize_text_field( wp_unslash( $_GET['token'] ) );
+            $provided_token = sanitize_text_field( wp_unslash( $_GET[ $token_key ] ) );
             $auth = AuthService::instance();
             $user = $auth->validate_token( $provided_token );

woocommerce-pos/tags/1.4.16/includes/Templates/Payment.php

@@ -154 +154 @@
              */
             wp_set_current_user( $order->get_customer_id() );
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
 
             // create nonce for customer
@@ -251 +252 @@
 
     /**
+     * Fix: when checking out as Guest on the desktop application, WordPress gets a $uid from the
+     * session, eg: 't_8b04f8283e7edc5aeee2867c89dd06'. This causes the nonce check to fail.
+     */
+    public function nonce_user_logged_out( $uid, $action ) {
+        if ( $action === 'woocommerce-pay' ) {
+            return 0;
+        }
+        return $uid;
+    }
+
+    /**
      * Custom version of wp_create_nonce that uses the customer ID.
      */

woocommerce-pos/tags/1.4.16/readme.txt

@@ -4 +4 @@
 Requires at least: 5.6
 Tested up to: 6.5
-Stable tag: 1.4.15
+Stable tag: 1.4.16
 License: GPL-3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -80 +80 @@
 
 = 1.4.16 - 2024/03/22 =
-* Fix: namespace checkout token, this may help some situations where checkout is not completing
+* Fix: nonce check failing for Guest orders when checking out with the desktop application
 
 = 1.4.15 - 2024/03/20 = 

woocommerce-pos/tags/1.4.16/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd::getLoader();
+return ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4::getLoader();

woocommerce-pos/tags/1.4.16/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd
+class ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4
 {
     private static $loader;
@@ -23 +23 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

woocommerce-pos/tags/1.4.16/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd
+class ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4
 {
     public static $files = array (
@@ -330 +330 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$classMap;
 
         }, null, ClassLoader::class);

woocommerce-pos/tags/1.4.16/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'wcpos/woocommerce-pos',
-        'pretty_version' => 'v1.4.15',
-        'version' => '1.4.15.0',
-        'reference' => '0e20731b158cf9c09378807a37f0e4208d68a5e5',
+        'pretty_version' => 'v1.4.16',
+        'version' => '1.4.16.0',
+        'reference' => '4a1217212e913f8ef7fefb3a6aa79d97f9ab6a73',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -90 +90 @@
         ),
         'wcpos/woocommerce-pos' => array(
-            'pretty_version' => 'v1.4.15',
-            'version' => '1.4.15.0',
-            'reference' => '0e20731b158cf9c09378807a37f0e4208d68a5e5',
+            'pretty_version' => 'v1.4.16',
+            'version' => '1.4.16.0',
+            'reference' => '4a1217212e913f8ef7fefb3a6aa79d97f9ab6a73',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

woocommerce-pos/tags/1.4.16/woocommerce-pos.php

@@ -4 +4 @@
  * Plugin URI:        https://wordpress.org/plugins/woocommerce-pos/
  * Description:       A simple front-end for taking WooCommerce orders at the Point of Sale. Requires <a href="http://wordpress.org/plugins/woocommerce/">WooCommerce</a>.
- * Version:           1.4.15
+ * Version:           1.4.16
  * Author:            kilbot
  * Author URI:        http://wcpos.com
@@ -12 +12 @@
  * Domain Path:       /languages
  * Requires at least: 5.6
+ * Tested up to:      6.5
  * Requires PHP:      7.4
  * Requires Plugins:  woocommerce
- * Tested up to:      6.5
- * WC tested up to:   8.6
+ * WC tested up to:   8.7
  * WC requires at least: 5.3
  *
@@ -27 +27 @@
 
 // Define plugin constants.
-const VERSION     = '1.4.15';
+const VERSION     = '1.4.16';
 const PLUGIN_NAME = 'woocommerce-pos';
 const SHORT_NAME  = 'wcpos';

woocommerce-pos/trunk/includes/Form_Handler.php

@@ -36 +36 @@
         global $wp;
 
-        if ( woocommerce_pos_request() && isset( $_POST['woocommerce_pay'], $_GET['key'], $_GET['token'] ) ) {
+        if ( woocommerce_pos_request() && isset( $_POST['woocommerce_pay'], $_GET['key'] ) ) {
             $order_id  = absint( $wp->query_vars['order-pay'] );
             $order     = wc_get_order( $order_id );
@@ -59 +59 @@
             }
 
+            // Check for 'wcpos_jwt' and fall back to 'token' if not present.
+            // remove 'token' when wcpos_jwt is fully implemented.
+            $token_key = isset( $_GET['wcpos_jwt'] ) ? 'wcpos_jwt' : ( isset( $_GET['token'] ) ? 'token' : null );
+
+            if ( $token_key === null || ! isset( $_GET[ $token_key ] ) ) {
+                wp_die(
+                    esc_html__( 'Token not provided.', 'woocommerce-pos' ),
+                    esc_html__( 'Error', 'woocommerce-pos' ),
+                    array( 'response' => 403 )
+                );
+            }
+
             // Verify the cashier is authorized to access the order.
-            $provided_token = sanitize_text_field( wp_unslash( $_GET['token'] ) );
+            $provided_token = sanitize_text_field( wp_unslash( $_GET[ $token_key ] ) );
             $auth = AuthService::instance();
             $user = $auth->validate_token( $provided_token );

woocommerce-pos/trunk/includes/Templates/Payment.php

@@ -154 +154 @@
              */
             wp_set_current_user( $order->get_customer_id() );
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
 
             // create nonce for customer
@@ -251 +252 @@
 
     /**
+     * Fix: when checking out as Guest on the desktop application, WordPress gets a $uid from the
+     * session, eg: 't_8b04f8283e7edc5aeee2867c89dd06'. This causes the nonce check to fail.
+     */
+    public function nonce_user_logged_out( $uid, $action ) {
+        if ( $action === 'woocommerce-pay' ) {
+            return 0;
+        }
+        return $uid;
+    }
+
+    /**
      * Custom version of wp_create_nonce that uses the customer ID.
      */

woocommerce-pos/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.6
 Tested up to: 6.5
-Stable tag: 1.4.15
+Stable tag: 1.4.16
 License: GPL-3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -80 +80 @@
 
 = 1.4.16 - 2024/03/22 =
-* Fix: namespace checkout token, this may help some situations where checkout is not completing
+* Fix: nonce check failing for Guest orders when checking out with the desktop application
 
 = 1.4.15 - 2024/03/20 = 

woocommerce-pos/trunk/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd::getLoader();
+return ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4::getLoader();

woocommerce-pos/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd
+class ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4
 {
     private static $loader;
@@ -23 +23 @@
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitead8fb0d3bd5df28b924c8b8d86975cd', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitad4433f3e98ff755eb071679fbd4aec4', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

woocommerce-pos/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd
+class ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4
 {
     public static $files = array (
@@ -330 +330 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInitead8fb0d3bd5df28b924c8b8d86975cd::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitad4433f3e98ff755eb071679fbd4aec4::$classMap;
 
         }, null, ClassLoader::class);

woocommerce-pos/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'wcpos/woocommerce-pos',
-        'pretty_version' => 'v1.4.15',
-        'version' => '1.4.15.0',
-        'reference' => '0e20731b158cf9c09378807a37f0e4208d68a5e5',
+        'pretty_version' => 'v1.4.16',
+        'version' => '1.4.16.0',
+        'reference' => '4a1217212e913f8ef7fefb3a6aa79d97f9ab6a73',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -90 +90 @@
         ),
         'wcpos/woocommerce-pos' => array(
-            'pretty_version' => 'v1.4.15',
-            'version' => '1.4.15.0',
-            'reference' => '0e20731b158cf9c09378807a37f0e4208d68a5e5',
+            'pretty_version' => 'v1.4.16',
+            'version' => '1.4.16.0',
+            'reference' => '4a1217212e913f8ef7fefb3a6aa79d97f9ab6a73',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

woocommerce-pos/trunk/woocommerce-pos.php

@@ -4 +4 @@
  * Plugin URI:        https://wordpress.org/plugins/woocommerce-pos/
  * Description:       A simple front-end for taking WooCommerce orders at the Point of Sale. Requires <a href="http://wordpress.org/plugins/woocommerce/">WooCommerce</a>.
- * Version:           1.4.15
+ * Version:           1.4.16
  * Author:            kilbot
  * Author URI:        http://wcpos.com
@@ -12 +12 @@
  * Domain Path:       /languages
  * Requires at least: 5.6
+ * Tested up to:      6.5
  * Requires PHP:      7.4
  * Requires Plugins:  woocommerce
- * Tested up to:      6.5
- * WC tested up to:   8.6
+ * WC tested up to:   8.7
  * WC requires at least: 5.3
  *
@@ -27 +27 @@
 
 // Define plugin constants.
-const VERSION     = '1.4.15';
+const VERSION     = '1.4.16';
 const PLUGIN_NAME = 'woocommerce-pos';
 const SHORT_NAME  = 'wcpos';