Remove unnecessary gateway methods

Author: joshuatf

modules/ppcp-onboarding/package.json

@@ -32,6 +32,7 @@
 		"@wordpress/element": "^2.20.3",
 		"@wordpress/i18n": "^4.1.0",
 		"@wordpress/plugins": "^2.25.3",
-		"@wordpress/url": "^3.1.0"
+		"@wordpress/url": "^3.1.0",
+		"interpolate-components": "^1.1.1"
 	}
 }

modules/ppcp-onboarding/resources/js/task-list/connection-form.js

@@ -4,20 +4,56 @@
 import { __ } from '@wordpress/i18n';
 import apiFetch from '@wordpress/api-fetch';
 import { Button } from '@wordpress/components';
-import { Form, TextControl } from '@woocommerce/components';
+import { Form, Link, TextControl } from '@woocommerce/components';
+import interpolateComponents from 'interpolate-components';
 import { isEmail } from '@wordpress/url';
 import { OPTIONS_STORE_NAME } from '@woocommerce/data';
 import { useDispatch, useSelect } from '@wordpress/data';
 
 const WC_PAYPAL_NAMESPACE = '/wc-paypal/v1';
 
-export const ConnectionForm = ( { markConfigured, paymentGateway } ) => {
+const ConnectionHelpText = () => {
+	return (
+		<p>
+			{ interpolateComponents( {
+				mixedString: __(
+					'Your API details can be obtained from your {{docsLink}}PayPal developer account{{/docsLink}}, and your Merchant Id from your {{merchantLink}}PayPal Business account{{/merchantLink}}. Don’t have a PayPal account? {{registerLink}}Create one.{{/registerLink}}',
+					'woocommerce-admin'
+				),
+				components: {
+					docsLink: (
+						<Link
+							href="https://developer.paypal.com/docs/api-basics/manage-apps/#create-or-edit-sandbox-and-live-apps"
+							target="_blank"
+							type="external"
+						/>
+					),
+					merchantLink: (
+						<Link
+							href="https://www.paypal.com/us/smarthelp/article/FAQ3850"
+							target="_blank"
+							type="external"
+						/>
+					),
+					registerLink: (
+						<Link
+							href="https://www.paypal.com/us/business"
+							target="_blank"
+							type="external"
+						/>
+					),
+				},
+			} ) }
+		</p>
+	);
+};
+
+export const ConnectionForm = ( { markConfigured } ) => {
 	const { createNotice } = useDispatch( 'core/notices' );
 	const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
 	const isOptionsUpdating = useSelect( ( select ) => {
 		return select( OPTIONS_STORE_NAME ).isOptionsUpdating();
 	} );
-	const { setup_help_text: setupHelpText } = paymentGateway;
 
 	const updateSettingsManually = ( values ) => {
 		const productionValues = Object.keys( values ).reduce(
@@ -191,13 +227,14 @@ export const ConnectionForm = ( { markConfigured, paymentGateway } ) => {
 						/>
 						<Button
 							isPrimary
+							disabled={ isOptionsUpdating }
 							isBusy={ isOptionsUpdating }
 							onClick={ handleSubmit }
 						>
 							{ __( 'Proceed', 'woocommerce-paypal-payments' ) }
 						</Button>
 
-						<p>{ setupHelpText }</p>
+						<ConnectionHelpText />
 					</>
 				);
 			} }

modules/ppcp-onboarding/yarn.lock

@@ -3070,6 +3070,11 @@ ajv@^8.0.1:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+ansi-colors@^3.0.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
+
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -3821,7 +3826,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^12.0.2:
+cacache@^12.0.2, cacache@^12.0.3:
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c"
   integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==
@@ -4388,6 +4393,24 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
+[email protected]:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz#8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2"
+  integrity sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==
+  dependencies:
+    cacache "^12.0.3"
+    find-cache-dir "^2.1.0"
+    glob-parent "^3.1.0"
+    globby "^7.1.1"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
+    minimatch "^3.0.4"
+    normalize-path "^3.0.0"
+    p-limit "^2.2.1"
+    schema-utils "^1.0.0"
+    serialize-javascript "^4.0.0"
+    webpack-log "^2.0.0"
+
 core-js-compat@^3.9.0, core-js-compat@^3.9.1:
   version "3.13.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.13.0.tgz#a88f5fa81d8e9b15d7f98abc4447a4dfca2a358f"
@@ -4954,6 +4977,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dir-glob@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+  integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
+  dependencies:
+    path-type "^3.0.0"
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -6451,6 +6481,18 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+  integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+  dependencies:
+    array-union "^1.0.1"
+    dir-glob "^2.0.0"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
+
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
@@ -6792,6 +6834,11 @@ ignore-emit-webpack-plugin@^2.0.6:
   resolved "https://registry.yarnpkg.com/ignore-emit-webpack-plugin/-/ignore-emit-webpack-plugin-2.0.6.tgz#570c30a08ee4c2ce6060f80d4bc4c5c5fec4d606"
   integrity sha512-/zC18RWCC2wz4ZwnS4UoujGWzvSKy28DLjtE+jrGBOXej6YdmityhBDzE8E0NlktEqi4tgdNbydX8B6G4haHSQ==
 
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -6905,7 +6952,7 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-[email protected]:
+[email protected], interpolate-components@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/interpolate-components/-/interpolate-components-1.1.1.tgz#699fff45d1525e98c7ce7b7159591d992b5dd6df"
   integrity sha1-aZ//RdFSXpjHzntxWVkdmStd1t8=
@@ -9223,7 +9270,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0:
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -11023,6 +11070,11 @@ sisteransi@^1.0.5:
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -12485,6 +12537,14 @@ webpack-livereload-plugin@^2.3.0:
     portfinder "^1.0.17"
     tiny-lr "^1.1.1"
 
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
+  dependencies:
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
+
 webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"

modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php

@@ -173,10 +173,10 @@ public function __construct(
 	 * @return bool
 	 */
 	public function needs_setup(): bool {
-		return ! $this->get_option( 'merchant_email' ) ||
-			! $this->get_option( 'merchant_id' ) ||
-			! get_option( 'client_id' ) ||
-			! get_option( 'client_secret' );
+		return ! $this->config->has( 'merchant_email' ) ||
+			! $this->config->has( 'merchant_id' ) ||
+			! $this->config->has( 'client_id' ) ||
+			! $this->config->has( 'client_secret' );
 	}
 
 	/**
@@ -365,31 +365,6 @@ public function get_transaction_url( $order ): string {
 		return parent::get_transaction_url( $order );
 	}
 
-	/**
-	 * Get required setting keys for setup.
-	 *
-	 * @return array Array of setting keys used for setup.
-	 */
-	public function get_required_settings_keys() {
-		return array(
-			'merchant_email',
-			'merchant_id',
-			'client_id',
-			'client_secret',
-		);
-	}
-
-	/**
-	 * Get the oAuth connection URL.
-	 *
-	 * @param string $return_url The URL to return to after the oAuth connection has been established.
-	 * @return string Connection URL.
-	 */
-	public function get_oauth_connection_url( $return_url = '' ) {
-		// @todo This will need to load a new script or two that handles the onboarding script and window data.
-		return null;
-	}
-
 	/**
 	 * Get a list of scripts to enqueue after plugin install.
 	 *
@@ -399,17 +374,4 @@ public function get_post_install_script_handles() {
 		return array( 'ppcp-task-list-fill' );
 	}
 
-	/**
-	 * Get help text to display during quick setup.
-	 */
-	public function get_setup_help_text() {
-		return sprintf(
-			// translators: %1$s is the URL on info to create API credentials, %2$s is the URL on info find the secure Merchant ID, %3$s is the URL to create a new PayPal business account.
-			__( 'Your API details can be obtained from your <a href="%1$s">PayPal developer account</a>, and your Merchant ID from your <a href="%2$s">PayPal Business account</a>. Don’t have a PayPal account? <a href="%3$s">Create one.</a>', 'woocommerce-paypal-payments' ),
-			'https://developer.paypal.com/docs/api-basics/manage-apps/#create-or-edit-sandbox-and-live-apps',
-			'https://www.paypal.com/us/smarthelp/article/FAQ3850',
-			'https://www.paypal.com/us/business'
-		);
-	}
-
 }