mirror of
https://github.com/kmc7468/arkvault.git
synced 2025-12-16 15:08:46 +00:00
Merge branch 'dev' into add-file-thumbnail
This commit is contained in:
@@ -15,12 +15,12 @@ export const POST: RequestHandler = async ({ locals, request }) => {
|
||||
if (!zodRes.success) error(400, "Invalid request body");
|
||||
const { encPubKey, sigPubKey } = zodRes.data;
|
||||
|
||||
const { challenge } = await createSessionUpgradeChallenge(
|
||||
const { id, challenge } = await createSessionUpgradeChallenge(
|
||||
sessionId,
|
||||
userId,
|
||||
locals.ip,
|
||||
encPubKey,
|
||||
sigPubKey,
|
||||
);
|
||||
return json(sessionUpgradeResponse.parse({ challenge } satisfies SessionUpgradeResponse));
|
||||
return json(sessionUpgradeResponse.parse({ id, challenge } satisfies SessionUpgradeResponse));
|
||||
};
|
||||
|
||||
@@ -9,8 +9,8 @@ export const POST: RequestHandler = async ({ locals, request }) => {
|
||||
|
||||
const zodRes = sessionUpgradeVerifyRequest.safeParse(await request.json());
|
||||
if (!zodRes.success) error(400, "Invalid request body");
|
||||
const { answer, answerSig } = zodRes.data;
|
||||
const { id, answerSig } = zodRes.data;
|
||||
|
||||
await verifySessionUpgradeChallenge(sessionId, locals.ip, answer, answerSig);
|
||||
await verifySessionUpgradeChallenge(sessionId, locals.ip, id, answerSig);
|
||||
return text("Session upgraded", { headers: { "Content-Type": "text/plain" } });
|
||||
};
|
||||
|
||||
@@ -15,6 +15,6 @@ export const POST: RequestHandler = async ({ locals, request }) => {
|
||||
if (!zodRes.success) error(400, "Invalid request body");
|
||||
const { encPubKey, sigPubKey } = zodRes.data;
|
||||
|
||||
const { challenge } = await registerUserClient(userId, locals.ip, encPubKey, sigPubKey);
|
||||
return json(clientRegisterResponse.parse({ challenge } satisfies ClientRegisterResponse));
|
||||
const { id, challenge } = await registerUserClient(userId, locals.ip, encPubKey, sigPubKey);
|
||||
return json(clientRegisterResponse.parse({ id, challenge } satisfies ClientRegisterResponse));
|
||||
};
|
||||
|
||||
@@ -9,8 +9,8 @@ export const POST: RequestHandler = async ({ locals, request }) => {
|
||||
|
||||
const zodRes = clientRegisterVerifyRequest.safeParse(await request.json());
|
||||
if (!zodRes.success) error(400, "Invalid request body");
|
||||
const { answer, answerSig } = zodRes.data;
|
||||
const { id, answerSig } = zodRes.data;
|
||||
|
||||
await verifyUserClient(userId, locals.ip, answer, answerSig);
|
||||
await verifyUserClient(userId, locals.ip, id, answerSig);
|
||||
return text("Client verified", { headers: { "Content-Type": "text/plain" } });
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user