Don't send the Base URL header on unrelated Axios requests

inertiaui · Oct 31, 2024 · 370a734 · 370a734
1 parent c9d6ed2
commit 370a734
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/react/src/ModalRoot.jsx b/react/src/ModalRoot.jsx
@@ -224,6 +224,7 @@ export const ModalStackProvider = ({ children }) => {
                     'X-Inertia-Partial-Data': keys.join(','),
                     'X-InertiaUI-Modal': true,
                     'X-InertiaUI-Modal-Use-Router': 0,
+                    'X-InertiaUI-Modal-Base-Url': baseUrl,
                 },
             }).then((response) => {
                 this.updateProps(response.data.props)
@@ -308,6 +309,7 @@ export const ModalStackProvider = ({ children }) => {
                 'X-Inertia-Version': pageVersion,
                 'X-InertiaUI-Modal': true,
                 'X-InertiaUI-Modal-Use-Router': useInertiaRouter ? 1 : 0,
+                'X-InertiaUI-Modal-Base-Url': baseUrl,
             }
 
             if (useInertiaRouter) {
@@ -489,7 +491,9 @@ export const ModalRoot = ({ children }) => {
     const axiosRequestInterceptor = (config) => {
         // A Modal is opened on top of a base route, so we need to pass this base route
         // so it can redirect back with the back() helper method...
-        config.headers['X-InertiaUI-Modal-Base-Url'] = baseUrl
+        if (localStackCopy.length) {
+            config.headers['X-InertiaUI-Modal-Base-Url'] = baseUrl
+        }
         return config
     }
 

diff --git a/vue/src/ModalRoot.vue b/vue/src/ModalRoot.vue
@@ -43,7 +43,9 @@ onUnmounted(
 const axiosRequestInterceptor = (config) => {
     // A Modal is opened on top of a base route, so we need to pass this base route
     // so it can redirect back with the back() helper method...
-    config.headers['X-InertiaUI-Modal-Base-Url'] = modalStack.getBaseUrl()
+    if (modalStack.stack.value.length) {
+        config.headers['X-InertiaUI-Modal-Base-Url'] = modalStack.getBaseUrl()
+    }
 
     return config
 }

diff --git a/vue/src/modalStack.js b/vue/src/modalStack.js
@@ -203,6 +203,7 @@ class Modal {
                 'X-Inertia-Partial-Data': keys.join(','),
                 'X-InertiaUI-Modal': true,
                 'X-InertiaUI-Modal-Use-Router': 0,
+                'X-InertiaUI-Modal-Base-Url': baseUrl.value,
             },
         }).then((response) => {
             this.updateProps(response.data.props)
@@ -266,6 +267,7 @@ function visit(
             'X-Inertia-Version': usePage().version,
             'X-InertiaUI-Modal': true,
             'X-InertiaUI-Modal-Use-Router': useInertiaRouter ? 1 : 0,
+            'X-InertiaUI-Modal-Base-Url': baseUrl.value,
         }
 
         if (useInertiaRouter) {

diff --git a/vue/tests/modalStack.test.js b/vue/tests/modalStack.test.js
@@ -154,6 +154,7 @@ describe('modalStack', () => {
                     'X-Inertia-Partial-Data': 'test,another',
                     'X-InertiaUI-Modal': true,
                     'X-InertiaUI-Modal-Use-Router': 0,
+                    'X-InertiaUI-Modal-Base-Url': null,
                 },
             })
 
@@ -185,6 +186,7 @@ describe('modalStack', () => {
                     'X-Inertia-Partial-Data': 'test',
                     'X-InertiaUI-Modal': true,
                     'X-InertiaUI-Modal-Use-Router': 0,
+                    'X-InertiaUI-Modal-Base-Url': null,
                 },
             })
 
@@ -216,6 +218,7 @@ describe('modalStack', () => {
                     'X-Inertia-Partial-Data': 'test,third',
                     'X-InertiaUI-Modal': true,
                     'X-InertiaUI-Modal-Use-Router': 0,
+                    'X-InertiaUI-Modal-Base-Url': null,
                 },
             })
 
@@ -267,6 +270,7 @@ describe('modalStack', () => {
                     'X-Inertia-Version': '1.0',
                     'X-InertiaUI-Modal': true,
                     'X-InertiaUI-Modal-Use-Router': 0,
+                    'X-InertiaUI-Modal-Base-Url': '',
                 },
             })