chore: refactor usage of statusMessage to message; (#1039)

chore: remove redundant code in `refresh-token.server.ts`

Author: phoenix-ru

docs/guide/authjs/server-side/session-access.md

@@ -49,7 +49,7 @@ export default eventHandler(async (event) => {
   const session = await getServerSession(event)
   if (!session) {
     throw createError({
-      statusMessage: 'Unauthenticated',
+      message: 'Unauthenticated',
       statusCode: 403
     })
   }

docs/recipes/community/directus.md

@@ -124,7 +124,7 @@ export default NuxtAuthHandler({
           if (!userTokens || !userTokens.data || !userDetails || !userDetails.data) {
             throw createError({
               statusCode: 500,
-              statusMessage: 'Next auth failed',
+              message: 'Next auth failed',
             })
           }
 
@@ -151,7 +151,7 @@ export default NuxtAuthHandler({
           if (!allowedRoles.includes(user.role)) {
             throw createError({
               statusCode: 403,
-              statusMessage: 'Not allowed',
+              message: 'Not allowed',
             })
           }
 

playground-authjs/server/middleware/auth.ts

@@ -9,6 +9,6 @@ export default eventHandler(async (event) => {
 
   const session = await getServerSession(event)
   if (!session) {
-    throw createError({ statusMessage: 'Unauthenticated', statusCode: 403 })
+    throw createError({ message: 'Unauthenticated', statusCode: 403 })
   }
 })

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

@@ -11,7 +11,7 @@ export default eventHandler(async (event) => {
   if (!result.success) {
     throw createError({
       statusCode: 403,
-      statusMessage: 'Unauthorized, hint: try `hunter2` as password'
+      message: 'Unauthorized, hint: try `hunter2` as password'
     })
   }
 

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

@@ -14,7 +14,7 @@ export default eventHandler(async (event) => {
   if (!refreshToken || !authorizationHeader) {
     throw createError({
       statusCode: 401,
-      statusMessage: 'Unauthorized, no refreshToken or no Authorization header'
+      message: 'Unauthorized, no refreshToken or no Authorization header'
     })
   }
 
@@ -23,7 +23,7 @@ export default eventHandler(async (event) => {
   if (!decoded) {
     throw createError({
       statusCode: 401,
-      statusMessage: 'Unauthorized, refreshToken can\'t be verified'
+      message: 'Unauthorized, refreshToken can\'t be verified'
     })
   }
 
@@ -32,7 +32,7 @@ export default eventHandler(async (event) => {
   if (!userTokens) {
     throw createError({
       statusCode: 401,
-      statusMessage: 'Unauthorized, user is not logged in'
+      message: 'Unauthorized, user is not logged in'
     })
   }
 
@@ -47,7 +47,7 @@ export default eventHandler(async (event) => {
     })
     throw createError({
       statusCode: 401,
-      statusMessage: 'Tokens mismatch - this is not good'
+      message: 'Tokens mismatch - this is not good'
     })
   }
 

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

@@ -6,7 +6,7 @@ export default eventHandler(async (event) => {
   if (!result.success) {
     throw createError({
       statusCode: 400,
-      statusMessage: `Invalid input, please provide a valid username, and a password must be 'hunter2' for this demo.`
+      message: `Invalid input, please provide a valid username, and a password must be 'hunter2' for this demo.`
     })
   }
 

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

@@ -5,7 +5,7 @@ import type { JwtPayload } from '~/server/utils/session'
 export default eventHandler((event) => {
   const authorizationHeader = getRequestHeader(event, 'Authorization')
   if (typeof authorizationHeader === 'undefined') {
-    throw createError({ statusCode: 403, statusMessage: 'Need to pass valid Bearer-authorization header to access this endpoint' })
+    throw createError({ statusCode: 403, message: 'Need to pass valid Bearer-authorization header to access this endpoint' })
   }
 
   const requestAccessToken = extractTokenFromAuthorizationHeader(authorizationHeader)
@@ -23,15 +23,15 @@ export default eventHandler((event) => {
       msg: 'Login failed. Here\'s the raw error:',
       error
     })
-    throw createError({ statusCode: 403, statusMessage: 'You must be logged in to use this endpoint' })
+    throw createError({ statusCode: 403, message: 'You must be logged in to use this endpoint' })
   }
 
   // Get tokens of a user (only for demo, use a DB in your implementation)
   const userTokens = getTokensByUser(decoded.username)
   if (!userTokens) {
     throw createError({
       statusCode: 404,
-      statusMessage: 'User not found'
+      message: 'User not found'
     })
   }
 
@@ -40,7 +40,7 @@ export default eventHandler((event) => {
   if (!tokensValidityCheck.valid) {
     throw createError({
       statusCode: 401,
-      statusMessage: 'Unauthorized, user is not logged in'
+      message: 'Unauthorized, user is not logged in'
     })
   }
 

src/runtime/composables/authjs/useAuth.ts

@@ -286,7 +286,7 @@ export function useAuth(): UseAuthReturn {
     )
 
     if (!csrfToken) {
-      throw createError({ statusCode: 400, statusMessage: 'Could not fetch CSRF Token for signing out' })
+      throw createError({ statusCode: 400, message: 'Could not fetch CSRF Token for signing out' })
     }
 
     const signoutData = await _fetch<{ url: string }>(nuxt, '/signout', {

src/runtime/plugins/refresh-token.server.ts

@@ -1,7 +1,5 @@
-import type { DeepRequired } from 'ts-essentials'
 import { _fetch } from '../utils/fetch'
 import { jsonPointerGet, objectFromJsonPointer, useTypedBackendConfig } from '../helpers'
-import type { ProviderLocal } from '../types'
 import { defineNuxtPlugin, useAuthState, useRuntimeConfig } from '#imports'
 
 export default defineNuxtPlugin({
@@ -12,17 +10,14 @@ export default defineNuxtPlugin({
       = useAuthState()
 
     if (refreshToken.value && token.value) {
-      const config = nuxtApp.$config.public.auth
-      const configToken = useTypedBackendConfig(useRuntimeConfig(), 'local')
-
-      const provider = config.provider as DeepRequired<ProviderLocal>
+      const provider = useTypedBackendConfig(useRuntimeConfig(), 'local')
 
       const { path, method } = provider.refresh.endpoint
       const refreshRequestTokenPointer = provider.refresh.token.refreshRequestTokenPointer
 
       // include header in case of auth is required to avoid 403 rejection
       const headers = new Headers({
-        [configToken.token.headerName]: token.value
+        [provider.token.headerName]: token.value
       } as HeadersInit)
 
       try {
@@ -48,7 +43,7 @@ export default defineNuxtPlugin({
         }
 
         // check if refreshTokenOnly
-        if (!configToken.refresh.refreshOnlyToken) {
+        if (!provider.refresh.refreshOnlyToken) {
           const extractedRefreshToken = jsonPointerGet(
             response,
             provider.refresh.token.signInResponseRefreshTokenPointer

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

@@ -120,7 +120,7 @@ export async function getServerSession(event: H3Event) {
     // This call gives it a chance to load + initialize the variable. If it fails we still throw. This edge-case has happened to user matijao#7025 on discord.
     await $fetch(sessionUrlPath, { headers }).catch(error => error.data)
     if (!preparedAuthjsHandler) {
-      throw createError({ statusCode: 500, statusMessage: 'Tried to get server session without setting up an endpoint to handle authentication (see https://github.com/sidebase/nuxt-auth#quick-start)' })
+      throw createError({ statusCode: 500, message: 'Tried to get server session without setting up an endpoint to handle authentication (see https://github.com/sidebase/nuxt-auth#quick-start)' })
     }
   }
 
@@ -205,7 +205,7 @@ async function createRequestForAuthjs(
   const { action, providerId } = parseActionAndProvider(event)
   const error = query.error
   if (Array.isArray(error)) {
-    throw createError({ statusCode: 400, statusMessage: 'Error query parameter can only appear once' })
+    throw createError({ statusCode: 400, message: 'Error query parameter can only appear once' })
   }
 
   // Parse a body if the request method is supported, use `undefined` otherwise
@@ -235,15 +235,15 @@ function parseActionAndProvider({ context }: H3Event): { action: AuthAction, pro
   const params: string[] | undefined = context.params?._?.split('/')
 
   if (!params || ![1, 2].includes(params.length)) {
-    throw createError({ statusCode: 400, statusMessage: `Invalid path used for auth-endpoint. Supply either one path parameter (e.g., \`/api/auth/session\`) or two (e.g., \`/api/auth/signin/github\` after the base path (in previous examples base path was: \`/api/auth/\`. Received \`${params}\`` })
+    throw createError({ statusCode: 400, message: `Invalid path used for auth-endpoint. Supply either one path parameter (e.g., \`/api/auth/session\`) or two (e.g., \`/api/auth/signin/github\` after the base path (in previous examples base path was: \`/api/auth/\`. Received \`${params}\`` })
   }
 
   const [unvalidatedAction, providerId] = params
 
   // 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, message: `Called endpoint with unsupported action ${unvalidatedAction}. Only the following actions are supported: ${SUPPORTED_ACTIONS.join(', ')}` })
   }
 
   return { action, providerId }