refactor: update

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

@@ -16,6 +16,7 @@ import {
 	removeUserById,
 	setupWebMonitoring,
 	updateAdminById,
+	updateUser,
 } from "@dokploy/server";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
@@ -101,6 +102,9 @@ export const adminRouter = createTRPCRouter({
 						message: "You are not allowed to assign permissions",
 					});
 				}
+				await updateUser(user.id, {
+					...input,
+				});
 				// await db
 				// 	.update(users)
 				// 	.set({
@@ -130,32 +134,33 @@ export const adminRouter = createTRPCRouter({
 					});
 				}
 
-				// await updateAdminById(admin.adminId, {
-				// 	metricsConfig: {
-				// 		server: {
-				// 			type: "Dokploy",
-				// 			refreshRate: input.metricsConfig.server.refreshRate,
-				// 			port: input.metricsConfig.server.port,
-				// 			token: input.metricsConfig.server.token,
-				// 			cronJob: input.metricsConfig.server.cronJob,
-				// 			urlCallback: input.metricsConfig.server.urlCallback,
-				// 			retentionDays: input.metricsConfig.server.retentionDays,
-				// 			thresholds: {
-				// 				cpu: input.metricsConfig.server.thresholds.cpu,
-				// 				memory: input.metricsConfig.server.thresholds.memory,
-				// 			},
-				// 		},
-				// 		containers: {
-				// 			refreshRate: input.metricsConfig.containers.refreshRate,
-				// 			services: {
-				// 				include: input.metricsConfig.containers.services.include || [],
-				// 				exclude: input.metricsConfig.containers.services.exclude || [],
-				// 			},
-				// 		},
-				// 	},
-				// });
-				// const currentServer = await setupWebMonitoring(admin.adminId);
-				// return currentServer;
+				await updateUser(user.id, {
+					metricsConfig: {
+						server: {
+							type: "Dokploy",
+							refreshRate: input.metricsConfig.server.refreshRate,
+							port: input.metricsConfig.server.port,
+							token: input.metricsConfig.server.token,
+							cronJob: input.metricsConfig.server.cronJob,
+							urlCallback: input.metricsConfig.server.urlCallback,
+							retentionDays: input.metricsConfig.server.retentionDays,
+							thresholds: {
+								cpu: input.metricsConfig.server.thresholds.cpu,
+								memory: input.metricsConfig.server.thresholds.memory,
+							},
+						},
+						containers: {
+							refreshRate: input.metricsConfig.containers.refreshRate,
+							services: {
+								include: input.metricsConfig.containers.services.include || [],
+								exclude: input.metricsConfig.containers.services.exclude || [],
+							},
+						},
+					},
+				});
+
+				const currentServer = await setupWebMonitoring(user.id);
+				return currentServer;
 			} catch (error) {
 				throw error;
 			}

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

