From 4eb475938105eddabfd45f06a9b6972efd68ca2e Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Sun, 19 Mar 2023 13:59:32 +0100 Subject: [PATCH 1/3] 401 redirect fix --- packages/lib/server/getUserFromToken.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lib/server/getUserFromToken.ts b/packages/lib/server/getUserFromToken.ts index df96a35c5..ddf582db4 100644 --- a/packages/lib/server/getUserFromToken.ts +++ b/packages/lib/server/getUserFromToken.ts @@ -12,7 +12,7 @@ export async function getUserFromToken( const tokenEmail = token?.email?.toString(); if (!token) { - res.status(401).send("No session token found for request."); + if (res) res.status(401).send("No session token found for request."); return null; } From 156b7a69e7296d26ed5035f4f2418efc77052057 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Sun, 19 Mar 2023 14:05:20 +0100 Subject: [PATCH 2/3] bugfix doc-130 document does not render because there is no user and the request is still valid --- apps/web/pages/api/documents/[id].ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/web/pages/api/documents/[id].ts b/apps/web/pages/api/documents/[id].ts index 517e11757..c9fbd4644 100644 --- a/apps/web/pages/api/documents/[id].ts +++ b/apps/web/pages/api/documents/[id].ts @@ -18,10 +18,10 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) { } let user = null; - + let recipient = null; if (recipientToken) { // Request from signing page without login - const recipient = await prisma.recipient.findFirst({ + recipient = await prisma.recipient.findFirst({ where: { token: recipientToken?.toString(), }, @@ -37,7 +37,14 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) { if (!user) return res.status(401).end(); - const document: PrismaDocument = await getDocument(+documentId, req, res); + let document: PrismaDocument | null = null; + if (recipientToken) { + document = await prisma.document.findFirst({ + where: { id: recipient?.Document?.id }, + }); + } else { + document = await getDocument(+documentId, req, res); + } if (!document) res.status(404).end(`No document with id ${documentId} found.`); @@ -45,7 +52,7 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) { const signaturesCount = await prisma.signature.count({ where: { Field: { - documentId: document.id, + documentId: document?.id, }, }, }); From 36526119b2ed432f5da990d6a096baa561df3d49 Mon Sep 17 00:00:00 2001 From: Timur Ercan Date: Sun, 19 Mar 2023 14:05:32 +0100 Subject: [PATCH 3/3] bugfix 401 redirect --- packages/lib/server/getUserFromToken.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lib/server/getUserFromToken.ts b/packages/lib/server/getUserFromToken.ts index ddf582db4..579d47ada 100644 --- a/packages/lib/server/getUserFromToken.ts +++ b/packages/lib/server/getUserFromToken.ts @@ -12,7 +12,7 @@ export async function getUserFromToken( const tokenEmail = token?.email?.toString(); if (!token) { - if (res) res.status(401).send("No session token found for request."); + if (res.status) res.status(401).send("No session token found for request."); return null; }