Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-13 08:13:56 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fixes from code review

Browse Source
This commit is contained in:
Ephraim Atta-Duncan
2023-06-09 03:55:30 +00:00
parent 13a840ff78
commit e3bc41934c
5 changed files with 86 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/lib/server/getUserFromToken.ts
View File

@ -1,23 +1,17 @@
import { NextApiRequest, NextApiResponse } from "next";
import { GetServerSidePropsContext, NextApiRequest, NextApiResponse } from "next";
import { NextRequest } from "next/server";
import prisma from "@documenso/prisma";
import { User as PrismaUser } from "@prisma/client";
import { getToken } from "next-auth/jwt";
import { signOut } from "next-auth/react";
export async function getUserFromToken(
req: NextApiRequest,
res: NextApiResponse
req: GetServerSidePropsContext["req"] | NextRequest | NextApiRequest,
res?: NextApiResponse // TODO: Remove this optional parameter
): Promise<PrismaUser | null> {
const token = await getToken({ req });
const tokenEmail = token?.email?.toString();
if (!token) {
if (res.status) res.status(401).send("No session token found for request.");
return null;
}
if (!tokenEmail) {
res.status(400).send("No email found in session token.");
if (!token || !tokenEmail) {
return null;
}
@ -26,7 +20,6 @@ export async function getUserFromToken(
});
if (!user) {
if (res && res.status) res.status(401).end();
return null;
}