Merge branch 'dev' into clients-user

server/routers/client/createClient.ts

@@ -25,23 +25,19 @@ import { listExitNodes } from "#dynamic/lib/exitNodes";
 import { generateId } from "@server/auth/sessions/app";
 import { OpenAPITags, registry } from "@server/openApi";
 
-const paramsSchema = z
-    .object({
+const createClientParamsSchema = z.strictObject({
         orgId: z.string()
-    })
-    .strict();
+    });
 
-const bodySchema = z
-    .object({
+const createClientSchema = z.strictObject({
         name: z.string().min(1).max(255),
         olmId: z.string(),
         secret: z.string(),
         subnet: z.string(),
         type: z.enum(["olm"])
-    })
-    .strict();
+    });
 
-export type CreateClientBody = z.infer<typeof bodySchema>;
+export type CreateClientBody = z.infer<typeof createClientSchema>;
 
 export type CreateClientResponse = Client;
 
@@ -51,11 +47,11 @@ registry.registerPath({
     description: "Create a new client for an organization.",
     tags: [OpenAPITags.Client, OpenAPITags.Org],
     request: {
-        params: paramsSchema,
+        params: createClientParamsSchema,
         body: {
             content: {
                 "application/json": {
-                    schema: bodySchema
+                    schema: createClientSchema
                 }
             }
         }
@@ -69,7 +65,7 @@ export async function createClient(
     next: NextFunction
 ): Promise<any> {
     try {
-        const parsedBody = bodySchema.safeParse(req.body);
+        const parsedBody = createClientSchema.safeParse(req.body);
         if (!parsedBody.success) {
             return next(
                 createHttpError(
@@ -81,7 +77,7 @@ export async function createClient(
 
         const { name, type, olmId, secret, subnet } = parsedBody.data;
 
-        const parsedParams = paramsSchema.safeParse(req.params);
+        const parsedParams = createClientParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
             return next(
                 createHttpError(

server/routers/client/deleteClient.ts

@@ -10,11 +10,9 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 
-const deleteClientSchema = z
-    .object({
-        clientId: z.string().transform(Number).pipe(z.number().int().positive())
-    })
-    .strict();
+const deleteClientSchema = z.strictObject({
+        clientId: z.string().transform(Number).pipe(z.int().positive())
+    });
 
 registry.registerPath({
     method: "delete",

server/routers/client/getClient.ts

@@ -11,11 +11,9 @@ import stoi from "@server/lib/stoi";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 
-const getClientSchema = z
-    .object({
-        clientId: z.string().transform(stoi).pipe(z.number().int().positive())
-    })
-    .strict();
+const getClientSchema = z.strictObject({
+        clientId: z.string().transform(stoi).pipe(z.int().positive())
+    });
 
 async function query(clientId: number) {
     // Get the client

server/routers/client/listClients.ts

@@ -78,11 +78,9 @@ async function getLatestOlmVersion(): Promise<string | null> {
 }
 
 
-const listClientsParamsSchema = z
-    .object({
+const listClientsParamsSchema = z.strictObject({
         orgId: z.string()
-    })
-    .strict();
+    });
 
 const listClientsSchema = z.object({
     limit: z
@@ -90,13 +88,13 @@ const listClientsSchema = z.object({
         .optional()
         .default("1000")
         .transform(Number)
-        .pipe(z.number().int().positive()),
+        .pipe(z.int().positive()),
     offset: z
         .string()
         .optional()
         .default("0")
         .transform(Number)
-        .pipe(z.number().int().nonnegative()),
+        .pipe(z.int().nonnegative()),
     filter: z
         .enum(["user", "machine"])
         .optional()

server/routers/client/pickClientDefaults.ts

@@ -15,11 +15,9 @@ export type PickClientDefaultsResponse = {
     subnet: string;
 };
 
-const pickClientDefaultsSchema = z
-    .object({
+const pickClientDefaultsSchema = z.strictObject({
         orgId: z.string()
-    })
-    .strict();
+    });
 
 registry.registerPath({
     method: "get",

server/routers/client/updateClient.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z } from "zod";
-import { Client, db, exitNodes, sites } from "@server/db";
+import { Client, db, exitNodes, olms, sites } from "@server/db";
 import { clients, clientSites } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
@@ -10,17 +10,13 @@ import { eq, and } from "drizzle-orm";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 
-const updateClientParamsSchema = z
-    .object({
-        clientId: z.string().transform(Number).pipe(z.number().int().positive())
-    })
-    .strict();
+const updateClientParamsSchema = z.strictObject({
+    clientId: z.string().transform(Number).pipe(z.int().positive())
+});
 
-const updateClientSchema = z
-    .object({
-        name: z.string().min(1).max(255).optional()
-    })
-    .strict();
+const updateClientSchema = z.strictObject({
+    name: z.string().min(1).max(255).optional()
+});
 
 export type UpdateClientBody = z.infer<typeof updateClientSchema>;