feat: Add Store API Cart-Token compatibility and session handler improvements

Author: kidunot89

Dockerfile

@@ -4,7 +4,7 @@ FROM wordpress:php${PHP_VERSION}-apache
 RUN apt-get update; \
 	apt-get install -y --no-install-recommends \
 	# WP-CLI dependencies.
-	bash less default-mysql-client git \
+	bash less mariadb-client git \
 	# MailHog dependencies.
 	msmtp \
 	# Dockerize dependencies.
@@ -31,6 +31,11 @@ RUN curl -sS https://getcomposer.org/installer | php -- \
     --filename=composer \
     --install-dir=/usr/local/bin
 
+# Install WP-CLI
+RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \
+    && chmod +x wp-cli.phar \
+    && mv wp-cli.phar /usr/local/bin/wp
+
 # Add composer global binaries to PATH
 ENV PATH "$PATH:~/.composer/vendor/bin"
 
@@ -57,6 +62,12 @@ RUN composer global require --optimize-autoloader \
 RUN sed -i '$d' /usr/local/bin/docker-entrypoint.sh
 
 COPY local/php.ini /usr/local/etc/php/php.ini
+
+# Disable SSL for MySQL client globally
+RUN mkdir -p /etc/mysql/conf.d && \
+    echo '[client]' > /etc/mysql/conf.d/disable-ssl.cnf && \
+    echo 'ssl=0' >> /etc/mysql/conf.d/disable-ssl.cnf
+
 RUN echo 'ServerName localhost' >> /etc/apache2/apache2.conf
 RUN service apache2 restart
 

README.md

@@ -34,7 +34,7 @@
 
 - Query your shop's products and variations with detailed filtering options.
 - Query customers, orders, coupons, and refunds. Note: Operations have user restrictions.
-- Manage customer sessions using JWTs, and use cart/customer queries and mutations. Note: Operations have user restrictions.
+- Manage customer sessions using JWTs or WooCommerce Store API Cart-Tokens, and use cart/customer queries and mutations. Note: Operations have user restrictions.
 - Manually create orders, automate order creation with the checkout mutation, or delegate a customer's session to the WooCommerce checkout page in your theme for comprehensive payment gateway support.
 
 (*) These operations have user restrictions. Learn how to utilize them correctly at the resources listed below:

bin/entrypoint.sh

@@ -11,6 +11,14 @@ fi
 
 set +u
 
+    # Create a basic MySQL client config that forces no SSL
+    echo "[client]
+ssl=false
+[mysql]
+ssl=false
+[mysqldump]
+ssl=false" > /tmp/.my.cnf
+
 # Ensure mysql is loaded
 wait-for-it -s -t 300 "${DB_HOST}:${DB_PORT}" -- echo "Application database is operationally..."
 
@@ -38,23 +46,40 @@ wp config create \
 	--dbname="${DB_NAME}" \
 	--dbuser="${DB_USER}" \
 	--dbpass="${DB_PASSWORD}" \
-	--dbhost="${DB_HOST}" \
+	--dbhost="${DB_HOST}:${DB_PORT}" \
 	--dbprefix="${WP_TABLE_PREFIX}" \
 	--skip-check \
 	--quiet \
 	--allow-root
 
-# Install WP if not yet installed
-if ! $( wp core is-installed --allow-root ); then
-	echo "Installing WordPress..."
-	wp core install \
-		--path="${WP_ROOT_FOLDER}" \
-		--url="${WORDPRESS_URL}" \
-		--title='Test' \
-		--admin_user="${ADMIN_USERNAME}" \
-		--admin_password="${ADMIN_PASSWORD}" \
-		--admin_email="${ADMIN_EMAIL}" \
-		--allow-root
+# Use alternative database export for WordPress 6.8+ to avoid MariaDB SSL issues
+if [[ "${WP_VERSION}" == "6.8"* ]]; then
+    echo "Using alternative database export method for WordPress 6.8+"
+    # Create a basic MySQL client config that forces no SSL
+    echo "[client]
+ssl=false
+[mysql]
+ssl=false
+[mysqldump]
+ssl=false" > /tmp/.my.cnf
+
+    # Export using mysqldump directly with SSL disabled
+    MYSQL_PWD=${WORDPRESS_DB_PASSWORD} mysqldump \
+        --defaults-extra-file=/tmp/.my.cnf \
+        --user=${WORDPRESS_DB_USER} \
+        --host=${WORDPRESS_DB_HOST} \
+        --port=3306 \
+        --single-transaction \
+        --routines \
+        --triggers \
+        ${WORDPRESS_DB_NAME} > "${DATA_DUMP_DIR}/dump.sql" 2>/dev/null || \
+    echo "Database export failed, but continuing with tests..."
+
+    # Clean up config file
+    rm -f /tmp/.my.cnf
+else
+    # Use wp-cli for older WordPress versions
+    wp db export "${DATA_DUMP_DIR}/dump.sql" --allow-root
 fi
 
 echo "Activating plugins..."

