pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-26 06:46:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove lucia

Browse Source
This commit is contained in:
Milo Schwartz
2024-10-13 17:13:47 -04:00
parent f14fb90ab6
commit 99d6cababa
39 changed files with 234 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/routers/user/addUserAction.ts
View File

@@ -36,7 +36,7 @@ export async function addUserAction(req: Request, res: Response, next: NextFunct
}
// Check if the user exists
const user = await db.select().from(users).where(eq(users.id, userId)).limit(1);
const user = await db.select().from(users).where(eq(users.userId, userId)).limit(1);
if (user.length === 0) {
return next(createHttpError(HttpCode.NOT_FOUND, `User with ID ${userId} not found`));
}
@@ -58,4 +58,4 @@ export async function addUserAction(req: Request, res: Response, next: NextFunct
logger.error(error);
return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
}
}
}

4
server/routers/user/addUserOrg.ts
View File

@@ -51,7 +51,7 @@ export async function addUserOrg(req: Request, res: Response, next: NextFunction
}
// Check if the user exists
const user = await db.select().from(users).where(eq(users.id, userId)).limit(1);
const user = await db.select().from(users).where(eq(users.userId, userId)).limit(1);
if (user.length === 0) {
return next(createHttpError(HttpCode.NOT_FOUND, `User with ID ${userId} not found`));
}
@@ -84,4 +84,4 @@ export async function addUserOrg(req: Request, res: Response, next: NextFunction
logger.error(error);
return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
}
}
}

4
server/routers/user/getUser.ts
View File

@@ -21,7 +21,7 @@ export async function getUser(
next: NextFunction,
): Promise<any> {
try {
const userId = req.user?.id;
const userId = req.user?.userId;
if (!userId) {
return next(
@@ -32,7 +32,7 @@ export async function getUser(
const user = await db
.select()
.from(users)
.where(eq(users.id, userId))
.where(eq(users.userId, userId))
.limit(1);
if (user.length === 0) {

6
server/routers/user/listUsers.ts
View File

@@ -52,7 +52,7 @@ export async function listUsers(req: Request, res: Response, next: NextFunction)
// Query to join users, userOrgs, and roles tables
const usersWithRoles = await db
.select({
id: users.id,
id: users.userId,
email: users.email,
emailVerified: users.emailVerified,
dateCreated: users.dateCreated,
@@ -61,7 +61,7 @@ export async function listUsers(req: Request, res: Response, next: NextFunction)
roleName: roles.name,
})
.from(users)
.leftJoin(userOrgs, sql`${users.id} = ${userOrgs.userId}`)
.leftJoin(userOrgs, sql`${users.userId} = ${userOrgs.userId}`)
.leftJoin(roles, sql`${userOrgs.roleId} = ${roles.roleId}`)
.where(sql`${userOrgs.orgId} = ${orgId}`)
.limit(limit)
@@ -90,4 +90,4 @@ export async function listUsers(req: Request, res: Response, next: NextFunction)
logger.error(error);
return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
}
}
}