From 57280179112c06bb89ba5b24b945c7c4ceabba50 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Sat, 30 Dec 2023 19:29:32 +0800 Subject: [PATCH] Laravel Vapor - Fix error 400 with any api call (long term solution) --- .../assets/vue/vuex/modules/crudRequest.js | 29 ++++++++++--------- resources/views/vendor/head.blade.php | 4 +-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/resources/assets/vue/vuex/modules/crudRequest.js b/resources/assets/vue/vuex/modules/crudRequest.js index 4cad1076..cea9f12d 100644 --- a/resources/assets/vue/vuex/modules/crudRequest.js +++ b/resources/assets/vue/vuex/modules/crudRequest.js @@ -1,21 +1,24 @@ export default { actions: { crudRequest({getters, dispatch}, {endpoint, method, parameters}){ + console.log(endpoint); + console.log(window.LARAVEL_VAPOR_ENABLED); return dispatch('ensureReCaptchaIsSet').then(function () { - const queryDomain = endpoint.split('?')[0]; - let encodedParams = endpoint.split('?')[1]; - let decodedParams = fullyDecodeURI(encodedParams); - const queryParams = encodeURIComponent(decodedParams); - encodedParams = queryParams.toString(); - let filteredEncodedParams = encodedParams.replace(/%3D/g,'='); - filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&'); - console.log('filteredEncodedParams: ', filteredEncodedParams); - console.log('queryDomain: ', queryDomain); - let combinedAbsoluteUrl = queryDomain; - if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){ - combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams; - console.log('combinedAbsoluteUrl: ', combinedAbsoluteUrl); + let combinedAbsoluteUrl = endpoint; + if(window.LARAVEL_VAPOR_ENABLED){ + const queryDomain = endpoint.split('?')[0]; + let encodedParams = endpoint.split('?')[1]; + let decodedParams = fullyDecodeURI(encodedParams); + const queryParams = encodeURIComponent(decodedParams); + encodedParams = queryParams.toString(); + let filteredEncodedParams = encodedParams.replace(/%3D/g,'='); + filteredEncodedParams = filteredEncodedParams.replace(/%26/g,'&'); + combinedAbsoluteUrl = queryDomain; + if(filteredEncodedParams !== undefined && filteredEncodedParams !== 'undefined'){ + combinedAbsoluteUrl = queryDomain + '?' + filteredEncodedParams; + } } + // return fetch(endpoint, { return fetch(combinedAbsoluteUrl, { method: method, responseType: 'json', diff --git a/resources/views/vendor/head.blade.php b/resources/views/vendor/head.blade.php index 21aa971e..22a97ead 100644 --- a/resources/views/vendor/head.blade.php +++ b/resources/views/vendor/head.blade.php @@ -5,7 +5,7 @@ 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','GTM-TQKCPCD'); - + Exchange - Overseas Money Transfers @@ -18,4 +18,4 @@ - \ No newline at end of file +