From 3ad45405242aac49f11fa35c99e55bb03415433c Mon Sep 17 00:00:00 2001
From: "M. Palanikannan" <73993394+Palanikannan1437@users.noreply.github.com>
Date: Fri, 30 Aug 2024 13:16:34 +0530
Subject: [PATCH] fix: service token at a user level (#994)

---
 apiserver/plane/app/views/api.py         | 2 +-
 web/ee/components/iframe/silo-iframe.tsx | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apiserver/plane/app/views/api.py b/apiserver/plane/app/views/api.py
index fe7259fbbf..364863e7a3 100644
--- a/apiserver/plane/app/views/api.py
+++ b/apiserver/plane/app/views/api.py
@@ -92,6 +92,7 @@ class ServiceApiTokenEndpoint(BaseAPIView):
         api_token = APIToken.objects.filter(
             workspace=workspace,
             is_service=True,
+            user=request.user,
         ).first()
 
         if api_token:
@@ -119,4 +120,3 @@ class ServiceApiTokenEndpoint(BaseAPIView):
                 },
                 status=status.HTTP_201_CREATED,
             )
-
diff --git a/web/ee/components/iframe/silo-iframe.tsx b/web/ee/components/iframe/silo-iframe.tsx
index 8aa9c21ff9..0cc2cea99c 100644
--- a/web/ee/components/iframe/silo-iframe.tsx
+++ b/web/ee/components/iframe/silo-iframe.tsx
@@ -6,6 +6,7 @@ import useSWR from "swr";
 import { Spinner } from "@plane/ui";
 import { cn } from "@/helpers/common.helper";
 import { ServiceAPITokenService } from "@/plane-web/services/api_token.service";
+import { useUser } from "@/hooks/store";
 
 interface CustomIframeProps {
   srcBase: string;
@@ -18,6 +19,9 @@ const SiloIframe: React.FC<CustomIframeProps> = ({ srcBase }) => {
   const ref = useRef<HTMLIFrameElement>(null);
   const { resolvedTheme } = useTheme();
   const [isLoaded, setIsLoaded] = useState<boolean>(false);
+  const {
+    userProfile: { data: userProfile },
+  } = useUser();
 
   const { data: serviceApiToken } = useSWR(
     workspaceSlug ? `SERVICE_API_TOKEN_${workspaceSlug}` : null,
@@ -58,7 +62,7 @@ const SiloIframe: React.FC<CustomIframeProps> = ({ srcBase }) => {
     <div className="relative h-full w-full">
       <iframe
         ref={ref}
-        src={`${srcBase}&token=${serviceApiToken}`}
+        src={`${srcBase}&token=${serviceApiToken}&user=${userProfile.id}`}
         className={cn("w-full h-full opacity-0 absolute top-0 left-0", {
           "opacity-100": isLoaded,
         })}