Merge pull request #187 from kidunot89/feature/better-guest-customer-support

Better guest customer support

Author: kidunot89

.env.dist

@@ -28,4 +28,4 @@ TESTS_ENVS=tests/_envs
 
 CORE_BRANCH=develop
 JWT_AUTH_BRANCH=master
-SKIP_PCOV_CLOBBER_CLEANUP=false
+SKIP_TEST_CLEANUP=0

.travis.yml

@@ -34,18 +34,18 @@ matrix:
       env: PHP_VERSION=7.2 WP_VERSION=5.3
     - php: 7.2
       env: PHP_VERSION=7.2 WP_VERSION=4.9
+    - php: 7.1
+      env: PHP_VERSION=7.1 WP_VERSION=5.3
+    - php: 7.1
+      env: PHP_VERSION=7.1 WP_VERSION=4.9
     - php: 7.0
-      env: PHP_VERSION=7.0 WP_VERSION=5.0
+      env: PHP_VERSION=7.0 WP_VERSION=5.0 COVERAGE=1
     - php: 7.0
       env: PHP_VERSION=7.0 WP_VERSION=4.9
     - php: 5.6
       env: PHP_VERSION=5.6 WP_VERSION=5.0
     - php: 5.6
       env: PHP_VERSION=5.6 WP_VERSION=4.9
-    - php: 7.1
-      env: PHP_VERSION=7.1 WP_VERSION=5.3
-    - php: 7.1
-      env: PHP_VERSION=7.1 WP_VERSION=4.9 COVERAGE=1
   allow_failures:
     - env: PHP_VERSION=5.6 WP_VERSION=5.0
     - env: PHP_VERSION=5.6 WP_VERSION=4.9

Dockerfile

@@ -31,9 +31,15 @@ RUN if [ "$PHP_VERSION" != "5.6" ] && [ "$PHP_VERSION" != "7.0" ]; then \
         rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \
         echo "pcov.enabled=1" >> /usr/local/etc/php/php.ini ;\
     elif  [ "$PHP_VERSION" == "5.6" ]; then \
-        yes | pecl install xdebug-2.5.5; \
+        yes | pecl install xdebug-2.5.5 \
+        && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
+        && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
+        && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini; \
     else \
-        yes | pecl install xdebug; \
+        yes | pecl install xdebug \
+        && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
+        && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
+        && echo "xdebug.remote_autostart=off" >> /usr/local/etc/php/conf.d/xdebug.ini; \
     fi 
 
 # Install composer

bin/testing-entrypoint.sh

@@ -44,9 +44,9 @@ dockerize \
     -timeout 1m
 
 # Download c3 for testing.
-if [ ! -f "${PROJECT_DIR}/c3.php" ]; then
-    echo 'Downloading c3.php'
-    curl -L 'https://raw.github.com/Codeception/c3/2.0/c3.php' > "${PROJECT_DIR}/c3.php"
+if [ ! -f "$PROJECT_DIR/c3.php" ]; then
+    echo "Downloading Codeception's c3.php"
+    curl -L 'https://raw.github.com/Codeception/c3/2.0/c3.php' > "$PROJECT_DIR/c3.php"
 fi
 
 # Install dependencies
@@ -68,14 +68,20 @@ chmod 777 ${TESTS_OUTPUT}
 # Run tests
 run_tests ${SUITES}
 
+# Remove c3.php
+if [ -f "$PROJECT_DIR/c3.php" ] && [ "$SKIP_TESTS_CLEANUP" != "1" ]; then
+    echo "Removing Codeception's c3.php"
+    rm -rf "$PROJECT_DIR/c3.php"
+fi
+
 # Clean coverage.xml and clean up PCOV configurations.
 if [ -f "${TESTS_OUTPUT}/coverage.xml" ] && [[ "$COVERAGE" == "1" ]]; then
     echo 'Cleaning coverage.xml for deployment'.
     pattern="$PROJECT_DIR/"
     sed -i "s~$pattern~~g" "$TESTS_OUTPUT"/coverage.xml
 
     # Remove pcov/clobber
