Merge branch 'dev' into add-file-thumbnail

This commit is contained in:
static
2025-07-07 00:43:41 +09:00
14 changed files with 1057 additions and 1379 deletions

View File

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

View File

@@ -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" } });
};

View File

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

View File

@@ -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" } });
};