From f17aab4a6a78778fac0032f80b91b1cd81aa90e4 Mon Sep 17 00:00:00 2001 From: SauceyRed Date: Tue, 6 May 2025 01:44:09 +0200 Subject: [PATCH] feat: add check for access token presence in fetchWithAuth utility and added credentials to request --- utils/fetchWithAuth.ts | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/utils/fetchWithAuth.ts b/utils/fetchWithAuth.ts index 5a3bfaf..cae3853 100644 --- a/utils/fetchWithAuth.ts +++ b/utils/fetchWithAuth.ts @@ -1,16 +1,27 @@ import type { NitroFetchRequest, NitroFetchOptions } from "nitropack"; export default async (request: NitroFetchRequest, options: NitroFetchOptions = {}) => { - const accessToken = useCookie("access_token"); - console.log("access token 2:", accessToken.value); + const accessToken = useCookie("access_token").value; + console.log("access token 2:", accessToken); + + let headers: HeadersInit = {}; + + if (accessToken) { + headers = { + ...options.headers, + "Authorization": `Bearer ${accessToken}` + }; + } else { + headers = { + ...options.headers + }; + } try { const res = await $fetch(request, { ...options, - headers: { - ...options.headers, - "Authorization": `Bearer ${accessToken.value}` - } + headers, + credentials: "include" }); return res;