Pull up downstream changes

server/routers/client/createClient.ts

@@ -94,7 +94,7 @@ export async function createClient(
 
         const { orgId } = parsedParams.data;
 
-        if (!req.userOrgRoleId) {
+        if (req.user && !req.userOrgRoleId) {
             return next(
                 createHttpError(HttpCode.FORBIDDEN, "User does not have a role")
             );
@@ -208,7 +208,7 @@ export async function createClient(
                 clientId: newClient.clientId
             });
 
-            if (req.userOrgRoleId != adminRole[0].roleId) {
+            if (req.user && req.userOrgRoleId != adminRole[0].roleId) {
                 // make sure the user can access the site
                 trx.insert(userClients).values({
                     userId: req.user?.userId!,

server/routers/client/listClients.ts

@@ -126,7 +126,7 @@ export async function listClients(
         }
         const { orgId } = parsedParams.data;
 
-        if (orgId && orgId !== req.userOrgId) {
+        if (req.user && orgId && orgId !== req.userOrgId) {
             return next(
                 createHttpError(
                     HttpCode.FORBIDDEN,
@@ -135,21 +135,29 @@ export async function listClients(
             );
         }
 
-        const accessibleClients = await db
-            .select({
-                clientId: sql<number>`COALESCE(${userClients.clientId}, ${roleClients.clientId})`
-            })
-            .from(userClients)
-            .fullJoin(
-                roleClients,
-                eq(userClients.clientId, roleClients.clientId)
-            )
-            .where(
-                or(
-                    eq(userClients.userId, req.user!.userId),
-                    eq(roleClients.roleId, req.userOrgRoleId!)
+        let accessibleClients;
+        if (req.user) {
+            accessibleClients = await db
+                .select({
+                    clientId: sql<number>`COALESCE(${userClients.clientId}, ${roleClients.clientId})`
+                })
+                .from(userClients)
+                .fullJoin(
+                    roleClients,
+                    eq(userClients.clientId, roleClients.clientId)
                 )
-            );
+                .where(
+                    or(
+                        eq(userClients.userId, req.user!.userId),
+                        eq(roleClients.roleId, req.userOrgRoleId!)
+                    )
+                );
+        } else {
+            accessibleClients = await db
+                .select({ clientId: clients.clientId })
+                .from(clients)
+                .where(eq(clients.orgId, orgId));
+        }
 
         const accessibleClientIds = accessibleClients.map(
             (client) => client.clientId

server/routers/client/pickClientDefaults.ts

@@ -7,6 +7,7 @@ import { generateId } from "@server/auth/sessions/app";
 import { getNextAvailableClientSubnet } from "@server/lib/ip";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
 
 export type PickClientDefaultsResponse = {
     olmId: string;
@@ -20,6 +21,17 @@ const pickClientDefaultsSchema = z
     })
     .strict();
 
+registry.registerPath({
+    method: "get",
+    path: "/site/{siteId}/pick-client-defaults",
+    description: "Return pre-requisite data for creating a client.",
+    tags: [OpenAPITags.Client, OpenAPITags.Site],
+    request: {
+        params: pickClientDefaultsSchema
+    },
+    responses: {}
+});
+
 export async function pickClientDefaults(
     req: Request,
     res: Response,