useLaravelApi enhancements (#6)

* refactor: consolidate request methods into a single makeRequest function

* feat: allow providing custom ofetch instance

* fix: ensure xsrfToken cookie is evaluated on request

* chore: lint fixes

Author: lpheller

src/runtime/composables/useLaravelApi.ts

@@ -1,12 +1,10 @@
-import { ofetch } from 'ofetch'
-import { useCookie } from 'nuxt/app'
+import { useCookie, useNuxtApp } from 'nuxt/app'
+import type { ofetch } from 'ofetch'
 import { useLaravelConfig } from '#imports'
 
 export const useLaravelApi = () => {
     const config = useLaravelConfig()
 
-    const xsrfToken = useCookie('XSRF-TOKEN').value
-
     const getApiUrl = (url: string): string => {
         if (!url.startsWith('/')) {
             url = `/${url}`
@@ -24,9 +22,15 @@ export const useLaravelApi = () => {
         return `${apiBase}${url}`
     }
 
-    const get = async (url: string, options: any = {}) => {
-        return await ofetch(getApiUrl(url), {
-            method: 'GET',
+    const makeRequest = async (url: string, options: any = {}) => {
+        const xsrfToken = useCookie('XSRF-TOKEN').value
+
+        const fetch =
+            typeof useNuxtApp().$apiFetch === 'function'
+                ? (useNuxtApp().$apiFetch as typeof ofetch)
+                : ($fetch as typeof ofetch)
+
+        return await fetch(getApiUrl(url), {
             headers: {
                 Accept: 'application/json',
                 'X-XSRF-TOKEN': xsrfToken || '',
@@ -35,52 +39,39 @@ export const useLaravelApi = () => {
             ...options,
         })
     }
+
+    const get = async (url: string, options: any = {}) => {
+        return makeRequest(url, {
+            ...options,
+            method: 'GET',
+        })
+    }
     const post = async (url: string, body: any, options: any = {}) => {
-        return await ofetch(getApiUrl(url), {
+        return makeRequest(url, {
+            ...options,
             method: 'POST',
-            headers: {
-                Accept: 'application/json',
-                'X-XSRF-TOKEN': xsrfToken || '',
-            },
             body,
-            credentials: 'include',
-            ...options,
         })
     }
     const put = async (url: string, body: any, options: any = {}) => {
-        return await ofetch(getApiUrl(url), {
+        return makeRequest(url, {
+            ...options,
             method: 'PUT',
-            headers: {
-                Accept: 'application/json',
-                'X-XSRF-TOKEN': xsrfToken || '',
-            },
             body,
-            credentials: 'include',
-            ...options,
         })
     }
     const patch = async (url: string, body: any, options: any = {}) => {
-        return await ofetch(getApiUrl(url), {
+        return makeRequest(url, {
+            ...options,
             method: 'PATCH',
-            headers: {
-                Accept: 'application/json',
-                'X-XSRF-TOKEN': xsrfToken || '',
-            },
             body,
-            credentials: 'include',
-            ...options,
         })
     }
     const destroy = async (url: string, body: any, options: any = {}) => {
-        return await ofetch(getApiUrl(url), {
+        return makeRequest(url, {
+            ...options,
             method: 'DELETE',
-            headers: {
-                Accept: 'application/json',
-                'X-XSRF-TOKEN': xsrfToken || '',
-            },
-            credentials: 'include',
             body,
-            ...options,
         })
     }
 
@@ -100,6 +91,7 @@ export const useLaravelApi = () => {
         put,
         patch,
         destroy,
+        makeRequest,
         client,
     }
 }