diff --git a/server/private/routers/ssh/signSshKey.ts b/server/private/routers/ssh/signSshKey.ts index 067a8440f..3919306cf 100644 --- a/server/private/routers/ssh/signSshKey.ts +++ b/server/private/routers/ssh/signSshKey.ts @@ -467,14 +467,14 @@ export async function signSshKey( const validFor = 300n; expiresIn = Number(validFor); // seconds - const cert = signPublicKey(caKeys.privateKeyPem, publicKey, { + cert = signPublicKey(caKeys.privateKeyPem, publicKey, { keyId: `${usernameToUse}@${resource.niceId}`, validPrincipals: [usernameToUse, resource.niceId], validAfter: now - 60n, // Start 1 min ago for clock skew validBefore: now + validFor }); - const messageIds: number[] = []; + messageIds = []; for (const siteId of siteIds) { // get the site const [newt] = await db diff --git a/server/routers/resource/getUserResources.ts b/server/routers/resource/getUserResources.ts index a54001b70..be723af21 100644 --- a/server/routers/resource/getUserResources.ts +++ b/server/routers/resource/getUserResources.ts @@ -386,7 +386,7 @@ export type GetUserResourcesResponse = { domain: string; enabled: boolean; protected: boolean; - mode: string; + ode: string; }>; siteResources: Array<{ siteResourceId: number; diff --git a/server/routers/siteResource/listAllSiteResourcesByOrg.ts b/server/routers/siteResource/listAllSiteResourcesByOrg.ts index c22f5ab99..732f2a229 100644 --- a/server/routers/siteResource/listAllSiteResourcesByOrg.ts +++ b/server/routers/siteResource/listAllSiteResourcesByOrg.ts @@ -196,6 +196,7 @@ function querySiteResourcesBase() { disableIcmp: siteResources.disableIcmp, authDaemonMode: siteResources.authDaemonMode, authDaemonPort: siteResources.authDaemonPort, + pamMode: siteResources.pamMode, subdomain: siteResources.subdomain, domainId: siteResources.domainId, fullDomain: siteResources.fullDomain, diff --git a/src/components/MemberResourcesPortal.tsx b/src/components/MemberResourcesPortal.tsx index 954aab25e..fded7df52 100644 --- a/src/components/MemberResourcesPortal.tsx +++ b/src/components/MemberResourcesPortal.tsx @@ -49,7 +49,7 @@ type Resource = { domain: string; enabled: boolean; protected: boolean; - mode: string; // "http", "tcp", "udp", "rdp", "vnc", "ssh" + // mode: string; // "http", "tcp", "udp", "rdp", "vnc", "ssh" // Auth method fields sso?: boolean; password?: boolean;