-    if version_gt $PHP_VERSION 7.0 && [ ${SKIP_PCOV_CLOBBER_CLEANUP} != "true" ]; then
+    if version_gt $PHP_VERSION 7.0 && [ "$SKIP_TESTS_CLEANUP" != "1" ]; then
         echo 'Removing pcov/clobber.'
         vendor/bin/pcov unclobber
         COMPOSER_MEMORY_LIMIT=-1 composer remove --dev pcov/clobber

codeception.dist.yml

@@ -14,17 +14,15 @@ settings:
 coverage:
     enabled: true
     remote: false
-    work_dir: '%WP_ROOT_FOLDER%/wp-content/plugins/wp-graphql-woocommerce'
     c3_url: '%WP_URL%/wp-content/plugins/wp-graphql-woocommerce/wp-graphql-woocommerce.php'
-    whitelist:
-      include:
+    include:
+        - includes/*
+    exclude:
         - wp-graphql-woocommerce.php
         - access-functions.php
         - class-inflect.php
-        - includes/*.php
-    remote_context_options:
-        http:
-            timeout: 90
+        - vendor/*
+    show_only_summary: false
 extensions:
     enabled:
         - Codeception\Extension\RunFailed
@@ -56,12 +54,9 @@ modules:
             adminUsername: '%ADMIN_USERNAME%'
             adminPassword: '%ADMIN_PASSWORD%'
             adminPath: '/wp-admin'
-            curl: 
-                CURLOPT_TIMEOUT: 60000
         REST:
             depends: WPBrowser
             url: '%WP_URL%'
-            timeout: 90
         WPFilesystem:
             wpRootFolder: '%WP_ROOT_FOLDER%'
             plugins: '/wp-content/plugins'

docker-compose.yml

@@ -49,6 +49,7 @@ services:
       - './.log/testing:/var/log/apache2'
     env_file: .env.dist
     environment:
+      XDEBUG_CONFIG: remote_host=host.docker.internal remote_port=9000 remote_enable=1
       WPGRAPHQL_WOOCOMMERCE_AUTOLOAD: 1
       DB_HOST: app_db
       WP_URL: 'http://localhost'

includes/data/class-factory.php

@@ -29,13 +29,24 @@
 use WPGraphQL\WooCommerce\Data\Connection\Payment_Gateway_Connection_Resolver;
 use WPGraphQL\WooCommerce\Model\Order_Item;
 use WPGraphQL\WooCommerce\Model\Product;
+use WPGraphQL\WooCommerce\Model\Customer;
 use WPGraphQL\WooCommerce\Model\Tax_Rate;
 use WPGraphQL\WooCommerce\Model\Shipping_Method;
 
 /**
  * Class Factory
  */
 class Factory {
+	/**
+	 * Returns the current woocommerce customer object tied to the current session.
+	 *
+	 * @return Customer
+	 * @access public
+	 */
+	public static function resolve_session_customer() {
+		return new Customer();
+	}
+
 	/**
 	 * Returns the Customer store object for the provided user ID
 	 *

includes/model/class-customer.php

@@ -25,8 +25,8 @@ class Customer extends Model {
 	 * @access public
 	 * @return void
 	 */
-	public function __construct( $id ) {
-		$this->data                = new \WC_Customer( $id );
+	public function __construct( $id = 'session' ) {
+		$this->data                = 'session' === $id ? \WC()->customer : new \WC_Customer( $id );
 		$allowed_restricted_fields = array(
 			'isRestricted',
 			'isPrivate',
@@ -36,7 +36,7 @@ public function __construct( $id ) {
 			'displayName',
 		);
 
-		$restricted_cap = apply_filters( 'customer_restricted_cap', 'list_users' );
+		$restricted_cap = apply_filters( 'customer_restricted_cap', 'session' === $id ? '' : 'list_users' );
 
 		parent::__construct( $restricted_cap, $allowed_restricted_fields, $id );
 	}
@@ -62,10 +62,12 @@ protected function init() {
 		if ( empty( $this->fields ) ) {
 			$this->fields = array(
 				'ID'                    => function() {
-					return $this->data->get_id();
+					return ( ! empty( $this->data->get_id() ) ) ? $this->data->get_id() : \WC()->session->_customer_id;
 				},
 				'id'                    => function() {
-					return ( ! empty( $this->data ) ) ? Relay::toGlobalId( 'customer', $this->data->get_id() ) : null;
+					return ( ! empty( $this->data->get_id() ) )
+						? Relay::toGlobalId( 'customer', $this->data->get_id() )
+						: 'new_customer';
 				},
 				'customerId'            => function() {
 					return ( ! empty( $this->data->get_id() ) ) ? $this->data->get_id() : null;

includes/mutation/class-customer-update.php

@@ -14,6 +14,7 @@
 use WPGraphQL\WooCommerce\Data\Mutation\Customer_Mutation;
 use WPGraphQL\WooCommerce\Model\Customer;
 use WPGraphQL\Model\User;
+use WPGraphQL\Mutation\UserCreate;
 use WPGraphQL\Mutation\UserUpdate;
 
 /**
@@ -41,8 +42,12 @@ public static function register_mutation() {
 	 */
 	public static function get_input_fields() {
 		$input_fields = array_merge(
-			UserUpdate::get_input_fields(),
+			UserCreate::get_input_fields(),
 			array(
+				'id'                    => array(
+					'type'        => 'ID',
+					'description' => __( 'The ID of the user', 'wp-graphql' ),
+				),
 				'billing'               => array(
 					'type'        => 'CustomerAddressInput',
 					'description' => __( 'Customer billing information', 'wp-graphql-woocommerce' ),
@@ -84,21 +89,26 @@ public static function get_output_fields() {
 	 */
 	public static function mutate_and_get_payload() {
 		return function( $input, AppContext $context, ResolveInfo $info ) {
-			// Get closure from "UserRegister::mutate_and_get_payload".
-			$update_user = UserUpdate::mutate_and_get_payload();
+			$session_only = empty( $input['id'] );
+			$payload      = null;
+
+			if ( ! $session_only ) {
+				// Get closure from "UserRegister::mutate_and_get_payload".
+				$update_user = UserUpdate::mutate_and_get_payload();
 
-			// Update customer with core UserUpdate closure.
-			$payload = $update_user( $input, $context, $info );
+				// Update customer with core UserUpdate closure.
+				$payload = $update_user( $input, $context, $info );
 
-			if ( empty( $payload ) ) {
-				throw new UserError( __( 'Failed to update customer.', 'wp-graphql-woocommerce' ) );
+				if ( empty( $payload ) ) {
+					throw new UserError( __( 'Failed to update customer.', 'wp-graphql-woocommerce' ) );
+				}
 			}
 
 			// Map all of the args from GQL to WC friendly.
 			$customer_args = Customer_Mutation::prepare_customer_props( $input, 'update' );
 
 			// Create customer object.
-			$customer = new \WC_Customer( $payload['id'] );
+			$customer = ! $session_only ? new \WC_Customer( $payload['id'] ) : \WC()->customer;
 
 			// Set billing address.
 			if ( ! empty( $customer_args['billing'] ) ) {
@@ -128,7 +138,7 @@ public static function mutate_and_get_payload() {
 			$customer->save();
 
 			// Return payload.
-			return $payload;
+			return ! empty( $payload ) ? $payload : array( 'id' => 'session' );
 		};
 	}
 }

includes/mutation/class-order-create.php

@@ -50,7 +50,7 @@ public static function get_input_fields() {
 				'description' => __( 'Currency the order was created with, in ISO format.', 'wp-graphql-woocommerce' ),
 			),
 			'customerId'         => array(
-				'type'        => array( 'non_null' => 'Int' ),
+				'type'        => 'Int',
 				'description' => __( 'Order customer ID', 'wp-graphql-woocommerce' ),
 			),
 			'customerNote'       => array(
@@ -154,10 +154,8 @@ public static function mutate_and_get_payload() {
 				// Make sure gateways are loaded so hooks from gateways fire on save/create.
 				WC()->payment_gateways();
 
-				// Validate customer ID.
-				if ( empty( $input['customerId'] ) ) {
-					throw new UserError( __( 'No customer ID provided.', 'wp-graphql-woocommerce' ) );
-				} elseif ( ! Order_Mutation::validate_customer( $input ) ) {
+				// Validate customer ID, if set.
+				if ( ! empty( $input['customerId'] ) && ! Order_Mutation::validate_customer( $input ) ) {
 					throw new UserError( __( 'Customer ID is invalid.', 'wp-graphql-woocommerce' ) );
 				}