pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-03 09:16: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

12
server/routers/site/createSite.ts
View File

@@ -75,7 +75,7 @@ export async function createSite(req: Request, res: Response, next: NextFunction
.from(roles)
.where(and(eq(roles.isSuperuserRole, true), eq(roles.orgId, orgId)))
.limit(1);
if (superuserRole.length === 0) {
return next(
createHttpError(
@@ -84,20 +84,20 @@ export async function createSite(req: Request, res: Response, next: NextFunction
)
);
}
await db.insert(roleSites).values({
await db.insert(roleSites).values({
roleId: superuserRole[0].roleId,
siteId: newSite[0].siteId,
});
if (req.userOrgRoleId != superuserRole[0].roleId) {
// make sure the user can access the site
db.insert(userSites).values({
userId: req.user?.id!,
db.insert(userSites).values({
userId: req.user?.userId!,
siteId: newSite[0].siteId,
});
}
return response(res, {
data: newSite[0],
success: true,

4
server/routers/site/listSites.ts
View File

@@ -49,7 +49,7 @@ export async function listSites(req: Request, res: Response, next: NextFunction)
.fullJoin(roleSites, eq(userSites.siteId, roleSites.siteId))
.where(
or(
eq(userSites.userId, req.user!.id),
eq(userSites.userId, req.user!.userId),
eq(roleSites.roleId, req.userOrgRoleId!)
)
);
@@ -104,4 +104,4 @@ export async function listSites(req: Request, res: Response, next: NextFunction)
logger.error(error);
return next(createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred..."));
}
}
}