Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const status = computed(() => props.error.statusCode || 500)
const statusText = computed(() => {
if (props.error.statusMessage) return props.error.statusMessage
switch (status.value) {
case 401:
return 'Unauthorized'
case 404:
return 'Page not found'
case 500:
Expand Down
1 change: 1 addition & 0 deletions server/api/auth/atproto.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ export default defineEventHandler(async event => {

return handleApiError(error, {
statusCode: 401,
statusMessage: 'Unauthorized',
message: `${message}. Please login and try again.`,
})
}
Expand Down
9 changes: 8 additions & 1 deletion server/utils/error-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@ import type { ErrorOptions } from '#shared/types/error'
* Handles H3 errors, Valibot, and fallbacks in that order
*/
export function handleApiError(error: unknown, fallback: ErrorOptions): never {
// If already a known Nuxt/H3 Error, re-throw
// If already a known Nuxt/H3 Error, apply fallback only when the error has a generic 500 status
if (isError(error)) {
if (error.statusCode === 500 && fallback.statusCode) {
error.statusCode = fallback.statusCode
}
if (error.statusMessage === 'Server Error' && fallback.statusMessage) {
error.statusMessage = fallback.statusMessage
}
throw error
}

Expand All @@ -24,6 +30,7 @@ export function handleApiError(error: unknown, fallback: ErrorOptions): never {
// Generic fallback
throw createError({
statusCode: fallback.statusCode ?? 502,
statusMessage: fallback.statusMessage,
message: fallback.message,
})
}
1 change: 1 addition & 0 deletions shared/types/error.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export interface ErrorOptions {
message: string
statusCode?: number
statusMessage?: string
}
Loading