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";

backend/src/lib/types/index.ts

@@ -5,7 +5,7 @@ export type TGenericPermission = {
   actor: ActorType;
   actorId: string;
   actorAuthMethod: ActorAuthMethod;
-  actorOrgId: string | undefined;
+  actorOrgId: string;
 };
 
 /**

backend/src/services/org/org-service.ts

@@ -208,7 +208,7 @@ export const orgServiceFactory = ({
     userId: string,
     orgId: string,
     actorAuthMethod: ActorAuthMethod,
-    actorOrgId: string | undefined
+    actorOrgId: string
   ) => {
     const { permission } = await permissionService.getOrgPermission({
       actor: ActorType.USER,
@@ -701,7 +701,7 @@ export const orgServiceFactory = ({
     ipAddress: string;
     orgId: string;
     actorAuthMethod: ActorAuthMethod;
-    actorOrgId: string | undefined;
+    actorOrgId: string;
   }) => {
     const { hasRole } = await permissionService.getOrgPermission({
       actor: ActorType.USER,
@@ -1150,7 +1150,7 @@ export const orgServiceFactory = ({
     userId: string,
     orgId: string,
     actorAuthMethod: ActorAuthMethod,
-    actorOrgId: string | undefined
+    actorOrgId: string
   ) => {
     const { permission } = await permissionService.getOrgPermission({
       actor: ActorType.USER,
@@ -1170,7 +1170,7 @@ export const orgServiceFactory = ({
     orgId: string,
     email: string,
     actorAuthMethod: ActorAuthMethod,
-    actorOrgId: string | undefined
+    actorOrgId: string
   ) => {
     const { permission } = await permissionService.getOrgPermission({
       actor: ActorType.USER,
@@ -1198,7 +1198,7 @@ export const orgServiceFactory = ({
     orgId: string,
     id: string,
     actorAuthMethod: ActorAuthMethod,
-    actorOrgId: string | undefined
+    actorOrgId: string
   ) => {
     const { permission } = await permissionService.getOrgPermission({
       actor: ActorType.USER,

backend/src/services/org/org-types.ts

@@ -8,7 +8,7 @@ export type TUpdateOrgMembershipDTO = {
   membershipId: string;
   role?: string;
   isActive?: boolean;
-  actorOrgId: string | undefined;
+  actorOrgId: string;
   metadata?: { key: string; value: string }[];
   actorAuthMethod: ActorAuthMethod;
 };
@@ -21,7 +21,7 @@ export type TDeleteOrgMembershipDTO = {
   userId: string;
   orgId: string;
   membershipId: string;
-  actorOrgId: string | undefined;
+  actorOrgId: string;
   actorAuthMethod: ActorAuthMethod;
 };
 
@@ -29,7 +29,7 @@ export type TDeleteOrgMembershipsDTO = {
   userId: string;
   orgId: string;
   membershipIds: string[];
-  actorOrgId: string | undefined;
+  actorOrgId: string;
   actorAuthMethod: ActorAuthMethod;
 };
 
@@ -54,7 +54,7 @@ export type TVerifyUserToOrgDTO = {
 
 export type TFindOrgMembersByEmailDTO = {
   actor: ActorType;
-  actorOrgId: string | undefined;
+  actorOrgId: string;
   actorId: string;
   actorAuthMethod: ActorAuthMethod;
   orgId: string;
@@ -64,7 +64,7 @@ export type TFindOrgMembersByEmailDTO = {
 export type TFindAllWorkspacesDTO = {
   actor: ActorType;
   actorId: string;
-  actorOrgId: string | undefined;
+  actorOrgId: string;
   actorAuthMethod: ActorAuthMethod;
   orgId: string;
 };

backend/src/services/project/project-service.ts

@@ -1830,7 +1830,8 @@ export const projectServiceFactory = ({
       actorId: permission.id,
       orgId: permission.orgId,
       actorAuthMethod: permission.authMethod,
-      scope: OrganizationActionScope.Any
+      scope: OrganizationActionScope.Any,
+      actorOrgId: permission.orgId
     });
 
     return projectDAL.searchProjects({
@@ -1854,6 +1855,7 @@ export const projectServiceFactory = ({
       actorId: permission.id,
       orgId: permission.orgId,
       actorAuthMethod: permission.authMethod,
+      actorOrgId: permission.orgId,
       scope: OrganizationActionScope.Any
     });
 

backend/src/services/project/project-types.ts

@@ -41,7 +41,7 @@ export type TCreateProjectDTO = {
   actor: ActorType;
   actorAuthMethod: ActorAuthMethod;
   actorId: string;
-  actorOrgId?: string;
+  actorOrgId: string;
   projectName: string;
   projectDescription?: string;
   slug?: string;