@@ -61,7 +61,7 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -81,7 +81,7 @@ export const applicationRouter = createTRPCRouter({
 				const newApplication = await createApplication(input);
 
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newApplication.applicationId);
+					await addNewService(ctx.user.id, newApplication.applicationId);
 				}
 				return newApplication;
 			} catch (error: unknown) {
@@ -99,11 +99,7 @@ export const applicationRouter = createTRPCRouter({
 		.input(apiFindOneApplication)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(
-					ctx.user.authId,
-					input.applicationId,
-					"access",
-				);
+				await checkServiceAccess(ctx.user.id, input.applicationId, "access");
 			}
 			const application = await findApplicationById(input.applicationId);
 			if (application.project.userId !== ctx.user.ownerId) {
@@ -145,11 +141,7 @@ export const applicationRouter = createTRPCRouter({
 		.input(apiFindOneApplication)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(
-					ctx.user.authId,
-					input.applicationId,
-					"delete",
-				);
+				await checkServiceAccess(ctx.user.id, input.applicationId, "delete");
 			}
 			const application = await findApplicationById(input.applicationId);
 

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

@@ -16,6 +16,7 @@ import {
 	createUser,
 	findAuthByEmail,
 	findAuthById,
+	findUserById,
 	generate2FASecret,
 	getUserByToken,
 	lucia,
@@ -24,6 +25,7 @@ import {
 	sendDiscordNotification,
 	sendEmailNotification,
 	updateAuthById,
+	updateUser,
 	validateRequest,
 	verify2FA,
 } from "@dokploy/server";
@@ -252,19 +254,18 @@ export const authRouter = createTRPCRouter({
 		}),
 
 	generateToken: protectedProcedure.mutation(async ({ ctx, input }) => {
-		const auth = await findAuthById(ctx.user.authId);
+		const auth = await findUserById(ctx.user.id);
+		console.log(auth);
 
 		if (auth.token) {
 			await luciaToken.invalidateSession(auth.token);
 		}
-		const session = await luciaToken.createSession(auth?.id || "", {
-			expiresIn: 60 * 60 * 24 * 30,
-		});
-
-		await updateAuthById(auth.id, {
-			token: session.id,
-		});
-
+		// const session = await luciaToken.createSession(auth?.id || "", {
+		// 	expiresIn: 60 * 60 * 24 * 30,
+		// });
+		// await updateUser(auth.id, {
+		// 	token: session.id,
+		// });
 		return auth;
 	}),
 	verifyToken: protectedProcedure.mutation(async () => {
@@ -276,7 +277,7 @@ export const authRouter = createTRPCRouter({
 	}),
 
 	generate2FASecret: protectedProcedure.query(async ({ ctx }) => {
-		return await generate2FASecret(ctx.user.authId);
+		return await generate2FASecret(ctx.user.id);
 	}),
 	verify2FASetup: protectedProcedure
 		.input(apiVerify2FA)

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

@@ -44,6 +44,7 @@ import {
 	findDomainsByComposeId,
 	findProjectById,
 	findServerById,
+	findUserById,
 	loadServices,
 	randomizeComposeFile,
 	randomizeIsolatedDeploymentComposeFile,
@@ -61,7 +62,7 @@ export const composeRouter = createTRPCRouter({
 		.mutation(async ({ ctx, input }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -80,7 +81,7 @@ export const composeRouter = createTRPCRouter({
 				const newService = await createCompose(input);
 
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newService.composeId);
+					await addNewService(ctx.user.id, newService.composeId);
 				}
 
 				return newService;
@@ -93,7 +94,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.composeId, "access");
+				await checkServiceAccess(ctx.user.id, input.composeId, "access");
 			}
 
 			const compose = await findComposeById(input.composeId);
@@ -122,7 +123,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiDeleteCompose)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.composeId, "delete");
+				await checkServiceAccess(ctx.user.id, input.composeId, "delete");
 			}
 			const composeResult = await findComposeById(input.composeId);
 
@@ -376,7 +377,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiCreateComposeByTemplate)
 		.mutation(async ({ ctx, input }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+				await checkServiceAccess(ctx.user.id, input.projectId, "create");
 			}
 
 			if (IS_CLOUD && !input.serverId) {
@@ -390,7 +391,7 @@ export const composeRouter = createTRPCRouter({
 
 			const generate = await loadTemplateModule(input.id as TemplatesKeys);
 
-			const admin = await findAdminById(ctx.user.adminId);
+			const admin = await findUserById(ctx.user.ownerId);
 			let serverIp = admin.serverIp || "127.0.0.1";
 
 			const project = await findProjectById(input.projectId);
@@ -419,7 +420,7 @@ export const composeRouter = createTRPCRouter({
 			});
 
 			if (ctx.user.rol === "user") {
-				await addNewService(ctx.user.authId, compose.composeId);
+				await addNewService(ctx.user.id, compose.composeId);
 			}
 
 			if (mounts && mounts?.length > 0) {

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

@@ -38,7 +38,7 @@ export const mariadbRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -57,7 +57,7 @@ export const mariadbRouter = createTRPCRouter({
 				}
 				const newMariadb = await createMariadb(input);
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newMariadb.mariadbId);
+					await addNewService(ctx.user.id, newMariadb.mariadbId);
 				}
 
 				await createMount({
@@ -80,7 +80,7 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiFindOneMariaDB)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.mariadbId, "access");
+				await checkServiceAccess(ctx.user.id, input.mariadbId, "access");
 			}
 			const mariadb = await findMariadbById(input.mariadbId);
 			if (mariadb.project.userId !== ctx.user.ownerId) {
@@ -202,7 +202,7 @@ export const mariadbRouter = createTRPCRouter({
 		.input(apiFindOneMariaDB)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.mariadbId, "delete");
+				await checkServiceAccess(ctx.user.id, input.mariadbId, "delete");
 			}
 
 			const mongo = await findMariadbById(input.mariadbId);

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

@@ -37,7 +37,7 @@ export const mongoRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -56,7 +56,7 @@ export const mongoRouter = createTRPCRouter({
 				}
 				const newMongo = await createMongo(input);
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newMongo.mongoId);
+					await addNewService(ctx.user.id, newMongo.mongoId);
 				}
 
 				await createMount({
@@ -83,7 +83,7 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiFindOneMongo)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.mongoId, "access");
+				await checkServiceAccess(ctx.user.id, input.mongoId, "access");
 			}
 
 			const mongo = await findMongoById(input.mongoId);
@@ -243,7 +243,7 @@ export const mongoRouter = createTRPCRouter({
 		.input(apiFindOneMongo)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.mongoId, "delete");
+				await checkServiceAccess(ctx.user.id, input.mongoId, "delete");
 			}
 
 			const mongo = await findMongoById(input.mongoId);

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

@@ -39,7 +39,7 @@ export const mysqlRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -59,7 +59,7 @@ export const mysqlRouter = createTRPCRouter({
 
 				const newMysql = await createMysql(input);
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newMysql.mysqlId);
+					await addNewService(ctx.user.id, newMysql.mysqlId);
 				}
 
 				await createMount({
@@ -86,7 +86,7 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiFindOneMySql)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.mysqlId, "access");
+				await checkServiceAccess(ctx.user.id, input.mysqlId, "access");
 			}
 			const mysql = await findMySqlById(input.mysqlId);
 			if (mysql.project.userId !== ctx.user.ownerId) {
@@ -241,7 +241,7 @@ export const mysqlRouter = createTRPCRouter({
 		.input(apiFindOneMySql)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.mysqlId, "delete");
+				await checkServiceAccess(ctx.user.id, input.mysqlId, "delete");
 			}
 			const mongo = await findMySqlById(input.mysqlId);
 			if (mongo.project.userId !== ctx.user.ownerId) {

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

@@ -45,7 +45,7 @@ export const postgresRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -64,7 +64,7 @@ export const postgresRouter = createTRPCRouter({
 				}
 				const newPostgres = await createPostgres(input);
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newPostgres.postgresId);
+					await addNewService(ctx.user.id, newPostgres.postgresId);
 				}
 
 				await createMount({
@@ -91,7 +91,7 @@ export const postgresRouter = createTRPCRouter({
 		.input(apiFindOnePostgres)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.postgresId, "access");
+				await checkServiceAccess(ctx.user.id, input.postgresId, "access");
 			}
 
 			const postgres = await findPostgresById(input.postgresId);
@@ -222,7 +222,7 @@ export const postgresRouter = createTRPCRouter({
 		.input(apiFindOnePostgres)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.postgresId, "delete");
+				await checkServiceAccess(ctx.user.id, input.postgresId, "delete");
 			}
 			const postgres = await findPostgresById(input.postgresId);
 

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

@@ -25,9 +25,9 @@ import {
 	checkProjectAccess,
 	createProject,
 	deleteProject,
-	findAdminById,
 	findProjectById,
 	findUserByAuthId,
+	findUserById,
 	updateProjectById,
 } from "@dokploy/server";
 
@@ -37,10 +37,10 @@ export const projectRouter = createTRPCRouter({
 		.mutation(async ({ ctx, input }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkProjectAccess(ctx.user.authId, "create");
+					await checkProjectAccess(ctx.user.id, "create");
 				}
 
-				const admin = await findAdminById(ctx.user.adminId);
+				const admin = await findUserById(ctx.user.ownerId);
 
 				if (admin.serversQuantity === 0 && IS_CLOUD) {
 					throw new TRPCError({
@@ -49,9 +49,9 @@ export const projectRouter = createTRPCRouter({
 					});
 				}
 
-				const project = await createProject(input, ctx.user.adminId);
+				const project = await createProject(input, ctx.user.ownerId);
 				if (ctx.user.rol === "user") {
-					await addNewProject(ctx.user.authId, project.projectId);
+					await addNewProject(ctx.user.id, project.projectId);
 				}
 
 				return project;
@@ -68,9 +68,9 @@ export const projectRouter = createTRPCRouter({
 		.input(apiFindOneProject)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				const { accessedServices } = await findUserByAuthId(ctx.user.authId);
+				const { accessedServices } = await findUserByAuthId(ctx.user.id);
 
-				await checkProjectAccess(ctx.user.authId, "access", input.projectId);
+				await checkProjectAccess(ctx.user.id, "access", input.projectId);
 
 				const project = await db.query.projects.findFirst({
 					where: and(
@@ -126,7 +126,7 @@ export const projectRouter = createTRPCRouter({
 	all: protectedProcedure.query(async ({ ctx }) => {
 		// console.log(ctx.user);
 		if (ctx.user.rol === "user") {
-			const { accessedProjects, accessedServices } = await findUserByAuthId(
+			const { accessedProjects, accessedServices } = await findUserById(
 				ctx.user.id,
 			);
 
@@ -204,7 +204,7 @@ export const projectRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkProjectAccess(ctx.user.authId, "delete");
+					await checkProjectAccess(ctx.user.id, "delete");
 				}
 				const currentProject = await findProjectById(input.projectId);
 				if (currentProject.userId !== ctx.user.ownerId) {

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

@@ -37,7 +37,7 @@ export const redisRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				if (ctx.user.rol === "user") {
-					await checkServiceAccess(ctx.user.authId, input.projectId, "create");
+					await checkServiceAccess(ctx.user.id, input.projectId, "create");
 				}
 
 				if (IS_CLOUD && !input.serverId) {
@@ -56,7 +56,7 @@ export const redisRouter = createTRPCRouter({
 				}
 				const newRedis = await createRedis(input);
 				if (ctx.user.rol === "user") {
-					await addNewService(ctx.user.authId, newRedis.redisId);
+					await addNewService(ctx.user.id, newRedis.redisId);
 				}
 
 				await createMount({
@@ -76,7 +76,7 @@ export const redisRouter = createTRPCRouter({
 		.input(apiFindOneRedis)
 		.query(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.redisId, "access");
+				await checkServiceAccess(ctx.user.id, input.redisId, "access");
 			}
 
 			const redis = await findRedisById(input.redisId);
@@ -233,7 +233,7 @@ export const redisRouter = createTRPCRouter({
 		.input(apiFindOneRedis)
 		.mutation(async ({ input, ctx }) => {
 			if (ctx.user.rol === "user") {
-				await checkServiceAccess(ctx.user.authId, input.redisId, "delete");
+				await checkServiceAccess(ctx.user.id, input.redisId, "delete");
 			}
 
 			const redis = await findRedisById(input.redisId);

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

@@ -120,8 +120,7 @@ export const stripeRouter = createTRPCRouter({
 
 	canCreateMoreServers: adminProcedure.query(async ({ ctx }) => {
 		const user = await findUserById(ctx.user.ownerId);
-		console.log(user);
-		// const servers = await findServersByUserId(user.id);
+		const servers = await findServersByUserId(user.id);
 
 		if (!IS_CLOUD) {
 			return true;