Separate types & fix #private import

server/private/routers/orgIdp/createOrgOidcIdp.ts

@@ -27,6 +27,7 @@ import config from "@server/lib/config";
 import { build } from "@server/build";
 import { getOrgTierData } from "#private/lib/billing";
 import { TierId } from "@server/lib/billing/tiers";
+import { CreateOrgIdpResponse } from "@server/routers/orgIdp/types";
 
 const paramsSchema = z.object({ orgId: z.string().nonempty() }).strict();
 
@@ -47,11 +48,6 @@ const bodySchema = z
     })
     .strict();
 
-export type CreateOrgIdpResponse = {
-    idpId: number;
-    redirectUrl: string;
-};
-
 // registry.registerPath({
 //     method: "put",
 //     path: "/idp/oidc",

server/private/routers/orgIdp/getOrgIdp.ts

@@ -25,6 +25,7 @@ import { OpenAPITags, registry } from "@server/openApi";
 import config from "@server/lib/config";
 import { decrypt } from "@server/lib/crypto";
 import { generateOidcRedirectUrl } from "@server/lib/idp/generateRedirectUrl";
+import { GetOrgIdpResponse } from "@server/routers/orgIdp/types";
 
 const paramsSchema = z
     .object({
@@ -47,10 +48,6 @@ async function query(idpId: number, orgId: string) {
     return res;
 }
 
-export type GetOrgIdpResponse = NonNullable<
-    Awaited<ReturnType<typeof query>>
-> & { redirectUrl: string };
-
 // registry.registerPath({
 //     method: "get",
 //     path: "/idp/{idpId}",

server/private/routers/orgIdp/listOrgIdps.ts

@@ -22,6 +22,7 @@ import { eq, sql } from "drizzle-orm";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
+import { ListOrgIdpsResponse } from "@server/routers/orgIdp/types";
 
 const querySchema = z
     .object({
@@ -65,15 +66,6 @@ async function query(orgId: string, limit: number, offset: number) {
     return res;
 }
 
-export type ListOrgIdpsResponse = {
-    idps: Awaited<ReturnType<typeof query>>;
-    pagination: {
-        total: number;
-        limit: number;
-        offset: number;
-    };
-};
-
 // registry.registerPath({
 //     method: "get",
 //     path: "/idp",