fix: salesforce settings

Automattic · Nov 26, 2024 · e3d1a66 · e3d1a66
1 parent 3509fb7
commit e3d1a66
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/includes/wizards/audience/class-audience-donations.php b/includes/wizards/audience/class-audience-donations.php
@@ -74,7 +74,6 @@ public function enqueue_scripts_and_styles() {
 			'newspack-wizards',
 			'newspackAudienceDonations',
 			[
-				'salesforce_redirect_url' => Salesforce::get_redirect_url(),
 				'can_use_name_your_price' => Donations::can_use_name_your_price(),
 			]
 		);

diff --git a/includes/wizards/audience/class-audience-wizard.php b/includes/wizards/audience/class-audience-wizard.php
@@ -79,9 +79,10 @@ public function enqueue_scripts_and_styles() {
 		}
 		parent::enqueue_scripts_and_styles();
 		$data = [
-			'has_memberships'       => class_exists( 'WC_Memberships' ),
-			'reader_activation_url' => admin_url( 'admin.php?page=newspack-audience#/' ),
-			'esp_metadata_fields'   => Reader_Activation\Sync\Metadata::get_default_fields(),
+			'has_memberships'         => class_exists( 'WC_Memberships' ),
+			'reader_activation_url'   => admin_url( 'admin.php?page=newspack-audience#/' ),
+			'esp_metadata_fields'     => Reader_Activation\Sync\Metadata::get_default_fields(),
+			'salesforce_redirect_url' => Salesforce::get_redirect_url(),
 		];
 
 		if ( method_exists( 'Newspack\Newsletters\Subscription_Lists', 'get_add_new_url' ) ) {
@@ -208,6 +209,17 @@ public function register_api_endpoints() {
 			]
 		);
 
+		// Get Salesforce settings.
+		register_rest_route(
+			NEWSPACK_API_NAMESPACE,
+			'/wizard/' . $this->slug . '/salesforce',
+			[
+				'methods'             => \WP_REST_Server::READABLE,
+				'callback'            => [ $this, 'api_get_salesforce_settings' ],
+				'permission_callback' => [ $this, 'api_permissions_check' ],
+			]
+		);
+
 		// Save Salesforce settings.
 		register_rest_route(
 			NEWSPACK_API_NAMESPACE,
@@ -430,6 +442,15 @@ public function api_update_content_gating_settings( $request ) {
 		return rest_ensure_response( self::get_memberships_settings() );
 	}
 
+	/**
+	 * API endpoint to get Salesforce settings.
+	 *
+	 * @return WP_REST_Response with Salesforce settings.
+	 */
+	public function api_get_salesforce_settings() {
+		return \rest_ensure_response( Salesforce::get_salesforce_settings() );
+	}
+
 	/**
 	 * API endpoint for setting Salesforce settings.
 	 *
@@ -441,7 +462,7 @@ public function api_update_salesforce_settings( $request ) {
 		if ( is_wp_error( $salesforce_response ) ) {
 			return rest_ensure_response( $salesforce_response );
 		}
-		return \rest_ensure_response( $this->get_payment_data() );
+		return \rest_ensure_response( Salesforce::get_salesforce_settings() );
 	}
 
 	/**
@@ -592,16 +613,15 @@ public function get_payment_data() {
 		$stripe_data              = Stripe_Connection::get_stripe_data();
 
 		$args = [
-			'payment_gateways'    => [
+			'payment_gateways' => [
 				'stripe'      => $stripe_data,
 				'woopayments' => $wc_configuration_manager->woopayments_data(),
 			],
-			'salesforce_settings' => [],
-			'platform_data'       => [
+			'platform_data'    => [
 				'platform' => $platform,
 			],
-			'is_ssl'              => is_ssl(),
-			'errors'              => [],
+			'is_ssl'           => is_ssl(),
+			'errors'           => [],
 		];
 		if ( 'wc' === $platform ) {
 			$plugin_status    = true;
@@ -617,8 +637,7 @@ public function get_payment_data() {
 			}
 			$args = wp_parse_args(
 				[
-					'salesforce_settings' => Salesforce::get_salesforce_settings(),
-					'plugin_status'       => $plugin_status,
+					'plugin_status' => $plugin_status,
 				],
 				$args
 			);

diff --git a/src/wizards/audience/components/salesforce/index.js b/src/wizards/audience/components/salesforce/index.js
@@ -16,20 +16,18 @@ import { addQueryArgs } from '@wordpress/url';
  * Internal dependencies.
  */
 import { PluginSettings, Notice, Wizard } from '../../../../components/src';
-import { READER_REVENUE_WIZARD_SLUG } from '../../constants';
 
 const Salesforce = () => {
 	const { salesforce_redirect_url: redirectUrl } = window?.newspackAudienceDonations || {};
 	const [ hasCopied, setHasCopied ] = useState( false );
-	const { salesforce_settings: salesforceData = {} } = Wizard.useWizardData( 'audience-donations' );
+	const salesforceData = Wizard.useWizardData( 'newspack-audience/salesforce' );
 	const [ isConnected, setIsConnected ] = useState( salesforceData.refresh_token );
 	const [ error, setError ] = useState( null );
 
 	const { saveWizardSettings, wizardApiFetch } = useDispatch( Wizard.STORE_NAMESPACE );
 	const saveAllSettings = value =>
 		saveWizardSettings( {
-			slug: READER_REVENUE_WIZARD_SLUG,
-			section: 'salesforce',
+			slug: 'newspack-audience/salesforce',
 			payloadPath: [ 'salesforce_settings' ],
 			updatePayload: {
 				path: [ 'salesforce_settings' ],