Merge pull request #187 from woocommerce/PCP-179-incorrect-api-credentials-cause-

Incorrect API credentials cause fatal error

.github/workflows/php.yml

@@ -11,18 +11,24 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        php-versions: ['7.1']
+
     steps:
     - uses: actions/checkout@v2
 
+    - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+
     - name: Validate composer.json and composer.lock
       run: composer validate
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress --no-suggest
 
-    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-    # Docs: https://getcomposer.org/doc/articles/scripts.md
-
     - name: Run test suite
       run: ./vendor/bin/phpunit
     - name: Run Woocommerce coding standards

modules/ppcp-api-client/src/Authentication/class-paypalbearer.php

@@ -120,7 +120,11 @@ class PayPalBearer implements Bearer {
 
 		if ( is_wp_error( $response ) || wp_remote_retrieve_response_code( $response ) !== 200 ) {
 			$error = new RuntimeException(
-				__( 'Could not create token.', 'woocommerce-paypal-payments' )
+				sprintf(
+					// translators: %s is the error description.
+					__( 'Could not create token. %s', 'woocommerce-paypal-payments' ),
+					isset( json_decode( $response['body'] )->error_description ) ? json_decode( $response['body'] )->error_description : ''
+				)
 			);
 			$this->logger->log(
 				'warning',

modules/ppcp-wc-gateway/src/Assets/class-settingspageassets.php

@@ -10,6 +10,7 @@ declare(strict_types=1);
 namespace WooCommerce\PayPalCommerce\WcGateway\Assets;
 
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
+use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 
 /**
  * Class SettingsPageAssets
@@ -111,6 +112,7 @@ class SettingsPageAssets {
 			true
 		);
 
+		try {
 			$token = $bearer->bearer();
 			wp_localize_script(
 				'ppcp-gateway-settings',
@@ -119,5 +121,8 @@ class SettingsPageAssets {
 					'vaulting_features_available' => $token->vaulting_available(),
 				)
 			);
+		} catch ( RuntimeException $exception ) {
+			return;
+		}
 	}
 }

modules/ppcp-wc-gateway/src/Settings/class-settingslistener.php

@@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\WcGateway\Settings;
 
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\Bearer;
 use WooCommerce\PayPalCommerce\ApiClient\Authentication\PayPalBearer;
+use WooCommerce\PayPalCommerce\ApiClient\Exception\RuntimeException;
 use WooCommerce\PayPalCommerce\ApiClient\Helper\Cache;
 use WooCommerce\PayPalCommerce\Onboarding\State;
 use WooCommerce\PayPalCommerce\WcGateway\Gateway\CreditCardGateway;
@@ -147,12 +148,24 @@ class SettingsListener {
 			return;
 		}
 
+		try {
 			$token = $this->bearer->bearer();
 			if ( ! $token->vaulting_available() ) {
 				$this->settings->set( 'vault_enabled', false );
 				$this->settings->persist();
 				return;
 			}
+		} catch ( RuntimeException $exception ) {
+			add_action(
+				'admin_notices',
+				function () use ( $exception ) {
+					printf(
+						'<div class="notice notice-error"><p>%s</p></div>',
+						esc_attr( $exception->getMessage() )
+					);
+				}
+			);
+		}
 
 		/**
 		 * No need to verify nonce here.