From 69bb6fb03c0d9caef15fb2016cd6ec8aa7fca0fe Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 28 Sep 2024 13:42:40 +0200 Subject: [PATCH] fix cors on api --- dashboard/server/api/v1/events.post.ts | 2 +- dashboard/server/api/v1/events.ts | 2 +- dashboard/server/api/v1/visits.post.ts | 2 +- dashboard/server/api/v1/visits.ts | 2 +- dashboard/server/utils/useCors.ts | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dashboard/server/api/v1/events.post.ts b/dashboard/server/api/v1/events.post.ts index 2ee7d36..30be6e5 100644 --- a/dashboard/server/api/v1/events.post.ts +++ b/dashboard/server/api/v1/events.post.ts @@ -5,7 +5,7 @@ import { useCors } from '~/server/utils/useCors'; export default defineEventHandler(async event => { - useCors(event); + if (useCors(event)) return ''; const { rows, from, to, limit } = await readBody(event); diff --git a/dashboard/server/api/v1/events.ts b/dashboard/server/api/v1/events.ts index 833ec2a..1357b1f 100644 --- a/dashboard/server/api/v1/events.ts +++ b/dashboard/server/api/v1/events.ts @@ -5,7 +5,7 @@ import { useCors } from '~/server/utils/useCors'; export default defineEventHandler(async event => { - useCors(event); + if (useCors(event)) return ''; const { row, from, to, limit } = getQuery(event); diff --git a/dashboard/server/api/v1/visits.post.ts b/dashboard/server/api/v1/visits.post.ts index 9415a99..f6d8e1a 100644 --- a/dashboard/server/api/v1/visits.post.ts +++ b/dashboard/server/api/v1/visits.post.ts @@ -6,7 +6,7 @@ import { useCors } from '~/server/utils/useCors'; export default defineEventHandler(async event => { - useCors(event); + if (useCors(event)) return ''; const { rows, from, to, limit } = await readBody(event); diff --git a/dashboard/server/api/v1/visits.ts b/dashboard/server/api/v1/visits.ts index 307cfa1..d7a0e16 100644 --- a/dashboard/server/api/v1/visits.ts +++ b/dashboard/server/api/v1/visits.ts @@ -6,7 +6,7 @@ import { useCors } from '~/server/utils/useCors'; export default defineEventHandler(async event => { - useCors(event); + if (useCors(event)) return ''; const { row, from, to, limit } = getQuery(event); diff --git a/dashboard/server/utils/useCors.ts b/dashboard/server/utils/useCors.ts index b8bcc38..09b8c56 100644 --- a/dashboard/server/utils/useCors.ts +++ b/dashboard/server/utils/useCors.ts @@ -7,4 +7,6 @@ export function useCors(event: H3Event) { setResponseHeader(event, 'Access-Control-Allow-Origin', '*'); setResponseHeader(event, 'Access-Control-Allow-Methods', 'GET, POST, OPTIONS, PUT, DELETE'); setResponseHeader(event, 'Access-Control-Allow-Headers', 'Content-Type, Authorization'); + if (event.method === 'OPTIONS') return true; + return false; } \ No newline at end of file