mirror of
https://github.com/fosrl/pangolin.git
synced 2026-09-04 18:29:21 +02:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ad3d26451 | |||
| cddb5ecc3d |
Generated
+673
-288
File diff suppressed because it is too large
Load Diff
+8
-8
@@ -33,7 +33,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@asteasolutions/zod-to-openapi": "9.1.0",
|
"@asteasolutions/zod-to-openapi": "9.1.0",
|
||||||
"@aws-sdk/client-s3": "3.1121.0",
|
"@aws-sdk/client-s3": "3.1123.0",
|
||||||
"@devolutions/iron-remote-desktop": "https://static.pangolin.net/packages/devolutions-iron-remote-desktop-0.0.0.tgz",
|
"@devolutions/iron-remote-desktop": "https://static.pangolin.net/packages/devolutions-iron-remote-desktop-0.0.0.tgz",
|
||||||
"@devolutions/iron-remote-desktop-rdp": "https://static.pangolin.net/packages/devolutions-iron-remote-desktop-rdp-0.0.1.tgz",
|
"@devolutions/iron-remote-desktop-rdp": "https://static.pangolin.net/packages/devolutions-iron-remote-desktop-rdp-0.0.1.tgz",
|
||||||
"@headlessui/react": "2.2.10",
|
"@headlessui/react": "2.2.10",
|
||||||
@@ -69,7 +69,7 @@
|
|||||||
"@simplewebauthn/server": "13.3.3",
|
"@simplewebauthn/server": "13.3.3",
|
||||||
"@tailwindcss/forms": "0.5.11",
|
"@tailwindcss/forms": "0.5.11",
|
||||||
"@tanstack/react-query": "5.102.8",
|
"@tanstack/react-query": "5.102.8",
|
||||||
"@tanstack/react-table": "8.21.3",
|
"@tanstack/react-table": "9.2.4",
|
||||||
"@xterm/addon-fit": "^0.11.0",
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
"@xterm/addon-web-links": "^0.12.0",
|
"@xterm/addon-web-links": "^0.12.0",
|
||||||
"@xterm/xterm": "^6.0.0",
|
"@xterm/xterm": "^6.0.0",
|
||||||
@@ -99,7 +99,7 @@
|
|||||||
"lucide-react": "1.38.0",
|
"lucide-react": "1.38.0",
|
||||||
"maxmind": "5.0.7",
|
"maxmind": "5.0.7",
|
||||||
"moment": "2.30.1",
|
"moment": "2.30.1",
|
||||||
"next": "16.3.3",
|
"next": "16.3.4",
|
||||||
"next-intl": "4.14.1",
|
"next-intl": "4.14.1",
|
||||||
"next-themes": "0.4.6",
|
"next-themes": "0.4.6",
|
||||||
"nextjs-toploader": "3.9.17",
|
"nextjs-toploader": "3.9.17",
|
||||||
@@ -110,7 +110,7 @@
|
|||||||
"posthog-node": "5.51.4",
|
"posthog-node": "5.51.4",
|
||||||
"qrcode.react": "4.2.0",
|
"qrcode.react": "4.2.0",
|
||||||
"react": "19.2.8",
|
"react": "19.2.8",
|
||||||
"react-day-picker": "9.14.0",
|
"react-day-picker": "10.0.1",
|
||||||
"react-dom": "19.2.8",
|
"react-dom": "19.2.8",
|
||||||
"react-easy-sort": "1.8.0",
|
"react-easy-sort": "1.8.0",
|
||||||
"react-hook-form": "7.87.0",
|
"react-hook-form": "7.87.0",
|
||||||
@@ -169,15 +169,15 @@
|
|||||||
"esbuild": "0.28.2",
|
"esbuild": "0.28.2",
|
||||||
"esbuild-node-externals": "2.0.0",
|
"esbuild-node-externals": "2.0.0",
|
||||||
"eslint": "10.9.1",
|
"eslint": "10.9.1",
|
||||||
"eslint-config-next": "16.3.3",
|
"eslint-config-next": "16.3.4",
|
||||||
"postcss": "8.5.26",
|
"postcss": "8.5.26",
|
||||||
"prettier": "3.9.6",
|
"prettier": "3.9.6",
|
||||||
"react-email": "6.9.3",
|
"react-email": "6.9.3",
|
||||||
"tailwindcss": "4.3.3",
|
"tailwindcss": "4.3.3",
|
||||||
"tsc-alias": "1.9.2",
|
"tsc-alias": "1.9.3",
|
||||||
"tsx": "4.23.13",
|
"tsx": "4.23.13",
|
||||||
"typescript": "6.0.3",
|
"typescript": "7.0.2",
|
||||||
"typescript-eslint": "8.68.0"
|
"typescript-eslint": "8.69.0"
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"esbuild": "0.28.2",
|
"esbuild": "0.28.2",
|
||||||
|
|||||||
@@ -112,11 +112,6 @@ export class Config {
|
|||||||
? "true"
|
? "true"
|
||||||
: "false";
|
: "false";
|
||||||
|
|
||||||
process.env.FLAGS_DISABLE_VIRTUAL_API_KEYS_UI = parsedConfig.flags
|
|
||||||
?.disable_virtual_api_keys_ui
|
|
||||||
? "true"
|
|
||||||
: "false";
|
|
||||||
|
|
||||||
this.rawConfig = parsedConfig;
|
this.rawConfig = parsedConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -442,7 +442,6 @@ export const configSchema = z
|
|||||||
disable_config_managed_domains: z.boolean().optional(),
|
disable_config_managed_domains: z.boolean().optional(),
|
||||||
disable_product_help_banners: z.boolean().optional(),
|
disable_product_help_banners: z.boolean().optional(),
|
||||||
disable_enterprise_features: z.boolean().optional(),
|
disable_enterprise_features: z.boolean().optional(),
|
||||||
disable_virtual_api_keys_ui: z.boolean().optional(),
|
|
||||||
enable_acme_cert_sync: z.boolean().optional().default(true),
|
enable_acme_cert_sync: z.boolean().optional().default(true),
|
||||||
disable_private_http_placeholder: z
|
disable_private_http_placeholder: z
|
||||||
.boolean()
|
.boolean()
|
||||||
|
|||||||
@@ -104,8 +104,7 @@ const processMessage = async (
|
|||||||
|
|
||||||
const handler = messageHandlers[message.type];
|
const handler = messageHandlers[message.type];
|
||||||
if (!handler) {
|
if (!handler) {
|
||||||
logger.debug(`No handler found for message type: ${message.type}`);
|
throw new Error(`Unsupported message type: ${message.type}`);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await handler({
|
const response = await handler({
|
||||||
|
|||||||
@@ -353,10 +353,7 @@ const setupConnection = async (
|
|||||||
|
|
||||||
const handler = messageHandlers[message.type];
|
const handler = messageHandlers[message.type];
|
||||||
if (!handler) {
|
if (!handler) {
|
||||||
logger.debug(
|
throw new Error(`Unsupported message type: ${message.type}`);
|
||||||
`No handler found for message type: ${message.type}`
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await handler({
|
const response = await handler({
|
||||||
|
|||||||
@@ -76,11 +76,6 @@ export default async function KeysPage(props: KeysPageProps) {
|
|||||||
redirect("/");
|
redirect("/");
|
||||||
}
|
}
|
||||||
|
|
||||||
const env = pullEnv();
|
|
||||||
if (env.flags.disableVirtualApiKeysUi) {
|
|
||||||
redirect(`/${orgId}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
let keysData: ListMyVirtualApiKeysResponse | null = null;
|
let keysData: ListMyVirtualApiKeysResponse | null = null;
|
||||||
try {
|
try {
|
||||||
const res = await internal.get<
|
const res = await internal.get<
|
||||||
@@ -95,6 +90,7 @@ export default async function KeysPage(props: KeysPageProps) {
|
|||||||
redirect(`/${orgId}`);
|
redirect(`/${orgId}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const env = pullEnv();
|
||||||
const primaryOrg = orgs.find((o) => o.orgId === orgId)?.isPrimaryOrg;
|
const primaryOrg = orgs.find((o) => o.orgId === orgId)?.isPrimaryOrg;
|
||||||
const isAdminOrOwner = Boolean(overview?.isAdmin || overview?.isOwner);
|
const isAdminOrOwner = Boolean(overview?.isAdmin || overview?.isOwner);
|
||||||
|
|
||||||
@@ -110,7 +106,6 @@ export default async function KeysPage(props: KeysPageProps) {
|
|||||||
showSidebar={false}
|
showSidebar={false}
|
||||||
launcherMode
|
launcherMode
|
||||||
showViewAsAdmin={isAdminOrOwner}
|
showViewAsAdmin={isAdminOrOwner}
|
||||||
env={env}
|
|
||||||
>
|
>
|
||||||
<UserVirtualApiKeys orgId={orgId} initialData={keysData} />
|
<UserVirtualApiKeys orgId={orgId} initialData={keysData} />
|
||||||
</Layout>
|
</Layout>
|
||||||
|
|||||||
@@ -83,7 +83,6 @@ export default async function OrgPage(props: OrgPageProps) {
|
|||||||
showSidebar={false}
|
showSidebar={false}
|
||||||
launcherMode
|
launcherMode
|
||||||
showViewAsAdmin={isAdminOrOwner}
|
showViewAsAdmin={isAdminOrOwner}
|
||||||
env={env}
|
|
||||||
>
|
>
|
||||||
{overview && launcherData ? (
|
{overview && launcherData ? (
|
||||||
<ResourceLauncher
|
<ResourceLauncher
|
||||||
|
|||||||
@@ -117,7 +117,6 @@ export default function SecurityPage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function LogRetentionSectionForm({ org }: SectionFormProps) {
|
function LogRetentionSectionForm({ org }: SectionFormProps) {
|
||||||
const { updateOrg } = useOrgContext();
|
|
||||||
const form = useForm({
|
const form = useForm({
|
||||||
resolver: zodResolver(
|
resolver: zodResolver(
|
||||||
SecurityFormSchema.pick({
|
SecurityFormSchema.pick({
|
||||||
@@ -174,11 +173,6 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
|
|||||||
// Update organization
|
// Update organization
|
||||||
await api.post(`/org/${org.orgId}`, reqData);
|
await api.post(`/org/${org.orgId}`, reqData);
|
||||||
|
|
||||||
// Update the org context immediately so the dropdowns reflect
|
|
||||||
// the saved values without waiting on a re-fetch that could
|
|
||||||
// race a lagging read replica
|
|
||||||
updateOrg(reqData);
|
|
||||||
|
|
||||||
toast({
|
toast({
|
||||||
title: t("orgUpdated"),
|
title: t("orgUpdated"),
|
||||||
description: t("orgUpdatedDescription")
|
description: t("orgUpdatedDescription")
|
||||||
@@ -205,10 +199,7 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
|
|||||||
<SettingsSectionForm>
|
<SettingsSectionForm>
|
||||||
<Form {...form}>
|
<Form {...form}>
|
||||||
<form
|
<form
|
||||||
onSubmit={(e) => {
|
action={formAction}
|
||||||
e.preventDefault();
|
|
||||||
formAction();
|
|
||||||
}}
|
|
||||||
className="grid gap-4"
|
className="grid gap-4"
|
||||||
id="org-log-retention-settings-form"
|
id="org-log-retention-settings-form"
|
||||||
>
|
>
|
||||||
@@ -836,7 +827,6 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
|
|||||||
|
|
||||||
function SecuritySettingsSectionForm({ org }: SectionFormProps) {
|
function SecuritySettingsSectionForm({ org }: SectionFormProps) {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const { updateOrg } = useOrgContext();
|
|
||||||
const form = useForm({
|
const form = useForm({
|
||||||
resolver: zodResolver(
|
resolver: zodResolver(
|
||||||
SecurityFormSchema.pick({
|
SecurityFormSchema.pick({
|
||||||
@@ -909,11 +899,6 @@ function SecuritySettingsSectionForm({ org }: SectionFormProps) {
|
|||||||
// Update organization
|
// Update organization
|
||||||
await api.post(`/org/${org.orgId}`, reqData);
|
await api.post(`/org/${org.orgId}`, reqData);
|
||||||
|
|
||||||
// Update the org context immediately so the dropdowns reflect
|
|
||||||
// the saved values without waiting on a re-fetch that could
|
|
||||||
// race a lagging read replica
|
|
||||||
updateOrg(reqData);
|
|
||||||
|
|
||||||
toast({
|
toast({
|
||||||
title: t("orgUpdated"),
|
title: t("orgUpdated"),
|
||||||
description: t("orgUpdatedDescription")
|
description: t("orgUpdatedDescription")
|
||||||
@@ -957,10 +942,7 @@ function SecuritySettingsSectionForm({ org }: SectionFormProps) {
|
|||||||
<SettingsSectionForm>
|
<SettingsSectionForm>
|
||||||
<Form {...form}>
|
<Form {...form}>
|
||||||
<form
|
<form
|
||||||
onSubmit={(e) => {
|
action={formAction}
|
||||||
e.preventDefault();
|
|
||||||
formAction();
|
|
||||||
}}
|
|
||||||
ref={formRef}
|
ref={formRef}
|
||||||
id="security-settings-section-form"
|
id="security-settings-section-form"
|
||||||
className="space-y-4"
|
className="space-y-4"
|
||||||
|
|||||||
@@ -30,15 +30,9 @@ import { normalizePostAuthPath } from "@server/lib/normalizePostAuthPath";
|
|||||||
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
import { tierMatrix } from "@server/lib/billing/tierMatrix";
|
||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
|
|
||||||
export async function generateMetadata(): Promise<Metadata> {
|
export const metadata: Metadata = {
|
||||||
const env = pullEnv();
|
title: "Resource Access"
|
||||||
const title =
|
};
|
||||||
env.branding.resourceAuthPage?.titleText ||
|
|
||||||
env.branding.appName ||
|
|
||||||
"Resource Access";
|
|
||||||
|
|
||||||
return { title };
|
|
||||||
}
|
|
||||||
|
|
||||||
export const dynamic = "force-dynamic";
|
export const dynamic = "force-dynamic";
|
||||||
|
|
||||||
|
|||||||
+6
-10
@@ -53,21 +53,17 @@ export type OrgNavSectionsOptions = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Merged from 'user-management-and-resources' branch
|
// Merged from 'user-management-and-resources' branch
|
||||||
export const orgLangingNavItems = (env?: Env): SidebarNavItem[] => [
|
export const orgLangingNavItems: SidebarNavItem[] = [
|
||||||
{
|
{
|
||||||
title: "sidebarAccount",
|
title: "sidebarAccount",
|
||||||
href: "/{orgId}",
|
href: "/{orgId}",
|
||||||
icon: <LayoutGrid className="size-4 flex-none" />
|
icon: <LayoutGrid className="size-4 flex-none" />
|
||||||
},
|
},
|
||||||
...(!env?.flags.disableVirtualApiKeysUi
|
{
|
||||||
? [
|
title: "sidebarMyApiKeys",
|
||||||
{
|
href: "/{orgId}/keys",
|
||||||
title: "sidebarMyApiKeys",
|
icon: <KeyRound className="size-4 flex-none" />
|
||||||
href: "/{orgId}/keys",
|
}
|
||||||
icon: <KeyRound className="size-4 flex-none" />
|
|
||||||
}
|
|
||||||
]
|
|
||||||
: [])
|
|
||||||
];
|
];
|
||||||
|
|
||||||
export const orgNavSections = (
|
export const orgNavSections = (
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { cn } from "@app/lib/cn";
|
import { cn } from "@app/lib/cn";
|
||||||
import { ListUserOrgsResponse } from "@server/routers/org";
|
import { ListUserOrgsResponse } from "@server/routers/org";
|
||||||
import { Env } from "@app/lib/types/env";
|
|
||||||
import {
|
import {
|
||||||
orgLangingNavItems,
|
orgLangingNavItems,
|
||||||
type CommandBarNavSection,
|
type CommandBarNavSection,
|
||||||
@@ -26,7 +25,6 @@ interface LayoutProps {
|
|||||||
defaultSidebarCollapsed?: boolean;
|
defaultSidebarCollapsed?: boolean;
|
||||||
launcherMode?: boolean;
|
launcherMode?: boolean;
|
||||||
showViewAsAdmin?: boolean;
|
showViewAsAdmin?: boolean;
|
||||||
env?: Env;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function Layout({
|
export async function Layout({
|
||||||
@@ -40,8 +38,7 @@ export async function Layout({
|
|||||||
showTopBar = true,
|
showTopBar = true,
|
||||||
defaultSidebarCollapsed = false,
|
defaultSidebarCollapsed = false,
|
||||||
launcherMode = false,
|
launcherMode = false,
|
||||||
showViewAsAdmin = false,
|
showViewAsAdmin = false
|
||||||
env
|
|
||||||
}: LayoutProps) {
|
}: LayoutProps) {
|
||||||
const allCookies = await cookies();
|
const allCookies = await cookies();
|
||||||
const sidebarStateCookie = allCookies.get("pangolin-sidebar-state")?.value;
|
const sidebarStateCookie = allCookies.get("pangolin-sidebar-state")?.value;
|
||||||
@@ -52,7 +49,7 @@ export async function Layout({
|
|||||||
(sidebarStateCookie !== "expanded" && defaultSidebarCollapsed);
|
(sidebarStateCookie !== "expanded" && defaultSidebarCollapsed);
|
||||||
|
|
||||||
const launcherNavItems: SidebarNavItem[] = launcherMode
|
const launcherNavItems: SidebarNavItem[] = launcherMode
|
||||||
? orgLangingNavItems(env)
|
? orgLangingNavItems
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -70,10 +70,6 @@ export function pullEnv(): Env {
|
|||||||
: false,
|
: false,
|
||||||
disableEnterpriseFeatures:
|
disableEnterpriseFeatures:
|
||||||
process.env.DISABLE_ENTERPRISE_FEATURES === "true"
|
process.env.DISABLE_ENTERPRISE_FEATURES === "true"
|
||||||
? true
|
|
||||||
: false,
|
|
||||||
disableVirtualApiKeysUi:
|
|
||||||
process.env.FLAGS_DISABLE_VIRTUAL_API_KEYS_UI === "true"
|
|
||||||
? true
|
? true
|
||||||
: false
|
: false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ export type Env = {
|
|||||||
usePangolinDns: boolean;
|
usePangolinDns: boolean;
|
||||||
disableProductHelpBanners: boolean;
|
disableProductHelpBanners: boolean;
|
||||||
disableEnterpriseFeatures: boolean;
|
disableEnterpriseFeatures: boolean;
|
||||||
disableVirtualApiKeysUi: boolean;
|
|
||||||
};
|
};
|
||||||
branding: {
|
branding: {
|
||||||
appName?: string;
|
appName?: string;
|
||||||
|
|||||||
Reference in New Issue
Block a user