refactor: remove old references

apps/dokploy/__test__/drop/drop.test.test.ts

@@ -45,7 +45,7 @@ const baseApp: ApplicationNested = {
 	previewWildcard: "",
 	project: {
 		env: "",
-		adminId: "",
+		organizationId: "",
 		name: "",
 		description: "",
 		createdAt: "",

apps/dokploy/__test__/traefik/server/update-server-config.test.ts

@@ -5,7 +5,7 @@ vi.mock("node:fs", () => ({
 	default: fs,
 }));
 
-import type { Admin, FileConfig } from "@dokploy/server";
+import type { Admin, FileConfig, User } from "@dokploy/server";
 import {
 	createDefaultServerTraefikConfig,
 	loadOrCreateConfig,
@@ -13,7 +13,7 @@ import {
 } from "@dokploy/server";
 import { beforeEach, expect, test, vi } from "vitest";
 
-const baseAdmin: Admin = {
+const baseAdmin: Partial<User> = {
 	enablePaidFeatures: false,
 	metricsConfig: {
 		containers: {
@@ -40,9 +40,7 @@ const baseAdmin: Admin = {
 	cleanupCacheApplications: false,
 	cleanupCacheOnCompose: false,
 	cleanupCacheOnPreviews: false,
-	createdAt: "",
-	authId: "",
-	adminId: "string",
+	createdAt: new Date(),
 	serverIp: null,
 	certificateType: "none",
 	host: null,

apps/dokploy/pages/api/stripe/webhook.ts

@@ -1,6 +1,6 @@
 import { buffer } from "node:stream/consumers";
 import { db } from "@/server/db";
-import { admins, server, users_temp } from "@/server/db/schema";
+import { server, users_temp } from "@/server/db/schema";
 import { findAdminById, findUserById } from "@dokploy/server";
 import { asc, eq } from "drizzle-orm";
 import type { NextApiRequest, NextApiResponse } from "next";

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

@@ -201,14 +201,7 @@ const Project = (
 	const [isBulkActionLoading, setIsBulkActionLoading] = useState(false);
 	const { projectId } = props;
 	const { data: auth } = api.auth.get.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
+
 	const { data, isLoading, refetch } = api.project.one.useQuery({ projectId });
 	const router = useRouter();
 
@@ -335,7 +328,7 @@ const Project = (
 								</CardTitle>
 								<CardDescription>{data?.description}</CardDescription>
 							</CardHeader>
-							{(auth?.role === "owner" || user?.canCreateServices) && (
+							{(auth?.role === "owner" || auth?.user?.canCreateServices) && (
 								<div className="flex flex-row gap-4 flex-wrap">
 									<ProjectEnvironment projectId={projectId}>
 										<Button variant="outline">Project Environment</Button>

apps/dokploy/pages/dashboard/project/[projectId]/services/application/[applicationId].tsx

@@ -40,7 +40,6 @@ import { cn } from "@/lib/utils";
 import { appRouter } from "@/server/api/root";
 import { api } from "@/utils/api";
 import { validateRequest } from "@dokploy/server/lib/auth";
-// import { validateRequest } from "@dokploy/server";
 import { createServerSideHelpers } from "@trpc/react-query/server";
 import copy from "copy-to-clipboard";
 import { GlobeIcon, HelpCircle, ServerOff, Trash2 } from "lucide-react";
@@ -89,14 +88,6 @@ const Service = (
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 	const { data: auth } = api.auth.get.useQuery();
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
 
 	return (
 		<div className="pb-10">
@@ -187,7 +178,8 @@ const Service = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateApplication applicationId={applicationId} />
-									{(auth?.role === "owner" || user?.canDeleteServices) && (
+									{(auth?.role === "owner" ||
+										auth?.user?.canDeleteServices) && (
 										<DeleteService id={applicationId} type="application" />
 									)}
 								</div>
@@ -387,8 +379,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx

@@ -82,14 +82,6 @@ const Service = (
 	const { data: auth } = api.auth.get.useQuery();
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
 
 	return (
 		<div className="pb-10">
@@ -181,7 +173,8 @@ const Service = (
 									<div className="flex flex-row gap-2 justify-end">
 										<UpdateCompose composeId={composeId} />
 
-										{(auth?.role === "owner" || user?.canDeleteServices) && (
+										{(auth?.role === "owner" ||
+											auth?.user?.canDeleteServices) && (
 											<DeleteService id={composeId} type="compose" />
 										)}
 									</div>
@@ -382,8 +375,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

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

@@ -63,14 +63,7 @@ const Mariadb = (
 	const { data } = api.mariadb.one.useQuery({ mariadbId });
 	const { data: auth } = api.auth.get.useQuery();
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
+
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
 	return (
@@ -154,7 +147,8 @@ const Mariadb = (
 								</div>
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateMariadb mariadbId={mariadbId} />
-									{(auth?.role === "owner" || user?.canDeleteServices) && (
+									{(auth?.role === "owner" ||
+										auth?.user?.canDeleteServices) && (
 										<DeleteService id={mariadbId} type="mariadb" />
 									)}
 								</div>
@@ -332,8 +326,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

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

@@ -63,14 +63,6 @@ const Mongo = (
 
 	const { data: auth } = api.auth.get.useQuery();
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
@@ -156,7 +148,8 @@ const Mongo = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateMongo mongoId={mongoId} />
-									{(auth?.role === "owner" || user?.canDeleteServices) && (
+									{(auth?.role === "owner" ||
+										auth?.user?.canDeleteServices) && (
 										<DeleteService id={mongoId} type="mongo" />
 									)}
 								</div>
@@ -334,8 +327,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

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

@@ -62,14 +62,6 @@ const MySql = (
 	const { data } = api.mysql.one.useQuery({ mysqlId });
 	const { data: auth } = api.auth.get.useQuery();
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
@@ -156,7 +148,8 @@ const MySql = (
 
 									<div className="flex flex-row gap-2 justify-end">
 										<UpdateMysql mysqlId={mysqlId} />
-										{(auth?.role === "owner" || user?.canDeleteServices) && (
+										{(auth?.role === "owner" ||
+											auth?.user?.canDeleteServices) && (
 											<DeleteService id={mysqlId} type="mysql" />
 										)}
 									</div>
@@ -339,8 +332,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

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

@@ -61,14 +61,7 @@ const Postgresql = (
 	const [tab, setSab] = useState<TabState>(activeTab);
 	const { data } = api.postgres.one.useQuery({ postgresId });
 	const { data: auth } = api.auth.get.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
+
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
@@ -154,7 +147,8 @@ const Postgresql = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdatePostgres postgresId={postgresId} />
-									{(auth?.role === "owner" || user?.canDeleteServices) && (
+									{(auth?.role === "owner" ||
+										auth?.user?.canDeleteServices) && (
 										<DeleteService id={postgresId} type="postgres" />
 									)}
 								</div>
@@ -335,8 +329,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

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

@@ -62,14 +62,6 @@ const Redis = (
 
 	const { data: auth } = api.auth.get.useQuery();
 	const { data: monitoring } = api.admin.getMetricsToken.useQuery();
-	const { data: user } = api.user.byAuthId.useQuery(
-		{
-			authId: auth?.id || "",
-		},
-		{
-			enabled: !!auth?.id && auth?.role === "member",
-		},
-	);
 
 	const { data: isCloud } = api.settings.isCloud.useQuery();
 
@@ -155,7 +147,8 @@ const Redis = (
 
 								<div className="flex flex-row gap-2 justify-end">
 									<UpdateRedis redisId={redisId} />
-									{(auth?.role === "owner" || user?.canDeleteServices) && (
+									{(auth?.role === "owner" ||
+										auth?.user?.canDeleteServices) && (
 										<DeleteService id={redisId} type="redis" />
 									)}
 								</div>
@@ -327,8 +320,8 @@ export async function getServerSideProps(
 			req: req as any,
 			res: res as any,
 			db: null as any,
-			session: session,
-			user: user,
+			session: session as any,
+			user: user as any,
 		},
 		transformer: superjson,
 	});

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

@@ -4,7 +4,6 @@ import {
 	apiCreateUserInvitation,
 	apiFindOneToken,
 	apiRemoveUser,
-	apiUpdateAdmin,
 	apiUpdateWebServerMonitoring,
 } from "@/server/db/schema";
 import {
@@ -36,19 +35,17 @@ export const adminRouter = createTRPCRouter({
 			...rest,
 		};
 	}),
-	update: adminProcedure
-		.input(apiUpdateAdmin)
-		.mutation(async ({ input, ctx }) => {
-			if (ctx.user.rol === "member") {
-				throw new TRPCError({
-					code: "UNAUTHORIZED",
-					message: "You are not allowed to update this admin",
-				});
-			}
-			const { id } = await findUserById(ctx.user.id);
-			// @ts-ignore
-			return updateAdmin(id, input);
-		}),
+	update: adminProcedure.mutation(async ({ input, ctx }) => {
+		if (ctx.user.rol === "member") {
+			throw new TRPCError({
+				code: "UNAUTHORIZED",
+				message: "You are not allowed to update this admin",
+			});
+		}
+		const { id } = await findUserById(ctx.user.id);
+		// @ts-ignore
+		return updateAdmin(id, input);
+	}),
 	createUserInvitation: adminProcedure
 		.input(apiCreateUserInvitation)
 		.mutation(async ({ input, ctx }) => {

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

@@ -1,30 +1,23 @@
 import {
-	apiCreateAdmin,
-	apiCreateUser,
-	apiFindOneAuth,
-	apiLogin,
-	apiUpdateAuth,
-	apiVerify2FA,
-	apiVerifyLogin2FA,
-	auth,
+	// apiCreateAdmin,
+	// apiCreateUser,
+	// apiFindOneAuth,
+	// apiLogin,
+	// apiUpdateAuth,
+	// apiVerify2FA,
+	// apiVerifyLogin2FA,
+	// auth,
 	member,
 } from "@/server/db/schema";
 import { WEBSITE_URL } from "@/server/utils/stripe";
 import {
-	type Auth,
 	IS_CLOUD,
-	createAdmin,
-	createUser,
-	findAuthByEmail,
 	findAuthById,
 	findUserById,
 	generate2FASecret,
 	getUserByToken,
-	removeAdminByAuthId,
 	sendDiscordNotification,
 	sendEmailNotification,
-	updateAuthById,
-	updateUser,
 	validateRequest,
 	verify2FA,
 } from "@dokploy/server";
@@ -43,81 +36,77 @@ import {
 } from "../trpc";
 
 export const authRouter = createTRPCRouter({
-	createAdmin: publicProcedure
-		.input(apiCreateAdmin)
-		.mutation(async ({ ctx, input }) => {
-			try {
-				if (!IS_CLOUD) {
-					const admin = await db.query.admins.findFirst({});
-					if (admin) {
-						throw new TRPCError({
-							code: "BAD_REQUEST",
-							message: "Admin already exists",
-						});
-					}
+	createAdmin: publicProcedure.mutation(async ({ ctx, input }) => {
+		try {
+			if (!IS_CLOUD) {
+				const admin = await db.query.admins.findFirst({});
+				if (admin) {
+					throw new TRPCError({
+						code: "BAD_REQUEST",
+						message: "Admin already exists",
+					});
 				}
-				const newAdmin = await createAdmin(input);
+			}
+			const newAdmin = await createAdmin(input);
 
-				if (IS_CLOUD) {
-					await sendDiscordNotificationWelcome(newAdmin);
-					await sendVerificationEmail(newAdmin.id);
-					return {
-						status: "success",
-						type: "cloud",
-					};
-				}
-				// const session = await lucia.createSession(newAdmin.id || "", {});
-				// ctx.res.appendHeader(
-				// 	"Set-Cookie",
-				// 	lucia.createSessionCookie(session.id).serialize(),
-				// );
+			if (IS_CLOUD) {
+				await sendDiscordNotificationWelcome(newAdmin);
+				await sendVerificationEmail(newAdmin.id);
 				return {
 					status: "success",
-					type: "selfhosted",
+					type: "cloud",
 				};
-			} catch (error) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					// @ts-ignore
-					message: `Error: ${error?.code === "23505" ? "Email already exists" : "Error creating admin"}`,
-					cause: error,
-				});
 			}
-		}),
-	createUser: publicProcedure
-		.input(apiCreateUser)
-		.mutation(async ({ ctx, input }) => {
-			try {
-				const token = await getUserByToken(input.token);
-				// if (token.isExpired) {
-				// 	throw new TRPCError({
-				// 		code: "BAD_REQUEST",
-				// 		message: "Invalid token",
-				// 	});
-				// }
+			// const session = await lucia.createSession(newAdmin.id || "", {});
+			// ctx.res.appendHeader(
+			// 	"Set-Cookie",
+			// 	lucia.createSessionCookie(session.id).serialize(),
+			// );
+			return {
+				status: "success",
+				type: "selfhosted",
+			};
+		} catch (error) {
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				// @ts-ignore
+				message: `Error: ${error?.code === "23505" ? "Email already exists" : "Error creating admin"}`,
+				cause: error,
+			});
+		}
+	}),
+	createUser: publicProcedure.mutation(async ({ ctx, input }) => {
+		try {
+			const token = await getUserByToken(input.token);
+			// if (token.isExpired) {
+			// 	throw new TRPCError({
+			// 		code: "BAD_REQUEST",
+			// 		message: "Invalid token",
+			// 	});
+			// }
 
-				// const newUser = await createUser(input);
+			// const newUser = await createUser(input);
 
-				// if (IS_CLOUD) {
-				// 	await sendVerificationEmail(token.authId);
-				// 	return true;
-				// }
-				// const session = await lucia.createSession(newUser?.authId || "", {});
-				// ctx.res.appendHeader(
-				// 	"Set-Cookie",
-				// 	lucia.createSessionCookie(session.id).serialize(),
-				// );
-				return true;
-			} catch (error) {
-				throw new TRPCError({
-					code: "BAD_REQUEST",
-					message: "Error creating the user",
-					cause: error,
-				});
-			}
-		}),
+			// if (IS_CLOUD) {
+			// 	await sendVerificationEmail(token.authId);
+			// 	return true;
+			// }
+			// const session = await lucia.createSession(newUser?.authId || "", {});
+			// ctx.res.appendHeader(
+			// 	"Set-Cookie",
+			// 	lucia.createSessionCookie(session.id).serialize(),
+			// );
+			return true;
+		} catch (error) {
+			throw new TRPCError({
+				code: "BAD_REQUEST",
+				message: "Error creating the user",
+				cause: error,
+			});
+		}
+	}),
 
-	login: publicProcedure.input(apiLogin).mutation(async ({ ctx, input }) => {
+	login: publicProcedure.mutation(async ({ ctx, input }) => {
 		try {
 			const auth = await findAuthByEmail(input.email);
 
@@ -192,33 +181,31 @@ export const authRouter = createTRPCRouter({
 		return true;
 	}),
 
-	update: protectedProcedure
-		.input(apiUpdateAuth)
-		.mutation(async ({ ctx, input }) => {
-			const currentAuth = await findAuthByEmail(ctx.user.email);
+	update: protectedProcedure.mutation(async ({ ctx, input }) => {
+		const currentAuth = await findAuthByEmail(ctx.user.email);
 
-			if (input.currentPassword || input.password) {
-				const correctPassword = bcrypt.compareSync(
-					input.currentPassword || "",
-					currentAuth?.password || "",
-				);
-				if (!correctPassword) {
-					throw new TRPCError({
-						code: "BAD_REQUEST",
-						message: "Current password is incorrect",
-					});
-				}
+		if (input.currentPassword || input.password) {
+			const correctPassword = bcrypt.compareSync(
+				input.currentPassword || "",
+				currentAuth?.password || "",
+			);
+			if (!correctPassword) {
+				throw new TRPCError({
+					code: "BAD_REQUEST",
+					message: "Current password is incorrect",
+				});
 			}
-			// const auth = await updateAuthById(ctx.user.authId, {
-			// 	...(input.email && { email: input.email.toLowerCase() }),
-			// 	...(input.password && {
-			// 		password: bcrypt.hashSync(input.password, 10),
-			// 	}),
-			// 	...(input.image && { image: input.image }),
-			// });
+		}
+		// const auth = await updateAuthById(ctx.user.authId, {
+		// 	...(input.email && { email: input.email.toLowerCase() }),
+		// 	...(input.password && {
+		// 		password: bcrypt.hashSync(input.password, 10),
+		// 	}),
+		// 	...(input.image && { image: input.image }),
+		// });
 
-			return auth;
-		}),
+		return auth;
+	}),
 	removeSelfAccount: protectedProcedure
 		.input(
 			z.object({
@@ -279,7 +266,7 @@ export const authRouter = createTRPCRouter({
 	verifyToken: protectedProcedure.mutation(async () => {
 		return true;
 	}),
-	one: adminProcedure.input(apiFindOneAuth).query(async ({ input }) => {
+	one: adminProcedure.query(async ({ input }) => {
 		const auth = await findAuthById(input.id);
 		return auth;
 	}),
@@ -287,34 +274,30 @@ export const authRouter = createTRPCRouter({
 	generate2FASecret: protectedProcedure.query(async ({ ctx }) => {
 		return await generate2FASecret(ctx.user.id);
 	}),
-	verify2FASetup: protectedProcedure
-		.input(apiVerify2FA)
-		.mutation(async ({ ctx, input }) => {
-			// const auth = await findAuthById(ctx.user.authId);
-			// await verify2FA(auth, input.secret, input.pin);
-			// await updateAuthById(auth.id, {
-			// 	is2FAEnabled: true,
-			// 	secret: input.secret,
-			// });
-			// return auth;
-		}),
+	verify2FASetup: protectedProcedure.mutation(async ({ ctx, input }) => {
+		// const auth = await findAuthById(ctx.user.authId);
+		// await verify2FA(auth, input.secret, input.pin);
+		// await updateAuthById(auth.id, {
+		// 	is2FAEnabled: true,
+		// 	secret: input.secret,
+		// });
+		// return auth;
+	}),
 
-	verifyLogin2FA: publicProcedure
-		.input(apiVerifyLogin2FA)
-		.mutation(async ({ ctx, input }) => {
-			// const auth = await findAuthById(input.id);
+	verifyLogin2FA: publicProcedure.mutation(async ({ ctx, input }) => {
+		// const auth = await findAuthById(input.id);
 
-			// await verify2FA(auth, auth.secret || "", input.pin);
+		// await verify2FA(auth, auth.secret || "", input.pin);
 
-			// const session = await lucia.createSession(auth.id, {});
+		// const session = await lucia.createSession(auth.id, {});
 
-			// ctx.res.appendHeader(
-			// 	"Set-Cookie",
-			// 	lucia.createSessionCookie(session.id).serialize(),
-			// );
+		// ctx.res.appendHeader(
+		// 	"Set-Cookie",
+		// 	lucia.createSessionCookie(session.id).serialize(),
+		// );
 
-			return true;
-		}),
+		return true;
+	}),
 	disable2FA: protectedProcedure.mutation(async ({ ctx }) => {
 		// const auth = await findAuthById(ctx.user.authId);
 		// await updateAuthById(auth.id, {