From a9e12c2b18d6335ad9130812c8a5aa08e7219e96 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Thu, 20 Feb 2025 01:42:35 -0600
Subject: [PATCH] refactor: update organization context in API routers

---
 .../settings/users/show-invitations.tsx       |  2 +-
 apps/dokploy/server/api/routers/bitbucket.ts  |  2 +-
 .../dokploy/server/api/routers/destination.ts |  7 +++++--
 apps/dokploy/server/api/routers/gitlab.ts     |  2 +-
 .../server/api/routers/notification.ts        | 20 +++++++++++++++----
 .../server/api/routers/organization.ts        | 11 +++++-----
 apps/dokploy/server/api/trpc.ts               |  1 -
 7 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/users/show-invitations.tsx b/apps/dokploy/components/dashboard/settings/users/show-invitations.tsx
index 3a36b780..b2ee8168 100644
--- a/apps/dokploy/components/dashboard/settings/users/show-invitations.tsx
+++ b/apps/dokploy/components/dashboard/settings/users/show-invitations.tsx
@@ -14,7 +14,6 @@ import {
 	DropdownMenuLabel,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import copy from "copy-to-clipboard";
 import {
 	Table,
 	TableBody,
@@ -26,6 +25,7 @@ import {
 } from "@/components/ui/table";
 import { authClient } from "@/lib/auth-client";
 import { api } from "@/utils/api";
+import copy from "copy-to-clipboard";
 import { format } from "date-fns";
 import { Mail, MoreHorizontal, Users } from "lucide-react";
 import { Loader2 } from "lucide-react";
diff --git a/apps/dokploy/server/api/routers/bitbucket.ts b/apps/dokploy/server/api/routers/bitbucket.ts
index 7a846264..fa02be8d 100644
--- a/apps/dokploy/server/api/routers/bitbucket.ts
+++ b/apps/dokploy/server/api/routers/bitbucket.ts
@@ -22,7 +22,7 @@ export const bitbucketRouter = createTRPCRouter({
 		.input(apiCreateBitbucket)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createBitbucket(input, ctx.user.ownerId);
+				return await createBitbucket(input, ctx.session.activeOrganizationId);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
diff --git a/apps/dokploy/server/api/routers/destination.ts b/apps/dokploy/server/api/routers/destination.ts
index 770cb699..f1d582c5 100644
--- a/apps/dokploy/server/api/routers/destination.ts
+++ b/apps/dokploy/server/api/routers/destination.ts
@@ -28,7 +28,10 @@ export const destinationRouter = createTRPCRouter({
 		.input(apiCreateDestination)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createDestintation(input, ctx.user.ownerId);
+				return await createDestintation(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
@@ -111,7 +114,7 @@ export const destinationRouter = createTRPCRouter({
 				}
 				return await removeDestinationById(
 					input.destinationId,
-					ctx.user.ownerId,
+					ctx.session.activeOrganizationId,
 				);
 			} catch (error) {
 				throw error;
diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts
index b702bc2a..daae68a5 100644
--- a/apps/dokploy/server/api/routers/gitlab.ts
+++ b/apps/dokploy/server/api/routers/gitlab.ts
@@ -25,7 +25,7 @@ export const gitlabRouter = createTRPCRouter({
 		.input(apiCreateGitlab)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createGitlab(input, ctx.user.ownerId);
+				return await createGitlab(input, ctx.session.activeOrganizationId);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
diff --git a/apps/dokploy/server/api/routers/notification.ts b/apps/dokploy/server/api/routers/notification.ts
index bba6c7db..6a893d36 100644
--- a/apps/dokploy/server/api/routers/notification.ts
+++ b/apps/dokploy/server/api/routers/notification.ts
@@ -110,7 +110,10 @@ export const notificationRouter = createTRPCRouter({
 		.input(apiCreateTelegram)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createTelegramNotification(input, ctx.user.ownerId);
+				return await createTelegramNotification(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
@@ -162,7 +165,10 @@ export const notificationRouter = createTRPCRouter({
 		.input(apiCreateDiscord)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createDiscordNotification(input, ctx.user.ownerId);
+				return await createDiscordNotification(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
@@ -223,7 +229,10 @@ export const notificationRouter = createTRPCRouter({
 		.input(apiCreateEmail)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createEmailNotification(input, ctx.user.ownerId);
+				return await createEmailNotification(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
@@ -388,7 +397,10 @@ export const notificationRouter = createTRPCRouter({
 		.input(apiCreateGotify)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				return await createGotifyNotification(input, ctx.user.ownerId);
+				return await createGotifyNotification(
+					input,
+					ctx.session.activeOrganizationId,
+				);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
diff --git a/apps/dokploy/server/api/routers/organization.ts b/apps/dokploy/server/api/routers/organization.ts
index 7158a01a..30c2630d 100644
--- a/apps/dokploy/server/api/routers/organization.ts
+++ b/apps/dokploy/server/api/routers/organization.ts
@@ -5,12 +5,12 @@ import {
 	organization,
 	users_temp,
 } from "@/server/db/schema";
+import { IS_CLOUD, auth } from "@dokploy/server/index";
 import { TRPCError } from "@trpc/server";
 import { and, desc, eq, exists } from "drizzle-orm";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
-import { auth, IS_CLOUD } from "@dokploy/server/index";
 export const organizationRouter = createTRPCRouter({
 	create: protectedProcedure
 		.input(
@@ -148,10 +148,9 @@ export const organizationRouter = createTRPCRouter({
 	acceptInvitation: adminProcedure
 		.input(z.object({ invitationId: z.string() }))
 		.mutation(async ({ ctx, input }) => {
-			const result = await auth.api.acceptInvitation({
-				invitationId: input.invitationId,
-			});
-
-			return result;
+			// const result = await auth.api.acceptInvitation({
+			// 	invitationId: input.invitationId,
+			// });
+			// return result;
 		}),
 });
diff --git a/apps/dokploy/server/api/trpc.ts b/apps/dokploy/server/api/trpc.ts
index c63839c5..8e820642 100644
--- a/apps/dokploy/server/api/trpc.ts
+++ b/apps/dokploy/server/api/trpc.ts
@@ -9,7 +9,6 @@
 
 // import { getServerAuthSession } from "@/server/auth";
 import { db } from "@/server/db";
-import { validateBearerToken } from "@dokploy/server";
 import { validateRequest } from "@dokploy/server/lib/auth";
 import type { OpenApiMeta } from "@dokploy/trpc-openapi";
 import { TRPCError, initTRPC } from "@trpc/server";