Edit client page done

server/auth/actions.ts

@@ -66,6 +66,7 @@ export enum ActionsEnum {
     deleteClient = "deleteClient",
     updateClient = "updateClient",
     listClients = "listClients",
+    getClient = "getClient",
     listOrgDomains = "listOrgDomains",
 }
 

server/routers/client/getClient.ts

@@ -0,0 +1,74 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db } from "@server/db";
+import { clients } from "@server/db/schema";
+import { eq, and } from "drizzle-orm";
+import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import logger from "@server/logger";
+import stoi from "@server/lib/stoi";
+import { fromError } from "zod-validation-error";
+
+const getClientSchema = z
+    .object({
+        clientId: z
+            .string()
+            .transform(stoi)
+            .pipe(z.number().int().positive()),
+        orgId: z.string().optional()
+    })
+    .strict();
+
+async function query(clientId: number) {
+        const [res] = await db
+            .select()
+            .from(clients)
+            .where(eq(clients.clientId, clientId))
+            .limit(1);
+        return res;
+}
+
+export type GetClientResponse = NonNullable<Awaited<ReturnType<typeof query>>>;
+
+export async function getClient(
+    req: Request,
+    res: Response,
+    next: NextFunction
+): Promise<any> {
+    try {
+        const parsedParams = getClientSchema.safeParse(req.params);
+        if (!parsedParams.success) {
+            logger.error(
+                `Error parsing params: ${fromError(parsedParams.error).toString()}`
+            );
+            return next(
+                createHttpError(
+                    HttpCode.BAD_REQUEST,
+                    fromError(parsedParams.error).toString()
+                )
+            );
+        }
+
+        const { clientId } = parsedParams.data;
+
+        const client = await query(clientId);
+
+        if (!client) {
+            return next(createHttpError(HttpCode.NOT_FOUND, "Client not found"));
+        }
+
+        return response<GetClientResponse>(res, {
+            data: client,
+            success: true,
+            error: false,
+            message: "Client retrieved successfully",
+            status: HttpCode.OK
+        });
+    } catch (error) {
+        logger.error(error);
+        return next(
+            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
+        );
+    }
+}

server/routers/client/index.ts

@@ -2,4 +2,5 @@ export * from "./pickClientDefaults";
 export * from "./createClient";
 export * from "./deleteClient";
 export * from "./listClients";
-export * from "./updateClient";
+export * from "./updateClient";
+export * from "./getClient";

server/routers/external.ts

@@ -120,6 +120,13 @@ authenticated.get(
     client.listClients
 );
 
+authenticated.get(
+    "/org/:orgId/client/:clientId",
+    verifyOrgAccess,
+    verifyUserHasAction(ActionsEnum.getClient),
+    client.getClient
+);
+
 authenticated.put(
     "/org/:orgId/client",
     verifyOrgAccess,

server/routers/site/listSites.ts

@@ -42,7 +42,8 @@ function querySites(orgId: string, accessibleSiteIds: number[]) {
             megabytesOut: sites.megabytesOut,
             orgName: orgs.name,
             type: sites.type,
-            online: sites.online
+            online: sites.online,
+            address: sites.address,
         })
         .from(sites)
         .leftJoin(orgs, eq(sites.orgId, orgs.orgId))