refactor: update

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

@@ -72,7 +72,7 @@ export const composeRouter = createTRPCRouter({
 					});
 				}
 				const project = await findProjectById(input.projectId);
-				if (project.userId !== ctx.user.ownerId) {
+				if (project.organizationId !== ctx.session.activeOrganizationId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
 						message: "You are not authorized to access this project",
@@ -98,7 +98,7 @@ export const composeRouter = createTRPCRouter({
 			}
 
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to access this compose",
@@ -111,7 +111,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiUpdateCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to update this compose",
@@ -127,7 +127,10 @@ export const composeRouter = createTRPCRouter({
 			}
 			const composeResult = await findComposeById(input.composeId);
 
-			if (composeResult.project.userId !== ctx.user.ownerId) {
+			if (
+				composeResult.project.organizationId !==
+				ctx.session.activeOrganizationId
+			) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to delete this compose",
@@ -158,7 +161,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to clean this compose",
@@ -171,7 +174,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFetchServices)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to load this compose",
@@ -185,7 +188,9 @@ export const composeRouter = createTRPCRouter({
 			try {
 				const compose = await findComposeById(input.composeId);
 
-				if (compose.project.userId !== ctx.user.ownerId) {
+				if (
+					compose.project.organizationId !== ctx.session.activeOrganizationId
+				) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
 						message: "You are not authorized to fetch this compose",
@@ -210,7 +215,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiRandomizeCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to randomize this compose",
@@ -222,7 +227,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiRandomizeCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to randomize this compose",
@@ -237,7 +242,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to get this compose",
@@ -255,7 +260,7 @@ export const composeRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
 
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to deploy this compose",
@@ -288,7 +293,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to redeploy this compose",
@@ -320,7 +325,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this compose",
@@ -334,7 +339,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to stop this compose",
@@ -349,7 +354,7 @@ export const composeRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
 
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to get this compose",
@@ -362,7 +367,7 @@ export const composeRouter = createTRPCRouter({
 		.input(apiFindCompose)
 		.mutation(async ({ input, ctx }) => {
 			const compose = await findComposeById(input.composeId);
-			if (compose.project.userId !== ctx.user.ownerId) {
+			if (compose.project.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not authorized to refresh this compose",

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

@@ -57,7 +57,10 @@ export const notificationRouter = createTRPCRouter({
 		.input(apiCreateSlack)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createSlackNotification(input, ctx.user.ownerId);
+				return await createSlackNotification(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
@@ -80,7 +83,7 @@ export const notificationRouter = createTRPCRouter({
 				}
 				return await updateSlackNotification({
 					...input,
-					userId: ctx.user.ownerId,
+					organizationId: ctx.session.activeOrganizationId,
 				});
 			} catch (error) {
 				throw error;
@@ -131,7 +134,7 @@ export const notificationRouter = createTRPCRouter({
 				}
 				return await updateTelegramNotification({
 					...input,
-					userId: ctx.user.ownerId,
+					organizationId: ctx.session.activeOrganizationId,
 				});
 			} catch (error) {
 				throw new TRPCError({
@@ -183,7 +186,7 @@ export const notificationRouter = createTRPCRouter({
 				}
 				return await updateDiscordNotification({
 					...input,
-					userId: ctx.user.ownerId,
+					organizationId: ctx.session.activeOrganizationId,
 				});
 			} catch (error) {
 				throw new TRPCError({
@@ -243,7 +246,7 @@ export const notificationRouter = createTRPCRouter({
 				}
 				return await updateEmailNotification({
 					...input,
-					userId: ctx.user.ownerId,
+					organizationId: ctx.session.activeOrganizationId,
 				});
 			} catch (error) {
 				throw new TRPCError({
@@ -314,13 +317,7 @@ export const notificationRouter = createTRPCRouter({
 				gotify: true,
 			},
 			orderBy: desc(notifications.createdAt),
-			...(IS_CLOUD && {
-				where: eq(
-					notifications.organizationId,
-					ctx.session.activeOrganizationId,
-				),
-			}),
-			// TODO: Remove this line when the cloud version is ready
+			where: eq(notifications.organizationId, ctx.session.activeOrganizationId),
 		});
 	}),
 	receiveNotification: publicProcedure
@@ -337,7 +334,7 @@ export const notificationRouter = createTRPCRouter({
 		)
 		.mutation(async ({ input }) => {
 			try {
-				let userId = "";
+				let organizationId = "";
 				let ServerName = "";
 				if (input.ServerType === "Dokploy") {
 					const result = await db
@@ -354,7 +351,7 @@ export const notificationRouter = createTRPCRouter({
 						});
 					}
 
-					userId = result?.[0]?.id;
+					organizationId = result?.[0]?.id;
 					ServerName = "Dokploy";
 				} else {
 					const result = await db
@@ -364,18 +361,18 @@ export const notificationRouter = createTRPCRouter({
 							sql`${server.metricsConfig}::jsonb -> 'server' ->> 'token' = ${input.Token}`,
 						);
 
-					if (!result?.[0]?.userId) {
+					if (!result?.[0]?.organizationId) {
 						throw new TRPCError({
 							code: "BAD_REQUEST",
 							message: "Token not found",
 						});
 					}
 
-					userId = result?.[0]?.userId;
+					organizationId = result?.[0]?.organizationId;
 					ServerName = "Remote";
 				}
 
-				await sendServerThresholdNotifications(userId, {
+				await sendServerThresholdNotifications(organizationId, {
 					...input,
 					ServerName,
 				});
@@ -416,7 +413,7 @@ export const notificationRouter = createTRPCRouter({
 				}
 				return await updateGotifyNotification({
 					...input,
-					userId: ctx.user.ownerId,
+					organizationId: ctx.session.activeOrganizationId,
 				});
 			} catch (error) {
 				throw error;

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

@@ -49,7 +49,10 @@ export const projectRouter = createTRPCRouter({
 					});
 				}
 
-				const project = await createProject(input, ctx.user.ownerId);
+				const project = await createProject(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 				if (ctx.user.rol === "member") {
 					await addNewProject(ctx.user.id, project.projectId);
 				}

apps/dokploy/server/api/routers/ssh-key.ts

@@ -41,10 +41,7 @@ export const sshRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				const sshKey = await findSSHKeyById(input.sshKeyId);
-				if (
-					IS_CLOUD &&
-					sshKey.organizationId !== ctx.session.activeOrganizationId
-				) {
+				if (sshKey.organizationId !== ctx.session.activeOrganizationId) {
 					// TODO: Remove isCloud in the next versions of dokploy
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
@@ -62,11 +59,7 @@ export const sshRouter = createTRPCRouter({
 		.query(async ({ input, ctx }) => {
 			const sshKey = await findSSHKeyById(input.sshKeyId);
 
-			if (
-				IS_CLOUD &&
-				sshKey.organizationId !== ctx.session.activeOrganizationId
-			) {
-				// TODO: Remove isCloud in the next versions of dokploy
+			if (sshKey.organizationId !== ctx.session.activeOrganizationId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
 					message: "You are not allowed to access this SSH key",
@@ -76,12 +69,9 @@ export const sshRouter = createTRPCRouter({
 		}),
 	all: protectedProcedure.query(async ({ ctx }) => {
 		return await db.query.sshKeys.findMany({
-			...(IS_CLOUD && {
-				where: eq(sshKeys.organizationId, ctx.session.activeOrganizationId),
-			}),
+			where: eq(sshKeys.organizationId, ctx.session.activeOrganizationId),
 			orderBy: desc(sshKeys.createdAt),
 		});
-		// TODO: Remove this line when the cloud version is ready
 	}),
 	generate: protectedProcedure
 		.input(apiGenerateSSHKey)
@@ -93,11 +83,7 @@ export const sshRouter = createTRPCRouter({
 		.mutation(async ({ input, ctx }) => {
 			try {
 				const sshKey = await findSSHKeyById(input.sshKeyId);
-				if (
-					IS_CLOUD &&
-					sshKey.organizationId !== ctx.session.activeOrganizationId
-				) {
-					// TODO: Remove isCloud in the next versions of dokploy
+				if (sshKey.organizationId !== ctx.session.activeOrganizationId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
 						message: "You are not allowed to update this SSH key",

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

@@ -5,6 +5,7 @@ import { member } from "@dokploy/server/db/schema";
 import { TRPCError } from "@trpc/server";
 import { eq } from "drizzle-orm";
 import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
+import { z } from "zod";
 export const userRouter = createTRPCRouter({
 	all: adminProcedure.query(async ({ ctx }) => {
 		return await db.query.member.findMany({
@@ -14,16 +15,20 @@ export const userRouter = createTRPCRouter({
 			},
 		});
 	}),
-	byAuthId: protectedProcedure
-		.input(apiFindOneUserByAuth)
+	get: protectedProcedure
+		.input(
+			z.object({
+				userId: z.string(),
+			}),
+		)
 		.query(async ({ input, ctx }) => {
-			const user = await findUserByAuthId(input.authId);
-			if (user.adminId !== ctx.user.adminId) {
-				throw new TRPCError({
-					code: "UNAUTHORIZED",
-					message: "You are not allowed to access this user",
-				});
-			}
+			const user = await findUserById(input.userId);
+			// if (user.adminId !== ctx.user.adminId) {
+			// 	throw new TRPCError({
+			// 		code: "UNAUTHORIZED",
+			// 		message: "You are not allowed to access this user",
+			// 	});
+			// }
 			return user;
 		}),
 	byUserId: protectedProcedure