Updates to 1.9.4

Author: Woo

changelog.txt

@@ -1,5 +1,11 @@
 *** Xero Integration ***
 
+2025-02-10 - version 1.9.4
+* Fix - Improve logging around `refresh_access_token` to avoid invalid request connection status errors.
+* Dev - Bump WooCommerce "tested up to" version 9.7.
+* Dev - Bump WooCommerce minimum supported version to 9.5.
+* Dev - Bump WordPress minimum supported version to 6.6.
+
 2025-01-13 - version 1.9.3
 * Fix - Resolved PHP notice caused by loading localization code too early on WordPress 6.7.
 

includes/class-wc-xr-data-encryption.php

@@ -128,6 +128,11 @@ public function encrypt( string $value ): string {
 			$key   = sodium_crypto_generichash( $this->key, '', SODIUM_CRYPTO_SECRETBOX_KEYBYTES );
 			$nonce = random_bytes( SODIUM_CRYPTO_SECRETBOX_NONCEBYTES );
 		} catch ( Exception $e ) {
+			$logger = new WC_XR_Oauth20_Logger();
+			$logger->write( 'Error generating key or nonce during encryption.' );
+			$logger->write( 'Exception: ' . $e->getMessage() );
+			$logger->write( 'Trace: ' . $e->getTraceAsString() );
+
 			// Return the original value if fail to generate nonce and key.
 			return $value;
 		}
@@ -136,6 +141,11 @@ public function encrypt( string $value ): string {
 			$encrypted = sodium_crypto_secretbox( $value . $this->salt, $nonce, $key );
 			return sodium_bin2base64( $nonce . $encrypted, SODIUM_BASE64_VARIANT_ORIGINAL );
 		} catch ( Exception $e ) {
+			$logger = new WC_XR_Oauth20_Logger();
+			$logger->write( 'Error encrypting the unencrypted string during encryption.' );
+			$logger->write( 'Exception: ' . $e->getMessage() );
+			$logger->write( 'Trace: ' . $e->getTraceAsString() );
+
 			// Return false if encryption fails.
 			return false;
 		}
@@ -159,17 +169,30 @@ public function decrypt( string $encrypted ): string {
 			$nonce            = mb_substr( $decoded, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit' );
 			$encrypted_result = mb_substr( $decoded, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit' );
 		} catch ( Exception $e ) {
+			$logger = new WC_XR_Oauth20_Logger();
+			$logger->write( 'Error decrypting the encrypted string during decoding.' );
+			$logger->write( 'Exception: ' . $e->getMessage() );
+			$logger->write( 'Trace: ' . $e->getTraceAsString() );
+
 			// Return the original value if fail to get decoded value or nonce and key.
 			return $encrypted;
 		}
 
 		try {
 			$value = sodium_crypto_secretbox_open( $encrypted_result, $nonce, $key );
 			if ( ! $value || substr( $value, - strlen( $this->salt ) ) !== $this->salt ) {
+				$logger = new WC_XR_Oauth20_Logger();
+				$logger->write( 'Decryption failed or the decrypted string is invalid. The string does not end with the expected salt.' );
+
 				return false;
 			}
 			return substr( $value, 0, - strlen( $this->salt ) );
 		} catch ( Exception $e ) {
+			$logger = new WC_XR_Oauth20_Logger();
+			$logger->write( 'Error decrypting the encrypted string during decryption.' );
+			$logger->write( 'Exception: ' . $e->getMessage() );
+			$logger->write( 'Trace: ' . $e->getTraceAsString() );
+
 			return false;
 		}
 	}

includes/class-wc-xr-oauth20-storage.php

@@ -92,11 +92,17 @@ public static function get_data() {
 		// Decrypt token only if value is non-empty. Default value of token is NULL.
 		if ( $xero_oauth_options['token'] ) {
 			$xero_oauth_options['token'] = $wc_xr_data_encryption->decrypt( $xero_oauth_options['token'] );
+		} else {
+			$logger = new WC_XR_Oauth20_Logger();
+			$logger->write( 'The token is empty' );
 		}
 
 		// Decrypt refresh_token only if value is non-empty. Default value of refresh_token is NULL.
 		if ( $xero_oauth_options['refresh_token'] ) {
 			$xero_oauth_options['refresh_token'] = $wc_xr_data_encryption->decrypt( $xero_oauth_options['refresh_token'] );
+		} else {
+			$logger = new WC_XR_Oauth20_Logger();
+			$logger->write( 'The refresh_token is empty' );
 		}
 
 		return $xero_oauth_options;

languages/woocommerce-xero.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the same license as the WooCommerce Xero Integration package.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce Xero Integration 1.9.3\n"
+"Project-Id-Version: WooCommerce Xero Integration 1.9.4\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/woocommerce-xero\n"
-"POT-Creation-Date: 2025-01-13 14:57:51+00:00\n"
+"POT-Creation-Date: 2025-02-10 14:38:49+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

lib/packages/firebase/php-jwt/src/BeforeValidException.php

@@ -2,7 +2,7 @@
 /**
  * @license BSD-3-Clause
  *
- * Modified by woocommerce on 13-January-2025 using Strauss.
+ * Modified by woocommerce on 10-February-2025 using Strauss.
  * @see https://github.com/BrianHenryIE/strauss
  */
 

lib/packages/firebase/php-jwt/src/CachedKeySet.php

@@ -2,7 +2,7 @@
 /**
  * @license BSD-3-Clause
  *
- * Modified by woocommerce on 13-January-2025 using Strauss.
+ * Modified by woocommerce on 10-February-2025 using Strauss.
  * @see https://github.com/BrianHenryIE/strauss
  */
 

lib/packages/firebase/php-jwt/src/ExpiredException.php

@@ -2,7 +2,7 @@
 /**
  * @license BSD-3-Clause
  *
- * Modified by woocommerce on 13-January-2025 using Strauss.
+ * Modified by woocommerce on 10-February-2025 using Strauss.
  * @see https://github.com/BrianHenryIE/strauss
  */
 

lib/packages/firebase/php-jwt/src/JWK.php

@@ -2,7 +2,7 @@
 /**
  * @license BSD-3-Clause
  *
- * Modified by woocommerce on 13-January-2025 using Strauss.
+ * Modified by woocommerce on 10-February-2025 using Strauss.
  * @see https://github.com/BrianHenryIE/strauss
  */
 

lib/packages/firebase/php-jwt/src/JWT.php

@@ -2,7 +2,7 @@
 /**
  * @license BSD-3-Clause
  *
- * Modified by woocommerce on 13-January-2025 using Strauss.
+ * Modified by woocommerce on 10-February-2025 using Strauss.
  * @see https://github.com/BrianHenryIE/strauss
  */
 

lib/packages/firebase/php-jwt/src/JWTExceptionWithPayloadInterface.php

@@ -2,7 +2,7 @@
 /**
  * @license BSD-3-Clause
  *
- * Modified by woocommerce on 13-January-2025 using Strauss.
+ * Modified by woocommerce on 10-February-2025 using Strauss.
  * @see https://github.com/BrianHenryIE/strauss
  */
 namespace Automattic\WooCommerce\Xero\Vendor\Firebase\JWT;