Merge branch 'main' into feat/json-pointer-extractor

playground-authjs/server/api/protected/inline.ts

@@ -1,3 +1,4 @@
+import { eventHandler } from 'h3'
 import { getServerSession } from '#auth'
 
 export default eventHandler(async (event) => {

playground-authjs/server/api/protected/middleware.ts

@@ -1 +1,3 @@
+import { eventHandler } from 'h3'
+
 export default eventHandler(() => ({ status: 'authenticated', text: 'you only see me if you are logged in, as a server-middleware protects me' }))

playground-authjs/server/api/token.get.ts

@@ -1,3 +1,4 @@
+import { eventHandler } from 'h3'
 import { getToken } from '#auth'
 
 export default eventHandler(event => getToken({ event }))

playground-authjs/server/middleware/auth.ts

@@ -1,4 +1,4 @@
-import { eventHandler } from 'h3'
+import { createError, eventHandler } from 'h3'
 import { getServerSession } from '#auth'
 
 export default eventHandler(async (event) => {

playground-local/server/api/auth/login.post.ts

@@ -1,3 +1,4 @@
+import { createError, eventHandler, readBody } from 'h3'
 import { z } from 'zod'
 import { sign } from 'jsonwebtoken'
 

playground-local/server/api/auth/logout.post.ts

@@ -1 +1,3 @@
+import { eventHandler } from 'h3'
+
 export default eventHandler(() => ({ status: 'OK ' }))

playground-local/server/api/auth/user.get.ts

@@ -1,4 +1,4 @@
-import { H3Event } from 'h3'
+import { createError, eventHandler, getRequestHeader, H3Event } from 'h3'
 import { verify } from 'jsonwebtoken'
 import { SECRET } from './login.post'
 

playground-refresh/server/api/auth/login.post.ts

@@ -1,3 +1,4 @@
+import { createError, eventHandler, readBody } from 'h3'
 import { z } from 'zod'
 import { sign } from 'jsonwebtoken'
 

playground-refresh/server/api/auth/logout.post.ts

@@ -1 +1,3 @@
-export default eventHandler(() => ({ status: 'OK ' }))
+import { eventHandler } from 'h3'
+
+export default eventHandler(() => ({ status: 'OK' }))

playground-refresh/server/api/auth/refresh.post.ts

@@ -1,3 +1,4 @@
+import { createError, eventHandler, readBody } from 'h3'
 import { sign, verify } from 'jsonwebtoken'
 
 export const SECRET = 'dummy'

playground-refresh/server/api/auth/user.get.ts

@@ -1,4 +1,4 @@
-import { H3Event } from 'h3'
+import { createError, eventHandler, getRequestHeader, H3Event } from 'h3'
 import { verify } from 'jsonwebtoken'
 import { SECRET } from './login.post'
 

src/runtime/server/services/authjs/nuxtAuthHandler.ts

@@ -1,5 +1,5 @@
 import type { IncomingHttpHeaders } from 'http'
-import { getQuery, setCookie, readBody, appendHeader, sendRedirect, eventHandler, parseCookies, createError, isMethod, getMethod, getHeaders } from 'h3'
+import { getQuery, setCookie, readBody, appendHeader, sendRedirect, eventHandler, parseCookies, createError, isMethod, getHeaders } from 'h3'
 import type { H3Event } from 'h3'
 
 import { AuthHandler } from 'next-auth/core'
@@ -31,7 +31,7 @@ const useConfig = () => useTypedBackendConfig(useRuntimeConfig(), 'authjs')
 const readBodyForNext = async (event: H3Event) => {
   let body: any
 
-  if (isMethod(event, 'PATCH') || isMethod(event, 'POST') || isMethod(event, 'PUT') || isMethod(event, 'DELETE')) {
+  if (isMethod(event, ['PATCH', 'POST', 'PUT', 'DELETE'])) {
     body = await readBody(event)
   }
   return body
@@ -54,7 +54,7 @@ const parseActionAndProvider = ({ context }: H3Event): { action: AuthAction, pro
   // Get TS to correctly infer the type of `unvalidatedAction`
   const action = SUPPORTED_ACTIONS.find(action => action === unvalidatedAction)
   if (!action) {
-    throw createError({ statusCode: 400, statusMessage: `Called endpoint with unsupported action ${unvalidatedAction!}. Only the following actions are supported: ${SUPPORTED_ACTIONS.join(', ')}` })
+    throw createError({ statusCode: 400, statusMessage: `Called endpoint with unsupported action ${unvalidatedAction}. Only the following actions are supported: ${SUPPORTED_ACTIONS.join(', ')}` })
   }
 
   return { action, providerId }
@@ -97,7 +97,7 @@ export const NuxtAuthHandler = (nuxtAuthOptions?: AuthOptions) => {
       cookies: parseCookies(event),
       query: undefined,
       headers: getHeaders(event),
-      method: getMethod(event),
+      method: event.method,
       providerId: undefined,
       error: undefined
     }