From 2bd9914373308c5400edb30302fe349220cf7889 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 12 Mar 2024 15:55:40 +0100
Subject: [PATCH] Fix: Add missing actorOrgId to service handlers

---
 backend/src/ee/routes/v1/license-router.ts           | 1 +
 backend/src/server/routes/v2/project-router.ts       | 1 +
 backend/src/server/routes/v2/service-token-router.ts | 1 +
 backend/src/server/routes/v3/secret-router.ts        | 1 +
 4 files changed, 4 insertions(+)

diff --git a/backend/src/ee/routes/v1/license-router.ts b/backend/src/ee/routes/v1/license-router.ts
index 4b0cf9a60..bd3fdca18 100644
--- a/backend/src/ee/routes/v1/license-router.ts
+++ b/backend/src/ee/routes/v1/license-router.ts
@@ -68,6 +68,7 @@ export const registerLicenseRouter = async (server: FastifyZodProvider) => {
       const data = await server.services.license.getOrgPlan({
         actorId: req.permission.id,
         actor: req.permission.type,
+        actorOrgId: req.permission.orgId,
         actorAuthMethod: req.permission.authMethod,
         orgId: req.params.organizationId
       });
diff --git a/backend/src/server/routes/v2/project-router.ts b/backend/src/server/routes/v2/project-router.ts
index 1344c6530..e86762486 100644
--- a/backend/src/server/routes/v2/project-router.ts
+++ b/backend/src/server/routes/v2/project-router.ts
@@ -164,6 +164,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
       const project = await server.services.project.createProject({
         actorId: req.permission.id,
         actor: req.permission.type,
+        actorOrgId: req.permission.orgId,
         actorAuthMethod: req.permission.authMethod,
         orgSlug: req.body.organizationSlug,
         workspaceName: req.body.projectName,
diff --git a/backend/src/server/routes/v2/service-token-router.ts b/backend/src/server/routes/v2/service-token-router.ts
index a3970d4c0..c4d08d104 100644
--- a/backend/src/server/routes/v2/service-token-router.ts
+++ b/backend/src/server/routes/v2/service-token-router.ts
@@ -47,6 +47,7 @@ export const registerServiceTokenRouter = async (server: FastifyZodProvider) =>
       const { serviceToken, user } = await server.services.serviceToken.getServiceToken({
         actorId: req.permission.id,
         actorAuthMethod: req.permission.authMethod,
+        actorOrgId: req.permission.orgId,
         actor: req.permission.type
       });
 
diff --git a/backend/src/server/routes/v3/secret-router.ts b/backend/src/server/routes/v3/secret-router.ts
index 9daa884f0..2ce8f5463 100644
--- a/backend/src/server/routes/v3/secret-router.ts
+++ b/backend/src/server/routes/v3/secret-router.ts
@@ -711,6 +711,7 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       if (req.body.type !== SecretType.Personal && req.permission.type === ActorType.USER) {
         const policy = await server.services.secretApprovalPolicy.getSecretApprovalPolicyOfFolder({
           actorId: req.permission.id,
+          actorOrgId: req.permission.orgId,
           actorAuthMethod: req.permission.authMethod,
           actor: req.permission.type,
           secretPath,