Fix some ui form issues

server/middlewares/index.ts

@@ -28,7 +28,7 @@ export * from "./verifyApiKeyAccess";
 export * from "./verifySiteProvisioningKeyAccess";
 export * from "./verifyDomainAccess";
 export * from "./verifyUserIsOrgOwner";
-export * from "./verifyUserFromSessionOrHeaders";
+export * from "./verifyUserFromResourceSession";
 export * from "./verifySiteResourceAccess";
 export * from "./logActionAudit";
 export * from "./verifyOlmAccess";

server/private/routers/browserGatewayTarget/listBrowserGatewayTargets.ts

@@ -117,17 +117,28 @@ export async function listBrowserGatewayTargets(
             );
         }
 
-        const targets = await db
-            .select()
+        const rows = await db
+            .select({
+                browserGatewayTargetId:
+                    browserGatewayTarget.browserGatewayTargetId,
+                resourceId: browserGatewayTarget.resourceId,
+                siteId: browserGatewayTarget.siteId,
+                authToken: browserGatewayTarget.authToken,
+                type: browserGatewayTarget.type,
+                destination: browserGatewayTarget.destination,
+                destinationPort: browserGatewayTarget.destinationPort,
+                siteName: sites.name
+            })
             .from(browserGatewayTarget)
+            .leftJoin(sites, eq(sites.siteId, browserGatewayTarget.siteId))
             .where(eq(browserGatewayTarget.resourceId, resourceId))
             .limit(limit)
             .offset(offset);
 
         return response<ListBrowserGatewayTargetsResponse>(res, {
             data: {
-                targets: targets,
-                total: targets.length,
+                targets: rows as any,
+                total: rows.length,
                 limit,
                 offset
             },

server/routers/org/listOrgs.ts

@@ -26,6 +26,15 @@ const listOrgsSchema = z.object({
         .pipe(z.int().nonnegative())
 });
 
+const ListOrgsResponseDataSchema = z.object({
+    orgs: z.array(z.object({}).passthrough()),
+    pagination: z.object({
+        total: z.number(),
+        limit: z.number(),
+        offset: z.number()
+    })
+});
+
 registry.registerPath({
     method: "get",
     path: "/orgs",
@@ -51,15 +60,6 @@ export type ListOrgsResponse = {
     pagination: { total: number; limit: number; offset: number };
 };
 
-const ListOrgsResponseDataSchema = z.object({
-    orgs: z.array(z.object({}).passthrough()),
-    pagination: z.object({
-        total: z.number(),
-        limit: z.number(),
-        offset: z.number()
-    })
-});
-
 export async function listOrgs(
     req: Request,
     res: Response,

server/routers/siteResource/createSiteResource.ts

@@ -524,25 +524,21 @@ export async function createSiteResource(
                 });
 
                 if (roleIds.length > 0) {
-                    await trx
-                        .insert(roleSiteResources)
-                        .values(
-                            roleIds.map((roleId) => ({
-                                roleId,
-                                siteResourceId
-                            }))
-                        );
+                    await trx.insert(roleSiteResources).values(
+                        roleIds.map((roleId) => ({
+                            roleId,
+                            siteResourceId
+                        }))
+                    );
                 }
 
                 if (userIds.length > 0) {
-                    await trx
-                        .insert(userSiteResources)
-                        .values(
-                            userIds.map((userId) => ({
-                                userId,
-                                siteResourceId
-                            }))
-                        );
+                    await trx.insert(userSiteResources).values(
+                        userIds.map((userId) => ({
+                            userId,
+                            siteResourceId
+                        }))
+                    );
                 }
 
                 if (clientIds.length > 0) {