Merge pull request #2401 from trycompai/main

[comp] Production Deploy

Author: Marfuen

apps/api/src/trigger/browser-automation/run-browser-automation.ts

@@ -46,6 +46,7 @@ async function sendTaskStatusChangeEmails(params: {
         where: {
           organizationId,
           deactivated: false,
+          user: { role: { not: 'admin' } },
         },
         select: {
           role: true,
@@ -113,6 +114,7 @@ async function sendTaskStatusChangeEmails(params: {
           db,
           recipient.email,
           'taskAssignments',
+          organizationId,
         );
 
         if (isUnsubscribed) {

apps/api/src/trigger/integration-platform/run-task-integration-checks.ts

@@ -44,6 +44,7 @@ async function sendTaskStatusChangeEmails(params: {
         where: {
           organizationId,
           deactivated: false,
+          user: { role: { not: 'admin' } },
         },
         select: {
           role: true,
@@ -111,6 +112,7 @@ async function sendTaskStatusChangeEmails(params: {
           db,
           recipient.email,
           'taskAssignments',
+          organizationId,
         );
 
         if (isUnsubscribed) {

packages/email/lib/check-unsubscribe.ts

@@ -117,26 +117,9 @@ export async function isUserUnsubscribed(
       return false;
     }
 
-    // Platform admins only receive notifications for organizations they own
+    // Platform admins never receive email notifications
     if (user.role === 'admin') {
-      if (!organizationId || !db.member) {
-        return true; // No org context — block notifications
-      }
-      const adminMemberRecords = await db.member.findMany({
-        where: {
-          organizationId,
-          user: { email },
-          deactivated: false,
-        },
-        select: { role: true },
-      });
-      const adminRoles = adminMemberRecords.flatMap((m) =>
-        m.role.split(',').map((r) => r.trim()),
-      );
-      if (!adminRoles.includes('owner')) {
-        return true; // Not an owner in this org — block notifications
-      }
-      // Platform admin IS an owner — fall through to normal notification logic
+      return true;
     }
 
     // If legacy all-or-nothing flag is set, user is unsubscribed from everything

packages/integration-platform/src/manifests/google-workspace/checks/employee-access.ts

@@ -127,6 +127,18 @@ export const employeeAccessCheck: IntegrationCheck = {
 
     ctx.log(`Fetched ${allUsers.length} total users`);
 
+    if (userFilterConfig.targetOrgUnits?.length) {
+      const ouCounts = new Map<string, number>();
+      for (const user of allUsers) {
+        const ou = user.orgUnitPath ?? '/';
+        ouCounts.set(ou, (ouCounts.get(ou) ?? 0) + 1);
+      }
+      ctx.log(
+        `Filtering to OUs: ${userFilterConfig.targetOrgUnits.join(', ')}. ` +
+          `User OUs: ${[...ouCounts.entries()].map(([ou, count]) => `${ou} (${count})`).join(', ')}`,
+      );
+    }
+
     // Same rules as 2FA check and employee sync (sync.controller.ts)
     const activeUsers = filterGoogleWorkspaceUsersForChecks(allUsers, userFilterConfig);
 

packages/integration-platform/src/manifests/google-workspace/checks/two-factor-auth.ts

@@ -51,6 +51,18 @@ export const twoFactorAuthCheck: IntegrationCheck = {
 
     ctx.log(`Fetched ${allUsers.length} total users`);
 
+    if (userFilterConfig.targetOrgUnits?.length) {
+      const ouCounts = new Map<string, number>();
+      for (const user of allUsers) {
+        const ou = user.orgUnitPath ?? '/';
+        ouCounts.set(ou, (ouCounts.get(ou) ?? 0) + 1);
+      }
+      ctx.log(
+        `Filtering to OUs: ${userFilterConfig.targetOrgUnits.join(', ')}. ` +
+          `User OUs: ${[...ouCounts.entries()].map(([ou, count]) => `${ou} (${count})`).join(', ')}`,
+      );
+    }
+
     // Org units + sync email filter — same rules as employee sync (sync.controller.ts)
     const usersToCheck = filterGoogleWorkspaceUsersForChecks(allUsers, userFilterConfig);
 

packages/integration-platform/src/manifests/google-workspace/variables.ts

@@ -17,14 +17,19 @@ export const targetOrgUnitsVariable: CheckVariable = {
         '/admin/directory/v1/customer/my_customer/orgunits?type=all',
       );
 
+      const rootOption = { value: '/', label: '/ (Root)' };
+
       if (!response.organizationUnits) {
-        return [{ value: '/', label: '/ (Root)' }];
+        return [rootOption];
       }
 
-      return response.organizationUnits.map((ou) => ({
-        value: ou.orgUnitPath,
-        label: `${ou.orgUnitPath} (${ou.name})`,
-      }));
+      return [
+        rootOption,
+        ...response.organizationUnits.map((ou) => ({
+          value: ou.orgUnitPath,
+          label: `${ou.orgUnitPath} (${ou.name})`,
+        })),
+      ];
     } catch {
       return [{ value: '/', label: '/ (Root)' }];
     }