Merge branch 'dev' of github.com:fosrl/pangolin into dev

server/db/pg/schema/schema.ts

@@ -1392,6 +1392,16 @@ export type ResourceHeaderAuthExtendedCompatibility = InferSelectModel<
 export type ResourceOtp = InferSelectModel<typeof resourceOtp>;
 export type ResourceAccessToken = InferSelectModel<typeof resourceAccessToken>;
 export type ResourceWhitelist = InferSelectModel<typeof resourceWhitelist>;
+export type ResourcePolicyPincode = InferSelectModel<
+    typeof resourcePolicyPincode
+>;
+export type ResourcePolicyPassword = InferSelectModel<
+    typeof resourcePolicyPassword
+>;
+export type ResourcePolicyHeaderAuth = InferSelectModel<
+    typeof resourcePolicyHeaderAuth
+>;
+
 export type VersionMigration = InferSelectModel<typeof versionMigrations>;
 export type ResourceRule = InferSelectModel<typeof resourceRules>;
 export type Domain = InferSelectModel<typeof domains>;

server/private/routers/ssh/signSshKey.ts

@@ -47,6 +47,7 @@ import { signPublicKey, getOrgCAKeys } from "@server/lib/sshCA";
 import config from "@server/lib/config";
 import { sendToClient } from "#private/routers/ws";
 import { ActionsEnum } from "@server/auth/actions";
+import type { SignSshKeyResponse } from "@server/routers/ssh/types";
 
 const paramsSchema = z.strictObject({
     orgId: z.string().nonempty()
@@ -72,23 +73,6 @@ const bodySchema = z
         }
     );
 
-export type SignSshKeyResponse = {
-    certificate?: string;
-    messageIds: number[];
-    messageId?: number;
-    sshUsername: string;
-    sshHost: string;
-    resourceId: number;
-    siteIds: number[];
-    siteId: number;
-    keyId?: string;
-    validPrincipals?: string[];
-    validAfter?: string;
-    validBefore?: string;
-    expiresIn?: number;
-    authDaemonMode: "site" | "remote" | "native" | null;
-};
-
 export async function signSshKey(
     req: Request,
     res: Response,

server/routers/ssh/types.ts

@@ -0,0 +1,16 @@
+export type SignSshKeyResponse = {
+    certificate?: string;
+    messageIds: number[];
+    messageId?: number;
+    sshUsername: string;
+    sshHost: string;
+    resourceId: number;
+    siteIds: number[];
+    siteId: number;
+    keyId?: string;
+    validPrincipals?: string[];
+    validAfter?: string;
+    validBefore?: string;
+    expiresIn?: number;
+    authDaemonMode: "site" | "remote" | "native" | null;
+};