Merge remote-tracking branch 'origin/staging' into staging-v83

Author: icecrasher321

.github/actions/docker-build/action.yml

@@ -142,7 +142,14 @@ runs:
           prev=''; stable=0
           for _ in $(seq 1 60); do
             cur="$(total)"
-            if [ "$cur" = "$prev" ]; then
+            # An empty reading means du FAILED, never that the cache is empty:
+            # buildctl prints its `Total:` line unconditionally (cmd/buildctl
+            # diskusage.go), so an empty cache still reports `Total: 0B`. Without
+            # the -n guard the initial prev='' matched two empty readings and the
+            # loop exited after ~2s -- precisely when du is failing and the prune
+            # is most likely still deleting. Treat it as unstable and wait out the
+            # bound instead.
+            if [ -n "$cur" ] && [ "$cur" = "$prev" ]; then
               stable=$((stable + 1))
               [ "$stable" -ge 2 ] && break
             else

apps/sim/app/credential-groups/enroll/[token]/page.tsx

@@ -134,8 +134,15 @@ export default async function CredentialGroupEnrollmentPage({
           Connect your accounts
         </h1>
         <p className='mt-4 max-w-[560px] text-pretty text-[var(--text-muted)] text-base leading-relaxed'>
-          <span className='font-medium text-[var(--text-body)]'>{enrollment.inviterName}</span>{' '}
-          invited you to connect accounts for{' '}
+          {enrollment.inviterName ? (
+            <>
+              <span className='font-medium text-[var(--text-body)]'>{enrollment.inviterName}</span>{' '}
+              invited you
+            </>
+          ) : (
+            'You have been invited'
+          )}{' '}
+          to connect accounts for{' '}
           <span className='font-medium text-[var(--text-body)]'>{enrollment.workspaceName}</span>.
         </p>
       </header>

apps/sim/components/emails/credential-groups/credential-group-invitation-email.tsx

@@ -5,7 +5,8 @@ import { getBrandConfig } from '@/ee/whitelabeling'
 
 interface CredentialGroupInvitationEmailProps {
   recipientEmail: string
-  inviterName: string
+  /** Absent when a workflow issued the invitation: there is no person to name. */
+  inviterName?: string
   workspaceName: string
   credentialGroupName: string
   invitationLink: string
@@ -22,14 +23,26 @@ export function CredentialGroupInvitationEmail({
 
   return (
     <EmailLayout
-      preview={`${inviterName} invited you to connect accounts for ${workspaceName}`}
+      preview={
+        inviterName
+          ? `${inviterName} invited you to connect accounts for ${workspaceName}`
+          : `You have been invited to connect accounts for ${workspaceName}`
+      }
       showUnsubscribe={false}
     >
       <Text style={baseStyles.paragraph}>Hello,</Text>
       <Text style={baseStyles.paragraph}>
-        <strong>{inviterName}</strong> invited <strong>{recipientEmail}</strong> to connect accounts
-        for <strong>{credentialGroupName}</strong> in the <strong>{workspaceName}</strong> workspace
-        on {brand.name}.
+        {inviterName ? (
+          <>
+            <strong>{inviterName}</strong> invited <strong>{recipientEmail}</strong>
+          </>
+        ) : (
+          <>
+            <strong>{recipientEmail}</strong> has been invited
+          </>
+        )}{' '}
+        to connect accounts for <strong>{credentialGroupName}</strong> in the{' '}
+        <strong>{workspaceName}</strong> workspace on {brand.name}.
       </Text>
 
       <Link href={invitationLink} style={{ textDecoration: 'none' }}>

apps/sim/components/emails/credential-groups/render.ts

@@ -3,7 +3,7 @@ import { CredentialGroupInvitationEmail } from '@/components/emails/credential-g
 
 export async function renderCredentialGroupInvitationEmail(params: {
   recipientEmail: string
-  inviterName: string
+  inviterName?: string
   workspaceName: string
   credentialGroupName: string
   invitationLink: string

apps/sim/components/emails/subjects.ts

@@ -110,10 +110,16 @@ export function getOtpSubject(resourceLabel: string): string {
   return `Verification code for ${resourceLabel}`
 }
 
-/** Names both the inviter and workspace so an external recipient can identify the request. */
+/**
+ * Names the workspace so an external recipient can identify the request, and the
+ * inviter when there is one — a workflow-issued invitation has no person to name.
+ */
 export function getCredentialGroupInvitationSubject(
-  inviterName: string,
+  inviterName: string | undefined,
   workspaceName: string
 ): string {
-  return `${inviterName} invited you to connect accounts for ${workspaceName} on ${getBrandConfig().name}`
+  const brandName = getBrandConfig().name
+  return inviterName
+    ? `${inviterName} invited you to connect accounts for ${workspaceName} on ${brandName}`
+    : `You have been invited to connect accounts for ${workspaceName} on ${brandName}`
 }

apps/sim/lib/credential-groups/application/authorization.test.ts

@@ -20,7 +20,10 @@ vi.mock('@/lib/resource-policies/repository', () => ({
   requireResourcePolicy: mocks.requirePolicy,
 }))
 
-import { requireCredentialGroupCredentialAccess } from '@/lib/credential-groups/application/authorization'
+import {
+  requireCredentialGroupCredentialAccess,
+  requireCredentialGroupWorkflowActor,
+} from '@/lib/credential-groups/application/authorization'
 
 const context = {
   workspaceId: 'workspace-1',
@@ -216,3 +219,60 @@ describe('requireCredentialGroupCredentialAccess', () => {
     expect(mocks.loadEnrollmentAccess).not.toHaveBeenCalled()
   })
 })
+
+describe('requireCredentialGroupWorkflowActor', () => {
+  it('returns the external subject a Slack-triggered run acts as', () => {
+    expect(requireCredentialGroupWorkflowActor(executorPrincipal())).toEqual({
+      kind: 'external_user',
+      provider: 'slack',
+      tenantId: 'T123',
+      subjectId: 'U123',
+    })
+  })
+
+  it('returns no subject for an actorless deployed run', () => {
+    const principal = executorPrincipal()
+    principal.delegationContext!.principal = {
+      kind: 'system',
+      serviceId: 'schedule',
+      workspaceId: 'workspace-1',
+      workflowId: 'root-workflow',
+    }
+
+    expect(requireCredentialGroupWorkflowActor(principal)).toBeNull()
+  })
+
+  it('returns the Sim subject a session-actor run acts as', () => {
+    const principal = executorPrincipal()
+    principal.subjectUserId = 'user-1'
+    principal.delegationContext!.principal = {
+      kind: 'session',
+      userId: 'user-1',
+      sessionId: 'session-1',
+    }
+
+    expect(requireCredentialGroupWorkflowActor(principal)).toEqual({
+      kind: 'sim_user',
+      userId: 'user-1',
+    })
+  })
+
+  it('rejects a delegation whose asserted subject contradicts its run', () => {
+    const invented = executorPrincipal()
+    invented.subjectUserId = 'invented-user'
+    expect(() => requireCredentialGroupWorkflowActor(invented)).toThrow(
+      'Credential Group actor access required'
+    )
+
+    const mismatched = executorPrincipal()
+    mismatched.subjectUserId = 'user-2'
+    mismatched.delegationContext!.principal = {
+      kind: 'session',
+      userId: 'user-1',
+      sessionId: 'session-1',
+    }
+    expect(() => requireCredentialGroupWorkflowActor(mismatched)).toThrow(
+      'Credential Group actor access required'
+    )
+  })
+})

apps/sim/lib/credential-groups/application/authorization.ts

@@ -1,5 +1,6 @@
 import {
   type Principal,
+  type PrincipalSubject,
   resolvePrincipalSubject,
   type WorkflowExecutionAuthority,
   type WorkflowExecutionPrincipal,
@@ -67,16 +68,19 @@ function requireConsistentWorkflowSubject(
   return subject
 }
 
-export function requireCredentialGroupWorkflowSubject(principal: Principal): string {
-  const subject = resolvePrincipalSubject(requireWorkflowExecutionPrincipal(principal))
-  if (
-    subject?.kind !== 'sim_user' ||
-    principal.kind !== 'delegated' ||
-    principal.subjectUserId !== subject.userId
-  ) {
-    throw new OrchestrationError('forbidden', 'Credential Group user access required')
-  }
-  return subject.userId
+/**
+ * Asserts the delegation still names the subject its run was minted for, without
+ * requiring that subject to be a Sim user.
+ *
+ * A Slack-triggered run's subject is the external Slack user, and a scheduled,
+ * public-API, or subject-less webhook run has no subject at all. Neither is
+ * representable as a Sim user, and neither is what authorizes the call — for an
+ * actorless caller that is the deployment the workspace layer already checked.
+ * Whoever the run acts as is attribution only; an invitation issued with no Sim
+ * user simply records none.
+ */
+export function requireCredentialGroupWorkflowActor(principal: Principal): PrincipalSubject | null {
+  return requireConsistentWorkflowSubject(principal, requireWorkflowExecutionPrincipal(principal))
 }
 
 export async function requireCredentialGroupCredentialAccess(

apps/sim/lib/credential-groups/application/list-groups.ts

@@ -2,7 +2,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import {
   credentialGroupWorkspaceDelegationPolicy,
-  requireCredentialGroupWorkflowSubject,
+  requireCredentialGroupWorkflowActor,
 } from '@/lib/credential-groups/application/authorization'
 import {
   requireCredentialGroupsAvailable,
@@ -35,7 +35,7 @@ export const listCredentialGroupsForWorkflow = defineAuthorizedWorkspaceUseCase(
     resolveCredentialGroupWorkspaceContext(input.workspaceId),
   authorizationOptions: { delegation: credentialGroupWorkspaceDelegationPolicy },
   authorizeResource({ principal }) {
-    requireCredentialGroupWorkflowSubject(principal)
+    requireCredentialGroupWorkflowActor(principal)
   },
   execute: async ({ input, context }): Promise<ListCredentialGroupsResult> => {
     if (

apps/sim/lib/credential-groups/application/list-people.ts

@@ -3,7 +3,7 @@ import { defineAuthorizedWorkspaceUseCase } from '@/lib/core/application'
 import { OrchestrationError } from '@/lib/core/orchestration/types'
 import {
   credentialGroupDelegationPolicy,
-  requireCredentialGroupWorkflowSubject,
+  requireCredentialGroupWorkflowActor,
 } from '@/lib/credential-groups/application/authorization'
 import {
   requireCredentialGroupsAvailable,
@@ -38,7 +38,7 @@ export const listCredentialGroupPeople = defineAuthorizedWorkspaceUseCase({
     resolveCredentialGroupContext(input.credentialGroupId),
   authorizationOptions: { delegation: credentialGroupDelegationPolicy },
   authorizeResource({ principal }) {
-    requireCredentialGroupWorkflowSubject(principal)
+    requireCredentialGroupWorkflowActor(principal)
   },
   execute: async ({ input, context }) => {
     if (context.status !== 'active') {