From fa9a1c704d70b205428cf1b3bf34dfd3cad9c0db Mon Sep 17 00:00:00 2001 From: Emili Castells Guasch Date: Mon, 18 Nov 2024 17:54:02 +0100 Subject: [PATCH] Add sdk and user tokens based on user logged status --- .../resources/js/modules/Helper/ConfigProcessor.js | 11 ++++------- .../js/modules/Helper/PayPalScriptLoading.js | 2 +- .../resources/js/modules/Helper/ScriptLoading.js | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/ppcp-button/resources/js/modules/Helper/ConfigProcessor.js b/modules/ppcp-button/resources/js/modules/Helper/ConfigProcessor.js index b70403a50..b8736d0e1 100644 --- a/modules/ppcp-button/resources/js/modules/Helper/ConfigProcessor.js +++ b/modules/ppcp-button/resources/js/modules/Helper/ConfigProcessor.js @@ -6,16 +6,16 @@ const processAxoConfig = ( config ) => { const scriptOptions = {}; const sdkClientToken = config?.axo?.sdk_client_token; const uuid = uuidv4().replace( /-/g, '' ); - if ( sdkClientToken ) { + if ( sdkClientToken && config?.user?.is_logged !== true ) { scriptOptions[ 'data-sdk-client-token' ] = sdkClientToken; scriptOptions[ 'data-client-metadata-id' ] = uuid; } return scriptOptions; }; -const processUserIdToken = ( config, sdkClientToken ) => { +const processUserIdToken = ( config ) => { const userIdToken = config?.save_payment_methods?.id_token; - return userIdToken && ! sdkClientToken + return userIdToken && config?.user?.is_logged === true ? { 'data-user-id-token': userIdToken } : {}; }; @@ -26,9 +26,6 @@ export const processConfig = ( config ) => { scriptOptions = merge( scriptOptions, config.script_attributes ); } const axoOptions = processAxoConfig( config ); - const userIdTokenOptions = processUserIdToken( - config, - axoOptions[ 'data-sdk-client-token' ] - ); + const userIdTokenOptions = processUserIdToken( config ); return merge.all( [ scriptOptions, axoOptions, userIdTokenOptions ] ); }; diff --git a/modules/ppcp-button/resources/js/modules/Helper/PayPalScriptLoading.js b/modules/ppcp-button/resources/js/modules/Helper/PayPalScriptLoading.js index 2fd5feaa3..48134d2bc 100644 --- a/modules/ppcp-button/resources/js/modules/Helper/PayPalScriptLoading.js +++ b/modules/ppcp-button/resources/js/modules/Helper/PayPalScriptLoading.js @@ -9,7 +9,7 @@ const scriptPromises = new Map(); const handleDataClientIdAttribute = async ( scriptOptions, config ) => { if ( config.data_client_id?.set_attribute && - config.vault_v3_enabled !== '1' + config.vault_v3_enabled !== true ) { return new Promise( ( resolve, reject ) => { dataClientIdAttributeHandler( diff --git a/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js b/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js index 38f605cc7..00ae98a9c 100644 --- a/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js +++ b/modules/ppcp-button/resources/js/modules/Helper/ScriptLoading.js @@ -75,7 +75,7 @@ export const loadPaypalScript = ( config, onLoaded, onError = null ) => { // Axo SDK options const sdkClientToken = config?.axo?.sdk_client_token; const uuid = uuidv4().replace( /-/g, '' ); - if ( sdkClientToken ) { + if ( sdkClientToken && config?.user?.is_logged !== true ) { scriptOptions[ 'data-sdk-client-token' ] = sdkClientToken; scriptOptions[ 'data-client-metadata-id' ] = uuid; } @@ -96,7 +96,7 @@ export const loadPaypalScript = ( config, onLoaded, onError = null ) => { // Adds data-user-id-token to script options. const userIdToken = config?.save_payment_methods?.id_token; - if ( userIdToken && ! sdkClientToken ) { + if ( userIdToken && config?.user?.is_logged === true ) { scriptOptions[ 'data-user-id-token' ] = userIdToken; }