@@ -1425,10 +1776,12 @@ export const HandleNotifications = ({ notificationId }: Props) => {
isLoadingTelegram ||
isLoadingDiscord ||
isLoadingEmail ||
+ isLoadingResend ||
isLoadingGotify ||
isLoadingNtfy ||
isLoadingLark ||
- isLoadingCustom
+ isLoadingCustom ||
+ isLoadingPushover
}
variant="secondary"
type="button"
@@ -1464,6 +1817,12 @@ export const HandleNotifications = ({ notificationId }: Props) => {
fromAddress: data.fromAddress,
toAddresses: data.toAddresses,
});
+ } else if (data.type === "resend") {
+ await testResendConnection({
+ apiKey: data.apiKey,
+ fromAddress: data.fromAddress,
+ toAddresses: data.toAddresses,
+ });
} else if (data.type === "gotify") {
await testGotifyConnection({
serverUrl: data.serverUrl,
@@ -1497,6 +1856,22 @@ export const HandleNotifications = ({ notificationId }: Props) => {
endpoint: data.endpoint,
headers: headersRecord,
});
+ } else if (data.type === "pushover") {
+ if (
+ data.priority === 2 &&
+ (data.retry == null || data.expire == null)
+ ) {
+ throw new Error(
+ "Retry and expire are required for emergency priority (2)",
+ );
+ }
+ await testPushoverConnection({
+ userKey: data.userKey,
+ apiToken: data.apiToken,
+ priority: data.priority,
+ retry: data.priority === 2 ? data.retry : undefined,
+ expire: data.priority === 2 ? data.expire : undefined,
+ });
}
toast.success("Connection Success");
} catch (error) {
diff --git a/apps/dokploy/components/dashboard/settings/notifications/show-notifications.tsx b/apps/dokploy/components/dashboard/settings/notifications/show-notifications.tsx
index 06ffd91e4..a3c1377ae 100644
--- a/apps/dokploy/components/dashboard/settings/notifications/show-notifications.tsx
+++ b/apps/dokploy/components/dashboard/settings/notifications/show-notifications.tsx
@@ -5,6 +5,7 @@ import {
GotifyIcon,
LarkIcon,
NtfyIcon,
+ ResendIcon,
SlackIcon,
TelegramIcon,
} from "@/components/icons/notification-icons";
@@ -36,7 +37,7 @@ export const ShowNotifications = () => {
Add your providers to receive notifications, like Discord, Slack,
- Telegram, Email, Lark.
+ Telegram, Email, Resend, Lark.
@@ -86,6 +87,11 @@ export const ShowNotifications = () => {
)}
+ {notification.notificationType === "resend" && (
+
diff --git a/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx b/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx
index ad66aa0fa..461a4c17c 100644
--- a/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx
@@ -41,7 +41,7 @@ const profileSchema = z.object({
password: z.string().nullable(),
currentPassword: z.string().nullable(),
image: z.string().optional(),
- name: z.string().optional(),
+ firstName: z.string().optional(),
lastName: z.string().optional(),
allowImpersonation: z.boolean().optional().default(false),
});
@@ -91,7 +91,7 @@ export const ProfileForm = () => {
image: data?.user?.image || "",
currentPassword: "",
allowImpersonation: data?.user?.allowImpersonation || false,
- name: data?.user?.firstName || "",
+ firstName: data?.user?.firstName || "",
lastName: data?.user?.lastName || "",
},
resolver: zodResolver(profileSchema),
@@ -106,7 +106,7 @@ export const ProfileForm = () => {
image: data?.user?.image || "",
currentPassword: form.getValues("currentPassword") || "",
allowImpersonation: data?.user?.allowImpersonation,
- name: data?.user?.firstName || "",
+ firstName: data?.user?.firstName || "",
lastName: data?.user?.lastName || "",
},
{
@@ -131,7 +131,7 @@ export const ProfileForm = () => {
image: values.image,
currentPassword: values.currentPassword || undefined,
allowImpersonation: values.allowImpersonation,
- name: values.name || undefined,
+ firstName: values.firstName || undefined,
lastName: values.lastName || undefined,
});
await refetch();
@@ -141,7 +141,7 @@ export const ProfileForm = () => {
password: "",
image: values.image,
currentPassword: "",
- name: values.name || "",
+ firstName: values.firstName || "",
lastName: values.lastName || "",
});
} catch (error) {
@@ -184,7 +184,7 @@ export const ProfileForm = () => {
(
First Name
diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
index 2bafe7e64..42b73cf59 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
@@ -23,6 +23,8 @@ export const ShowDokployActions = () => {
const { mutateAsync: cleanRedis } = api.settings.cleanRedis.useMutation();
const { mutateAsync: reloadRedis } = api.settings.reloadRedis.useMutation();
+ const { mutateAsync: cleanAllDeploymentQueue } =
+ api.settings.cleanAllDeploymentQueue.useMutation();
return (
@@ -87,6 +89,21 @@ export const ShowDokployActions = () => {
Clean Redis
+ {
+ await cleanAllDeploymentQueue()
+ .then(() => {
+ toast.success("Deployment queue cleaned");
+ })
+ .catch(() => {
+ toast.error("Error cleaning deployment queue");
+ });
+ }}
+ >
+ Clean all deployment queue
+
+
{
diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx
index aebba8877..5b4d751ff 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx
@@ -12,6 +12,7 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
+import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
import { api } from "@/utils/api";
import { EditTraefikEnv } from "../../web-server/edit-traefik-env";
import { ManageTraefikPorts } from "../../web-server/manage-traefik-ports";
@@ -33,14 +34,45 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
serverId,
});
+ const {
+ execute: executeWithHealthCheck,
+ isExecuting: isHealthCheckExecuting,
+ } = useHealthCheckAfterMutation({
+ initialDelay: 5000,
+ pollInterval: 4000,
+ successMessage: "Traefik dashboard updated successfully",
+ onSuccess: () => {
+ refetchDashboard();
+ },
+ });
+
+ const {
+ execute: executeReloadWithHealthCheck,
+ isExecuting: isReloadHealthCheckExecuting,
+ } = useHealthCheckAfterMutation({
+ initialDelay: 5000,
+ pollInterval: 4000,
+ successMessage: "Traefik Reloaded",
+ });
+
return (
{t("settings.server.webServer.traefik.label")}
@@ -54,15 +86,19 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
{
- await reloadTraefik({
- serverId: serverId,
- })
- .then(async () => {
- toast.success("Traefik Reloaded");
- })
- .catch(() => {});
+ try {
+ await executeReloadWithHealthCheck(() =>
+ reloadTraefik({ serverId }),
+ );
+ } catch (error) {
+ const errorMessage =
+ (error as Error)?.message ||
+ "Failed to reload Traefik. Please try again.";
+ toast.error(errorMessage);
+ }
}}
className="cursor-pointer"
+ disabled={isReloadHealthCheckExecuting}
>
{t("settings.server.webServer.reload")}
@@ -108,24 +144,21 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
}
onClick={async () => {
- await toggleDashboard({
- enableDashboard: !haveTraefikDashboardPortEnabled,
- serverId: serverId,
- })
- .then(async () => {
- toast.success(
- `${haveTraefikDashboardPortEnabled ? "Disabled" : "Enabled"} Dashboard`,
- );
- refetchDashboard();
- })
- .catch((error) => {
- const errorMessage =
- error?.message ||
- "Failed to toggle dashboard. Please check if port 8080 is available.";
- toast.error(errorMessage);
- });
+ try {
+ await executeWithHealthCheck(() =>
+ toggleDashboard({
+ enableDashboard: !haveTraefikDashboardPortEnabled,
+ serverId: serverId,
+ }),
+ );
+ } catch (error) {
+ const errorMessage =
+ (error as Error)?.message ||
+ "Failed to toggle dashboard. Please check if port 8080 is available.";
+ toast.error(errorMessage);
+ }
}}
- disabled={toggleDashboardIsLoading}
+ disabled={toggleDashboardIsLoading || isHealthCheckExecuting}
type="default"
>
{
) : (
- {
- e.preventDefault();
+ size="sm"
+ onClick={() => {
setIsOpen(true);
}}
>
- Setup Server
-
+ Setup Server
diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
index 85e7f3ee7..92d6fc5c3 100644
--- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
@@ -6,9 +6,7 @@ import {
Loader2,
MoreHorizontal,
Network,
- Pencil,
ServerIcon,
- Settings,
Terminal,
Trash2,
User,
@@ -31,9 +29,7 @@ import {
import {
DropdownMenu,
DropdownMenuContent,
- DropdownMenuItem,
DropdownMenuLabel,
- DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import {
@@ -285,7 +281,32 @@ export const ShowServers = () => {
{/* Compact Actions */}
{isActive && (
-
+
+
+
+
+
+
+
+
+ Setup Server
+
+
+ Configure and initialize your
+ server with Docker, Traefik, and
+ other essential services
+
+
+
+
+
{server.sshKeyId && (
@@ -311,20 +332,6 @@ export const ShowServers = () => {
)}
-
-
-
-
-
-
- Setup Server
-
-
-
diff --git a/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx b/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
index f1f7bce32..482b98579 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
@@ -1,6 +1,7 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { useEffect, useState } from "react";
import { useForm } from "react-hook-form";
+import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
import { toast } from "sonner";
import { z } from "zod";
import { AlertBlock } from "@/components/shared/alert-block";
@@ -46,6 +47,14 @@ export const EditTraefikEnv = ({ children, serverId }: Props) => {
const { mutateAsync, isLoading, error, isError } =
api.settings.writeTraefikEnv.useMutation();
+ const {
+ execute: executeWithHealthCheck,
+ isExecuting: isHealthCheckExecuting,
+ } = useHealthCheckAfterMutation({
+ initialDelay: 5000,
+ successMessage: "Traefik Env Updated",
+ });
+
const form = useForm
({
defaultValues: {
env: data || "",
@@ -63,16 +72,16 @@ export const EditTraefikEnv = ({ children, serverId }: Props) => {
}, [form, form.reset, data]);
const onSubmit = async (data: Schema) => {
- await mutateAsync({
- env: data.env,
- serverId,
- })
- .then(async () => {
- toast.success("Traefik Env Updated");
- })
- .catch(() => {
- toast.error("Error updating the Traefik env");
- });
+ try {
+ await executeWithHealthCheck(() =>
+ mutateAsync({
+ env: data.env,
+ serverId,
+ }),
+ );
+ } catch {
+ toast.error("Error updating the Traefik env");
+ }
};
// Add keyboard shortcut for Ctrl+S/Cmd+S
@@ -154,8 +163,8 @@ TRAEFIK_CERTIFICATESRESOLVERS_LETSENCRYPT_HTTP_CHALLENGE_DNS_PROVIDER=cloudflare
diff --git a/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx b/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
index 3ce95aa1f..73973ef06 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/manage-traefik-ports.tsx
@@ -1,6 +1,7 @@
import { zodResolver } from "@hookform/resolvers/zod";
import { ArrowRightLeft, Plus, Trash2 } from "lucide-react";
import { useTranslation } from "next-i18next";
+import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
import type React from "react";
import { useEffect, useState } from "react";
import { useFieldArray, useForm } from "react-hook-form";
@@ -76,11 +77,19 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
});
const { mutateAsync: updatePorts, isLoading } =
- api.settings.updateTraefikPorts.useMutation({
- onSuccess: () => {
- refetchPorts();
- },
- });
+ api.settings.updateTraefikPorts.useMutation();
+
+ const {
+ execute: executeWithHealthCheck,
+ isExecuting: isHealthCheckExecuting,
+ } = useHealthCheckAfterMutation({
+ initialDelay: 5000,
+ successMessage: t("settings.server.webServer.traefik.portsUpdated"),
+ onSuccess: () => {
+ refetchPorts();
+ setOpen(false);
+ },
+ });
useEffect(() => {
if (currentPorts) {
@@ -99,11 +108,12 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
const onSubmit = async (data: TraefikPortsForm) => {
try {
- await updatePorts({
- serverId,
- additionalPorts: data.ports,
- });
- toast.success(t("settings.server.webServer.traefik.portsUpdated"));
+ await executeWithHealthCheck(() =>
+ updatePorts({
+ serverId,
+ additionalPorts: data.ports,
+ }),
+ );
setOpen(false);
} catch (error) {
toast.error((error as Error).message || "Error updating Traefik ports");
@@ -317,7 +327,7 @@ export const ManageTraefikPorts = ({ children, serverId }: Props) => {
type="submit"
variant="default"
className="text-sm"
- isLoading={isLoading}
+ isLoading={isLoading || isHealthCheckExecuting}
>
Save
diff --git a/apps/dokploy/components/icons/notification-icons.tsx b/apps/dokploy/components/icons/notification-icons.tsx
index cc54327a8..05f66146a 100644
--- a/apps/dokploy/components/icons/notification-icons.tsx
+++ b/apps/dokploy/components/icons/notification-icons.tsx
@@ -231,3 +231,49 @@ export const NtfyIcon = ({ className }: Props) => {
);
};
+
+export const PushoverIcon = ({ className }: Props) => {
+ return (
+
+
+
+
+ );
+};
+
+export const ResendIcon = ({ className }: Props) => {
+ return (
+
+
+ );
+};
diff --git a/apps/dokploy/components/layouts/side.tsx b/apps/dokploy/components/layouts/side.tsx
index 45b6a7e3a..0062c223a 100644
--- a/apps/dokploy/components/layouts/side.tsx
+++ b/apps/dokploy/components/layouts/side.tsx
@@ -18,9 +18,10 @@ import {
Forward,
GalleryVerticalEnd,
GitBranch,
- HeartIcon,
+ Key,
KeyRound,
Loader2,
+ LogIn,
type LucideIcon,
Package,
PieChart,
@@ -397,6 +398,24 @@ const MENU: Menu = {
// Only enabled for admins in cloud environments
isEnabled: ({ auth, isCloud }) => !!(auth?.role === "owner" && isCloud),
},
+ {
+ isSingle: true,
+ title: "License",
+ url: "/dashboard/settings/license",
+ icon: Key,
+ // Only enabled for admins in non-cloud environments
+ isEnabled: ({ auth }) =>
+ !!(auth?.role === "owner" || auth?.role === "admin"),
+ },
+ {
+ isSingle: true,
+ title: "SSO",
+ url: "/dashboard/settings/sso",
+ icon: LogIn,
+ // Enabled for admins in both cloud and self-hosted (enterprise)
+ isEnabled: ({ auth }) =>
+ !!(auth?.role === "owner" || auth?.role === "admin"),
+ },
],
help: [
@@ -410,18 +429,6 @@ const MENU: Menu = {
url: "https://discord.gg/2tBnJ3jDJc",
icon: CircleHelp,
},
- {
- name: "Sponsor",
- url: "https://opencollective.com/dokploy",
- icon: ({ className }) => (
-
+
+
+ Sign in with GitHub
+
+ );
+}
diff --git a/apps/dokploy/components/proprietary/auth/sign-in-with-google.tsx b/apps/dokploy/components/proprietary/auth/sign-in-with-google.tsx
new file mode 100644
index 000000000..bff0e69ab
--- /dev/null
+++ b/apps/dokploy/components/proprietary/auth/sign-in-with-google.tsx
@@ -0,0 +1,59 @@
+"use client";
+
+import { useState } from "react";
+import { toast } from "sonner";
+import { authClient } from "@/lib/auth-client";
+import { Button } from "@/components/ui/button";
+
+export function SignInWithGoogle() {
+ const [isLoading, setIsLoading] = useState(false);
+
+ const handleClick = async () => {
+ setIsLoading(true);
+ try {
+ const { error } = await authClient.signIn.social({
+ provider: "google",
+ });
+ if (error) {
+ toast.error(error.message);
+ return;
+ }
+ } catch (err) {
+ toast.error("An error occurred while signing in with Google", {
+ description: err instanceof Error ? err.message : "Unknown error",
+ });
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ return (
+
+
+
+ Sign in with Google
+
+ );
+}
diff --git a/apps/dokploy/components/proprietary/enterprise-feature-gate.tsx b/apps/dokploy/components/proprietary/enterprise-feature-gate.tsx
new file mode 100644
index 000000000..875813fcb
--- /dev/null
+++ b/apps/dokploy/components/proprietary/enterprise-feature-gate.tsx
@@ -0,0 +1,114 @@
+"use client";
+
+import { Loader2, Lock } from "lucide-react";
+import Link from "next/link";
+import { Button } from "@/components/ui/button";
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+} from "@/components/ui/card";
+import { api } from "@/utils/api";
+
+interface EnterpriseFeatureLockedProps {
+ /** Optional title override */
+ title?: string;
+ /** Optional description override */
+ description?: string;
+ /** Optional custom CTA label */
+ ctaLabel?: string;
+ /** Optional CTA href (default: /dashboard/settings/license) */
+ ctaHref?: string;
+ /** Compact variant (less padding, smaller icon) */
+ compact?: boolean;
+}
+
+/**
+ * Displays a locked state for enterprise features when the user has no valid license.
+ * Use standalone or via EnterpriseFeatureGate.
+ */
+export function EnterpriseFeatureLocked({
+ title = "Enterprise feature",
+ description = "This feature is part of Dokploy Enterprise. Add a valid license to use it.",
+ ctaLabel = "Go to License",
+ ctaHref = "/dashboard/settings/license",
+ compact = false,
+}: EnterpriseFeatureLockedProps) {
+ return (
+
+
+
+
+
+
+ {title}
+
+ {description}
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+interface EnterpriseFeatureGateProps {
+ children: React.ReactNode;
+ /** Props for the locked state when license is invalid */
+ lockedProps?: Omit;
+ /** Show loading spinner while checking license */
+ fallback?: React.ReactNode;
+}
+
+/**
+ * Renders children only when the instance has a valid enterprise license.
+ * Otherwise shows EnterpriseFeatureLocked.
+ */
+export function EnterpriseFeatureGate({
+ children,
+ lockedProps,
+ fallback,
+}: EnterpriseFeatureGateProps) {
+ const { data: haveValidLicense, isLoading } =
+ api.licenseKey.haveValidLicenseKey.useQuery();
+
+ if (isLoading) {
+ if (fallback) return <>{fallback};
+ return (
+
+
+ Checking license...
+
+
+ );
+ }
+
+ if (!haveValidLicense) {
+ return
+ {isCheckingLicenseKey ? (
+
+
+ Checking license key...
+
+
+ ) : (
+ <>
+
+
+
+ License Key
+
+
+ {enabled && (
+
+
+ {enabled ? "Enabled" : "Disabled"}
+
+ {
+ try {
+ await updateEnterpriseSettings({
+ enableEnterpriseFeatures: next,
+ });
+ await utils.licenseKey.getEnterpriseSettings.invalidate();
+ toast.success("Enterprise features updated");
+ } catch (error) {
+ console.error(error);
+ toast.error("Failed to update enterprise features");
+ }
+ }}
+ />
+
+ )}
+
+
+
+ To unlock extra features you need an enterprise license key.
+ Contact us{" "}
+
+
+ {enabled ? (
+ <>
+
+
+
+ License Key
+
+
+
+ {haveValidLicenseKey && (
+ {
+ try {
+ await deactivateLicenseKey();
+ await utils.licenseKey.getEnterpriseSettings.invalidate();
+ await utils.licenseKey.haveValidLicenseKey.invalidate();
+ setLicenseKey("");
+ toast.success("License key deactivated");
+ } catch (error) {
+ console.error(error);
+ toast.error(
+ error instanceof Error
+ ? error.message
+ : "Failed to deactivate license key",
+ );
+ }
+ }}
+ disabled={isDeactivating || !haveValidLicenseKey}
+ >
+
+ Deactivate
+
+
+ )}
+ {haveValidLicenseKey && (
+ {
+ try {
+ const valid = await validateLicenseKey();
+ if (valid) {
+ toast.success("License key is valid");
+ } else {
+ toast.error("License key is invalid");
+ }
+ } catch (error) {
+ console.error(error);
+ toast.error(
+ error instanceof Error
+ ? error.message
+ : "Failed to validate license key",
+ );
+ }
+ }}
+ >
+ Validate
+
+ )}
+ {!haveValidLicenseKey && (
+ {
+ try {
+ await activateLicenseKey({ licenseKey });
+ await utils.licenseKey.getEnterpriseSettings.invalidate();
+ await utils.licenseKey.haveValidLicenseKey.invalidate();
+ toast.success("License key activated");
+ } catch (error) {
+ console.error(error);
+ toast.error(
+ error instanceof Error
+ ? error.message
+ : "Failed to activate license key",
+ );
+ }
+ }}
+ >
+ Activate
+
+ )}
+
+
+
+ ) : (
+
+
+
+
+
+
Enterprise Features
+
+ Unlock advanced capabilities like SSO, Audit logs,
+ whitelabeling and more.
+
+
+
+
+
{
+ try {
+ await updateEnterpriseSettings({
+ enableEnterpriseFeatures: true,
+ });
+ await utils.licenseKey.getEnterpriseSettings.invalidate();
+ toast.success("Enterprise features enabled");
+ } catch (error) {
+ console.error(error);
+ toast.error("Failed to enable enterprise features");
+ }
+ }}
+ isLoading={isSaving}
+ disabled={isLoading || isDeactivating}
+ >
+ Enable Enterprise Features
+
+
+ )}
+
+ )}
+
;
+
+interface RegisterOidcDialogProps {
+ children: React.ReactNode;
+}
+
+const formDefaultValues = {
+ providerId: "",
+ issuer: "",
+ domains: [""],
+ clientId: "",
+ clientSecret: "",
+ scopes: [...DEFAULT_SCOPES],
+};
+
+export function RegisterOidcDialog({ children }: RegisterOidcDialogProps) {
+ const utils = api.useUtils();
+ const [open, setOpen] = useState(false);
+ const { mutateAsync, isLoading } = api.sso.register.useMutation();
+
+ const form = useForm({
+ resolver: zodResolver(oidcProviderSchema),
+ defaultValues: formDefaultValues,
+ });
+
+ const { fields, append, remove } = useFieldArray({
+ control: form.control,
+ name: "domains" as FieldArrayPath,
+ });
+
+ const {
+ fields: scopeFields,
+ append: appendScope,
+ remove: removeScope,
+ } = useFieldArray({
+ control: form.control,
+ name: "scopes" as FieldArrayPath,
+ });
+
+ const isSubmitting = form.formState.isSubmitting;
+
+ const onSubmit = async (data: OidcProviderForm) => {
+ try {
+ const scopes = data.scopes.filter(Boolean).length
+ ? data.scopes.filter(Boolean)
+ : DEFAULT_SCOPES;
+
+ const isAzure = data.issuer.includes("login.microsoftonline.com");
+ const mapping = isAzure
+ ? {
+ id: "sub",
+ email: "preferred_username",
+ emailVerified: "email_verified",
+ name: "name",
+ }
+ : {
+ id: "sub",
+ email: "email",
+ emailVerified: "email_verified",
+ name: "preferred_username",
+ image: "picture",
+ };
+ await mutateAsync({
+ providerId: data.providerId,
+ issuer: data.issuer,
+ domains: data.domains,
+ oidcConfig: {
+ clientId: data.clientId,
+ clientSecret: data.clientSecret,
+ scopes,
+ pkce: true,
+ mapping,
+ },
+ });
+
+ toast.success("OIDC provider registered successfully");
+ form.reset(formDefaultValues);
+ setOpen(false);
+ await utils.sso.listProviders.invalidate();
+ } catch (err) {
+ toast.error(
+ err instanceof Error ? err.message : "Failed to register SSO provider",
+ );
+ }
+ };
+
+ return (
+
+ {children}
+
+
+ Register OIDC provider
+
+ Add any OIDC-compliant identity provider (e.g. Okta, Azure AD,
+ Google Workspace, Auth0, Keycloak). Discovery will fill endpoints
+ from the issuer URL when possible.
+
+
+
+
+
+
+ );
+}
diff --git a/apps/dokploy/components/proprietary/sso/register-saml-dialog.tsx b/apps/dokploy/components/proprietary/sso/register-saml-dialog.tsx
new file mode 100644
index 000000000..4835eb6b8
--- /dev/null
+++ b/apps/dokploy/components/proprietary/sso/register-saml-dialog.tsx
@@ -0,0 +1,328 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Plus, Trash2 } from "lucide-react";
+import { useEffect, useState } from "react";
+import { type FieldArrayPath, useFieldArray, useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ Form,
+ FormControl,
+ FormDescription,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { api } from "@/utils/api";
+
+const domainsArraySchema = z
+ .array(z.string().trim())
+ .superRefine((arr, ctx) => {
+ const filled = arr.filter((s) => s.length > 0);
+ if (filled.length < 1) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: "At least one domain is required",
+ path: [],
+ });
+ }
+ });
+
+const samlProviderSchema = z.object({
+ providerId: z.string().min(1, "Provider ID is required").trim(),
+ issuer: z.string().min(1, "Issuer URL is required").url("Invalid URL").trim(),
+ domains: domainsArraySchema,
+ entryPoint: z
+ .string()
+ .min(1, "IdP SSO URL is required")
+ .url("Invalid URL")
+ .trim(),
+ cert: z.string().min(1, "IdP signing certificate is required"),
+ idpMetadataXml: z.string().optional(),
+});
+
+type SamlProviderForm = z.infer;
+
+interface RegisterSamlDialogProps {
+ children: React.ReactNode;
+}
+
+const formDefaultValues: SamlProviderForm = {
+ providerId: "",
+ issuer: "",
+ domains: [""],
+ entryPoint: "",
+ cert: "",
+ idpMetadataXml: "",
+};
+
+export function RegisterSamlDialog({ children }: RegisterSamlDialogProps) {
+ const utils = api.useUtils();
+ const [open, setOpen] = useState(false);
+ const { mutateAsync, isLoading } = api.sso.register.useMutation();
+
+ const [baseURL, setBaseURL] = useState("");
+
+ useEffect(() => {
+ if (typeof window !== "undefined") {
+ setBaseURL(window.location.origin);
+ }
+ }, []);
+
+ const form = useForm({
+ resolver: zodResolver(samlProviderSchema),
+ defaultValues: formDefaultValues,
+ });
+
+ const { fields, append, remove } = useFieldArray({
+ control: form.control,
+ name: "domains" as FieldArrayPath,
+ });
+
+ const isSubmitting = form.formState.isSubmitting;
+
+ const onSubmit = async (data: SamlProviderForm) => {
+ try {
+ // maybe add the /saml/metadata endpoint to the baseURL
+ const baseURLWithMetadata = `${baseURL}/saml/metadata`;
+ const generateSpMetadata = (providerId: string) => {
+ return `
+
+
+
+ `;
+ };
+
+ await mutateAsync({
+ providerId: data.providerId,
+ issuer: data.issuer,
+ domains: data.domains,
+ samlConfig: {
+ entryPoint: data.entryPoint,
+ cert: data.cert,
+ callbackUrl: `${baseURL}/api/auth/sso/saml2/callback/${data.providerId}`,
+ audience: baseURL,
+ idpMetadata: data.idpMetadataXml?.trim()
+ ? { metadata: data.idpMetadataXml.trim() }
+ : undefined,
+ spMetadata: {
+ metadata: generateSpMetadata(data.providerId),
+ },
+ mapping: {
+ id: "nameID",
+ email: "email",
+ name: "displayName",
+ firstName: "givenName",
+ lastName: "surname",
+ },
+ },
+ });
+
+ toast.success("SAML provider registered successfully");
+ form.reset(formDefaultValues);
+ setOpen(false);
+ await utils.sso.listProviders.invalidate();
+ } catch (err) {
+ toast.error(
+ err instanceof Error ? err.message : "Failed to register SAML provider",
+ );
+ }
+ };
+
+ return (
+
+ {children}
+
+
+ Register SAML provider
+
+ Add a SAML 2.0 identity provider (e.g. Okta SAML, Azure AD SAML,
+ OneLogin). You need the IdP's SSO URL and signing certificate.
+
+
+
+
+
+
+ );
+}
diff --git a/apps/dokploy/components/proprietary/sso/sign-in-with-sso.tsx b/apps/dokploy/components/proprietary/sso/sign-in-with-sso.tsx
new file mode 100644
index 000000000..391329ed3
--- /dev/null
+++ b/apps/dokploy/components/proprietary/sso/sign-in-with-sso.tsx
@@ -0,0 +1,127 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Loader2, LogIn } from "lucide-react";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { toast } from "sonner";
+import { z } from "zod";
+import { Button } from "@/components/ui/button";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { authClient } from "@/lib/auth-client";
+
+const ssoEmailSchema = z.object({
+ email: z
+ .string()
+ .min(1, "Enter your work email")
+ .email("Enter a valid email address")
+ .transform((v) => v.trim()),
+});
+
+type SSOEmailForm = z.infer;
+
+interface SignInWithSSOProps {
+ /** Content shown when SSO is collapsed (e.g. email/password form) */
+ children: React.ReactNode;
+}
+
+export function SignInWithSSO({ children }: SignInWithSSOProps) {
+ const [expanded, setExpanded] = useState(false);
+
+ const form = useForm({
+ resolver: zodResolver(ssoEmailSchema),
+ defaultValues: { email: "" },
+ });
+
+ const onSubmit = async (values: SSOEmailForm) => {
+ try {
+ const { data, error } = await authClient.signIn.sso({
+ email: values.email,
+ callbackURL: "/dashboard/projects",
+ });
+ if (error) {
+ toast.error(error.message ?? "Failed to sign in with SSO");
+ return;
+ }
+ if (data?.url) {
+ window.location.href = data.url;
+ }
+ } catch (err) {
+ toast.error(
+ err instanceof Error ? err.message : "Failed to sign in with SSO",
+ );
+ }
+ };
+
+ if (!expanded) {
+ return (
+
+ setExpanded(true)}
+ >
+
+ {children}
+
+ );
+ }
+
+ return (
+
+ );
+}
diff --git a/apps/dokploy/components/proprietary/sso/sso-settings.tsx b/apps/dokploy/components/proprietary/sso/sso-settings.tsx
new file mode 100644
index 000000000..830745e01
--- /dev/null
+++ b/apps/dokploy/components/proprietary/sso/sso-settings.tsx
@@ -0,0 +1,371 @@
+"use client";
+
+import { Eye, Loader2, LogIn, Trash2 } from "lucide-react";
+import { useEffect, useState } from "react";
+import { toast } from "sonner";
+import { DialogAction } from "@/components/shared/dialog-action";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import {
+ Card,
+ CardContent,
+ CardDescription,
+ CardHeader,
+ CardTitle,
+} from "@/components/ui/card";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from "@/components/ui/dialog";
+import { api } from "@/utils/api";
+import { RegisterOidcDialog } from "./register-oidc-dialog";
+import { RegisterSamlDialog } from "./register-saml-dialog";
+
+type ProviderForDetails = {
+ id: string | null;
+ providerId: string;
+ issuer: string;
+ domain: string;
+ oidcConfig: string | null;
+ samlConfig: string | null;
+ organizationId: string | null;
+};
+
+function parseOidcConfig(config: string | null): {
+ clientId?: string;
+ scopes?: string[];
+} | null {
+ if (!config) return null;
+ try {
+ const parsed = JSON.parse(config) as {
+ clientId?: string;
+ scopes?: string[];
+ };
+ return { clientId: parsed.clientId, scopes: parsed.scopes };
+ } catch {
+ return null;
+ }
+}
+
+function parseSamlConfig(
+ config: string | null,
+): { entryPoint?: string } | null {
+ if (!config) return null;
+ try {
+ const parsed = JSON.parse(config) as { entryPoint?: string };
+ return { entryPoint: parsed.entryPoint };
+ } catch {
+ return null;
+ }
+}
+
+export const SSOSettings = () => {
+ const utils = api.useUtils();
+ const [detailsProvider, setDetailsProvider] =
+ useState(null);
+ const [baseURL, setBaseURL] = useState("");
+
+ useEffect(() => {
+ if (typeof window !== "undefined") {
+ setBaseURL(window.location.origin);
+ }
+ }, []);
+
+ const { data: providers, isLoading } = api.sso.listProviders.useQuery();
+ const { mutateAsync: deleteProvider, isLoading: isDeleting } =
+ api.sso.deleteProvider.useMutation();
+
+ return (
+
+
+
+ Single Sign-On (SSO)
+
+
+ Configure OIDC or SAML identity providers for enterprise sign-in.
+ Users can sign in with their organization's IdP.
+
+
+
+ {isLoading ? (
+
+
+ Loading providers...
+
+
+ ) : (
+ <>
+ {providers && providers.length > 0 && (
+
+
+
+
+
+
+
+
+
+
+ )}
+
+ {providers && providers.length > 0 ? (
+
+
Registered providers
+
+ {providers.map((provider) => {
+ const isOidc = !!provider.oidcConfig;
+ const isSaml = !!provider.samlConfig;
+
+ return (
+
+
+
+
+
+ {provider.providerId}
+
+
+ {provider.issuer}
+
+
+
+ {provider.domain}
+
+ {isOidc && (
+
+ OIDC
+
+ )}
+ {isSaml && (
+
+ SAML
+
+ )}
+
+
+
+
+
+ setDetailsProvider({
+ id: provider.id,
+ providerId: provider.providerId,
+ issuer: provider.issuer,
+ domain: provider.domain,
+ oidcConfig: provider.oidcConfig,
+ samlConfig: provider.samlConfig,
+ organizationId: provider.organizationId,
+ })
+ }
+ >
+
+ {
+ try {
+ await deleteProvider({
+ providerId: provider.providerId,
+ });
+ toast.success("Provider removed");
+ await utils.sso.listProviders.invalidate();
+ } catch (err) {
+ toast.error(
+ err instanceof Error
+ ? err.message
+ : "Failed to remove provider",
+ );
+ }
+ }}
+ >
+
+
+
+
+
+ );
+ })}
+
+
+ ) : (
+
+
+
+
+
+
No SSO providers
+
+ Add an OIDC or SAML provider so users can sign in with their
+ organization's IdP (e.g. Okta, Azure AD).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )}
+
+ )}
+
+
!open && setDetailsProvider(null)}
+ >
+
+ {detailsProvider && (
+ <>
+
+ SSO provider details
+
+ View-only. To change settings, remove this provider and add it
+ again with the new values.
+
+
+
+
+
+ Provider ID
+
+
+ {detailsProvider.providerId}
+
+
+
+
+ Issuer URL
+
+
+ {detailsProvider.issuer}
+
+
+
+
+ Domain
+
+
+ {detailsProvider.domain}
+
+
+ {detailsProvider.oidcConfig && (
+ <>
+ {(() => {
+ const oidc = parseOidcConfig(detailsProvider.oidcConfig);
+ if (!oidc) return null;
+ return (
+ <>
+ {oidc.clientId && (
+
+
+ Client ID
+
+
+ {oidc.clientId}
+
+
+ )}
+ {oidc.scopes && oidc.scopes.length > 0 && (
+
+
+ Scopes
+
+
+ {oidc.scopes.join(" ")}
+
+
+ )}
+
+ );
+ })()}
+
+ )}
+ {detailsProvider.samlConfig && (
+ <>
+ {(() => {
+ const saml = parseSamlConfig(detailsProvider.samlConfig);
+ if (!saml?.entryPoint) return null;
+ return (
+
+
+ Entry point
+
+
+ {saml.entryPoint}
+
+
+ );
+ })()}
+
+ )}
+
+
+ Callback URL (configure in your IdP)
+
+
+ {baseURL || "{baseURL}"}
+ {detailsProvider.samlConfig
+ ? "/api/auth/sso/saml2/callback/"
+ : "/api/auth/sso/callback/"}
+ {detailsProvider.providerId}
+
+ {!baseURL && (
+
+ Replace {"{baseURL}"} with your Dokploy URL (e.g. https://
+ your-domain.com).
+
+ )}
+
+
+ setDetailsProvider(null)}
+ >
+ Close
+
+
+
+ )}
+
+
+
-
+
{
diff --git a/apps/dokploy/components/ui/input.tsx b/apps/dokploy/components/ui/input.tsx
index 87afd64e5..ddeb36894 100644
--- a/apps/dokploy/components/ui/input.tsx
+++ b/apps/dokploy/components/ui/input.tsx
@@ -1,18 +1,75 @@
-import { EyeIcon, EyeOffIcon } from "lucide-react";
+import { EyeIcon, EyeOffIcon, RefreshCcw } from "lucide-react";
import * as React from "react";
+import { generateRandomPassword } from "@/lib/password-utils";
import { cn } from "@/lib/utils";
export interface InputProps
extends React.InputHTMLAttributes {
errorMessage?: string;
+ enablePasswordGenerator?: boolean;
+ passwordGeneratorLength?: number;
}
const Input = React.forwardRef(
- ({ className, errorMessage, type, ...props }, ref) => {
+ (
+ {
+ className,
+ errorMessage,
+ type,
+ enablePasswordGenerator = false,
+ passwordGeneratorLength,
+ ...props
+ },
+ ref,
+ ) => {
const [showPassword, setShowPassword] = React.useState(false);
+ const inputRef = React.useRef(null);
const isPassword = type === "password";
+ const shouldShowGenerator =
+ isPassword &&
+ enablePasswordGenerator !== false &&
+ !props.disabled &&
+ !props.readOnly;
const inputType = isPassword ? (showPassword ? "text" : "password") : type;
+ const setRefs = React.useCallback(
+ (node: HTMLInputElement | null) => {
+ // @ts-ignore
+ inputRef.current = node;
+ if (typeof ref === "function") {
+ ref(node);
+ } else if (ref) {
+ ref.current = node;
+ }
+ },
+ [ref],
+ );
+
+ const handleGeneratePassword = () => {
+ const nextValue =
+ typeof passwordGeneratorLength === "number" &&
+ passwordGeneratorLength > 0
+ ? generateRandomPassword(Math.floor(passwordGeneratorLength))
+ : generateRandomPassword();
+
+ const input = inputRef.current;
+ if (!input) {
+ return;
+ }
+
+ const valueSetter = Object.getOwnPropertyDescriptor(
+ HTMLInputElement.prototype,
+ "value",
+ )?.set;
+ if (valueSetter) {
+ valueSetter.call(input, nextValue);
+ } else {
+ input.value = nextValue;
+ }
+
+ input.dispatchEvent(new Event("input", { bubbles: true }));
+ };
+
return (
<>
@@ -21,25 +78,39 @@ const Input = React.forwardRef
(
className={cn(
// bg-gray
"flex h-10 w-full rounded-md bg-input px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border disabled:cursor-not-allowed disabled:opacity-50",
- isPassword && "pr-10", // Add padding for the eye icon
+ isPassword && (shouldShowGenerator ? "pr-16" : "pr-10"),
className,
)}
- ref={ref}
+ ref={setRefs}
{...props}
/>
{isPassword && (
- setShowPassword(!showPassword)}
- tabIndex={-1}
- >
- {showPassword ? (
-
+ {shouldShowGenerator && (
+
+
)}
-
+ setShowPassword(!showPassword)}
+ tabIndex={-1}
+ >
+ {showPassword ? (
+
+
)}
;
+ /**
+ * If true, reloads the page when health check passes (e.g. for server update).
+ * @default false
+ */
+ reloadOnSuccess?: boolean;
+}
+
+export const useHealthCheckAfterMutation = ({
+ initialDelay = 5000,
+ pollInterval = 2000,
+ successMessage,
+ onSuccess,
+ reloadOnSuccess = false,
+}: UseHealthCheckAfterMutationOptions) => {
+ const [isExecuting, setIsExecuting] = useState(false);
+
+ const checkHealth = useCallback(async (): Promise => {
+ try {
+ const response = await fetch(HEALTH_CHECK_URL);
+ return response.ok;
+ } catch {
+ return false;
+ }
+ }, []);
+
+ const pollUntilHealthy = useCallback(async (): Promise => {
+ const isHealthy = await checkHealth();
+
+ if (isHealthy) {
+ toast.success(successMessage);
+
+ if (reloadOnSuccess) {
+ setTimeout(() => {
+ window.location.reload();
+ }, 2000);
+ } else {
+ await onSuccess?.();
+ }
+ return;
+ }
+
+ await new Promise((resolve) => setTimeout(resolve, pollInterval));
+ await pollUntilHealthy();
+ }, [checkHealth, successMessage, reloadOnSuccess, onSuccess, pollInterval]);
+
+ const execute = useCallback(
+ async (mutationFn: () => Promise): Promise => {
+ setIsExecuting(true);
+
+ try {
+ const result = await mutationFn();
+
+ // Give time for the service to restart before polling
+ await new Promise((resolve) => setTimeout(resolve, initialDelay));
+
+ await pollUntilHealthy();
+
+ return result;
+ } finally {
+ setIsExecuting(false);
+ }
+ },
+ [initialDelay, pollUntilHealthy],
+ );
+
+ return { execute, isExecuting };
+};
diff --git a/apps/dokploy/lib/auth-client.ts b/apps/dokploy/lib/auth-client.ts
index 147e94cbf..47f0d2294 100644
--- a/apps/dokploy/lib/auth-client.ts
+++ b/apps/dokploy/lib/auth-client.ts
@@ -1,3 +1,4 @@
+import { ssoClient } from "@better-auth/sso/client";
import {
adminClient,
apiKeyClient,
@@ -13,6 +14,7 @@ export const authClient = createAuthClient({
organizationClient(),
twoFactorClient(),
apiKeyClient(),
+ ssoClient(),
adminClient(),
inferAdditionalFields({
user: {
diff --git a/apps/dokploy/lib/password-utils.ts b/apps/dokploy/lib/password-utils.ts
new file mode 100644
index 000000000..b95fd290f
--- /dev/null
+++ b/apps/dokploy/lib/password-utils.ts
@@ -0,0 +1,38 @@
+const DEFAULT_PASSWORD_LENGTH = 20;
+const DEFAULT_PASSWORD_CHARSET =
+ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+export const generateRandomPassword = (
+ length: number = DEFAULT_PASSWORD_LENGTH,
+ charset: string = DEFAULT_PASSWORD_CHARSET,
+) => {
+ const safeLength =
+ Number.isFinite(length) && length > 0
+ ? Math.floor(length)
+ : DEFAULT_PASSWORD_LENGTH;
+
+ if (safeLength <= 0 || charset.length === 0) {
+ return "";
+ }
+
+ const cryptoApi =
+ typeof globalThis !== "undefined" ? globalThis.crypto : undefined;
+
+ if (!cryptoApi?.getRandomValues) {
+ let fallback = "";
+ for (let i = 0; i < safeLength; i += 1) {
+ fallback += charset[Math.floor(Math.random() * charset.length)];
+ }
+ return fallback;
+ }
+
+ const values = new Uint32Array(safeLength);
+ cryptoApi.getRandomValues(values);
+
+ let result = "";
+ for (const value of values) {
+ result += charset[value % charset.length];
+ }
+
+ return result;
+};
diff --git a/apps/dokploy/migration.ts b/apps/dokploy/migration.ts
index d52066c88..984197b2a 100644
--- a/apps/dokploy/migration.ts
+++ b/apps/dokploy/migration.ts
@@ -1,10 +1,9 @@
+import { dbUrl } from "@dokploy/server/db";
import { drizzle } from "drizzle-orm/postgres-js";
import { migrate } from "drizzle-orm/postgres-js/migrator";
import postgres from "postgres";
-const connectionString = process.env.DATABASE_URL!;
-
-const sql = postgres(connectionString, { max: 1 });
+const sql = postgres(dbUrl, { max: 1 });
const db = drizzle(sql);
await migrate(db, { migrationsFolder: "drizzle" })
diff --git a/apps/dokploy/next.config.mjs b/apps/dokploy/next.config.mjs
index a1b19d722..48231114a 100644
--- a/apps/dokploy/next.config.mjs
+++ b/apps/dokploy/next.config.mjs
@@ -19,6 +19,32 @@ const nextConfig = {
locales: ["en"],
defaultLocale: "en",
},
+ async headers() {
+ return [
+ {
+ // Apply security headers to all routes
+ source: "/:path*",
+ headers: [
+ {
+ key: "X-Frame-Options",
+ value: "DENY",
+ },
+ {
+ key: "Content-Security-Policy",
+ value: "frame-ancestors 'none'",
+ },
+ {
+ key: "X-Content-Type-Options",
+ value: "nosniff",
+ },
+ {
+ key: "Referrer-Policy",
+ value: "strict-origin-when-cross-origin",
+ },
+ ],
+ },
+ ];
+ },
};
export default nextConfig;
diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
index 375ecbe69..dfb039195 100644
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -1,15 +1,17 @@
{
"name": "dokploy",
- "version": "v0.26.3",
+ "version": "v0.27.0",
"private": true,
"license": "Apache-2.0",
"type": "module",
"scripts": {
"build": "npm run build-server && npm run build-next",
- "start": "node -r dotenv/config dist/server.mjs",
+ "start": "node -r dotenv/config dist/migration.mjs && node -r dotenv/config dist/server.mjs",
"build-server": "tsx esbuild.config.ts",
- "build-next": "next build",
+ "build-next": "next build --webpack",
"setup": "tsx -r dotenv/config setup.ts && sleep 5 && pnpm run migration:run",
+ "wait-for-postgres": "node -r dotenv/config dist/wait-for-postgres.mjs",
+ "wait-for-postgres-dev": "tsx -r dotenv/config wait-for-postgres.ts",
"reset-password": "node -r dotenv/config dist/reset-password.mjs",
"reset-2fa": "node -r dotenv/config dist/reset-2fa.mjs",
"dev": "tsx -r dotenv/config ./server/server.ts --project tsconfig.server.json ",
@@ -37,6 +39,8 @@
"generate:openapi": "tsx -r dotenv/config scripts/generate-openapi.ts"
},
"dependencies": {
+ "resend": "^6.0.2",
+ "@better-auth/sso": "1.4.18",
"@ai-sdk/anthropic": "^2.0.5",
"@ai-sdk/azure": "^2.0.16",
"@ai-sdk/cohere": "^2.0.4",
@@ -94,10 +98,10 @@
"ai": "^5.0.17",
"ai-sdk-ollama": "^0.5.1",
"bcrypt": "5.1.1",
- "better-auth": "v1.2.8-beta.7",
+ "better-auth": "1.4.18",
"bl": "6.0.11",
"boxen": "^7.1.1",
- "bullmq": "5.4.2",
+ "bullmq": "5.67.3",
"shell-quote": "^1.8.1",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
@@ -106,7 +110,7 @@
"date-fns": "3.6.0",
"dockerode": "4.0.2",
"dotenv": "16.4.5",
- "drizzle-orm": "^0.39.3",
+ "drizzle-orm": "^0.41.0",
"drizzle-zod": "0.5.1",
"fancy-ansi": "^0.1.3",
"i18next": "^23.16.8",
@@ -116,7 +120,7 @@
"lucide-react": "^0.469.0",
"micromatch": "4.0.8",
"nanoid": "3.3.11",
- "next": "^16.0.10",
+ "next": "^16.1.6",
"next-i18next": "^15.4.2",
"next-themes": "^0.2.1",
"nextjs-toploader": "^3.9.17",
@@ -153,16 +157,18 @@
"xterm-addon-fit": "^0.8.0",
"yaml": "2.8.1",
"zod": "^3.25.32",
- "zod-form-data": "^2.0.7"
+ "zod-form-data": "^2.0.7",
+ "semver": "7.7.3"
},
"devDependencies": {
+ "@types/semver": "7.7.1",
"@types/shell-quote": "^1.7.5",
"@types/adm-zip": "^0.5.7",
"@types/bcrypt": "5.0.2",
"@types/js-cookie": "^3.0.6",
"@types/lodash": "4.17.4",
"@types/micromatch": "4.0.9",
- "@types/node": "^18.19.104",
+ "@types/node": "^20.16.0",
"@types/node-schedule": "2.1.6",
"@types/nodemailer": "^6.4.17",
"@types/qrcode": "^1.5.5",
@@ -172,7 +178,7 @@
"@types/swagger-ui-react": "^4.19.0",
"@types/ws": "8.5.10",
"autoprefixer": "10.4.12",
- "drizzle-kit": "^0.30.6",
+ "drizzle-kit": "^0.31.4",
"esbuild": "0.20.2",
"lint-staged": "^15.5.2",
"memfs": "^4.17.2",
@@ -180,7 +186,7 @@
"tsx": "^4.16.2",
"typescript": "^5.8.3",
"vite-tsconfig-paths": "4.3.2",
- "vitest": "^1.6.1"
+ "vitest": "^4.0.18"
},
"ct3aMetadata": {
"initVersion": "7.25.2"
@@ -194,10 +200,5 @@
"*": [
"biome check --write --no-errors-on-unmatched --files-ignore-unknown=true"
]
- },
- "commitlint": {
- "extends": [
- "@commitlint/config-conventional"
- ]
}
}
diff --git a/apps/dokploy/pages/api/deploy/[refreshToken].ts b/apps/dokploy/pages/api/deploy/[refreshToken].ts
index 415ece29b..1bd911494 100644
--- a/apps/dokploy/pages/api/deploy/[refreshToken].ts
+++ b/apps/dokploy/pages/api/deploy/[refreshToken].ts
@@ -195,7 +195,9 @@ export default async function handler(
const commitedPaths = await extractCommitedPaths(
req.body,
application.bitbucket,
- application.bitbucketRepository || "",
+ application.bitbucketRepositorySlug ||
+ application.bitbucketRepository ||
+ "",
);
const shouldDeployPaths = shouldDeploy(
diff --git a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
index d9b5ef2a2..f41b41198 100644
--- a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
+++ b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
@@ -100,7 +100,9 @@ export default async function handler(
const commitedPaths = await extractCommitedPaths(
req.body,
composeResult.bitbucket,
- composeResult.bitbucketRepository || "",
+ composeResult.bitbucketRepositorySlug ||
+ composeResult.bitbucketRepository ||
+ "",
);
const shouldDeployPaths = shouldDeploy(
diff --git a/apps/dokploy/pages/api/deploy/github.ts b/apps/dokploy/pages/api/deploy/github.ts
index 9369e800e..ba031e71a 100644
--- a/apps/dokploy/pages/api/deploy/github.ts
+++ b/apps/dokploy/pages/api/deploy/github.ts
@@ -355,6 +355,11 @@ export default async function handler(
action === "labeled" ||
action === "unlabeled"
) {
+ const shouldCreateDeployment =
+ action === "opened" ||
+ action === "synchronize" ||
+ action === "reopened";
+
const repository = githubBody?.repository?.name;
const deploymentHash = githubBody?.pull_request?.head?.sha;
const branch = githubBody?.pull_request?.base?.ref;
@@ -475,7 +480,7 @@ export default async function handler(
let previewDeploymentId =
previewDeploymentResult?.previewDeploymentId || "";
- if (!previewDeploymentResult) {
+ if (!previewDeploymentResult && shouldCreateDeployment) {
const previewDeployment = await createPreviewDeployment({
applicationId: app.applicationId as string,
branch: prBranch,
@@ -497,21 +502,23 @@ export default async function handler(
previewDeploymentId,
};
- if (IS_CLOUD && app.serverId) {
- jobData.serverId = app.serverId;
- deploy(jobData).catch((error) => {
- console.error("Background deployment failed:", error);
- });
- continue;
+ if (previewDeploymentId) {
+ if (IS_CLOUD && app.serverId) {
+ jobData.serverId = app.serverId;
+ deploy(jobData).catch((error) => {
+ console.error("Background deployment failed:", error);
+ });
+ continue;
+ }
+ await myQueue.add(
+ "deployments",
+ { ...jobData },
+ {
+ removeOnComplete: true,
+ removeOnFail: true,
+ },
+ );
}
- await myQueue.add(
- "deployments",
- { ...jobData },
- {
- removeOnComplete: true,
- removeOnFail: true,
- },
- );
}
return res.status(200).json({ message: "Apps Deployed" });
}
diff --git a/apps/dokploy/pages/api/providers/gitea/callback.ts b/apps/dokploy/pages/api/providers/gitea/callback.ts
index c7950b6e3..9e7e66a56 100644
--- a/apps/dokploy/pages/api/providers/gitea/callback.ts
+++ b/apps/dokploy/pages/api/providers/gitea/callback.ts
@@ -15,7 +15,9 @@ const parseState = (state: string): string | null => {
// Helper to fetch access token from Gitea
const fetchAccessToken = async (gitea: Gitea, code: string) => {
- const response = await fetch(`${gitea.giteaUrl}/login/oauth/access_token`, {
+ // Use internal URL for token exchange when Gitea is on same instance as Dokploy
+ const baseUrl = gitea.giteaInternalUrl || gitea.giteaUrl;
+ const response = await fetch(`${baseUrl}/login/oauth/access_token`, {
method: "POST",
headers: {
"Content-Type": "application/x-www-form-urlencoded",
diff --git a/apps/dokploy/pages/api/providers/gitea/helper.ts b/apps/dokploy/pages/api/providers/gitea/helper.ts
index 90f09d571..207eb9075 100644
--- a/apps/dokploy/pages/api/providers/gitea/helper.ts
+++ b/apps/dokploy/pages/api/providers/gitea/helper.ts
@@ -9,6 +9,7 @@ export interface Gitea {
refreshToken: string | null;
expiresAt: number | null;
giteaUrl: string;
+ giteaInternalUrl: string | null;
clientId: string | null;
clientSecret: string | null;
organizationName?: string;
diff --git a/apps/dokploy/pages/api/providers/gitlab/callback.ts b/apps/dokploy/pages/api/providers/gitlab/callback.ts
index 008873511..42d81df12 100644
--- a/apps/dokploy/pages/api/providers/gitlab/callback.ts
+++ b/apps/dokploy/pages/api/providers/gitlab/callback.ts
@@ -12,7 +12,9 @@ export default async function handler(
}
const gitlab = await findGitlabById(gitlabId as string);
- const gitlabUrl = new URL(gitlab.gitlabUrl);
+ // Use internal URL for token exchange when GitLab is on same instance as Dokploy
+ const baseUrl = gitlab.gitlabInternalUrl || gitlab.gitlabUrl;
+ const gitlabUrl = new URL(baseUrl);
const headers: HeadersInit = {
"Content-Type": "application/x-www-form-urlencoded",
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx
index dcc34cec2..af901311e 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx
@@ -909,7 +909,9 @@ const EnvironmentPage = (
Project Environment
- {(auth?.role === "owner" || auth?.canCreateServices) && (
+ {(auth?.role === "owner" ||
+ auth?.role === "admin" ||
+ auth?.canCreateServices) && (
@@ -1032,6 +1034,7 @@ const EnvironmentPage = (
{(auth?.role === "owner" ||
+ auth?.role === "admin" ||
auth?.canDeleteServices) && (
<>
0) {
+ // Try to find default, otherwise use first accessible
+ const targetEnv =
+ accessibleEnvironments.find((env) => env.isDefault) ||
+ accessibleEnvironments[0];
+
+ return {
+ redirect: {
+ permanent: false,
+ destination: `/dashboard/project/${params.projectId}/environment/${targetEnv.environmentId}`,
+ },
+ };
+ }
+ // No accessible environments, redirect to home
+ return {
+ redirect: {
+ permanent: false,
+ destination: "/",
+ },
+ };
+ }
await helpers.environment.byProjectId.fetch({
projectId: params.projectId,
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/application/[applicationId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/application/[applicationId].tsx
index e6fc9ddf0..7917bd97c 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/application/[applicationId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/application/[applicationId].tsx
@@ -108,6 +108,7 @@ const Service = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -192,7 +193,9 @@ const Service = (
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx
index 56b4b5d0c..1d6902c59 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx
@@ -97,6 +97,7 @@ const Service = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -182,7 +183,9 @@ const Service = (
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx
index d47fbd14d..0a1e8501d 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx
@@ -79,6 +79,7 @@ const Mariadb = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -156,7 +157,9 @@ const Mariadb = (
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx
index 660315d5a..bae83cb2b 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx
@@ -78,6 +78,7 @@ const Mongo = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -155,7 +156,9 @@ const Mongo = (
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx
index 7f4cc791c..ba2b9d8a0 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx
@@ -77,6 +77,7 @@ const MySql = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -156,7 +157,9 @@ const MySql = (
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx
index a34f7b7ee..1d90e3e13 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx
@@ -77,6 +77,7 @@ const Postgresql = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -154,7 +155,9 @@ const Postgresql = (
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx
index 72a513fba..47eb82a74 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx
@@ -77,6 +77,7 @@ const Redis = (
{ name: "Projects", href: "/dashboard/projects" },
{
name: data?.environment?.project?.name || "",
+ href: `/dashboard/project/${projectId}/environment/${environmentId}`,
},
{
name: data?.environment?.name || "",
@@ -154,7 +155,9 @@ const Redis = (
diff --git a/apps/dokploy/pages/dashboard/settings/invoices.tsx b/apps/dokploy/pages/dashboard/settings/invoices.tsx
new file mode 100644
index 000000000..a37c3607c
--- /dev/null
+++ b/apps/dokploy/pages/dashboard/settings/invoices.tsx
@@ -0,0 +1,63 @@
+import { IS_CLOUD } from "@dokploy/server/constants";
+import { validateRequest } from "@dokploy/server/lib/auth";
+import { createServerSideHelpers } from "@trpc/react-query/server";
+import type { GetServerSidePropsContext } from "next";
+import type { ReactElement } from "react";
+import superjson from "superjson";
+import { ShowBillingInvoices } from "@/components/dashboard/settings/billing/show-billing-invoices";
+import { DashboardLayout } from "@/components/layouts/dashboard-layout";
+import { appRouter } from "@/server/api/root";
+
+const Page = () => {
+ return {page} ;
+};
+export async function getServerSideProps(
+ ctx: GetServerSidePropsContext<{ serviceId: string }>,
+) {
+ if (!IS_CLOUD) {
+ return {
+ redirect: {
+ permanent: true,
+ destination: "/dashboard/projects",
+ },
+ };
+ }
+ const { req, res } = ctx;
+ const { user, session } = await validateRequest(req);
+ if (!user || user.role !== "owner") {
+ return {
+ redirect: {
+ permanent: true,
+ destination: "/",
+ },
+ };
+ }
+
+ const helpers = createServerSideHelpers({
+ router: appRouter,
+ ctx: {
+ req: req as any,
+ res: res as any,
+ db: null as any,
+ session: session as any,
+ user: user as any,
+ },
+ transformer: superjson,
+ });
+
+ await helpers.user.get.prefetch();
+
+ await helpers.settings.isCloud.prefetch();
+
+ return {
+ props: {
+ trpcState: helpers.dehydrate(),
+ },
+ };
+}
diff --git a/apps/dokploy/pages/dashboard/settings/license.tsx b/apps/dokploy/pages/dashboard/settings/license.tsx
new file mode 100644
index 000000000..af8035994
--- /dev/null
+++ b/apps/dokploy/pages/dashboard/settings/license.tsx
@@ -0,0 +1,76 @@
+import { IS_CLOUD, validateRequest } from "@dokploy/server";
+import { createServerSideHelpers } from "@trpc/react-query/server";
+import type { GetServerSidePropsContext } from "next";
+import type { ReactElement } from "react";
+import superjson from "superjson";
+import { DashboardLayout } from "@/components/layouts/dashboard-layout";
+import { LicenseKeySettings } from "@/components/proprietary/license-keys/license-key";
+import { Card } from "@/components/ui/card";
+import { appRouter } from "@/server/api/root";
+import { getLocale, serverSideTranslations } from "@/utils/i18n";
+
+const Page = () => {
+ return (
+
+ );
+};
+
+export default Page;
+
+Page.getLayout = (page: ReactElement) => {
+ return {page} ;
+};
+
+export async function getServerSideProps(
+ ctx: GetServerSidePropsContext<{ serviceId: string }>,
+) {
+ const { req, res } = ctx;
+ const locale = await getLocale(req.cookies);
+ const { user, session } = await validateRequest(ctx.req);
+ if (!user) {
+ return {
+ redirect: {
+ permanent: true,
+ destination: "/",
+ },
+ };
+ }
+ if (user.role === "member") {
+ return {
+ redirect: {
+ permanent: true,
+ destination: "/dashboard/settings/profile",
+ },
+ };
+ }
+
+ const helpers = createServerSideHelpers({
+ router: appRouter,
+ ctx: {
+ req: req as any,
+ res: res as any,
+ db: null as any,
+ session: session as any,
+ user: user as any,
+ },
+ transformer: superjson,
+ });
+ await helpers.user.get.prefetch();
+
+ return {
+ props: {
+ trpcState: helpers.dehydrate(),
+ ...(await serverSideTranslations(locale, ["settings"])),
+ },
+ };
+}
diff --git a/apps/dokploy/pages/dashboard/settings/sso.tsx b/apps/dokploy/pages/dashboard/settings/sso.tsx
new file mode 100644
index 000000000..164e2c3da
--- /dev/null
+++ b/apps/dokploy/pages/dashboard/settings/sso.tsx
@@ -0,0 +1,84 @@
+import { validateRequest } from "@dokploy/server";
+import { createServerSideHelpers } from "@trpc/react-query/server";
+import type { GetServerSidePropsContext } from "next";
+import type { ReactElement } from "react";
+import superjson from "superjson";
+import { DashboardLayout } from "@/components/layouts/dashboard-layout";
+import { EnterpriseFeatureGate } from "@/components/proprietary/enterprise-feature-gate";
+import { SSOSettings } from "@/components/proprietary/sso/sso-settings";
+import { Card } from "@/components/ui/card";
+import { appRouter } from "@/server/api/root";
+import { getLocale, serverSideTranslations } from "@/utils/i18n";
+
+const Page = () => {
+ return (
+
+ );
+};
+
+export default Page;
+
+Page.getLayout = (page: ReactElement) => {
+ return {page} ;
+};
+
+export async function getServerSideProps(ctx: GetServerSidePropsContext) {
+ const { req, res } = ctx;
+ const locale = await getLocale(req.cookies);
+ const { user, session } = await validateRequest(ctx.req);
+ if (!user) {
+ return {
+ redirect: {
+ permanent: true,
+ destination: "/",
+ },
+ };
+ }
+ if (user.role === "member") {
+ return {
+ redirect: {
+ permanent: true,
+ destination: "/dashboard/settings/profile",
+ },
+ };
+ }
+
+ const helpers = createServerSideHelpers({
+ router: appRouter,
+ ctx: {
+ req: req as any,
+ res: res as any,
+ db: null as any,
+ session: session as any,
+ user: user as any,
+ },
+ transformer: superjson,
+ });
+ await helpers.user.get.prefetch();
+
+ return {
+ props: {
+ trpcState: helpers.dehydrate(),
+ ...(await serverSideTranslations(locale, ["settings"])),
+ },
+ };
+}
diff --git a/apps/dokploy/pages/index.tsx b/apps/dokploy/pages/index.tsx
index 8127b41fd..de4294581 100644
--- a/apps/dokploy/pages/index.tsx
+++ b/apps/dokploy/pages/index.tsx
@@ -10,6 +10,9 @@ import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { OnboardingLayout } from "@/components/layouts/onboarding-layout";
+import { SignInWithGithub } from "@/components/proprietary/auth/sign-in-with-github";
+import { SignInWithGoogle } from "@/components/proprietary/auth/sign-in-with-google";
+import { SignInWithSSO } from "@/components/proprietary/sso/sign-in-with-sso";
import { AlertBlock } from "@/components/shared/alert-block";
import { Logo } from "@/components/shared/logo";
import { Button } from "@/components/ui/button";
@@ -37,6 +40,7 @@ import {
} from "@/components/ui/input-otp";
import { Label } from "@/components/ui/label";
import { authClient } from "@/lib/auth-client";
+import { api } from "@/utils/api";
const LoginSchema = z.object({
email: z.string().email(),
@@ -54,6 +58,7 @@ interface Props {
}
export default function Home({ IS_CLOUD }: Props) {
const router = useRouter();
+ const { data: showSignInWithSSO } = api.sso.showSignInWithSSO.useQuery();
const [isLoginLoading, setIsLoginLoading] = useState(false);
const [isTwoFactorLoading, setIsTwoFactorLoading] = useState(false);
const [isBackupCodeLoading, setIsBackupCodeLoading] = useState(false);
@@ -62,8 +67,6 @@ export default function Home({ IS_CLOUD }: Props) {
const [twoFactorCode, setTwoFactorCode] = useState("");
const [isBackupCodeModalOpen, setIsBackupCodeModalOpen] = useState(false);
const [backupCode, setBackupCode] = useState("");
- const [isGithubLoading, setIsGithubLoading] = useState(false);
- const [isGoogleLoading, setIsGoogleLoading] = useState(false);
const loginForm = useForm({
resolver: zodResolver(LoginSchema),
defaultValues: {
@@ -161,45 +164,54 @@ export default function Home({ IS_CLOUD }: Props) {
}
};
- const handleGithubSignIn = async () => {
- setIsGithubLoading(true);
- try {
- const { error } = await authClient.signIn.social({
- provider: "github",
- });
+ const loginContent = (
+ <>
+ {IS_CLOUD &&
@@ -221,97 +233,11 @@ export default function Home({ IS_CLOUD }: Props) {
{!isTwoFactor ? (
<>
- {IS_CLOUD && (
-
-
-
- Sign in with GitHub
-
+ {showSignInWithSSO ? (
+ {loginContent}
+ ) : (
+ loginContent
)}
- {IS_CLOUD && (
-
-
-
- Sign in with Google
-
- )}
-
-
) : (
<>
diff --git a/apps/dokploy/pages/register.tsx b/apps/dokploy/pages/register.tsx
index 66f95512a..d41749d4d 100644
--- a/apps/dokploy/pages/register.tsx
+++ b/apps/dokploy/pages/register.tsx
@@ -9,6 +9,8 @@ import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { OnboardingLayout } from "@/components/layouts/onboarding-layout";
+import { SignInWithGithub } from "@/components/proprietary/auth/sign-in-with-github";
+import { SignInWithGoogle } from "@/components/proprietary/auth/sign-in-with-google";
import { AlertBlock } from "@/components/shared/alert-block";
import { Logo } from "@/components/shared/logo";
import { Button } from "@/components/ui/button";
@@ -152,6 +154,17 @@ const Register = ({ isCloud }: Props) => {
)}
+ {isCloud && (
+
+
+ )}
+ {isCloud && (
+
+ Or register with email
+
+ )}
-
-
-### [Tuple, the premier screen sharing app for developers](https://tuple.app/dokploy)
-[Available for MacOS & Windows](https://tuple.app/dokploy)
- 
-
- 
-
-
- 
-
- 
-