Initial plan

apps/dokploy/__test__/traefik/traefik.test.ts

@@ -275,51 +275,3 @@ test("CertificateType on websecure entrypoint", async () => {
 
 	expect(router.tls?.certResolver).toBe("letsencrypt");
 });
-
-/** IDN/Punycode */
-
-test("Internationalized domain name is converted to punycode", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "тест.рф" },
-		"web",
-	);
-
-	// тест.рф in punycode is xn--e1aybc.xn--p1ai
-	expect(router.rule).toContain("Host(`xn--e1aybc.xn--p1ai`)");
-	expect(router.rule).not.toContain("тест.рф");
-});
-
-test("ASCII domain remains unchanged", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "example.com" },
-		"web",
-	);
-
-	expect(router.rule).toContain("Host(`example.com`)");
-});
-
-test("Russian Cyrillic label with .ru TLD is converted to punycode", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "сайт.ru" },
-		"web",
-	);
-
-	// сайт in punycode is xn--80aswg
-	expect(router.rule).toContain("Host(`xn--80aswg.ru`)");
-	expect(router.rule).not.toContain("сайт");
-});
-
-test("Subdomain with Russian IDN TLD converts non-ASCII part to punycode", async () => {
-	const router = await createRouterConfig(
-		baseApp,
-		{ ...baseDomain, host: "app.тест.рф" },
-		"web",
-	);
-
-	// app stays ASCII, тест.рф becomes xn--e1aybc.xn--p1ai
-	expect(router.rule).toContain("Host(`app.xn--e1aybc.xn--p1ai`)");
-	expect(router.rule).not.toContain("тест.рф");
-});

apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx

@@ -7,7 +7,6 @@ import { z } from "zod";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { CodeEditor } from "@/components/shared/code-editor";
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
 import {
 	Dialog,
 	DialogContent,
@@ -25,6 +24,7 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
+import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
 import { api } from "@/utils/api";
 

apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx

@@ -245,13 +245,13 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -263,15 +263,11 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!bitbucketId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Bitbucket account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/application/general/generic/save-gitea-provider.tsx

@@ -258,14 +258,14 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo: GiteaRepository) =>
 																		repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -277,15 +277,11 @@ export const SaveGiteaProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!giteaId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Gitea account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx

@@ -233,13 +233,13 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -251,15 +251,11 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!githubId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitHub account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx

@@ -254,13 +254,13 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -272,15 +272,11 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!gitlabId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitLab account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx

@@ -247,13 +247,13 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -265,15 +265,11 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!bitbucketId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Bitbucket account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/compose/general/generic/save-gitea-provider-compose.tsx

@@ -244,13 +244,13 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
 											</FormControl>
@@ -261,15 +261,11 @@ export const SaveGiteaProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!giteaId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a Gitea account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx

@@ -234,13 +234,13 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -252,15 +252,11 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!githubId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitHub account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx

@@ -256,13 +256,13 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 														!field.value && "text-muted-foreground",
 													)}
 												>
-													{!field.value.owner
+													{isLoadingRepositories
-														? "Select repository"
+														? "Loading...."
-														: isLoadingRepositories
+														: field.value.owner
-															? "Loading...."
+															? repositories?.find(
-															: (repositories?.find(
 																	(repo) => repo.name === field.value.repo,
-																)?.name ?? "Select repository")}
+																)?.name
+															: "Select repository"}
 
 													<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
 												</Button>
@@ -274,15 +274,11 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 													placeholder="Search repository..."
 													className="h-9"
 												/>
-												{!gitlabId ? (
+												{isLoadingRepositories && (
-													<span className="py-6 text-center text-sm text-muted-foreground">
-														Select a GitLab account first
-													</span>
-												) : isLoadingRepositories ? (
 													<span className="py-6 text-center text-sm">
 														Loading Repositories....
 													</span>
-												) : null}
+												)}
 												<CommandEmpty>No repositories found.</CommandEmpty>
 												<ScrollArea className="h-96">
 													<CommandGroup>

apps/dokploy/components/dashboard/compose/logs/show.tsx

@@ -1,8 +1,8 @@
 import { Loader2 } from "lucide-react";
-import dynamic from "next/dynamic";
-import { useEffect, useState } from "react";
 import { badgeStateColor } from "@/components/dashboard/application/logs/show";
 import { Badge } from "@/components/ui/badge";
+import dynamic from "next/dynamic";
+import { useEffect, useState } from "react";
 import {
 	Card,
 	CardContent,

apps/dokploy/components/dashboard/projects/show.tsx

@@ -430,7 +430,7 @@ export const ShowProjects = () => {
 																</DropdownMenu>
 															) : null}
 															<CardHeader>
-																<CardTitle className="flex items-center justify-between gap-2 overflow-clip">
+																<CardTitle className="flex items-center justify-between gap-2">
 																	<span className="flex flex-col gap-1.5 ">
 																		<div className="flex items-center gap-2">
 																			<BookIcon className="size-4 text-muted-foreground" />
