pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-24 13:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename super user to admin and middleware refactoring

Browse Source
This commit is contained in:
Milo Schwartz
2024-11-05 22:38:57 -05:00
parent 7b755a273c
commit 03051878ef
26 changed files with 790 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,25 +107,24 @@ export async function createSite(
subnet,
})
.returning();
// find the Super User roleId and also add the resource to the Super User role
const superUserRole = await db
const adminRole = await db
.select()
.from(roles)
.where(and(eq(roles.isSuperUserRole, true), eq(roles.orgId, orgId)))
.where(and(eq(roles.isAdmin, true), eq(roles.orgId, orgId)))
.limit(1);
if (superUserRole.length === 0) {
if (adminRole.length === 0) {
return next(
createHttpError(HttpCode.NOT_FOUND, `Super User role not found`)
createHttpError(HttpCode.NOT_FOUND, `Admin role not found`)
);
}
await db.insert(roleSites).values({
roleId: superUserRole[0].roleId,
roleId: adminRole[0].roleId,
siteId: newSite.siteId,
});
if (req.userOrgRoleId != superUserRole[0].roleId) {
if (req.userOrgRoleId != adminRole[0].roleId) {
// make sure the user can access the site
db.insert(userSites).values({
userId: req.user?.userId!,

2
server/routers/site/listSiteRoles.ts
View File

@@ -51,7 +51,7 @@ export async function listSiteRoles(
roleId: roles.roleId,
name: roles.name,
description: roles.description,
isSuperUserRole: roles.isSuperUserRole,
isAdmin: roles.isAdmin,
})
.from(roleSites)
.innerJoin(roles, eq(roleSites.roleId, roles.roleId))