Merge dev into fix/log-analytics-adjustments

server/routers/idp/createIdpOrgPolicy.ts

@@ -12,14 +12,14 @@ import { eq, and } from "drizzle-orm";
 import { idp, idpOrg } from "@server/db";
 
 const paramsSchema = z.strictObject({
-        idpId: z.coerce.number<number>(),
-        orgId: z.string()
-    });
+    idpId: z.coerce.number<number>(),
+    orgId: z.string()
+});
 
 const bodySchema = z.strictObject({
-        roleMapping: z.string().optional(),
-        orgMapping: z.string().optional()
-    });
+    roleMapping: z.string().optional(),
+    orgMapping: z.string().optional()
+});
 
 export type CreateIdpOrgPolicyResponse = {};
 

server/routers/idp/createOidcIdp.ts

@@ -15,17 +15,17 @@ import config from "@server/lib/config";
 const paramsSchema = z.strictObject({});
 
 const bodySchema = z.strictObject({
-        name: z.string().nonempty(),
-        clientId: z.string().nonempty(),
-        clientSecret: z.string().nonempty(),
-        authUrl: z.url(),
-        tokenUrl: z.url(),
-        identifierPath: z.string().nonempty(),
-        emailPath: z.string().optional(),
-        namePath: z.string().optional(),
-        scopes: z.string().nonempty(),
-        autoProvision: z.boolean().optional()
-    });
+    name: z.string().nonempty(),
+    clientId: z.string().nonempty(),
+    clientSecret: z.string().nonempty(),
+    authUrl: z.url(),
+    tokenUrl: z.url(),
+    identifierPath: z.string().nonempty(),
+    emailPath: z.string().optional(),
+    namePath: z.string().optional(),
+    scopes: z.string().nonempty(),
+    autoProvision: z.boolean().optional()
+});
 
 export type CreateIdpResponse = {
     idpId: number;

server/routers/idp/deleteIdp.ts

@@ -53,12 +53,7 @@ export async function deleteIdp(
             .where(eq(idp.idpId, idpId));
 
         if (!existingIdp) {
-            return next(
-                createHttpError(
-                    HttpCode.NOT_FOUND,
-                    "IdP not found"
-                )
-            );
+            return next(createHttpError(HttpCode.NOT_FOUND, "IdP not found"));
         }
 
         // Delete the IDP and its related records in a transaction
@@ -69,14 +64,10 @@ export async function deleteIdp(
                 .where(eq(idpOidcConfig.idpId, idpId));
 
             // Delete IDP-org mappings
-            await trx
-                .delete(idpOrg)
-                .where(eq(idpOrg.idpId, idpId));
+            await trx.delete(idpOrg).where(eq(idpOrg.idpId, idpId));
 
             // Delete the IDP itself
-            await trx
-                .delete(idp)
-                .where(eq(idp.idpId, idpId));
+            await trx.delete(idp).where(eq(idp.idpId, idpId));
         });
 
         return response<null>(res, {

server/routers/idp/deleteIdpOrgPolicy.ts

@@ -11,9 +11,9 @@ import { eq, and } from "drizzle-orm";
 import { OpenAPITags, registry } from "@server/openApi";
 
 const paramsSchema = z.strictObject({
-        idpId: z.coerce.number<number>(),
-        orgId: z.string()
-    });
+    idpId: z.coerce.number<number>(),
+    orgId: z.string()
+});
 
 registry.registerPath({
     method: "delete",

server/routers/idp/generateOidcUrl.ts

@@ -24,8 +24,8 @@ const paramsSchema = z
     .strict();
 
 const bodySchema = z.strictObject({
-        redirectUrl: z.string()
-    });
+    redirectUrl: z.string()
+});
 
 const querySchema = z.object({
     orgId: z.string().optional() // check what actuall calls it

server/routers/idp/getIdp.ts

@@ -71,14 +71,8 @@ export async function getIdp(
             const clientSecret = idpRes.idpOidcConfig!.clientSecret;
             const clientId = idpRes.idpOidcConfig!.clientId;
 
-            idpRes.idpOidcConfig!.clientSecret = decrypt(
-                clientSecret,
-                key
-            );
-            idpRes.idpOidcConfig!.clientId = decrypt(
-                clientId,
-                key
-            );
+            idpRes.idpOidcConfig!.clientSecret = decrypt(clientSecret, key);
+            idpRes.idpOidcConfig!.clientId = decrypt(clientId, key);
         }
 
         return response<GetIdpResponse>(res, {

server/routers/idp/index.ts

@@ -8,4 +8,4 @@ export * from "./getIdp";
 export * from "./createIdpOrgPolicy";
 export * from "./deleteIdpOrgPolicy";
 export * from "./listIdpOrgPolicies";
-export * from "./updateIdpOrgPolicy";
+export * from "./updateIdpOrgPolicy";

server/routers/idp/listIdpOrgPolicies.ts

@@ -15,19 +15,19 @@ const paramsSchema = z.object({
 });
 
 const querySchema = z.strictObject({
-        limit: z
-            .string()
-            .optional()
-            .default("1000")
-            .transform(Number)
-            .pipe(z.int().nonnegative()),
-        offset: z
-            .string()
-            .optional()
-            .default("0")
-            .transform(Number)
-            .pipe(z.int().nonnegative())
-    });
+    limit: z
+        .string()
+        .optional()
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+    offset: z
+        .string()
+        .optional()
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
+});
 
 async function query(idpId: number, limit: number, offset: number) {
     const res = await db

server/routers/idp/listIdps.ts

@@ -11,19 +11,19 @@ import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 
 const querySchema = z.strictObject({
-        limit: z
-            .string()
-            .optional()
-            .default("1000")
-            .transform(Number)
-            .pipe(z.int().nonnegative()),
-        offset: z
-            .string()
-            .optional()
-            .default("0")
-            .transform(Number)
-            .pipe(z.int().nonnegative())
-    });
+    limit: z
+        .string()
+        .optional()
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+    offset: z
+        .string()
+        .optional()
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
+});
 
 async function query(limit: number, offset: number) {
     const res = await db

server/routers/idp/updateIdpOrgPolicy.ts

@@ -11,14 +11,14 @@ import { eq, and } from "drizzle-orm";
 import { idp, idpOrg } from "@server/db";
 
 const paramsSchema = z.strictObject({
-        idpId: z.coerce.number<number>(),
-        orgId: z.string()
-    });
+    idpId: z.coerce.number<number>(),
+    orgId: z.string()
+});
 
 const bodySchema = z.strictObject({
-        roleMapping: z.string().optional(),
-        orgMapping: z.string().optional()
-    });
+    roleMapping: z.string().optional(),
+    orgMapping: z.string().optional()
+});
 
 export type UpdateIdpOrgPolicyResponse = {};
 

server/routers/idp/updateOidcIdp.ts

@@ -19,19 +19,19 @@ const paramsSchema = z
     .strict();
 
 const bodySchema = z.strictObject({
-        name: z.string().optional(),
-        clientId: z.string().optional(),
-        clientSecret: z.string().optional(),
-        authUrl: z.string().optional(),
-        tokenUrl: z.string().optional(),
-        identifierPath: z.string().optional(),
-        emailPath: z.string().optional(),
-        namePath: z.string().optional(),
-        scopes: z.string().optional(),
-        autoProvision: z.boolean().optional(),
-        defaultRoleMapping: z.string().optional(),
-        defaultOrgMapping: z.string().optional()
-    });
+    name: z.string().optional(),
+    clientId: z.string().optional(),
+    clientSecret: z.string().optional(),
+    authUrl: z.string().optional(),
+    tokenUrl: z.string().optional(),
+    identifierPath: z.string().optional(),
+    emailPath: z.string().optional(),
+    namePath: z.string().optional(),
+    scopes: z.string().optional(),
+    autoProvision: z.boolean().optional(),
+    defaultRoleMapping: z.string().optional(),
+    defaultOrgMapping: z.string().optional()
+});
 
 export type UpdateIdpResponse = {
     idpId: number;