fix: initialData fallback loop

TYPO3-Headless · Feb 8, 2021 · 9ac31c3 · 9ac31c3
1 parent 19a28c2
commit 9ac31c3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/lib/options.js b/lib/options.js
@@ -3,7 +3,7 @@ export default {
   api: {
     baseURL: 'http://localhost:3000/api',
     endpoints: {
-      initialData: '?type=834'
+      initialData: '/?type=834'
     }
   },
   layouts: {},

diff --git a/lib/templates/lib/api.js b/lib/templates/lib/api.js
@@ -25,7 +25,7 @@ export default class API {
     }
   ) {
     return this.$http
-      .get(`${params.path}/${this.options.endpoints.initialData}`)
+      .get(`${params.path}${this.options.endpoints.initialData}`)
       .catch(error => {
         logger.warn(`cant get the initial config ${this.options.baseURL}`)
         logger.error(new Error(error))

diff --git a/lib/templates/plugins/api.js b/lib/templates/plugins/api.js
@@ -2,6 +2,8 @@ import API from '~typo3/lib/api'
 import { getLocaleCodePath } from '~typo3/lib/i18n'
 export default function(context, options) {
   const { store, $axios } = context
+  let initialDataRetried = false
+
   const api = {
     ...new API(
       store.state.typo3 && store.state.typo3.domain
@@ -22,9 +24,16 @@ export default function(context, options) {
       error.config.url &&
       error.config.url.includes(options.api.endpoints.initialData)
     ) {
-      return api.getInitialData({
-        path: getLocaleCodePath(context)
-      })
+      if (!initialDataRetried) {
+        initialDataRetried = true
+        return api.getInitialData({
+          path: getLocaleCodePath(context)
+        })
+      } else {
+        throw new Error(
+          `initialData fallback not available for ${error.config.baseURL}${error.config.url}`
+        )
+      }
     }
   })