Merge branch 'main' of https://github.com/fosrl/pangolin

server/db/schema.ts

@@ -130,8 +130,10 @@ export const userOrgs = sqliteTable("userOrgs", {
         .notNull()
         .references(() => users.userId),
     orgId: text("orgId")
-        .notNull()
-        .references(() => orgs.orgId),
+        .references(() => orgs.orgId, {
+            onDelete: "cascade"
+        })
+        .notNull(),
     roleId: integer("roleId")
         .notNull()
         .references(() => roles.roleId),

server/middlewares/verifyUserIsOrgOwner.ts

@@ -27,7 +27,6 @@ export async function verifyUserIsOrgOwner(
             )
         );
     }
-
     try {
         if (!req.userOrg) {
             const res = await db
@@ -56,6 +55,8 @@ export async function verifyUserIsOrgOwner(
                 )
             );
         }
+        
+        return next();
     } catch (e) {
         return next(
             createHttpError(

server/routers/org/deleteOrg.ts

@@ -24,6 +24,10 @@ const deleteOrgSchema = z
     })
     .strict();
 
+export type DeleteOrgResponse = {
+
+}
+
 export async function deleteOrg(
     req: Request,
     res: Response,
@@ -41,7 +45,6 @@ export async function deleteOrg(
         }
 
         const { orgId } = parsedParams.data;
-
         // Check if the user has permission to list sites
         const hasPermission = await checkUserActionPermission(
             ActionsEnum.deleteOrg,
@@ -55,7 +58,6 @@ export async function deleteOrg(
                 )
             );
         }
-
         const [org] = await db
             .select()
             .from(orgs)
@@ -70,7 +72,6 @@ export async function deleteOrg(
                 )
             );
         }
-
         // we need to handle deleting each site
         const orgSites = await db
             .select()
@@ -97,20 +98,20 @@ export async function deleteOrg(
                             sendToClient(deletedNewt.newtId, payload);
 
                             // delete all of the sessions for the newt
-                            db.delete(newtSessions)
+                            await db.delete(newtSessions)
                                 .where(
                                     eq(newtSessions.newtId, deletedNewt.newtId)
-                                )
-                                .run();
+                                );
                         }
                     }
                 }
 
-                db.delete(sites).where(eq(sites.siteId, site.siteId)).run();
+                logger.info(`Deleting site ${site.siteId}`);
+                await db.delete(sites).where(eq(sites.siteId, site.siteId))
             }
         }
 
-        await db.delete(orgs).where(eq(orgs.orgId, orgId)).returning();
+        await db.delete(orgs).where(eq(orgs.orgId, orgId));
 
         return response(res, {
             data: null,

server/routers/site/getSite.ts

@@ -28,6 +28,7 @@ export type GetSiteResponse = {
     name: string;
     subdomain: string;
     subnet: string;
+    type: string;
 };
 
 export async function getSite(
@@ -81,7 +82,8 @@ export async function getSite(
                 siteId: site[0].siteId,
                 niceId: site[0].niceId,
                 name: site[0].name,
-                subnet: site[0].subnet
+                subnet: site[0].subnet,
+                type: site[0].type
             },
             success: true,
             error: false,