@@ -439,7 +439,7 @@ export const ShowProjects = () => {
 																			</span>
 																		</div>
 
-																		<span className="text-sm font-medium text-muted-foreground break-normal">
+																		<span className="text-sm font-medium text-muted-foreground break-all">
 																			{project.description}
 																		</span>
 

apps/dokploy/components/dashboard/settings/git/gitea/add-gitea-provider.tsx

@@ -19,9 +19,9 @@ import {
 import {
 	Form,
 	FormControl,
-	FormDescription,
 	FormField,
 	FormItem,
+	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";

apps/dokploy/components/dashboard/settings/git/gitea/edit-gitea-provider.tsx

@@ -17,9 +17,9 @@ import {
 import {
 	Form,
 	FormControl,
-	FormDescription,
 	FormField,
 	FormItem,
+	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";

apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx

@@ -19,9 +19,9 @@ import {
 import {
 	Form,
 	FormControl,
-	FormDescription,
 	FormField,
 	FormItem,
+	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";

apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx

@@ -18,9 +18,9 @@ import {
 import {
 	Form,
 	FormControl,
-	FormDescription,
 	FormField,
 	FormItem,
+	FormDescription,
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";

apps/dokploy/components/dashboard/settings/linking-account/linking-account.tsx

@@ -1,245 +0,0 @@
-"use client";
-
-import { Link2, Loader2, Unlink } from "lucide-react";
-import { useCallback, useEffect, useState } from "react";
-import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
-import {
-	Card,
-	CardContent,
-	CardDescription,
-	CardHeader,
-	CardTitle,
-} from "@/components/ui/card";
-import { authClient } from "@/lib/auth-client";
-
-const LINKING_CALLBACK_URL = "/dashboard/settings/profile";
-
-const TRUSTED_PROVIDERS = ["google", "github"] as const;
-type SocialProvider = (typeof TRUSTED_PROVIDERS)[number];
-
-type AccountItem = {
-	providerId: string;
-	accountId?: string;
-};
-
-function providerLabel(providerId: string): string {
-	return providerId.charAt(0).toUpperCase() + providerId.slice(1);
-}
-
-export function LinkingAccount() {
-	const [accounts, setAccounts] = useState<AccountItem[]>([]);
-	const [accountsLoading, setAccountsLoading] = useState(true);
-	const [linkingProvider, setLinkingProvider] = useState<SocialProvider | null>(
-		null,
-	);
-	const [unlinkingProviderId, setUnlinkingProviderId] = useState<string | null>(
-		null,
-	);
-
-	const fetchAccounts = useCallback(async () => {
-		setAccountsLoading(true);
-		try {
-			const { data } = await authClient.listAccounts();
-			const list = Array.isArray(data)
-				? data
-				: ((data && typeof data === "object" && "accounts" in data
-						? (data as { accounts?: AccountItem[] }).accounts
-						: null) ?? []);
-			setAccounts(Array.isArray(list) ? list : []);
-		} catch {
-			setAccounts([]);
-		} finally {
-			setAccountsLoading(false);
-		}
-	}, []);
-
-	useEffect(() => {
-		fetchAccounts();
-	}, [fetchAccounts]);
-
-	const linkedProviderIds = new Set(accounts.map((a) => a.providerId));
-	const socialAccounts = accounts.filter((a) =>
-		TRUSTED_PROVIDERS.includes(a.providerId as SocialProvider),
-	);
-
-	const handleLinkSocial = async (provider: SocialProvider) => {
-		setLinkingProvider(provider);
-		try {
-			const { error } = await authClient.linkSocial({
-				provider,
-				callbackURL: LINKING_CALLBACK_URL,
-			});
-			if (error) {
-				toast.error(error.message ?? "Failed to link account");
-				setLinkingProvider(null);
-				return;
-			}
-		} catch (err) {
-			toast.error(
-				"Failed to link account",
-				err instanceof Error ? { description: err.message } : undefined,
-			);
-			setLinkingProvider(null);
-		}
-	};
-
-	const handleUnlink = async (providerId: string, accountId?: string) => {
-		setUnlinkingProviderId(providerId);
-		try {
-			const { error } = await authClient.unlinkAccount({
-				providerId,
-				...(accountId && { accountId }),
-			});
-			if (error) {
-				toast.error(error.message ?? "Failed to unlink account");
-				return;
-			}
-			toast.success("Account unlinked");
-			await fetchAccounts();
-		} catch (err) {
-			toast.error(
-				"Failed to unlink account",
-				err instanceof Error ? { description: err.message } : undefined,
-			);
-		} finally {
-			setUnlinkingProviderId(null);
-		}
-	};
-
-	const canUnlink = accounts.length > 1;
-
-	return (
-		<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-6xl mx-auto w-full">
-			<div className="rounded-xl bg-background shadow-md">
-				<CardHeader>
-					<div className="flex flex-row gap-2 flex-wrap justify-between items-center">
-						<div>
-							<CardTitle className="text-xl flex flex-row gap-2">
-								<Link2 className="size-6 text-muted-foreground self-center" />
-								Linking account
-							</CardTitle>
-							<CardDescription>
-								Link your Google or GitHub account to sign in with them.
-							</CardDescription>
-						</div>
-					</div>
-				</CardHeader>
-				<CardContent className="space-y-6 py-8 border-t">
-					{/* Linked accounts */}
-					<div className="space-y-2">
-						<p className="text-sm font-medium">Linked accounts</p>
-						{accountsLoading ? (
-							<div className="flex items-center gap-2 text-sm text-muted-foreground py-2">
-								<Loader2 className="size-4 animate-spin" />
-								Loading...
-							</div>
-						) : socialAccounts.length === 0 ? (
-							<p className="text-sm text-muted-foreground py-2">
-								No social accounts linked yet.
-							</p>
-						) : (
-							<ul className="space-y-2">
-								{socialAccounts.map((acc) => (
-									<li
-										key={acc.accountId ?? acc.providerId}
-										className="flex items-center justify-between rounded-lg border px-3 py-2 text-sm"
-									>
-										<span className="font-medium">
-											{providerLabel(acc.providerId)}
-										</span>
-										{canUnlink && (
-											<Button
-												variant="ghost"
-												size="sm"
-												className="text-destructive hover:text-destructive hover:bg-destructive/10"
-												onClick={() =>
-													handleUnlink(acc.providerId, acc.accountId)
-												}
-												disabled={unlinkingProviderId === acc.providerId}
-												isLoading={unlinkingProviderId === acc.providerId}
-											>
-												{unlinkingProviderId === acc.providerId ? (
-													<Loader2 className="size-4 animate-spin" />
-												) : (
-													<>
-														<Unlink className="mr-1.5 size-4" />
-														Unlink
-													</>
-												)}
-											</Button>
-										)}
-									</li>
-								))}
-							</ul>
-						)}
-					</div>
-
-					<p className="text-sm text-muted-foreground">
-						Click a provider below to link it to your account. You will be
-						redirected to complete the flow.
-					</p>
-					<div className="flex flex-wrap gap-3">
-						{!linkedProviderIds.has("google") && (
-							<Button
-								variant="outline"
-								type="button"
-								className="min-w-[180px]"
-								onClick={() => handleLinkSocial("google")}
-								disabled={!!linkingProvider}
-								isLoading={linkingProvider === "google"}
-							>
-								{linkingProvider === "google" ? (
-									<Loader2 className="mr-2 size-4 animate-spin" />
-								) : (
-									<svg viewBox="0 0 24 24" className="mr-2 size-4">
-										<path
-											fill="currentColor"
-											d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z"
-										/>
-										<path
-											fill="currentColor"
-											d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z"
-										/>
-										<path
-											fill="currentColor"
-											d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z"
-										/>
-										<path
-											fill="currentColor"
-											d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z"
-										/>
-									</svg>
-								)}
-								Link with Google
-							</Button>
-						)}
-						{!linkedProviderIds.has("github") && (
-							<Button
-								variant="outline"
-								type="button"
-								className="min-w-[180px]"
-								onClick={() => handleLinkSocial("github")}
-								disabled={!!linkingProvider}
-								isLoading={linkingProvider === "github"}
-							>
-								{linkingProvider === "github" ? (
-									<Loader2 className="mr-2 size-4 animate-spin" />
-								) : (
-									<svg
-										viewBox="0 0 24 24"
-										className="mr-2 size-4"
-										fill="currentColor"
-									>
-										<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
-									</svg>
-								)}
-								Link with GitHub
-							</Button>
-						)}
-					</div>
-				</CardContent>
-			</div>
-		</Card>
-	);
-}

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";
@@ -23,7 +24,6 @@ import {
 	FormLabel,
 	FormMessage,
 } from "@/components/ui/form";
-import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
 import { api } from "@/utils/api";
 
 const schema = z.object({

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";
@@ -35,7 +36,6 @@ import {
 	SelectTrigger,
 	SelectValue,
 } from "@/components/ui/select";
-import { useHealthCheckAfterMutation } from "@/hooks/use-health-check-after-mutation";
 import { api } from "@/utils/api";
 
 interface Props {

apps/dokploy/components/dashboard/settings/web-server/update-server.tsx

@@ -135,9 +135,7 @@ export const UpdateServer = ({
 						<div className="flex items-center gap-1.5 rounded-full px-3 py-1 mr-2 bg-muted">
 							<Server className="h-4 w-4 text-muted-foreground" />
 							<span className="text-sm text-muted-foreground">
-								{dokployVersion}{" "}
+								{dokployVersion} | {releaseTag}
-								{(releaseTag === "canary" || releaseTag === "feature") &&
-									`(${releaseTag})`}
 							</span>
 						</div>
 					)}

apps/dokploy/components/layouts/side.tsx

@@ -638,129 +638,127 @@ function SidebarLogo() {
 								<DropdownMenuLabel className="text-xs text-muted-foreground">
 									Organizations
 								</DropdownMenuLabel>
-								<div className="max-h-[60vh] overflow-y-auto">
+								{organizations?.map((org) => {
-									{organizations?.map((org) => {
+									const isDefault = org.members?.[0]?.isDefault ?? false;
-										const isDefault = org.members?.[0]?.isDefault ?? false;
+									return (
-										return (
+										<div
-											<div
+											className="flex flex-row justify-between"
-												className="flex flex-row justify-between"
+											key={org.name}
-												key={org.name}
+										>
+											<DropdownMenuItem
+												onClick={async () => {
+													await authClient.organization.setActive({
+														organizationId: org.id,
+													});
+													window.location.reload();
+												}}
+												className="w-full gap-2 p-2"
 											>
-												<DropdownMenuItem
+												<div className="flex flex-col gap-1">
-													onClick={async () => {
+													<div className="flex items-center gap-2">
-														await authClient.organization.setActive({
+														{org.name}
-															organizationId: org.id,
-														});
-														window.location.reload();
-													}}
-													className="w-full gap-2 p-2"
-												>
-													<div className="flex flex-col gap-1">
-														<div className="flex items-center gap-2">
-															{org.name}
-														</div>
 													</div>
-													<div className="flex size-6 items-center justify-center rounded-sm border">
-														<Logo
-															className={cn(
-																"transition-all",
-																state === "collapsed" ? "size-6" : "size-10",
-															)}
-															logoUrl={org.logo ?? undefined}
-														/>
-													</div>
-												</DropdownMenuItem>
-
-												<div className="flex items-center gap-2">
-													<Button
-														variant="ghost"
-														size="icon"
-														className={cn(
-															"group",
-															isDefault
-																? "hover:bg-yellow-500/10"
-																: "hover:bg-blue-500/10",
-														)}
-														isLoading={isSettingDefault && !isDefault}
-														disabled={isDefault}
-														onClick={async (e) => {
-															if (isDefault) return;
-															e.stopPropagation();
-															await setDefaultOrganization({
-																organizationId: org.id,
-															})
-																.then(() => {
-																	refetch();
-																	toast.success("Default organization updated");
-																})
-																.catch((error) => {
-																	toast.error(
-																		error?.message ||
-																			"Error setting default organization",
-																	);
-																});
-														}}
-														title={
-															isDefault
-																? "Default organization"
-																: "Set as default"
-														}
-													>
-														{isDefault ? (
-															<Star
-																fill="#eab308"
-																stroke="#eab308"
-																className="size-4 text-yellow-500"
-															/>
-														) : (
-															<Star
-																fill="none"
-																stroke="currentColor"
-																className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
-															/>
-														)}
-													</Button>
-													{org.ownerId === session?.user?.id && (
-														<>
-															<AddOrganization organizationId={org.id} />
-															<DialogAction
-																title="Delete Organization"
-																description="Are you sure you want to delete this organization?"
-																type="destructive"
-																onClick={async () => {
-																	await deleteOrganization({
-																		organizationId: org.id,
-																	})
-																		.then(() => {
-																			refetch();
-																			toast.success(
-																				"Organization deleted successfully",
-																			);
-																		})
-																		.catch((error) => {
-																			toast.error(
-																				error?.message ||
-																					"Error deleting organization",
-																			);
-																		});
-																}}
-															>
-																<Button
-																	variant="ghost"
-																	size="icon"
-																	className="group hover:bg-red-500/10"
-																	isLoading={isRemoving}
-																>
-																	<Trash2 className="size-4 text-primary group-hover:text-red-500" />
-																</Button>
-															</DialogAction>
-														</>
-													)}
 												</div>
+												<div className="flex size-6 items-center justify-center rounded-sm border">
+													<Logo
+														className={cn(
+															"transition-all",
+															state === "collapsed" ? "size-6" : "size-10",
+														)}
+														logoUrl={org.logo ?? undefined}
+													/>
+												</div>
+											</DropdownMenuItem>
+
+											<div className="flex items-center gap-2">
+												<Button
+													variant="ghost"
+													size="icon"
+													className={cn(
+														"group",
+														isDefault
+															? "hover:bg-yellow-500/10"
+															: "hover:bg-blue-500/10",
+													)}
+													isLoading={isSettingDefault && !isDefault}
+													disabled={isDefault}
+													onClick={async (e) => {
+														if (isDefault) return;
+														e.stopPropagation();
+														await setDefaultOrganization({
+															organizationId: org.id,
+														})
+															.then(() => {
+																refetch();
+																toast.success("Default organization updated");
+															})
+															.catch((error) => {
+																toast.error(
+																	error?.message ||
+																		"Error setting default organization",
+																);
+															});
+													}}
+													title={
+														isDefault
+															? "Default organization"
+															: "Set as default"
+													}
+												>
+													{isDefault ? (
+														<Star
+															fill="#eab308"
+															stroke="#eab308"
+															className="size-4 text-yellow-500"
+														/>
+													) : (
+														<Star
+															fill="none"
+															stroke="currentColor"
+															className="size-4 text-gray-400 group-hover:text-blue-500 transition-colors"
+														/>
+													)}
+												</Button>
+												{org.ownerId === session?.user?.id && (
+													<>
+														<AddOrganization organizationId={org.id} />
+														<DialogAction
+															title="Delete Organization"
+															description="Are you sure you want to delete this organization?"
+															type="destructive"
+															onClick={async () => {
+																await deleteOrganization({
+																	organizationId: org.id,
+																})
+																	.then(() => {
+																		refetch();
+																		toast.success(
+																			"Organization deleted successfully",
+																		);
+																	})
+																	.catch((error) => {
+																		toast.error(
+																			error?.message ||
+																				"Error deleting organization",
+																		);
+																	});
+															}}
+														>
+															<Button
+																variant="ghost"
+																size="icon"
+																className="group hover:bg-red-500/10"
+																isLoading={isRemoving}
+															>
+																<Trash2 className="size-4 text-primary group-hover:text-red-500" />
+															</Button>
+														</DialogAction>
+													</>
+												)}
 											</div>
-										);
+										</div>
-									})}
+									);
-								</div>
+								})}
 								{(user?.role === "owner" ||
 									user?.role === "admin" ||
 									isCloud) && (

apps/dokploy/components/proprietary/auth/sign-in-with-github.tsx

@@ -2,8 +2,8 @@
 
 import { useState } from "react";
 import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
 import { authClient } from "@/lib/auth-client";
+import { Button } from "@/components/ui/button";
 
 export function SignInWithGithub() {
 	const [isLoading, setIsLoading] = useState(false);

apps/dokploy/components/proprietary/auth/sign-in-with-google.tsx

@@ -2,8 +2,8 @@
 
 import { useState } from "react";
 import { toast } from "sonner";
-import { Button } from "@/components/ui/button";
 import { authClient } from "@/lib/auth-client";
+import { Button } from "@/components/ui/button";
 
 export function SignInWithGoogle() {
 	const [isLoading, setIsLoading] = useState(false);

apps/dokploy/components/proprietary/sso/sso-settings.tsx

@@ -1,14 +1,6 @@
 "use client";
 
-import {
+import { Eye, Loader2, LogIn, Trash2 } from "lucide-react";
-	Eye,
-	Loader2,
-	LogIn,
-	Pencil,
-	Plus,
-	Shield,
-	Trash2,
-} from "lucide-react";
 import { useEffect, useState } from "react";
 import { toast } from "sonner";
 import { DialogAction } from "@/components/shared/dialog-action";
@@ -29,7 +21,6 @@ import {
 	DialogHeader,
 	DialogTitle,
 } from "@/components/ui/dialog";
-import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
 import { RegisterOidcDialog } from "./register-oidc-dialog";
 import { RegisterSamlDialog } from "./register-saml-dialog";
@@ -77,10 +68,6 @@ export const SSOSettings = () => {
 	const [detailsProvider, setDetailsProvider] =
 		useState<ProviderForDetails | null>(null);
 	const [baseURL, setBaseURL] = useState("");
-	const [manageOriginsOpen, setManageOriginsOpen] = useState(false);
-	const [editingOrigin, setEditingOrigin] = useState<string | null>(null);
-	const [editingValue, setEditingValue] = useState("");
-	const [newOriginInput, setNewOriginInput] = useState("");
 
 	useEffect(() => {
 		if (typeof window !== "undefined") {
@@ -89,101 +76,20 @@ export const SSOSettings = () => {
 	}, []);
 
 	const { data: providers, isLoading } = api.sso.listProviders.useQuery();
-	const { data: userData } = api.user.get.useQuery(undefined, {
-		enabled: manageOriginsOpen,
-	});
 	const { mutateAsync: deleteProvider, isLoading: isDeleting } =
 		api.sso.deleteProvider.useMutation();
-	const { mutateAsync: addTrustedOrigin, isLoading: isAddingOrigin } =
-		api.sso.addTrustedOrigin.useMutation();
-	const { mutateAsync: removeTrustedOrigin, isLoading: isRemovingOrigin } =
-		api.sso.removeTrustedOrigin.useMutation();
-	const { mutateAsync: updateTrustedOrigin, isLoading: isUpdatingOrigin } =
-		api.sso.updateTrustedOrigin.useMutation();
-
-	const trustedOrigins = userData?.user?.trustedOrigins ?? [];
-
-	const handleAddOrigin = async () => {
-		const value = newOriginInput.trim();
-		if (!value) return;
-		try {
-			await addTrustedOrigin({ origin: value });
-			toast.success("Trusted origin added");
-			setNewOriginInput("");
-			await utils.user.get.invalidate();
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to add trusted origin",
-			);
-		}
-	};
-
-	const handleRemoveOrigin = async (origin: string) => {
-		try {
-			await removeTrustedOrigin({ origin });
-			toast.success("Trusted origin removed");
-			if (editingOrigin === origin) setEditingOrigin(null);
-			await utils.user.get.invalidate();
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to remove trusted origin",
-			);
-		}
-	};
-
-	const handleStartEdit = (origin: string) => {
-		setEditingOrigin(origin);
-		setEditingValue(origin);
-	};
-
-	const handleSaveEdit = async () => {
-		if (editingOrigin == null || !editingValue.trim()) {
-			setEditingOrigin(null);
-			return;
-		}
-		try {
-			await updateTrustedOrigin({
-				oldOrigin: editingOrigin,
-				newOrigin: editingValue.trim(),
-			});
-			toast.success("Trusted origin updated");
-			setEditingOrigin(null);
-			setEditingValue("");
-			await utils.user.get.invalidate();
-		} catch (err) {
-			toast.error(
-				err instanceof Error ? err.message : "Failed to update trusted origin",
-			);
-		}
-	};
-
-	const handleCancelEdit = () => {
-		setEditingOrigin(null);
-		setEditingValue("");
-	};
 
 	return (
 		<div className="flex flex-col gap-4 rounded-lg border p-4">
-			<div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
+			<div className="flex flex-col gap-2">
-				<div className="flex flex-col gap-2">
+				<div className="flex items-center gap-2">
-					<div className="flex items-center gap-2">
+					<LogIn className="size-6 text-muted-foreground" />
-						<LogIn className="size-6 text-muted-foreground" />
+					<CardTitle className="text-xl">Single Sign-On (SSO)</CardTitle>
-						<CardTitle className="text-xl">Single Sign-On (SSO)</CardTitle>
-					</div>
-					<CardDescription>
-						Configure OIDC or SAML identity providers for enterprise sign-in.
-						Users can sign in with their organization&apos;s IdP.
-					</CardDescription>
 				</div>
-				<Button
+				<CardDescription>
-					variant="outline"
+					Configure OIDC or SAML identity providers for enterprise sign-in.
-					size="sm"
+					Users can sign in with their organization&apos;s IdP.
-					onClick={() => setManageOriginsOpen(true)}
+				</CardDescription>
-					className="shrink-0"
-				>
-					<Shield className="mr-2 size-4" />
-					Manage origins
-				</Button>
 			</div>
 
 			{isLoading ? (
@@ -460,128 +366,6 @@ export const SSOSettings = () => {
 					)}
 				</DialogContent>
 			</Dialog>
-
-			<Dialog open={manageOriginsOpen} onOpenChange={setManageOriginsOpen}>
-				<DialogContent className="sm:max-w-[480px]">
-					<DialogHeader>
-						<DialogTitle className="flex items-center gap-2">
-							<Shield className="size-5" />
-							Trusted origins
-						</DialogTitle>
-						<DialogDescription>
-							Manage allowed origins for SSO callbacks. Add, edit, or remove
-							origins for your account.
-						</DialogDescription>
-					</DialogHeader>
-					<div className="space-y-4 py-2">
-						<div className="space-y-2">
-							<span className="text-sm font-medium">Current origins</span>
-							{trustedOrigins.length === 0 ? (
-								<p className="rounded-md border border-dashed bg-muted/30 px-3 py-4 text-center text-sm text-muted-foreground">
-									No trusted origins yet. Add one below.
-								</p>
-							) : (
-								<ul className="flex flex-col gap-2">
-									{trustedOrigins.map((origin) => (
-										<li
-											key={origin}
-											className="flex items-center gap-2 rounded-md border bg-muted/30 px-3 py-2"
-										>
-											{editingOrigin === origin ? (
-												<>
-													<Input
-														value={editingValue}
-														onChange={(e) => setEditingValue(e.target.value)}
-														placeholder="https://..."
-														className="flex-1 font-mono text-sm"
-														autoFocus
-													/>
-													<Button
-														size="sm"
-														onClick={handleSaveEdit}
-														disabled={!editingValue.trim() || isUpdatingOrigin}
-													>
-														Save
-													</Button>
-													<Button
-														size="sm"
-														variant="ghost"
-														onClick={handleCancelEdit}
-													>
-														Cancel
-													</Button>
-												</>
-											) : (
-												<>
-													<span className="flex-1 break-all font-mono text-sm">
-														{origin}
-													</span>
-													<Button
-														variant="ghost"
-														size="icon"
-														className="size-8 shrink-0"
-														onClick={() => handleStartEdit(origin)}
-													>
-														<Pencil className="size-3.5" />
-													</Button>
-													<DialogAction
-														title="Remove trusted origin"
-														description={`Remove "${origin}" from trusted origins?`}
-														type="destructive"
-														onClick={async () => handleRemoveOrigin(origin)}
-													>
-														<Button
-															variant="ghost"
-															size="icon"
-															className="size-8 shrink-0 text-destructive hover:text-destructive"
-															disabled={isRemovingOrigin}
-														>
-															<Trash2 className="size-3.5" />
-														</Button>
-													</DialogAction>
-												</>
-											)}
-										</li>
-									))}
-								</ul>
-							)}
-						</div>
-						<div className="space-y-2">
-							<span className="text-sm font-medium">Add trusted origin</span>
-							<div className="flex gap-2">
-								<Input
-									value={newOriginInput}
-									onChange={(e) => setNewOriginInput(e.target.value)}
-									placeholder="https://example.com"
-									className="font-mono text-sm"
-									onKeyDown={(e) => {
-										if (e.key === "Enter") {
-											e.preventDefault();
-											void handleAddOrigin();
-										}
-									}}
-								/>
-								<Button
-									size="sm"
-									onClick={handleAddOrigin}
-									disabled={!newOriginInput.trim() || isAddingOrigin}
-								>
-									<Plus className="mr-1 size-4" />
-									Add
-								</Button>
-							</div>
-						</div>
-					</div>
-					<DialogFooter>
-						<Button
-							variant="outline"
-							onClick={() => setManageOriginsOpen(false)}
-						>
-							Close
-						</Button>
-					</DialogFooter>
-				</DialogContent>
-			</Dialog>
 		</div>
 	);
 };

apps/dokploy/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.27.1",
+	"version": "v0.27.0",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",

apps/dokploy/pages/dashboard/settings/profile.tsx

@@ -4,7 +4,6 @@ import type { GetServerSidePropsContext } from "next";
 import type { ReactElement } from "react";
 import superjson from "superjson";
 import { ShowApiKeys } from "@/components/dashboard/settings/api/show-api-keys";
-import { LinkingAccount } from "@/components/dashboard/settings/linking-account/linking-account";
 import { ProfileForm } from "@/components/dashboard/settings/profile/profile-form";
 import { DashboardLayout } from "@/components/layouts/dashboard-layout";
 import { appRouter } from "@/server/api/root";
@@ -13,16 +12,17 @@ import { getLocale, serverSideTranslations } from "@/utils/i18n";
 
 const Page = () => {
 	const { data } = api.user.get.useQuery();
-	const { data: isCloud } = api.settings.isCloud.useQuery();
 
+	// const { data: isCloud } = api.settings.isCloud.useQuery();
 	return (
 		<div className="w-full">
-			<div className="h-full rounded-xl max-w-5xl mx-auto flex flex-col gap-4">
+			<div className="h-full rounded-xl  max-w-5xl mx-auto flex flex-col gap-4">
 				<ProfileForm />
-				{isCloud && <LinkingAccount />}
 				{(data?.canAccessToAPI ||
 					data?.role === "owner" ||
 					data?.role === "admin") && <ShowApiKeys />}
+
+				{/* {isCloud && <RemoveSelfAccount />} */}
 			</div>
 		</div>
 	);

apps/dokploy/server/api/root.ts

@@ -22,12 +22,12 @@ import { mountRouter } from "./routers/mount";
 import { mysqlRouter } from "./routers/mysql";
 import { notificationRouter } from "./routers/notification";
 import { organizationRouter } from "./routers/organization";
+import { licenseKeyRouter } from "./routers/proprietary/license-key";
+import { ssoRouter } from "./routers/proprietary/sso";
 import { portRouter } from "./routers/port";
 import { postgresRouter } from "./routers/postgres";
 import { previewDeploymentRouter } from "./routers/preview-deployment";
 import { projectRouter } from "./routers/project";
-import { licenseKeyRouter } from "./routers/proprietary/license-key";
-import { ssoRouter } from "./routers/proprietary/sso";
 import { redirectsRouter } from "./routers/redirects";
 import { redisRouter } from "./routers/redis";
 import { registryRouter } from "./routers/registry";

apps/dokploy/server/api/routers/proprietary/sso.ts

@@ -177,65 +177,4 @@ export const ssoRouter = createTRPCRouter({
 			});
 			return { success: true };
 		}),
-	addTrustedOrigin: enterpriseProcedure
-		.input(z.object({ origin: z.string().min(1) }))
-		.mutation(async ({ ctx, input }) => {
-			const normalized = normalizeTrustedOrigin(input.origin);
-			const currentUser = await db.query.user.findFirst({
-				where: eq(user.id, ctx.session.userId),
-				columns: { trustedOrigins: true },
-			});
-			const existing = currentUser?.trustedOrigins || [];
-			if (existing.some((o) => o.toLowerCase() === normalized.toLowerCase())) {
-				return { success: true };
-			}
-			const next = Array.from(new Set([...existing, normalized]));
-			await db
-				.update(user)
-				.set({ trustedOrigins: next })
-				.where(eq(user.id, ctx.session.userId));
-			return { success: true };
-		}),
-	removeTrustedOrigin: enterpriseProcedure
-		.input(z.object({ origin: z.string().min(1) }))
-		.mutation(async ({ ctx, input }) => {
-			const normalized = normalizeTrustedOrigin(input.origin);
-			const currentUser = await db.query.user.findFirst({
-				where: eq(user.id, ctx.session.userId),
-				columns: { trustedOrigins: true },
-			});
-			const existing = currentUser?.trustedOrigins || [];
-			const next = existing.filter(
-				(o) => o.toLowerCase() !== normalized.toLowerCase(),
-			);
-			await db
-				.update(user)
-				.set({ trustedOrigins: next })
-				.where(eq(user.id, ctx.session.userId));
-			return { success: true };
-		}),
-	updateTrustedOrigin: enterpriseProcedure
-		.input(
-			z.object({
-				oldOrigin: z.string().min(1),
-				newOrigin: z.string().min(1),
-			}),
-		)
-		.mutation(async ({ ctx, input }) => {
-			const oldNorm = normalizeTrustedOrigin(input.oldOrigin);
-			const newNorm = normalizeTrustedOrigin(input.newOrigin);
-			const currentUser = await db.query.user.findFirst({
-				where: eq(user.id, ctx.session.userId),
-				columns: { trustedOrigins: true },
-			});
-			const existing = currentUser?.trustedOrigins || [];
-			const next = existing.map((o) =>
-				o.toLowerCase() === oldNorm.toLowerCase() ? newNorm : o,
-			);
-			await db
-				.update(user)
-				.set({ trustedOrigins: next })
-				.where(eq(user.id, ctx.session.userId));
-			return { success: true };
-		}),
 });

apps/dokploy/server/api/routers/stripe.ts

@@ -7,12 +7,7 @@ import {
 import { TRPCError } from "@trpc/server";
 import Stripe from "stripe";
 import { z } from "zod";
-import {
+import { getStripeItems, WEBSITE_URL } from "@/server/utils/stripe";
-	getStripeItems,
-	PRODUCT_ANNUAL_ID,
-	PRODUCT_MONTHLY_ID,
-	WEBSITE_URL,
-} from "@/server/utils/stripe";
 import { adminProcedure, createTRPCRouter } from "../trpc";
 
 export const stripeRouter = createTRPCRouter({
@@ -29,15 +24,9 @@ export const stripeRouter = createTRPCRouter({
 			active: true,
 		});
 
-		const filteredProducts = products.data.filter((product) => {
-			return (
-				product.id === PRODUCT_MONTHLY_ID || product.id === PRODUCT_ANNUAL_ID
-			);
-		});
-
 		if (!stripeCustomerId) {
 			return {
-				products: filteredProducts,
+				products: products.data,
 				subscriptions: [],
 			};
 		}
@@ -49,7 +38,7 @@ export const stripeRouter = createTRPCRouter({
 		});
 
 		return {
-			products: filteredProducts,
+			products: products.data,
 			subscriptions: subscriptions.data,
 		};
 	}),

apps/dokploy/server/queues/deployments-queue.ts

@@ -2,7 +2,6 @@ import {
 	deployApplication,
 	deployCompose,
 	deployPreviewApplication,
-	IS_CLOUD,
 	rebuildApplication,
 	rebuildCompose,
 	rebuildPreviewApplication,
@@ -14,83 +13,70 @@ import { type Job, Worker } from "bullmq";
 import type { DeploymentJob } from "./queue-types";
 import { redisConfig } from "./redis-connection";
 
-const createDeploymentWorker = () =>
+export const deploymentWorker = new Worker(
-	new Worker(
+	"deployments",
-		"deployments",
+	async (job: Job<DeploymentJob>) => {
-		async (job: Job<DeploymentJob>) => {
+		try {
-			try {
+			if (job.data.applicationType === "application") {
-				if (job.data.applicationType === "application") {
+				await updateApplicationStatus(job.data.applicationId, "running");
-					await updateApplicationStatus(job.data.applicationId, "running");
 
-					if (job.data.type === "redeploy") {
+				if (job.data.type === "redeploy") {
-						await rebuildApplication({
+					await rebuildApplication({
-							applicationId: job.data.applicationId,
+						applicationId: job.data.applicationId,
-							titleLog: job.data.titleLog,
+						titleLog: job.data.titleLog,
-							descriptionLog: job.data.descriptionLog,
+						descriptionLog: job.data.descriptionLog,
-						});
-					} else if (job.data.type === "deploy") {
-						await deployApplication({
-							applicationId: job.data.applicationId,
-							titleLog: job.data.titleLog,
-							descriptionLog: job.data.descriptionLog,
-						});
-					}
-				} else if (job.data.applicationType === "compose") {
-					await updateCompose(job.data.composeId, {
-						composeStatus: "running",
 					});
-					if (job.data.type === "deploy") {
+				} else if (job.data.type === "deploy") {
-						await deployCompose({
+					await deployApplication({
-							composeId: job.data.composeId,
+						applicationId: job.data.applicationId,
-							titleLog: job.data.titleLog,
+						titleLog: job.data.titleLog,
-							descriptionLog: job.data.descriptionLog,
+						descriptionLog: job.data.descriptionLog,
-						});
+					});
-					} else if (job.data.type === "redeploy") {
+				}
-						await rebuildCompose({
+			} else if (job.data.applicationType === "compose") {
-							composeId: job.data.composeId,
+				await updateCompose(job.data.composeId, {
-							titleLog: job.data.titleLog,
+					composeStatus: "running",
-							descriptionLog: job.data.descriptionLog,
+				});
-						});
+				if (job.data.type === "deploy") {
-					}
+					await deployCompose({
-				} else if (job.data.applicationType === "application-preview") {
+						composeId: job.data.composeId,
-					await updatePreviewDeployment(job.data.previewDeploymentId, {
+						titleLog: job.data.titleLog,
-						previewStatus: "running",
+						descriptionLog: job.data.descriptionLog,
+					});
+				} else if (job.data.type === "redeploy") {
+					await rebuildCompose({
+						composeId: job.data.composeId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+					});
+				}
+			} else if (job.data.applicationType === "application-preview") {
+				await updatePreviewDeployment(job.data.previewDeploymentId, {
+					previewStatus: "running",
+				});
+
+				if (job.data.type === "redeploy") {
+					await rebuildPreviewApplication({
+						applicationId: job.data.applicationId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+						previewDeploymentId: job.data.previewDeploymentId,
+					});
+				} else if (job.data.type === "deploy") {
+					await deployPreviewApplication({
+						applicationId: job.data.applicationId,
+						titleLog: job.data.titleLog,
+						descriptionLog: job.data.descriptionLog,
+						previewDeploymentId: job.data.previewDeploymentId,
 					});
-
-					if (job.data.type === "redeploy") {
-						await rebuildPreviewApplication({
-							applicationId: job.data.applicationId,
-							titleLog: job.data.titleLog,
-							descriptionLog: job.data.descriptionLog,
-							previewDeploymentId: job.data.previewDeploymentId,
-						});
-					} else if (job.data.type === "deploy") {
-						await deployPreviewApplication({
-							applicationId: job.data.applicationId,
-							titleLog: job.data.titleLog,
-							descriptionLog: job.data.descriptionLog,
-							previewDeploymentId: job.data.previewDeploymentId,
-						});
-					}
 				}
-			} catch (error) {
-				console.log("Error", error);
 			}
-		},
+		} catch (error) {
-		{
+			console.log("Error", error);
-			autorun: false,
+		}
-			connection: redisConfig,
+	},
-		},
+	{
-	);
+		autorun: false,
-
+		connection: redisConfig,
-/** No-op worker when Redis is disabled (e.g. IS_CLOUD). Avoids BullMQ connection errors. */
+	},
-const noopWorker = {
+);
-	run: () => Promise.resolve(),
-	close: () => Promise.resolve(),
-	cancelJob: () => Promise.resolve(),
-	cancelAllJobs: () => Promise.resolve(),
-};
-
-export const deploymentWorker = !IS_CLOUD
-	? createDeploymentWorker()
-	: (noopWorker as unknown as Worker<DeploymentJob>);

apps/dokploy/server/queues/queueSetup.ts

@@ -1,26 +1,15 @@
-import { IS_CLOUD } from "@dokploy/server";
 import {
 	execAsync,
 	execAsyncRemote,
 } from "@dokploy/server/utils/process/execAsync";
-import type { Job } from "bullmq";
 import { Queue } from "bullmq";
 import { deploymentWorker } from "./deployments-queue";
 import { redisConfig } from "./redis-connection";
 
-/** No-op queue when Redis is disabled (e.g. IS_CLOUD). Avoids BullMQ connection errors. */
+const myQueue = new Queue("deployments", {
-const createNoopQueue = () => ({
+	connection: redisConfig,
-	getJobs: () => Promise.resolve([] as Job[]),
-	add: () =>
-		Promise.resolve({ id: "noop", remove: () => Promise.resolve() } as Job),
-	close: () => Promise.resolve(),
-	on: () => {},
 });
 
-const myQueue = !IS_CLOUD
-	? new Queue("deployments", { connection: redisConfig })
-	: (createNoopQueue() as unknown as Queue);
-
 export const getJobsByApplicationId = async (applicationId: string) => {
 	const jobs = await myQueue.getJobs();
 	return jobs.filter((job) => job?.data?.applicationId === applicationId);
@@ -31,21 +20,19 @@ export const getJobsByComposeId = async (composeId: string) => {
 	return jobs.filter((job) => job?.data?.composeId === composeId);
 };
 
-if (!IS_CLOUD) {
+process.on("SIGTERM", () => {
-	process.on("SIGTERM", () => {
+	myQueue.close();
-		myQueue.close();
+	process.exit(0);
-		process.exit(0);
+});
-	});
 
-	myQueue.on("error", (error) => {
+myQueue.on("error", (error) => {
-		if ((error as any).code === "ECONNREFUSED") {
+	if ((error as any).code === "ECONNREFUSED") {
-			console.error(
+		console.error(
-				"Make sure you have installed Redis and it is running.",
+			"Make sure you have installed Redis and it is running.",
-				error,
+			error,
-			);
+		);
-		}
+	}
-	});
+});
-}
 
 export const cleanQueuesByApplication = async (applicationId: string) => {
 	const jobs = await myQueue.getJobs(["waiting", "delayed"]);

apps/dokploy/server/utils/enterprise.ts

@@ -8,9 +8,7 @@ function isNetworkError(error: unknown): boolean {
 		if (error.message === "fetch failed") return true;
 		const cause = (error as Error & { cause?: { code?: string } }).cause;
 		const code = cause?.code;
-		return (
+		return code === "ECONNREFUSED" || code === "ENOTFOUND" || code === "ETIMEDOUT";
-			code === "ECONNREFUSED" || code === "ENOTFOUND" || code === "ETIMEDOUT"
-		);
 	}
 	return false;
 }

apps/dokploy/server/utils/stripe.ts

@@ -3,12 +3,9 @@ export const WEBSITE_URL =
 		? "http://localhost:3000"
 		: process.env.SITE_URL;
 
-export const BASE_PRICE_MONTHLY_ID = process.env.BASE_PRICE_MONTHLY_ID!; // $4.00
+const BASE_PRICE_MONTHLY_ID = process.env.BASE_PRICE_MONTHLY_ID!; // $4.00
 
-export const BASE_ANNUAL_MONTHLY_ID = process.env.BASE_ANNUAL_MONTHLY_ID!; // $7.99
+const BASE_ANNUAL_MONTHLY_ID = process.env.BASE_ANNUAL_MONTHLY_ID!; // $7.99
-
-export const PRODUCT_MONTHLY_ID = process.env.PRODUCT_MONTHLY_ID!;
-export const PRODUCT_ANNUAL_ID = process.env.PRODUCT_ANNUAL_ID!;
 
 export const getStripeItems = (serverQuantity: number, isAnnual: boolean) => {
 	const items = [];

apps/dokploy/setup.ts

@@ -1,9 +1,8 @@
-import { exec } from "node:child_process";
 import { exit } from "node:process";
+import { exec } from "node:child_process";
 import { promisify } from "node:util";
 
 const execAsync = promisify(exec);
-
 import { setupDirectories } from "@dokploy/server/setup/config-paths";
 import { initializePostgres } from "@dokploy/server/setup/postgres-setup";
 import { initializeRedis } from "@dokploy/server/setup/redis-setup";

packages/server/src/lib/auth.ts

@@ -18,10 +18,6 @@ import { getHubSpotUTK, submitToHubSpot } from "../utils/tracking/hubspot";
 import { sendEmail } from "../verification/send-verification-email";
 import { getPublicIpWithFallback } from "../wss/utils";
 
-const query = await db.query.ssoProvider.findMany();
-
-const trustedProviders = query.map((provider) => provider.providerId);
-
 const { handler, api } = betterAuth({
 	database: drizzleAdapter(db, {
 		provider: "pg",
@@ -47,14 +43,6 @@ const { handler, api } = betterAuth({
 				},
 			}
 		: {}),
-
-	account: {
-		accountLinking: {
-			enabled: true,
-			trustedProviders: ["github", "google", ...(trustedProviders || [])],
-			allowDifferentEmails: true,
-		},
-	},
 	appName: "Dokploy",
 	socialProviders: {
 		github: {

packages/server/src/utils/crons/enterprise.ts

@@ -7,7 +7,7 @@ import { user as userSchema } from "../../db/schema/user";
 export const LICENSE_KEY_URL =
 	process.env.NODE_ENV === "development"
 		? "http://localhost:4002"
-		: "https://licenses-api.dokploy.com";
+		: "https://licenses.dokploy.com";
 
 export const initEnterpriseBackupCronJobs = async () => {
 	scheduleJob("enterprise-check", "0 0 */3 * *", async () => {

packages/server/src/utils/docker/domain.ts

@@ -164,12 +164,10 @@ export const addDomainToCompose = async (
 	for (const domain of domains) {
 		const { serviceName, https } = domain;
 		if (!serviceName) {
-			throw new Error(`Domain "${domain.host}" is missing a service name`);
+			throw new Error("Service name not found");
 		}
 		if (!result?.services?.[serviceName]) {
-			throw new Error(
+			throw new Error(`The service ${serviceName} not found in the compose`);
-				`Domain "${domain.host}" is attached to service "${serviceName}" which does not exist in the compose`,
-			);
 		}
 
 		const httpLabels = createDomainLabels(appName, domain, "web");

packages/server/src/utils/traefik/domain.ts

@@ -104,20 +104,6 @@ export const removeDomain = async (
 	}
 };
 
-/**
- * Converts an internationalized domain name (IDN) to ASCII punycode format.
- * Traefik requires domain names in ASCII format, so non-ASCII characters
- * must be converted (e.g., "тест.рф" → "xn--e1aybc.xn--p1ai").
- */
-const toPunycode = (host: string): string => {
-	try {
-		return new URL(`http://${host}`).hostname;
-	} catch {
-		// If URL parsing fails, return the original host
-		return host;
-	}
-};
-
 export const createRouterConfig = async (
 	app: ApplicationNested,
 	domain: Domain,
@@ -128,9 +114,8 @@ export const createRouterConfig = async (
 
 	const { host, path, https, uniqueConfigKey, internalPath, stripPath } =
 		domain;
-	const punycodeHost = toPunycode(host);
 	const routerConfig: HttpRouter = {
-		rule: `Host(\`${punycodeHost}\`)${path !== null && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`,
+		rule: `Host(\`${host}\`)${path !== null && path !== "/" ? ` && PathPrefix(\`${path}\`)` : ""}`,
 		service: `${appName}-service-${uniqueConfigKey}`,
 		middlewares: [],
 		entryPoints: [entryPoint],