Merge dev into fix/log-analytics-adjustments

server/private/routers/orgIdp/createOrgOidcIdp.ts

@@ -32,19 +32,19 @@ import { CreateOrgIdpResponse } from "@server/routers/orgIdp/types";
 const paramsSchema = z.strictObject({ orgId: z.string().nonempty() });
 
 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(),
-        variant: z.enum(["oidc", "google", "azure"]).optional().default("oidc"),
-        roleMapping: z.string().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(),
+    variant: z.enum(["oidc", "google", "azure"]).optional().default("oidc"),
+    roleMapping: z.string().optional()
+});
 
 // registry.registerPath({
 //     method: "put",
@@ -158,7 +158,10 @@ export async function createOrgOidcIdp(
             });
         });
 
-        const redirectUrl = await generateOidcRedirectUrl(idpId as number, orgId);
+        const redirectUrl = await generateOidcRedirectUrl(
+            idpId as number,
+            orgId
+        );
 
         return response<CreateOrgIdpResponse>(res, {
             data: {

server/private/routers/orgIdp/deleteOrgIdp.ts

@@ -66,12 +66,7 @@ export async function deleteOrgIdp(
             .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
@@ -82,14 +77,10 @@ export async function deleteOrgIdp(
                 .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/private/routers/orgIdp/getOrgIdp.ts

@@ -93,7 +93,10 @@ export async function getOrgIdp(
             idpRes.idpOidcConfig!.clientId = decrypt(clientId, key);
         }
 
-        const redirectUrl = await generateOidcRedirectUrl(idpRes.idp.idpId, orgId);
+        const redirectUrl = await generateOidcRedirectUrl(
+            idpRes.idp.idpId,
+            orgId
+        );
 
         return response<GetOrgIdpResponse>(res, {
             data: {

server/private/routers/orgIdp/index.ts

@@ -15,4 +15,4 @@ export * from "./createOrgOidcIdp";
 export * from "./getOrgIdp";
 export * from "./listOrgIdps";
 export * from "./updateOrgOidcIdp";
-export * from "./deleteOrgIdp";
+export * from "./deleteOrgIdp";

server/private/routers/orgIdp/listOrgIdps.ts

@@ -25,23 +25,23 @@ import { OpenAPITags, registry } from "@server/openApi";
 import { ListOrgIdpsResponse } from "@server/routers/orgIdp/types";
 
 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())
+});
 
 const paramsSchema = z.strictObject({
-        orgId: z.string().nonempty()
-    });
+    orgId: z.string().nonempty()
+});
 
 async function query(orgId: string, limit: number, offset: number) {
     const res = await db

server/private/routers/orgIdp/updateOrgOidcIdp.ts

@@ -36,18 +36,18 @@ 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(),
-        roleMapping: 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(),
+    roleMapping: z.string().optional()
+});
 
 export type UpdateOrgIdpResponse = {
     idpId: number;