Mayank.Mishra/MinglarBackendNestJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mayank' of http://git.wdipl.com/Mayank.Mishra/MinglarBackendNestJS into paritosh

Browse Source
This commit is contained in:
paritosh18
2025-11-14 16:58:57 +05:30
parent f23ff39f2e b2298e0fb1
commit d2045ae0b8
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/middlewares/jwt/authForMinglarAdmin.ts
View File

@@ -9,7 +9,8 @@ import { ROLE } from '@/common/utils/constants/common.constant';
const prisma = new PrismaClient();
interface DecodedToken {
id: number;
id?: number;
sub?: string | number;
role?: string;
iat: number;
exp: number;
@@ -36,15 +37,17 @@ export async function verifyMinglarAdminToken(token: string): Promise<{ id: numb
}
try {
const decoded = jwt.verify(token, config.jwt.secret) as DecodedToken;
const decoded = jwt.verify(token, config.jwt.secret) as unknown as DecodedToken;
if (!decoded?.id) {
const userId = decoded.id ?? (decoded.sub ? Number(decoded.sub) : null);
if (!userId) {
throw new ApiError(httpStatus.UNAUTHORIZED, 'Invalid token payload');
}
// ✅ Fetch user from Prisma (Host user only)
const user = await prisma.user.findUnique({
where: { id: decoded.id },
where: { id: userId },
include: { role: true },
});

11
src/common/middlewares/jwt/authForUser.ts
View File

@@ -9,7 +9,8 @@ import { ROLE } from '@/common/utils/constants/common.constant';
const prisma = new PrismaClient();
interface DecodedToken {
id: number;
id?: number;
sub?: string | number;
role?: string;
iat: number;
exp: number;
@@ -36,15 +37,17 @@ export async function verifyUserToken(token: string): Promise<{ id: number; role
}
try {
const decoded = jwt.verify(token, config.jwt.secret) as DecodedToken;
const decoded = jwt.verify(token, config.jwt.secret) as unknown as DecodedToken;
if (!decoded?.id) {
const userId = decoded.id ?? (decoded.sub ? Number(decoded.sub) : null);
if (!userId) {
throw new ApiError(httpStatus.UNAUTHORIZED, 'Invalid token payload');
}
// ✅ Fetch user from Prisma (Host user only)
const user = await prisma.user.findUnique({
where: { id: decoded.id },
where: { id: userId },
include: { role: true },
});