[autofix.ci] apply automated fixes

apps/dokploy/components/dashboard/project/advanced-environment-selector.tsx

@@ -22,12 +22,17 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
 import { toast } from "sonner";
-import { ChevronDownIcon, PlusIcon, PencilIcon, TrashIcon, CopyIcon } from "lucide-react";
+import {
+	ChevronDownIcon,
+	PlusIcon,
+	PencilIcon,
+	TrashIcon,
+	CopyIcon,
+} from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { AlertBlock } from "@/components/shared/alert-block";
 import { findEnvironmentById } from "@dokploy/server";
 
-
 type Environment = Awaited<ReturnType<typeof findEnvironmentById>>;
 interface AdvancedEnvironmentSelectorProps {
 	projectId: string;
@@ -42,11 +47,15 @@ export const AdvancedEnvironmentSelector = ({
 	const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
 	const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
 	const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
-	const [selectedEnvironment, setSelectedEnvironment] = useState<Environment | null>(null);
+	const [selectedEnvironment, setSelectedEnvironment] =
+		useState<Environment | null>(null);
 
-	const { data: project } = api.project.one.useQuery({ projectId },{
+	const { data: project } = api.project.one.useQuery(
-		enabled: !!projectId,
+		{ projectId },
-	});
+		{
+			enabled: !!projectId,
+		},
+	);
 	const environments = project?.environments || [];
 
 	// Form states
@@ -54,20 +63,22 @@ export const AdvancedEnvironmentSelector = ({
 	const [description, setDescription] = useState("");
 
 	// API mutations
-	const { data: environment } = api.environment.one.useQuery({ environmentId: currentEnvironmentId || "" },{
+	const { data: environment } = api.environment.one.useQuery(
-		enabled: !!currentEnvironmentId,
+		{ environmentId: currentEnvironmentId || "" },
-	});
+		{
-
+			enabled: !!currentEnvironmentId,
-
+		},
-	const haveServices = selectedEnvironment && (
-		(selectedEnvironment?.mariadb?.length || 0) > 0 || 
-		(selectedEnvironment?.mongo?.length || 0) > 0 || 
-		(selectedEnvironment?.mysql?.length || 0) > 0 || 
-		(selectedEnvironment?.postgres?.length || 0) > 0 || 
-		(selectedEnvironment?.redis?.length || 0) > 0 || 
-		(selectedEnvironment?.applications?.length || 0) > 0 || 
-		(selectedEnvironment?.compose?.length || 0) > 0
 	);
+
+	const haveServices =
+		selectedEnvironment &&
+		((selectedEnvironment?.mariadb?.length || 0) > 0 ||
+			(selectedEnvironment?.mongo?.length || 0) > 0 ||
+			(selectedEnvironment?.mysql?.length || 0) > 0 ||
+			(selectedEnvironment?.postgres?.length || 0) > 0 ||
+			(selectedEnvironment?.redis?.length || 0) > 0 ||
+			(selectedEnvironment?.applications?.length || 0) > 0 ||
+			(selectedEnvironment?.compose?.length || 0) > 0);
 	const createEnvironment = api.environment.create.useMutation();
 	const updateEnvironment = api.environment.update.useMutation();
 	const deleteEnvironment = api.environment.remove.useMutation();
@@ -130,9 +141,13 @@ export const AdvancedEnvironmentSelector = ({
 
 			// Redirect to production if we deleted the current environment
 			if (selectedEnvironment.environmentId === currentEnvironmentId) {
-				const productionEnv = environments.find(env => env.name === "production");
+				const productionEnv = environments.find(
+					(env) => env.name === "production",
+				);
 				if (productionEnv) {
-					router.push(`/dashboard/project/${projectId}/environment/${productionEnv.environmentId}`);
+					router.push(
+						`/dashboard/project/${projectId}/environment/${productionEnv.environmentId}`,
+					);
 				}
 			}
 		} catch (error) {
@@ -152,7 +167,9 @@ export const AdvancedEnvironmentSelector = ({
 			utils.project.one.invalidate({ projectId });
 
 			// Navigate to the new duplicated environment
-			router.push(`/dashboard/project/${projectId}/environment/${result.environmentId}`);
+			router.push(
+				`/dashboard/project/${projectId}/environment/${result.environmentId}`,
+			);
 		} catch (error) {
 			toast.error("Failed to duplicate environment");
 		}
@@ -170,7 +187,9 @@ export const AdvancedEnvironmentSelector = ({
 		setIsDeleteDialogOpen(true);
 	};
 
-	const currentEnv = environments.find(env => env.environmentId === currentEnvironmentId);
+	const currentEnv = environments.find(
+		(env) => env.environmentId === currentEnvironmentId,
+	);
 
 	return (
 		<>
@@ -179,11 +198,7 @@ export const AdvancedEnvironmentSelector = ({
 					<Button variant="outline" className="min-w-[200px] justify-between">
 						<div className="flex items-center gap-2">
 							<span>{currentEnv?.name || "Select Environment"}</span>
-							{currentEnv?.name === "production" && (
+							{currentEnv?.name === "production" && <Badge>Prod</Badge>}
-								<Badge >
-									Prod
-								</Badge>
-							)}
 						</div>
 						<ChevronDownIcon className="h-4 w-4" />
 					</Button>
@@ -197,17 +212,15 @@ export const AdvancedEnvironmentSelector = ({
 							<DropdownMenuItem
 								className="flex-1 cursor-pointer"
 								onClick={() => {
-									router.push(`/dashboard/project/${projectId}/environment/${environment.environmentId}`);
+									router.push(
+										`/dashboard/project/${projectId}/environment/${environment.environmentId}`,
+									);
 								}}
 							>
 								<div className="flex items-center justify-between w-full">
 									<div className="flex items-center gap-2">
 										<span>{environment.name}</span>
-										{environment.name === "production" && (
+										{environment.name === "production" && <Badge>Prod</Badge>}
-											<Badge >
-												Prod
-											</Badge>
-										)}
 									</div>
 									{environment.environmentId === currentEnvironmentId && (
 										<div className="w-2 h-2 bg-blue-500 rounded-full" />
@@ -377,15 +390,16 @@ export const AdvancedEnvironmentSelector = ({
 					<DialogHeader>
 						<DialogTitle>Delete Environment</DialogTitle>
 						<DialogDescription>
-							Are you sure you want to delete the environment "{selectedEnvironment?.name}"? 
+							Are you sure you want to delete the environment "
-							This action cannot be undone and will also delete all services in this environment.
+							{selectedEnvironment?.name}"? This action cannot be undone and
+							will also delete all services in this environment.
 						</DialogDescription>
 					</DialogHeader>
 
 					{haveServices && (
 						<AlertBlock type="warning">
-						This environment have active services, please delete them first.
+							This environment have active services, please delete them first.
-					</AlertBlock>
+						</AlertBlock>
 					)}
 
 					<DialogFooter>
@@ -401,7 +415,11 @@ export const AdvancedEnvironmentSelector = ({
 						<Button
 							variant="destructive"
 							onClick={handleDeleteEnvironment}
-							disabled={deleteEnvironment.isLoading || haveServices || !selectedEnvironment}
+							disabled={
+								deleteEnvironment.isLoading ||
+								haveServices ||
+								!selectedEnvironment
+							}
 						>
 							{deleteEnvironment.isLoading ? "Deleting..." : "Delete"}
 						</Button>

apps/dokploy/components/dashboard/project/ai/template-generator.tsx

@@ -103,7 +103,6 @@ export const TemplateGenerator = ({ environmentId }: Props) => {
 		useState<TemplateInfo>(defaultTemplateInfo);
 	const utils = api.useUtils();
 
-
 	const haveAtleasOneProviderEnabled = aiSettings?.some(
 		(ai) => ai.isEnabled === true,
 	);

apps/dokploy/components/dashboard/project/duplicate-project.tsx

@@ -57,17 +57,20 @@ export const DuplicateProject = ({
 	const [name, setName] = useState("");
 	const [description, setDescription] = useState("");
 	const [duplicateType, setDuplicateType] = useState("new-project"); // "new-project" or "existing-environment"
-	const [selectedTargetProject, setSelectedTargetProject] = useState<string>("");
+	const [selectedTargetProject, setSelectedTargetProject] =
-	const [selectedTargetEnvironment, setSelectedTargetEnvironment] = useState<string>("");
+		useState<string>("");
+	const [selectedTargetEnvironment, setSelectedTargetEnvironment] =
+		useState<string>("");
 	const utils = api.useUtils();
 	const router = useRouter();
 
 	// Queries for project and environment selection
 	const { data: allProjects } = api.project.all.useQuery();
-	const { data: selectedProjectEnvironments } = api.environment.byProjectId.useQuery(
+	const { data: selectedProjectEnvironments } =
-		{ projectId: selectedTargetProject },
+		api.environment.byProjectId.useQuery(
-		{ enabled: !!selectedTargetProject }
+			{ projectId: selectedTargetProject },
-	);
+			{ enabled: !!selectedTargetProject },
+		);
 
 	const selectedServices = services.filter((service) =>
 		selectedServiceIds.includes(service.id),
@@ -84,7 +87,9 @@ export const DuplicateProject = ({
 				);
 				setOpen(false);
 				if (duplicateType === "new-project") {
-					router.push(`/dashboard/project/${newProject?.projectId}/environment/${newProject?.environmentId}`);
+					router.push(
+						`/dashboard/project/${newProject?.projectId}/environment/${newProject?.environmentId}`,
+					);
 				}
 			},
 			onError: (error) => {
@@ -172,8 +177,13 @@ export const DuplicateProject = ({
 								<Label htmlFor="new-project">New project</Label>
 							</div>
 							<div className="flex items-center space-x-2">
-								<RadioGroupItem value="existing-environment" id="existing-environment" />
+								<RadioGroupItem
-								<Label htmlFor="existing-environment">Existing environment</Label>
+									value="existing-environment"
+									id="existing-environment"
+								/>
+								<Label htmlFor="existing-environment">
+									Existing environment
+								</Label>
 							</div>
 						</RadioGroup>
 					</div>
@@ -204,7 +214,8 @@ export const DuplicateProject = ({
 
 					{duplicateType === "existing-environment" && (
 						<>
-							{allProjects?.filter((p) => p.projectId !== environmentId).length === 0 ? (
+							{allProjects?.filter((p) => p.projectId !== environmentId)
+								.length === 0 ? (
 								<div className="flex flex-col items-center justify-center gap-2 py-4 text-center">
 									<p className="text-sm text-muted-foreground">
 										No other projects available. Create a new project first.
@@ -296,7 +307,8 @@ export const DuplicateProject = ({
 						disabled={
 							isLoading ||
 							(duplicateType === "new-project" && !name) ||
-							(duplicateType === "existing-environment" && (!selectedTargetProject || !selectedTargetEnvironment))
+							(duplicateType === "existing-environment" &&
+								(!selectedTargetProject || !selectedTargetEnvironment))
 						}
 					>
 						{isLoading ? (

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

@@ -187,28 +187,40 @@ export const ShowProjects = () => {
 									)}
 									<div className="w-full grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 flex-wrap gap-5">
 										{filteredProjects?.map((project) => {
-											const emptyServices =
+											const emptyServices = project?.environments
-												project?.environments.map((env) => env.applications.length === 0 &&
+												.map(
-												env.mariadb.length === 0 &&
+													(env) =>
-												env.mongo.length === 0 &&
+														env.applications.length === 0 &&
-												env.mysql.length === 0 &&
+														env.mariadb.length === 0 &&
-												env.postgres.length === 0 &&
+														env.mongo.length === 0 &&
-												env.redis.length === 0 &&
+														env.mysql.length === 0 &&
-												env.applications.length === 0 &&
+														env.postgres.length === 0 &&
-												env.compose.length === 0).every(Boolean);
+														env.redis.length === 0 &&
+														env.applications.length === 0 &&
+														env.compose.length === 0,
+												)
+												.every(Boolean);
 
-											const totalServices =
+											const totalServices = project?.environments
-												project?.environments.map((env) => env.mariadb.length +
+												.map(
-												env.mongo.length +
+													(env) =>
-												env.mysql.length +
+														env.mariadb.length +
-												env.postgres.length +
+														env.mongo.length +
-												env.redis.length +
+														env.mysql.length +
-												env.applications.length +
+														env.postgres.length +
-												env.compose.length ).reduce((acc, curr) => acc + curr, 0);
+														env.redis.length +
+														env.applications.length +
+														env.compose.length,
+												)
+												.reduce((acc, curr) => acc + curr, 0);
 
-												const haveServicesWithDomains =
+											const haveServicesWithDomains = project?.environments
-													project?.environments.map((env) => env.applications.length > 0 ||
+												.map(
-													env.compose.length > 0).some(Boolean);
+													(env) =>
+														env.applications.length > 0 ||
+														env.compose.length > 0,
+												)
+												.some(Boolean);
 
 											return (
 												<div
@@ -234,7 +246,9 @@ export const ShowProjects = () => {
 																		className="w-[200px] space-y-2 overflow-y-auto max-h-[400px]"
 																		onClick={(e) => e.stopPropagation()}
 																	>
-																		{project.environments.some((env) => env.applications.length > 0) && (
+																		{project.environments.some(
+																			(env) => env.applications.length > 0,
+																		) && (
 																			<DropdownMenuGroup>
 																				<DropdownMenuLabel>
 																					Applications
@@ -247,7 +261,9 @@ export const ShowProjects = () => {
 																								<DropdownMenuLabel className="font-normal capitalize text-xs flex items-center justify-between">
 																									{app.name}
 																									<StatusTooltip
-																										status={app.applicationStatus}
+																										status={
+																											app.applicationStatus
+																										}
 																									/>
 																								</DropdownMenuLabel>
 																								<DropdownMenuSeparator />
@@ -270,7 +286,7 @@ export const ShowProjects = () => {
 																								))}
 																							</DropdownMenuGroup>
 																						</div>
-																					))
+																					)),
 																				)}
 																			</DropdownMenuGroup>
 																		)}
@@ -445,7 +461,7 @@ export const ShowProjects = () => {
 																	<DateTooltip date={project.createdAt}>
 																		Created
 																	</DateTooltip>
-																	 <span>
+																	<span>
 																		{totalServices}{" "}
 																		{totalServices === 1
 																			? "service"

apps/dokploy/components/dashboard/settings/users/add-permissions.tsx

@@ -325,7 +325,7 @@ export const AddUserPermissions = ({ userId }: Props) => {
 										<FormLabel className="text-base">Projects</FormLabel>
 										<FormDescription>
 											Select the Projects that the user can access
-									</FormDescription>
+										</FormDescription>
 									</div>
 									{projects?.length === 0 && (
 										<p className="text-sm text-muted-foreground">

apps/dokploy/pages/dashboard/project/[projectId].tsx

@@ -159,17 +159,22 @@ const Project = (
 	// Redirigir automáticamente al ambiente de producción por defecto
 	useEffect(() => {
 		if (data?.environments && data.environments.length > 0) {
-			const productionEnv = data.environments.find(env => env.name === "production");
+			const productionEnv = data.environments.find(
+				(env) => env.name === "production",
+			);
 			const defaultEnv = productionEnv || data.environments[0];
 
 			// Redirigir al ambiente por defecto
 			if (defaultEnv) {
-				router.push(`/dashboard/project/${projectId}/environment/${defaultEnv.environmentId}`);
+				router.push(
+					`/dashboard/project/${projectId}/environment/${defaultEnv.environmentId}`,
+				);
 			}
 		}
 	}, [data?.environments, projectId, router]);
 
-	const emptyEnvironments = !data?.environments || data.environments.length === 0;
+	const emptyEnvironments =
+		!data?.environments || data.environments.length === 0;
 
 	return (
 		<div>
@@ -198,7 +203,6 @@ const Project = (
 									<ProjectEnvironment projectId={projectId}>
 										<Button variant="outline">Project Environment</Button>
 									</ProjectEnvironment>
-
 								</div>
 							</div>
 						</div>
@@ -212,7 +216,8 @@ const Project = (
 								<div className="flex h-[70vh] w-full flex-col items-center justify-center">
 									<FolderInput className="size-8 self-center text-muted-foreground" />
 									<span className="text-center font-medium text-muted-foreground">
-										No environments created yet. Click on Environments to create one.
+										No environments created yet. Click on Environments to create
+										one.
 									</span>
 								</div>
 							) : (

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId].tsx

@@ -284,10 +284,11 @@ const EnvironmentPage = (
 	const [selectedTargetEnvironment, setSelectedTargetEnvironment] =
 		useState<string>("");
 
-	const { data: selectedProjectEnvironments } = api.environment.byProjectId.useQuery(
+	const { data: selectedProjectEnvironments } =
-		{ projectId: selectedTargetProject },
+		api.environment.byProjectId.useQuery(
-		{ enabled: !!selectedTargetProject }
+			{ projectId: selectedTargetProject },
-	);
+			{ enabled: !!selectedTargetProject },
+		);
 
 	const emptyServices =
 		!currentEnvironment ||
@@ -774,9 +775,7 @@ const EnvironmentPage = (
 									<FolderInput className="size-6 text-muted-foreground self-center" />
 									{currentEnvironment.name}
 									{currentEnvironment.name === "production" && (
-										<Badge >
+										<Badge>Production</Badge>
-											Production
-										</Badge>
 									)}
 								</CardTitle>
 								<CardDescription>
@@ -819,9 +818,7 @@ const EnvironmentPage = (
 												projectName={projectData?.name}
 												environmentId={environmentId}
 											/>
-											<AddTemplate
+											<AddTemplate environmentId={environmentId} />
-												environmentId={environmentId}
-											/>
 											<AddAiAssistant
 												projectName={projectData?.name}
 												environmentId={environmentId}
@@ -980,12 +977,14 @@ const EnvironmentPage = (
 														<DialogHeader>
 															<DialogTitle>Move Services</DialogTitle>
 															<DialogDescription>
-																Select the target project and environment to move{" "}
+																Select the target project and environment to
-																{selectedServices.length} services
+																move {selectedServices.length} services
 															</DialogDescription>
 														</DialogHeader>
 														<div className="flex flex-col gap-4">
-															{allProjects?.filter((p) => p.projectId !== projectId).length === 0 ? (
+															{allProjects?.filter(
+																(p) => p.projectId !== projectId,
+															).length === 0 ? (
 																<div className="flex flex-col items-center justify-center gap-2 py-4">
 																	<FolderInput className="h-8 w-8 text-muted-foreground" />
 																	<p className="text-sm text-muted-foreground text-center">
@@ -997,7 +996,9 @@ const EnvironmentPage = (
 																<>
 																	{/* Step 1: Select Project */}
 																	<div className="flex flex-col gap-2">
-																		<label className="text-sm font-medium">Target Project</label>
+																		<label className="text-sm font-medium">
+																			Target Project
+																		</label>
 																		<Select
 																			value={selectedTargetProject}
 																			onValueChange={(value) => {
@@ -1010,7 +1011,9 @@ const EnvironmentPage = (
 																			</SelectTrigger>
 																			<SelectContent>
 																				{allProjects
-																					?.filter((p) => p.projectId !== projectId)
+																					?.filter(
+																						(p) => p.projectId !== projectId,
+																					)
 																					.map((project) => (
 																						<SelectItem
 																							key={project.projectId}
@@ -1026,23 +1029,29 @@ const EnvironmentPage = (
 																	{/* Step 2: Select Environment (only show if project is selected) */}
 																	{selectedTargetProject && (
 																		<div className="flex flex-col gap-2">
-																			<label className="text-sm font-medium">Target Environment</label>
+																			<label className="text-sm font-medium">
+																				Target Environment
+																			</label>
 																			<Select
 																				value={selectedTargetEnvironment}
-																				onValueChange={setSelectedTargetEnvironment}
+																				onValueChange={
+																					setSelectedTargetEnvironment
+																				}
 																			>
 																				<SelectTrigger>
 																					<SelectValue placeholder="Select target environment" />
 																				</SelectTrigger>
 																				<SelectContent>
-																					{selectedProjectEnvironments?.map((env) => (
+																					{selectedProjectEnvironments?.map(
-																						<SelectItem
+																						(env) => (
-																							key={env.environmentId}
+																							<SelectItem
-																							value={env.environmentId}
+																								key={env.environmentId}
-																						>
+																								value={env.environmentId}
-																							{env.name}
+																							>
-																						</SelectItem>
+																								{env.name}
-																					))}
+																							</SelectItem>
+																						),
+																					)}
 																				</SelectContent>
 																			</Select>
 																		</div>
@@ -1065,7 +1074,9 @@ const EnvironmentPage = (
 																onClick={handleBulkMove}
 																isLoading={isBulkActionLoading}
 																disabled={
-																	allProjects?.filter((p) => p.projectId !== projectId).length === 0 ||
+																	allProjects?.filter(
+																		(p) => p.projectId !== projectId,
+																	).length === 0 ||
 																	!selectedTargetProject ||
 																	!selectedTargetEnvironment
 																}

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx

@@ -84,7 +84,8 @@ const Mariadb = (
 			<div className="flex flex-col gap-4">
 				<Head>
 					<title>
-						Database: {data?.name} - {data?.environment?.project?.name} | Dokploy
+						Database: {data?.name} - {data?.environment?.project?.name} |
+						Dokploy
 					</title>
 				</Head>
 				<Card className="h-full bg-sidebar  p-2.5 rounded-xl w-full">
@@ -303,7 +304,11 @@ Mariadb.getLayout = (page: ReactElement) => {
 };
 
 export async function getServerSideProps(
-	ctx: GetServerSidePropsContext<{ mariadbId: string; activeTab: TabState; environmentId: string }>,
+	ctx: GetServerSidePropsContext<{
+		mariadbId: string;
+		activeTab: TabState;
+		environmentId: string;
+	}>,
 ) {
 	const { query, params, req, res } = ctx;
 	const activeTab = query.tab;

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx

@@ -305,7 +305,11 @@ Mongo.getLayout = (page: ReactElement) => {
 };
 
 export async function getServerSideProps(
-	ctx: GetServerSidePropsContext<{ mongoId: string; activeTab: TabState; environmentId: string }>,
+	ctx: GetServerSidePropsContext<{
+		mongoId: string;
+		activeTab: TabState;
+		environmentId: string;
+	}>,
 ) {
 	const { query, params, req, res } = ctx;
 	const activeTab = query.tab;

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx

@@ -83,7 +83,8 @@ const MySql = (
 			<div className="flex flex-col gap-4">
 				<Head>
 					<title>
-						Database: {data?.name} - {data?.environment?.project?.name} | Dokploy
+						Database: {data?.name} - {data?.environment?.project?.name} |
+						Dokploy
 					</title>
 				</Head>
 				<div className="w-full">
@@ -289,7 +290,11 @@ MySql.getLayout = (page: ReactElement) => {
 };
 
 export async function getServerSideProps(
-	ctx: GetServerSidePropsContext<{ mysqlId: string; activeTab: TabState; environmentId: string }>,
+	ctx: GetServerSidePropsContext<{
+		mysqlId: string;
+		activeTab: TabState;
+		environmentId: string;
+	}>,
 ) {
 	const { query, params, req, res } = ctx;
 	const activeTab = query.tab;

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx

@@ -73,8 +73,7 @@ const Postgresql = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href:
+						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
-							`/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.name || "",
@@ -83,9 +82,7 @@ const Postgresql = (
 			/>
 			<Head>
 				<title>
-					Database: {data?.name} - {data?.environment?.project?.name}
+					Database: {data?.name} - {data?.environment?.project?.name} | Dokploy
-					{" "}
-					| Dokploy
 				</title>
 			</Head>
 			<div className="w-full">
@@ -96,9 +93,7 @@ const Postgresql = (
 								<CardTitle className="text-xl flex flex-row gap-2">
 									<div className="relative flex flex-row gap-4">
 										<div className="absolute -right-1  -top-2">
-											<StatusTooltip
+											<StatusTooltip status={data?.applicationStatus} />
-												status={data?.applicationStatus}
-											/>
 										</div>
 
 										<PostgresqlIcon className="h-6 w-6 text-muted-foreground" />
@@ -106,9 +101,7 @@ const Postgresql = (
 									{data?.name}
 								</CardTitle>
 								{data?.description && (
-									<CardDescription>
+									<CardDescription>{data?.description}</CardDescription>
-										{data?.description}
-									</CardDescription>
 								)}
 
 								<span className="text-sm text-muted-foreground">
@@ -118,17 +111,17 @@ const Postgresql = (
 							<div className="flex flex-col h-fit w-fit gap-2">
 								<div className="flex flex-row h-fit w-fit gap-2">
 									<Badge
-										variant={!data?.serverId
+										variant={
-											? "default"
+											!data?.serverId
-											: data?.server?.serverStatus ===
+												? "default"
-													"active"
+												: data?.server?.serverStatus === "active"
-											? "default"
+													? "default"
-											: "destructive"}
+													: "destructive"
+										}
 									>
 										{data?.server?.name || "Dokploy Server"}
 									</Badge>
-									{data?.server?.serverStatus ===
+									{data?.server?.serverStatus === "inactive" && (
-											"inactive" && (
 										<TooltipProvider delayDuration={0}>
 											<Tooltip>
 												<TooltipTrigger asChild>
@@ -142,11 +135,9 @@ const Postgresql = (
 													side="top"
 												>
 													<span>
-														You cannot, deploy this
+														You cannot, deploy this application because the
-														application because the
+														server is inactive, please upgrade your plan to add
-														server is inactive,
+														more servers.
-														please upgrade your plan
-														to add more servers.
 													</span>
 												</TooltipContent>
 											</Tooltip>
@@ -156,178 +147,138 @@ const Postgresql = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdatePostgres postgresId={postgresId} />
-									{(auth?.role === "owner" ||
+									{(auth?.role === "owner" || auth?.canDeleteServices) && (
-										auth?.canDeleteServices) && (
+										<DeleteService id={postgresId} type="postgres" />
-										<DeleteService
-											id={postgresId}
-											type="postgres"
-										/>
 									)}
 								</div>
 							</div>
 						</CardHeader>
 						<CardContent className="space-y-2 py-8 border-t">
-							{data?.server?.serverStatus === "inactive"
+							{data?.server?.serverStatus === "inactive" ? (
-								? (
+								<div className="flex h-[55vh] border-2 rounded-xl border-dashed p-4">
-									<div className="flex h-[55vh] border-2 rounded-xl border-dashed p-4">
+									<div className="max-w-3xl mx-auto flex flex-col items-center justify-center self-center gap-3">
-										<div className="max-w-3xl mx-auto flex flex-col items-center justify-center self-center gap-3">
+										<ServerOff className="size-10 text-muted-foreground self-center" />
-											<ServerOff className="size-10 text-muted-foreground self-center" />
+										<span className="text-center text-base text-muted-foreground">
-											<span className="text-center text-base text-muted-foreground">
+											This service is hosted on the server {data.server.name},
-												This service is hosted on the
+											but this server has been disabled because your current
-												server{" "}
+											plan doesn't include enough servers. Please purchase more
-												{data.server.name}, but this
+											servers to regain access to this application.
-												server has been disabled because
+										</span>
-												your current plan doesn't
+										<span className="text-center text-base text-muted-foreground">
-												include enough servers. Please
+											Go to{" "}
-												purchase more servers to regain
+											<Link
-												access to this application.
+												href="/dashboard/settings/billing"
-											</span>
+												className="text-primary"
-											<span className="text-center text-base text-muted-foreground">
+											>
-												Go to{" "}
+												Billing
-												<Link
+											</Link>
-													href="/dashboard/settings/billing"
+										</span>
-													className="text-primary"
-												>
-													Billing
-												</Link>
-											</span>
-										</div>
 									</div>
-								)
+								</div>
-								: (
+							) : (
-									<Tabs
+								<Tabs
-										value={tab}
+									value={tab}
-										defaultValue="general"
+									defaultValue="general"
-										className="w-full"
+									className="w-full"
-										onValueChange={(e) => {
+									onValueChange={(e) => {
-											setSab(e as TabState);
+										setSab(e as TabState);
-											const newPath =
+										const newPath = `/dashboard/project/${projectId}/environment/${environmentId}/services/postgres/${postgresId}?tab=${e}`;
-												`/dashboard/project/${projectId}/environment/${environmentId}/services/postgres/${postgresId}?tab=${e}`;
 
-											router.push(newPath, undefined, {
+										router.push(newPath, undefined, {
-												shallow: true,
+											shallow: true,
-											});
+										});
-										}}
+									}}
-									>
+								>
-										<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
+									<div className="flex flex-row items-center justify-between w-full gap-4 overflow-x-scroll">
-											<TabsList
+										<TabsList
-												className={cn(
+											className={cn(
-													"md:grid md:w-fit max-md:overflow-y-scroll justify-start",
+												"md:grid md:w-fit max-md:overflow-y-scroll justify-start",
-													isCloud && data?.serverId
+												isCloud && data?.serverId
-														? "md:grid-cols-6"
+													? "md:grid-cols-6"
-														: data?.serverId
+													: data?.serverId
 														? "md:grid-cols-5"
 														: "md:grid-cols-6",
-												)}
+											)}
-											>
+										>
-												<TabsTrigger value="general">
+											<TabsTrigger value="general">General</TabsTrigger>
-													General
+											<TabsTrigger value="environment">Environment</TabsTrigger>
-												</TabsTrigger>
+											<TabsTrigger value="logs">Logs</TabsTrigger>
-												<TabsTrigger value="environment">
+											{((data?.serverId && isCloud) || !data?.server) && (
-													Environment
+												<TabsTrigger value="monitoring">Monitoring</TabsTrigger>
-												</TabsTrigger>
+											)}
-												<TabsTrigger value="logs">
+											<TabsTrigger value="backups">Backups</TabsTrigger>
-													Logs
+											<TabsTrigger value="advanced">Advanced</TabsTrigger>
-												</TabsTrigger>
+										</TabsList>
-												{((data?.serverId && isCloud) ||
+									</div>
-													!data?.server) && (
-													<TabsTrigger value="monitoring">
-														Monitoring
-													</TabsTrigger>
-												)}
-												<TabsTrigger value="backups">
-													Backups
-												</TabsTrigger>
-												<TabsTrigger value="advanced">
-													Advanced
-												</TabsTrigger>
-											</TabsList>
-										</div>
 
-										<TabsContent value="general">
+									<TabsContent value="general">
-											<div className="flex flex-col gap-4 pt-2.5">
+										<div className="flex flex-col gap-4 pt-2.5">
-												<ShowGeneralPostgres
+											<ShowGeneralPostgres postgresId={postgresId} />
-													postgresId={postgresId}
+											<ShowInternalPostgresCredentials
-												/>
+												postgresId={postgresId}
-												<ShowInternalPostgresCredentials
+											/>
-													postgresId={postgresId}
+											<ShowExternalPostgresCredentials
-												/>
+												postgresId={postgresId}
-												<ShowExternalPostgresCredentials
+											/>
-													postgresId={postgresId}
+										</div>
-												/>
+									</TabsContent>
+									<TabsContent value="environment">
+										<div className="flex flex-col gap-4 pt-2.5">
+											<ShowEnvironment id={postgresId} type="postgres" />
+										</div>
+									</TabsContent>
+									<TabsContent value="monitoring">
+										<div className="pt-2.5">
+											<div className="flex flex-col gap-4 border rounded-lg p-6">
+												{data?.serverId && isCloud ? (
+													<ContainerPaidMonitoring
+														appName={data?.appName || ""}
+														baseUrl={`${
+															data?.serverId
+																? `http://${data?.server?.ipAddress}:${data?.server?.metricsConfig?.server?.port}`
+																: "http://localhost:4500"
+														}`}
+														token={
+															data?.server?.metricsConfig?.server?.token || ""
+														}
+													/>
+												) : (
+													<>
+														<ContainerFreeMonitoring
+															appName={data?.appName || ""}
+														/>
+													</>
+												)}
 											</div>
-										</TabsContent>
+										</div>
-										<TabsContent value="environment">
+									</TabsContent>
-											<div className="flex flex-col gap-4 pt-2.5">
+									<TabsContent value="logs">
-												<ShowEnvironment
+										<div className="flex flex-col gap-4  pt-2.5">
-													id={postgresId}
+											<ShowDockerLogs
-													type="postgres"
+												serverId={data?.serverId || ""}
-												/>
+												appName={data?.appName || ""}
-											</div>
+											/>
-										</TabsContent>
+										</div>
-										<TabsContent value="monitoring">
+									</TabsContent>
-											<div className="pt-2.5">
+									<TabsContent value="backups">
-												<div className="flex flex-col gap-4 border rounded-lg p-6">
+										<div className="flex flex-col gap-4 pt-2.5">
-													{data?.serverId && isCloud
+											<ShowBackups
-														? (
+												id={postgresId}
-															<ContainerPaidMonitoring
+												databaseType="postgres"
-																appName={data
+												backupType="database"
-																	?.appName ||
+											/>
-																	""}
+										</div>
-																baseUrl={`${
+									</TabsContent>
-																	data?.serverId
+									<TabsContent value="advanced">
-																		? `http://${data?.server?.ipAddress}:${data?.server?.metricsConfig?.server?.port}`
+										<div className="flex flex-col gap-4 pt-2.5">
-																		: "http://localhost:4500"
+											<ShowDatabaseAdvancedSettings
-																}`}
+												id={postgresId}
-																token={data
+												type="postgres"
-																	?.server
+											/>
-																	?.metricsConfig
+										</div>
-																	?.server
+									</TabsContent>
-																	?.token ||
+								</Tabs>
-																	""}
+							)}
-															/>
-														)
-														: (
-															<>
-																<ContainerFreeMonitoring
-																	appName={data
-																		?.appName ||
-																		""}
-																/>
-															</>
-														)}
-												</div>
-											</div>
-										</TabsContent>
-										<TabsContent value="logs">
-											<div className="flex flex-col gap-4  pt-2.5">
-												<ShowDockerLogs
-													serverId={data?.serverId ||
-														""}
-													appName={data?.appName ||
-														""}
-												/>
-											</div>
-										</TabsContent>
-										<TabsContent value="backups">
-											<div className="flex flex-col gap-4 pt-2.5">
-												<ShowBackups
-													id={postgresId}
-													databaseType="postgres"
-													backupType="database"
-												/>
-											</div>
-										</TabsContent>
-										<TabsContent value="advanced">
-											<div className="flex flex-col gap-4 pt-2.5">
-												<ShowDatabaseAdvancedSettings
-													id={postgresId}
-													type="postgres"
-												/>
-											</div>
-										</TabsContent>
-									</Tabs>
-								)}
 						</CardContent>
 					</div>
 				</Card>
@@ -342,9 +293,11 @@ Postgresql.getLayout = (page: ReactElement) => {
 };
 
 export async function getServerSideProps(
-	ctx: GetServerSidePropsContext<
+	ctx: GetServerSidePropsContext<{
-		{ postgresId: string; activeTab: TabState; environmentId: string }
+		postgresId: string;
-	>,
+		activeTab: TabState;
+		environmentId: string;
+	}>,
 ) {
 	const { query, params, req, res } = ctx;
 	const activeTab = query.tab;

apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx

@@ -73,8 +73,7 @@ const Redis = (
 					},
 					{
 						name: data?.environment?.name || "",
-						href:
+						href: `/dashboard/project/${projectId}/environment/${environmentId}`,
-							`/dashboard/project/${projectId}/environment/${environmentId}`,
 					},
 					{
 						name: data?.name || "",
@@ -295,7 +294,11 @@ Redis.getLayout = (page: ReactElement) => {
 };
 
 export async function getServerSideProps(
-	ctx: GetServerSidePropsContext<{ redisId: string; activeTab: TabState; environmentId: string }>,
+	ctx: GetServerSidePropsContext<{
+		redisId: string;
+		activeTab: TabState;
+		environmentId: string;
+	}>,
 ) {
 	const { query, params, req, res } = ctx;
 	const activeTab = query.tab;

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

@@ -4,7 +4,11 @@ import {
 	apiUpdateAi,
 	deploySuggestionSchema,
 } from "@dokploy/server/db/schema/ai";
-import { createDomain, createMount, findEnvironmentById } from "@dokploy/server/index";
+import {
+	createDomain,
+	createMount,
+	findEnvironmentById,
+} from "@dokploy/server/index";
 import {
 	deleteAiSettings,
 	getAiSettingById,
@@ -194,8 +198,6 @@ export const aiRouter = createTRPCRouter({
 				});
 			}
 
-			
-
 			const projectName = slugify(`${project.name} ${input.id}`);
 
 			const compose = await createComposeByTemplate({

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

@@ -126,7 +126,8 @@ export const applicationRouter = createTRPCRouter({
 			}
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -218,7 +219,8 @@ export const applicationRouter = createTRPCRouter({
 			const application = await findApplicationById(input.applicationId);
 
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -260,7 +262,10 @@ export const applicationRouter = createTRPCRouter({
 		.input(apiFindOneApplication)
 		.mutation(async ({ input, ctx }) => {
 			const service = await findApplicationById(input.applicationId);
-			if (service.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				service.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this application",
@@ -280,7 +285,10 @@ export const applicationRouter = createTRPCRouter({
 		.input(apiFindOneApplication)
 		.mutation(async ({ input, ctx }) => {
 			const service = await findApplicationById(input.applicationId);
-			if (service.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				service.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to start this application",
@@ -302,7 +310,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -337,7 +346,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -355,7 +365,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -380,7 +391,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -407,7 +419,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -435,7 +448,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -461,7 +475,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -487,7 +502,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -510,7 +526,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -535,7 +552,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -596,7 +614,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -610,7 +629,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -636,7 +656,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -653,7 +674,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -689,7 +711,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -704,7 +727,8 @@ export const applicationRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -740,7 +764,10 @@ export const applicationRouter = createTRPCRouter({
 
 			const app = await findApplicationById(input.applicationId as string);
 
-			if (app.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				app.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this application",
@@ -783,7 +810,8 @@ export const applicationRouter = createTRPCRouter({
 			const application = await findApplicationById(input.applicationId);
 
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -825,7 +853,8 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -833,8 +862,13 @@ export const applicationRouter = createTRPCRouter({
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",

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

@@ -121,7 +121,10 @@ export const composeRouter = createTRPCRouter({
 			}
 
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this compose",
@@ -172,7 +175,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiUpdateCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to update this compose",
@@ -227,7 +233,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to clean this compose",
@@ -240,7 +249,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFetchServices)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to load this compose",
@@ -257,7 +269,10 @@ export const composeRouter = createTRPCRouter({
 		)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to load this compose",
@@ -276,7 +291,8 @@ export const composeRouter = createTRPCRouter({
 				const compose = await findComposeById(input.composeId);
 
 				if (
-					compose.environment.project.organizationId !== ctx.session.activeOrganizationId
+					compose.environment.project.organizationId !==
+					ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
@@ -302,7 +318,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiRandomizeCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to randomize this compose",
@@ -314,7 +333,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiRandomizeCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to randomize this compose",
@@ -329,7 +351,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to get this compose",
@@ -347,7 +372,10 @@ export const composeRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
 
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this compose",
@@ -380,7 +408,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to redeploy this compose",
@@ -412,7 +443,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this compose",
@@ -426,7 +460,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this compose",
@@ -441,7 +478,10 @@ export const composeRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
 
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to get this compose",
@@ -454,7 +494,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to refresh this compose",
@@ -599,7 +642,10 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to disconnect this git provider",
@@ -660,15 +706,23 @@ export const composeRouter = createTRPCRouter({
 		)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move this compose",
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",
@@ -706,7 +760,8 @@ export const composeRouter = createTRPCRouter({
 				const compose = await findComposeById(input.composeId);
 
 				if (
-					compose.environment.project.organizationId !== ctx.session.activeOrganizationId
+					compose.environment.project.organizationId !==
+					ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
@@ -777,7 +832,8 @@ export const composeRouter = createTRPCRouter({
 				);
 
 				if (
-					compose.environment.project.organizationId !== ctx.session.activeOrganizationId
+					compose.environment.project.organizationId !==
+					ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",

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

@@ -29,7 +29,8 @@ export const deploymentRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -43,7 +44,10 @@ export const deploymentRouter = createTRPCRouter({
 		.input(apiFindAllByCompose)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this compose",

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

@@ -34,7 +34,8 @@ export const domainRouter = createTRPCRouter({
 				if (input.domainType === "compose" && input.composeId) {
 					const compose = await findComposeById(input.composeId);
 					if (
-						compose.environment.project.organizationId !== ctx.session.activeOrganizationId
+						compose.environment.project.organizationId !==
+						ctx.session.activeOrganizationId
 					) {
 						throw new TRPCError({
 							code: "UNAUTHORIZED",
@@ -70,7 +71,8 @@ export const domainRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -83,7 +85,10 @@ export const domainRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this compose",
@@ -122,7 +127,8 @@ export const domainRouter = createTRPCRouter({
 			if (currentDomain.applicationId) {
 				const newApp = await findApplicationById(currentDomain.applicationId);
 				if (
-					newApp.environment.project.organizationId !== ctx.session.activeOrganizationId
+					newApp.environment.project.organizationId !==
+					ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
@@ -132,7 +138,8 @@ export const domainRouter = createTRPCRouter({
 			} else if (currentDomain.composeId) {
 				const newCompose = await findComposeById(currentDomain.composeId);
 				if (
-					newCompose.environment.project.organizationId !== ctx.session.activeOrganizationId
+					newCompose.environment.project.organizationId !==
+					ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
@@ -144,8 +151,8 @@ export const domainRouter = createTRPCRouter({
 					currentDomain.previewDeploymentId,
 				);
 				if (
-					newPreviewDeployment.application.environment.project.organizationId !==
+					newPreviewDeployment.application.environment.project
-					ctx.session.activeOrganizationId
+						.organizationId !== ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
@@ -175,7 +182,8 @@ export const domainRouter = createTRPCRouter({
 		if (domain.applicationId) {
 			const application = await findApplicationById(domain.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -184,7 +192,10 @@ export const domainRouter = createTRPCRouter({
 			}
 		} else if (domain.composeId) {
 			const compose = await findComposeById(domain.composeId);
-			if (compose.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				compose.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this compose",
@@ -211,7 +222,8 @@ export const domainRouter = createTRPCRouter({
 			} else if (domain.composeId) {
 				const compose = await findComposeById(domain.composeId);
 				if (
-					compose.environment.project.organizationId !== ctx.session.activeOrganizationId
+					compose.environment.project.organizationId !==
+					ctx.session.activeOrganizationId
 				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",

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

@@ -107,7 +107,10 @@ export const mariadbRouter = createTRPCRouter({
 				);
 			}
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this Mariadb",
@@ -120,7 +123,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiFindOneMariaDB)
 		.mutation(async ({ input, ctx }) => {
 			const service = await findMariadbById(input.mariadbId);
-			if (service.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				service.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to start this Mariadb",
@@ -157,7 +163,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiSaveExternalPortMariaDB)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMariadbById(input.mariadbId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this external port",
@@ -173,7 +182,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiDeployMariaDB)
 		.mutation(async ({ input, ctx }) => {
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this Mariadb",
@@ -194,7 +206,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiDeployMariaDB)
 		.subscription(async ({ input, ctx }) => {
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this Mariadb",
@@ -211,7 +226,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiChangeMariaDBStatus)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMariadbById(input.mariadbId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to change this Mariadb status",
@@ -235,7 +253,10 @@ export const mariadbRouter = createTRPCRouter({
 			}
 
 			const mongo = await findMariadbById(input.mariadbId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to delete this Mariadb",
@@ -261,7 +282,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiSaveEnvironmentVariablesMariaDB)
 		.mutation(async ({ input, ctx }) => {
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this environment",
@@ -284,7 +308,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiResetMariadb)
 		.mutation(async ({ input, ctx }) => {
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to reload this Mariadb",
@@ -314,7 +341,10 @@ export const mariadbRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const { mariadbId, ...rest } = input;
 			const mariadb = await findMariadbById(mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to update this Mariadb",
@@ -342,15 +372,23 @@ export const mariadbRouter = createTRPCRouter({
 		)
 		.mutation(async ({ input, ctx }) => {
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move this mariadb",
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",
@@ -380,7 +418,10 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiRebuildMariadb)
 		.mutation(async ({ input, ctx }) => {
 			const mariadb = await findMariadbById(input.mariadbId);
-			if (mariadb.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mariadb.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to rebuild this MariaDB database",

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

@@ -112,7 +112,10 @@ export const mongoRouter = createTRPCRouter({
 			}
 
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this mongo",
@@ -126,7 +129,10 @@ export const mongoRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const service = await findMongoById(input.mongoId);
 
-			if (service.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				service.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to start this mongo",
@@ -149,7 +155,10 @@ export const mongoRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
 
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this mongo",
@@ -171,7 +180,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiSaveExternalPortMongo)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this external port",
@@ -187,7 +199,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiDeployMongo)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this mongo",
@@ -207,7 +222,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiDeployMongo)
 		.subscription(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this mongo",
@@ -224,7 +242,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiChangeMongoStatus)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to change this mongo status",
@@ -239,7 +260,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiResetMongo)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to reload this mongo",
@@ -278,7 +302,10 @@ export const mongoRouter = createTRPCRouter({
 
 			const mongo = await findMongoById(input.mongoId);
 
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to delete this mongo",
@@ -304,7 +331,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiSaveEnvironmentVariablesMongo)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this environment",
@@ -328,7 +358,10 @@ export const mongoRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const { mongoId, ...rest } = input;
 			const mongo = await findMongoById(mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to update this mongo",
@@ -356,15 +389,23 @@ export const mongoRouter = createTRPCRouter({
 		)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move this mongo",
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",
@@ -394,7 +435,10 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiRebuildMongo)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMongoById(input.mongoId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to rebuild this MongoDB database",

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

@@ -113,7 +113,10 @@ export const mysqlRouter = createTRPCRouter({
 				);
 			}
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this MySQL",
@@ -126,7 +129,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiFindOneMySql)
 		.mutation(async ({ input, ctx }) => {
 			const service = await findMySqlById(input.mysqlId);
-			if (service.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				service.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to start this MySQL",
@@ -148,7 +154,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiFindOneMySql)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMySqlById(input.mysqlId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this MySQL",
@@ -169,7 +178,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiSaveExternalPortMySql)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMySqlById(input.mysqlId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this external port",
@@ -185,7 +197,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiDeployMySql)
 		.mutation(async ({ input, ctx }) => {
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this MySQL",
@@ -205,7 +220,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiDeployMySql)
 		.subscription(async ({ input, ctx }) => {
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this MySQL",
@@ -222,7 +240,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiChangeMySqlStatus)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findMySqlById(input.mysqlId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to change this MySQL status",
@@ -237,7 +258,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiResetMysql)
 		.mutation(async ({ input, ctx }) => {
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to reload this MySQL",
@@ -273,7 +297,10 @@ export const mysqlRouter = createTRPCRouter({
 				);
 			}
 			const mongo = await findMySqlById(input.mysqlId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to delete this MySQL",
@@ -299,7 +326,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiSaveEnvironmentVariablesMySql)
 		.mutation(async ({ input, ctx }) => {
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this environment",
@@ -323,7 +353,10 @@ export const mysqlRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const { mysqlId, ...rest } = input;
 			const mysql = await findMySqlById(mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to update this MySQL",
@@ -351,15 +384,23 @@ export const mysqlRouter = createTRPCRouter({
 		)
 		.mutation(async ({ input, ctx }) => {
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move this mysql",
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",
@@ -389,7 +430,10 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiRebuildMysql)
 		.mutation(async ({ input, ctx }) => {
 			const mysql = await findMySqlById(input.mysqlId);
-			if (mysql.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mysql.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to rebuild this MySQL database",

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

@@ -113,7 +113,8 @@ export const postgresRouter = createTRPCRouter({
 
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -128,7 +129,10 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const service = await findPostgresById(input.postgresId);
 
-			if (service.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				service.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to start this Postgres",
@@ -151,7 +155,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -175,7 +180,8 @@ export const postgresRouter = createTRPCRouter({
 			const postgres = await findPostgresById(input.postgresId);
 
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -193,7 +199,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -216,7 +223,8 @@ export const postgresRouter = createTRPCRouter({
 		.subscription(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -235,7 +243,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -261,7 +270,8 @@ export const postgresRouter = createTRPCRouter({
 			const postgres = await findPostgresById(input.postgresId);
 
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -286,7 +296,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -311,7 +322,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -343,7 +355,8 @@ export const postgresRouter = createTRPCRouter({
 			const { postgresId, ...rest } = input;
 			const postgres = await findPostgresById(postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -373,7 +386,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -381,8 +395,13 @@ export const postgresRouter = createTRPCRouter({
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",
@@ -413,7 +432,8 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const postgres = await findPostgresById(input.postgresId);
 			if (
-				postgres.environment.project.organizationId !== ctx.session.activeOrganizationId
+				postgres.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",

apps/dokploy/server/api/routers/preview-deployment.ts

@@ -15,7 +15,8 @@ export const previewDeploymentRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",

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

@@ -347,10 +347,15 @@ export const projectRouter = createTRPCRouter({
 				}
 
 				// Get source project
-				const sourceEnvironment = input.duplicateInSameProject ? await findEnvironmentById(input.sourceEnvironmentId) : null;
+				const sourceEnvironment = input.duplicateInSameProject
+					? await findEnvironmentById(input.sourceEnvironmentId)
+					: null;
 
-				
+				if (
-				if (input.duplicateInSameProject &&sourceEnvironment?.project.organizationId !== ctx.session.activeOrganizationId) {
+					input.duplicateInSameProject &&
+					sourceEnvironment?.project.organizationId !==
+						ctx.session.activeOrganizationId
+				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
 						message: "You are not authorized to access this project",
@@ -369,8 +374,7 @@ export const projectRouter = createTRPCRouter({
 							ctx.session.activeOrganizationId,
 						).then((value) => value.environment);
 
-						console.log("targetProject", targetProject);
+				console.log("targetProject", targetProject);
-
 
 				if (input.includeServices) {
 					const servicesToDuplicate = input.selectedServices || [];

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

@@ -104,7 +104,10 @@ export const redisRouter = createTRPCRouter({
 			}
 
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this Redis",
@@ -117,7 +120,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiFindOneRedis)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to start this Redis",
@@ -139,7 +145,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiResetRedis)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to reload this Redis",
@@ -169,7 +178,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiFindOneRedis)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this Redis",
@@ -190,7 +202,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiSaveExternalPortRedis)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findRedisById(input.redisId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this external port",
@@ -206,7 +221,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiDeployRedis)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this Redis",
@@ -226,7 +244,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiDeployRedis)
 		.subscription(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this Redis",
@@ -242,7 +263,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiChangeRedisStatus)
 		.mutation(async ({ input, ctx }) => {
 			const mongo = await findRedisById(input.redisId);
-			if (mongo.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				mongo.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to change this Redis status",
@@ -267,7 +291,10 @@ export const redisRouter = createTRPCRouter({
 
 			const redis = await findRedisById(input.redisId);
 
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to delete this Redis",
@@ -290,7 +317,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiSaveEnvironmentVariablesRedis)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to save this environment",
@@ -335,15 +365,23 @@ export const redisRouter = createTRPCRouter({
 		)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move this redis",
 				});
 			}
 
-			const targetEnvironment = await findEnvironmentById(input.targetEnvironmentId);
+			const targetEnvironment = await findEnvironmentById(
-			if (targetEnvironment.project.organizationId !== ctx.session.activeOrganizationId) {
+				input.targetEnvironmentId,
+			);
+			if (
+				targetEnvironment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to move to this environment",
@@ -373,7 +411,10 @@ export const redisRouter = createTRPCRouter({
 		.input(apiRebuildRedis)
 		.mutation(async ({ input, ctx }) => {
 			const redis = await findRedisById(input.redisId);
-			if (redis.environment.project.organizationId !== ctx.session.activeOrganizationId) {
+			if (
+				redis.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to rebuild this Redis database",

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

@@ -19,7 +19,8 @@ export const securityRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const application = await findApplicationById(input.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -34,7 +35,8 @@ export const securityRouter = createTRPCRouter({
 			const security = await findSecurityById(input.securityId);
 			const application = await findApplicationById(security.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -49,7 +51,8 @@ export const securityRouter = createTRPCRouter({
 			const security = await findSecurityById(input.securityId);
 			const application = await findApplicationById(security.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
@@ -64,7 +67,8 @@ export const securityRouter = createTRPCRouter({
 			const security = await findSecurityById(input.securityId);
 			const application = await findApplicationById(security.applicationId);
 			if (
-				application.environment.project.organizationId !== ctx.session.activeOrganizationId
+				application.environment.project.organizationId !==
+				ctx.session.activeOrganizationId
 			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",

packages/server/src/db/schema/application.ts

@@ -203,7 +203,6 @@ export const applications = pgTable("application", {
 export const applicationsRelations = relations(
 	applications,
 	({ one, many }) => ({
-
 		environment: one(environments, {
 			fields: [applications.environmentId],
 			references: [environments.environmentId],

packages/server/src/db/schema/compose.ts

@@ -110,7 +110,6 @@ export const compose = pgTable("compose", {
 });
 
 export const composeRelations = relations(compose, ({ one, many }) => ({
-
 	environment: one(environments, {
 		fields: [compose.environmentId],
 		references: [environments.environmentId],

packages/server/src/db/schema/mariadb.ts

@@ -77,7 +77,6 @@ export const mariadb = pgTable("mariadb", {
 });
 
 export const mariadbRelations = relations(mariadb, ({ one, many }) => ({
-
 	environment: one(environments, {
 		fields: [mariadb.environmentId],
 		references: [environments.environmentId],

packages/server/src/db/schema/mongo.ts

@@ -74,7 +74,6 @@ export const mongo = pgTable("mongo", {
 });
 
 export const mongoRelations = relations(mongo, ({ one, many }) => ({
-
 	environment: one(environments, {
 		fields: [mongo.environmentId],
 		references: [environments.environmentId],

packages/server/src/db/schema/mysql.ts

@@ -75,7 +75,6 @@ export const mysql = pgTable("mysql", {
 });
 
 export const mysqlRelations = relations(mysql, ({ one, many }) => ({
-
 	environment: one(environments, {
 		fields: [mysql.environmentId],
 		references: [environments.environmentId],

packages/server/src/db/schema/postgres.ts

@@ -75,7 +75,6 @@ export const postgres = pgTable("postgres", {
 });
 
 export const postgresRelations = relations(postgres, ({ one, many }) => ({
-
 	environment: one(environments, {
 		fields: [postgres.environmentId],
 		references: [environments.environmentId],

packages/server/src/db/schema/redis.ts

@@ -71,7 +71,6 @@ export const redis = pgTable("redis", {
 });
 
 export const redisRelations = relations(redis, ({ one, many }) => ({
-
 	environment: one(environments, {
 		fields: [redis.environmentId],
 		references: [environments.environmentId],

packages/server/src/services/application.ts

@@ -86,7 +86,6 @@ export const createApplication = async (
 			.returning()
 			.then((value) => value[0]);
 
-
 		if (!newApplication) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",

packages/server/src/services/environment.ts

@@ -62,7 +62,6 @@ export const findEnvironmentsByProjectId = async (projectId: string) => {
 };
 
 export const deleteEnvironment = async (environmentId: string) => {
-
 	const currentEnvironment = await findEnvironmentById(environmentId);
 	if (currentEnvironment.name === "production") {
 		throw new TRPCError({

packages/server/src/services/preview-deployment.ts

@@ -49,8 +49,6 @@ export const findPreviewDeploymentById = async (
 	return application;
 };
 
-
-
 export const removePreviewDeployment = async (previewDeploymentId: string) => {
 	try {
 		const previewDeployment =

packages/server/src/services/project.ts

@@ -36,13 +36,13 @@ export const createProject = async (
 	}
 
 	// Automatically create a production environment
-	const newEnvironment = await createProductionEnvironment(newProject.projectId);
+	const newEnvironment = await createProductionEnvironment(
-		return {
+		newProject.projectId,
-			project: newProject,
+	);
-			environment: newEnvironment,
+	return {
-		};
+		project: newProject,
-
+		environment: newEnvironment,
-
+	};
 };
 
 export const findProjectById = async (projectId: string) => {