Browse Source

correct key for api errors

pull/1250/head
Bernd Storath 10 months ago
parent
commit
fcf8adb059
  1. 1
      src/app.vue
  2. 6
      src/server/api/session.delete.ts
  3. 9
      src/server/api/session.post.ts
  4. 2
      src/server/api/wireguard/client/[clientId]/address.put.ts
  5. 2
      src/server/api/wireguard/client/[clientId]/disable.post.ts
  6. 2
      src/server/api/wireguard/client/[clientId]/enable.post.ts
  7. 2
      src/server/api/wireguard/client/[clientId]/name.put.ts
  8. 12
      src/server/middleware/session.ts
  9. 2
      src/server/utils/config.ts
  10. 6
      src/server/utils/session.ts

1
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());
})

6
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();

9
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',
});
}

2
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 });

2
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 };

2
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 };

2
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 });

12
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',
});
});

2
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');

6
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<Partial<WGSession>>(event, SESSION_CONFIG);
}
}

Loading…
Cancel
Save