From 0ab1854125d2b8ef40641f1e16be7ad6db8efb21 Mon Sep 17 00:00:00 2001 From: Owen Date: Fri, 29 May 2026 15:38:37 -0700 Subject: [PATCH] Fix import --- .../routers/browserGatewayTarget/getBrowserTarget.ts | 12 +----------- server/private/routers/ssh/signSshKey.ts | 2 +- server/routers/browserGatewayTarget/index.ts | 1 + server/routers/browserGatewayTarget/types.ts | 10 ++++++++++ server/routers/resource/index.ts | 1 - src/app/rdp/RdpClient.tsx | 2 +- src/app/rdp/page.tsx | 2 +- src/app/ssh/SshClient.tsx | 2 +- src/app/ssh/page.tsx | 2 +- src/app/vnc/VncClient.tsx | 2 +- src/app/vnc/page.tsx | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 server/routers/browserGatewayTarget/index.ts create mode 100644 server/routers/browserGatewayTarget/types.ts diff --git a/server/private/routers/browserGatewayTarget/getBrowserTarget.ts b/server/private/routers/browserGatewayTarget/getBrowserTarget.ts index 756f54438..7feda01e5 100644 --- a/server/private/routers/browserGatewayTarget/getBrowserTarget.ts +++ b/server/private/routers/browserGatewayTarget/getBrowserTarget.ts @@ -23,6 +23,7 @@ import { fromError } from "zod-validation-error"; import logger from "@server/logger"; import { decrypt } from "@server/lib/crypto"; import config from "@server/lib/config"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; const getBrowserTargetSchema = z .object({ @@ -30,17 +31,6 @@ const getBrowserTargetSchema = z }) .strict(); -export type GetBrowserTargetResponse = { - ip: string; - port: number; - authToken: string; - orgId: string; - resourceId: number; - niceId: string; - pamMode: "passthrough" | "push" | null; - authDaemonMode: "site" | "remote" | "native" | null; -}; - export async function getBrowserTarget( req: Request, res: Response, diff --git a/server/private/routers/ssh/signSshKey.ts b/server/private/routers/ssh/signSshKey.ts index 8e772118e..6086d713c 100644 --- a/server/private/routers/ssh/signSshKey.ts +++ b/server/private/routers/ssh/signSshKey.ts @@ -546,7 +546,7 @@ export async function signSshKey( if (resource.alias && resource.alias != "") { sshHost = resource.alias; } else { - sshHost = resource.destination || ""; // TODO: IF WE HAVE THE NATIVE SSH MODE WHAT SHOULD WE DO HERE? + sshHost = resource.destination || ""; } } else if (resource.authDaemonMode === "native") { if (siteIds.length > 1) { diff --git a/server/routers/browserGatewayTarget/index.ts b/server/routers/browserGatewayTarget/index.ts new file mode 100644 index 000000000..eea524d65 --- /dev/null +++ b/server/routers/browserGatewayTarget/index.ts @@ -0,0 +1 @@ +export * from "./types"; diff --git a/server/routers/browserGatewayTarget/types.ts b/server/routers/browserGatewayTarget/types.ts new file mode 100644 index 000000000..e644c952a --- /dev/null +++ b/server/routers/browserGatewayTarget/types.ts @@ -0,0 +1,10 @@ +export type GetBrowserTargetResponse = { + ip: string; + port: number; + authToken: string; + orgId: string; + resourceId: number; + niceId: string; + pamMode: "passthrough" | "push" | null; + authDaemonMode: "site" | "remote" | "native" | null; +}; diff --git a/server/routers/resource/index.ts b/server/routers/resource/index.ts index d8605ac5f..83dbdea2a 100644 --- a/server/routers/resource/index.ts +++ b/server/routers/resource/index.ts @@ -33,5 +33,4 @@ export * from "./removeUserFromResource"; export * from "./listAllResourceNames"; export * from "./removeEmailFromResourceWhitelist"; export * from "./getStatusHistory"; -export * from "./getBrowserTarget"; export * from "./getResourcePolicies"; diff --git a/src/app/rdp/RdpClient.tsx b/src/app/rdp/RdpClient.tsx index 35ffb9c56..d4b708fbf 100644 --- a/src/app/rdp/RdpClient.tsx +++ b/src/app/rdp/RdpClient.tsx @@ -14,7 +14,7 @@ import type { RdpFileTransferProvider, FileInfo } from "@devolutions/iron-remote-desktop-rdp/dist"; -import { GetBrowserTargetResponse } from "@server/routers/resource"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; import { Card, CardContent, diff --git a/src/app/rdp/page.tsx b/src/app/rdp/page.tsx index 4ccf07b3b..368d2f477 100644 --- a/src/app/rdp/page.tsx +++ b/src/app/rdp/page.tsx @@ -1,7 +1,7 @@ import { headers } from "next/headers"; import { priv } from "@app/lib/api"; import { AxiosResponse } from "axios"; -import { GetBrowserTargetResponse } from "@server/routers/resource"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; import RdpClient from "./RdpClient"; import AuthFooter from "@app/components/AuthFooter"; diff --git a/src/app/ssh/SshClient.tsx b/src/app/ssh/SshClient.tsx index d822b890a..20f2b9207 100644 --- a/src/app/ssh/SshClient.tsx +++ b/src/app/ssh/SshClient.tsx @@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { Textarea } from "@/components/ui/textarea"; import type { SignSshKeyResponse } from "@server/private/routers/ssh"; -import { GetBrowserTargetResponse } from "@server/routers/resource"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; import { Card, CardContent, diff --git a/src/app/ssh/page.tsx b/src/app/ssh/page.tsx index 467756236..663e33991 100644 --- a/src/app/ssh/page.tsx +++ b/src/app/ssh/page.tsx @@ -1,7 +1,7 @@ import { headers } from "next/headers"; import { priv } from "@app/lib/api"; import { AxiosResponse } from "axios"; -import { GetBrowserTargetResponse } from "@server/routers/resource"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; import SshClient from "./SshClient"; import { SignSshKeyResponse } from "@server/private/routers/ssh"; import crypto from "crypto"; diff --git a/src/app/vnc/VncClient.tsx b/src/app/vnc/VncClient.tsx index ea011ec5e..f5e95d232 100644 --- a/src/app/vnc/VncClient.tsx +++ b/src/app/vnc/VncClient.tsx @@ -5,7 +5,7 @@ import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Label } from "@/components/ui/label"; import { toast } from "@app/hooks/useToast"; -import { GetBrowserTargetResponse } from "@server/routers/resource"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; import { Card, CardContent, diff --git a/src/app/vnc/page.tsx b/src/app/vnc/page.tsx index e421a4284..0b30d0989 100644 --- a/src/app/vnc/page.tsx +++ b/src/app/vnc/page.tsx @@ -1,7 +1,7 @@ import { headers } from "next/headers"; import { priv } from "@app/lib/api"; import { AxiosResponse } from "axios"; -import { GetBrowserTargetResponse } from "@server/routers/resource"; +import { GetBrowserTargetResponse } from "@server/routers/browserGatewayTarget"; import VncClient from "./VncClient"; import AuthFooter from "@app/components/AuthFooter";