fix: service token at a user level (#994)

This commit is contained in:
M. Palanikannan
2024-08-30 13:16:34 +05:30
committed by GitHub
parent 8b2d232296
commit 3ad4540524
2 changed files with 6 additions and 2 deletions

View File

@@ -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,
)

View File

@@ -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,
})}