feat: patchy patchy patchy

backend/src/ee/routes/v1/license-router.ts

@@ -58,7 +58,7 @@ export const registerLicenseRouter = async (server: FastifyZodProvider) => {
       const plan = await server.services.license.getOrgPlan({
         actorId: req.permission.id,
         actor: req.permission.type,
-        actorOrgId: req.permission.parentOrgId,
+        actorOrgId: req.permission.rootOrgId,
         actorAuthMethod: req.permission.authMethod,
         orgId: req.params.organizationId,
         refreshCache: req.query.refreshCache

backend/src/ee/services/dynamic-secret/dynamic-secret-service.ts

@@ -138,7 +138,7 @@ export const dynamicSecretServiceFactory = ({
         scope: OrganizationActionScope.Any,
         actor,
         actorId,
-        orgId: actorOrgId,
+        orgId: gateway?.orgId || gatewayv2?.orgId,
         actorAuthMethod,
         actorOrgId
       });
@@ -302,7 +302,7 @@ export const dynamicSecretServiceFactory = ({
         scope: OrganizationActionScope.Any,
         actor,
         actorId,
-        orgId: actorOrgId,
+        orgId: gateway?.orgId || gatewayv2?.orgId,
         actorAuthMethod,
         actorOrgId
       });

backend/src/ee/services/permission/permission-service-types.ts

@@ -39,7 +39,7 @@ export type TGetOrgPermissionArg = {
   actorId: string;
   orgId: string;
   actorAuthMethod: ActorAuthMethod;
-  actorOrgId?: string;
+  actorOrgId: string;
   scope: OrganizationActionScope;
 };
 

backend/src/ee/services/saml-config/saml-config-types.ts

@@ -37,7 +37,7 @@ export type TGetSamlCfgDTO =
       actor: ActorType;
       actorId: string;
       actorAuthMethod: ActorAuthMethod;
-      actorOrgId: string | undefined;
+      actorOrgId: string;
     }
   | {
       type: "orgSlug";