From fcf8adb059404391816f06f741db7336d27c4d52 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Wed, 7 Aug 2024 10:13:16 +0200 Subject: [PATCH] correct key for api errors --- src/app.vue | 1 + src/server/api/session.delete.ts | 6 +++--- src/server/api/session.post.ts | 9 ++++----- .../api/wireguard/client/[clientId]/address.put.ts | 2 +- .../api/wireguard/client/[clientId]/disable.post.ts | 2 +- .../api/wireguard/client/[clientId]/enable.post.ts | 2 +- .../api/wireguard/client/[clientId]/name.put.ts | 2 +- src/server/middleware/session.ts | 12 ++++++------ src/server/utils/config.ts | 2 +- src/server/utils/session.ts | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app.vue b/src/app.vue index 79685756..b1f0a1f3 100644 --- a/src/app.vue +++ b/src/app.vue @@ -1434,6 +1434,7 @@ function login(e: Event) { return refresh(); }) .catch((err) => { + // TODO: replace alert with actual ui error message console.log(err); alert(err.message || err.toString()); }) diff --git a/src/server/api/session.delete.ts b/src/server/api/session.delete.ts index 9cac95e5..06cd5ad3 100644 --- a/src/server/api/session.delete.ts +++ b/src/server/api/session.delete.ts @@ -4,9 +4,9 @@ export default defineEventHandler(async (event) => { if (sessionId === undefined) { return createError({ - status: 401, - message: 'Not logged in' - }) + statusCode: 401, + statusMessage: 'Not logged in', + }); } await session.clear(); diff --git a/src/server/api/session.post.ts b/src/server/api/session.post.ts index 6835b473..c166fb79 100644 --- a/src/server/api/session.post.ts +++ b/src/server/api/session.post.ts @@ -6,15 +6,14 @@ export default defineEventHandler(async (event) => { // if no password is required, the API should never be called. // Do not automatically authenticate the user. throw createError({ - status: 401, - message: 'Invalid state', + statusCode: 401, + statusMessage: 'Invalid state', }); } - if (!isPasswordValid(password)) { throw createError({ - status: 401, - message: 'Incorrect Password', + statusCode: 401, + statusMessage: 'Incorrect Password', }); } diff --git a/src/server/api/wireguard/client/[clientId]/address.put.ts b/src/server/api/wireguard/client/[clientId]/address.put.ts index 6633a83f..ac5676dc 100644 --- a/src/server/api/wireguard/client/[clientId]/address.put.ts +++ b/src/server/api/wireguard/client/[clientId]/address.put.ts @@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => { clientId === 'constructor' || clientId === 'prototype' ) { - throw createError({ status: 403 }); + throw createError({ statusCode: 403 }); } const { address } = await readBody(event); await WireGuard.updateClientAddress({ clientId, address }); diff --git a/src/server/api/wireguard/client/[clientId]/disable.post.ts b/src/server/api/wireguard/client/[clientId]/disable.post.ts index 3f22d2c9..50aece6b 100644 --- a/src/server/api/wireguard/client/[clientId]/disable.post.ts +++ b/src/server/api/wireguard/client/[clientId]/disable.post.ts @@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => { clientId === 'constructor' || clientId === 'prototype' ) { - throw createError({ status: 403 }); + throw createError({ statusCode: 403 }); } await WireGuard.disableClient({ clientId }); return { success: true }; diff --git a/src/server/api/wireguard/client/[clientId]/enable.post.ts b/src/server/api/wireguard/client/[clientId]/enable.post.ts index 4f030fe3..4cd510f2 100644 --- a/src/server/api/wireguard/client/[clientId]/enable.post.ts +++ b/src/server/api/wireguard/client/[clientId]/enable.post.ts @@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => { clientId === 'constructor' || clientId === 'prototype' ) { - throw createError({ status: 403 }); + throw createError({ statusCode: 403 }); } await WireGuard.enableClient({ clientId }); return { success: true }; diff --git a/src/server/api/wireguard/client/[clientId]/name.put.ts b/src/server/api/wireguard/client/[clientId]/name.put.ts index 0e5e6e59..4069ac7c 100644 --- a/src/server/api/wireguard/client/[clientId]/name.put.ts +++ b/src/server/api/wireguard/client/[clientId]/name.put.ts @@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => { clientId === 'constructor' || clientId === 'prototype' ) { - throw createError({ status: 403 }); + throw createError({ statusCode: 403 }); } const { name } = await readBody(event); await WireGuard.updateClientName({ clientId, name }); diff --git a/src/server/middleware/session.ts b/src/server/middleware/session.ts index 67728fce..add2fcac 100644 --- a/src/server/middleware/session.ts +++ b/src/server/middleware/session.ts @@ -1,8 +1,8 @@ export default defineEventHandler(async (event) => { if (event.node.req.url === undefined) { throw createError({ - status: 400, - message: 'Invalid request', + statusCode: 400, + statusMessage: 'Invalid request', }); } if ( @@ -27,13 +27,13 @@ export default defineEventHandler(async (event) => { return; } throw createError({ - status: 401, - message: 'Incorrect Password', + statusCode: 401, + statusMessage: 'Incorrect Password', }); } throw createError({ - status: 401, - message: 'Not logged in', + statusCode: 401, + statusMessage: 'Not logged in', }); }); diff --git a/src/server/utils/config.ts b/src/server/utils/config.ts index 104365c1..30c2fea8 100644 --- a/src/server/utils/config.ts +++ b/src/server/utils/config.ts @@ -55,7 +55,7 @@ export const REQUIRES_PASSWORD = !!PASSWORD_HASH; export const SESSION_CONFIG = { password: getRandomHex(256), - name: 'wg-easy' + name: 'wg-easy', } satisfies SessionConfig; export const SERVER_DEBUG = debug('Server'); diff --git a/src/server/utils/session.ts b/src/server/utils/session.ts index 7a293bc7..825379cf 100644 --- a/src/server/utils/session.ts +++ b/src/server/utils/session.ts @@ -1,9 +1,9 @@ import type { H3Event } from 'h3'; export type WGSession = { - authenticated: boolean -} + authenticated: boolean; +}; export function useWGSession(event: H3Event) { return useSession>(event, SESSION_CONFIG); -} \ No newline at end of file +}