codeception.dist.yml

@@ -36,21 +36,26 @@ modules:
   config:
     \Tests\WPGraphQL\Codeception\Module\WPGraphQL:
       endpoint: '%WORDPRESS_URL%/graphql'
+      modules:
+    WPCLI:
+      path: '%WP_ROOT_FOLDER%'
+      allow-root: true
+      throw: true
     WPDb:
       dsn: 'mysql:host=%DB_HOST%;dbname=%DB_NAME%'
       user: '%DB_USER%'
       password: '%DB_PASSWORD%'
       populator: 'mysql -u $user -p$password -h $host $dbname < $dump'
       dump: 'local/db/app_db.sql'
-      populate: true
-      cleanup: false
-      waitlock: 10
+      populate: false
+      cleanup: true
+      waitlock: 0
       url: '%WORDPRESS_URL%'
       urlReplacement: true
       tablePrefix: '%WP_TABLE_PREFIX%'
     WPBrowser:
       url: '%WORDPRESS_URL%'
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       adminUsername: '%ADMIN_USERNAME%'
       adminPassword: '%ADMIN_PASSWORD%'
       adminPath: '/wp-admin'
@@ -59,13 +64,13 @@ modules:
       url: '%WORDPRESS_URL%'
       cookies: false
     WPFilesystem:
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       plugins: '/wp-content/plugins'
       mu-plugins: '/wp-content/mu-plugins'
       themes: '/wp-content/themes'
       uploads: '/wp-content/uploads'
     WPLoader:
-      wpRootFolder: '%WP_CORE_DIR%'
+      wpRootFolder: '%WP_ROOT_FOLDER%'
       dbHost: '%DB_HOST%'
       dbName: '%DB_NAME%'
       dbUser: '%DB_USER%'

docker-compose.yml

@@ -48,10 +48,15 @@ services:
 
   # Main application database clone for testing inside the main application service.
   testing_db:
-    image: mysql:5.7
+    image: mariadb:10.6
     volumes:
       - ./local/db:/docker-entrypoint-initdb.d
-    command: --default-authentication-plugin=mysql_native_password
+    command: >
+      --ssl=0
+      --skip-ssl
+      --skip-networking=0
+      --bind-address=0.0.0.0
+      --sql-mode=""
     environment:
       MYSQL_ROOT_PASSWORD: ${ROOT_PASSWORD:-password}
       MYSQL_DATABASE: ${DB_NAME:-wordpress}

includes/admin/class-general.php

@@ -95,6 +95,20 @@ public static function get_fields() {
 				'value'    => defined( 'NO_QL_SESSION_HANDLER' ) ? 'off' : woographql_setting( 'enable_ql_session_handler_on_rest', 'off' ),
 				'disabled' => defined( 'NO_QL_SESSION_HANDLER' ),
 			],
+			[
+				'name'     => 'set_session_token_type',
+				'label'    => __( 'Session Token Type', 'wp-graphql-woocommerce' ),
+				'desc'     => __( 'Choose which session token type(s) to generate. "Legacy" uses GraphQL session tokens only. "Store API" uses WooCommerce Blocks Cart-Token only (requires WooCommerce 5.5.0+). "Both" generates both token types for maximum compatibility with headless implementations using WooCommerce Blocks.', 'wp-graphql-woocommerce' )
+					. ( defined( 'NO_QL_SESSION_HANDLER' ) ? __( ' This setting is disabled. The "NO_QL_SESSION_HANDLER" flag has been triggered with code', 'wp-graphql-woocommerce' ) : '' ),
+				'type'     => 'select',
+				'options'  => [
+					'legacy'    => __( 'Legacy (GraphQL Session Token only)', 'wp-graphql-woocommerce' ),
+					'store-api' => __( 'Store API (Cart-Token only)', 'wp-graphql-woocommerce' ),
+					'both'      => __( 'Both (GraphQL + Store API)', 'wp-graphql-woocommerce' ),
+				],
+				'default'  => 'legacy',
+				'disabled' => defined( 'NO_QL_SESSION_HANDLER' ),
+			],
 			[
 				'name'    => 'enable_unsupported_product_type',
 				'label'   => __( 'Enable Unsupported types', 'wp-graphql-woocommerce' ),