Skip to content

The open alternative to Salesforce, designed for AI.

Run connection-provider disconnect hooks before deleting the token (#25215)

nitin28f6e37e1c64
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 1971344bafe..187031453c3 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -1586,13 +1586,6 @@ type EnterpriseSubscriptionStatusDTO {
isCancellationScheduled: Boolean!
}
-type ApprovedAccessDomain {
- id: UUID!
- domain: String!
- isValidated: Boolean!
- createdAt: DateTime!
-}
-
type FileWithSignedUrl {
id: UUID!
path: String!
@@ -1762,6 +1755,39 @@ type BillingUpdate {
billingSubscriptions: [BillingSubscription!]!
}
+type UsageBreakdownItem {
+ key: String!
+ label: String
+ creditsUsed: Float!
+}
+
+type UsageTimeSeries {
+ date: String!
+ creditsUsed: Float!
+}
+
+type UsageUserDaily {
+ userWorkspaceId: String!
+ dailyUsage: [UsageTimeSeries!]!
+}
+
+type UsageAnalytics {
+ usageByUser: [UsageBreakdownItem!]!
+ usageByOperationType: [UsageBreakdownItem!]!
+ usageByModel: [UsageBreakdownItem!]!
+ timeSeries: [UsageTimeSeries!]!
+ periodStart: DateTime!
+ periodEnd: DateTime!
+ userDailyUsage: UsageUserDaily
+}
+
+type ApprovedAccessDomain {
+ id: UUID!
+ domain: String!
+ isValidated: Boolean!
+ createdAt: DateTime!
+}
+
type InviteSuggestion {
email: String!
displayName: String
@@ -1833,32 +1859,6 @@ type ConnectedAccountPublicDTO {
connectionParameters: PublicImapSmtpCaldavConnectionParameters
}
-type UsageBreakdownItem {
- key: String!
- label: String
- creditsUsed: Float!
-}
-
-type UsageTimeSeries {
- date: String!
- creditsUsed: Float!
-}
-
-type UsageUserDaily {
- userWorkspaceId: String!
- dailyUsage: [UsageTimeSeries!]!
-}
-
-type UsageAnalytics {
- usageByUser: [UsageBreakdownItem!]!
- usageByOperationType: [UsageBreakdownItem!]!
- usageByModel: [UsageBreakdownItem!]!
- timeSeries: [UsageTimeSeries!]!
- periodStart: DateTime!
- periodEnd: DateTime!
- userDailyUsage: UsageUserDaily
-}
-
type FeatureFlag {
key: FeatureFlagKey!
value: Boolean!
@@ -3441,10 +3441,10 @@ type Query {
currentUserSessions: [UserSession!]!
myConnectedAccounts: [ConnectedAccountPublicDTO!]!
applicationConnectionProviders(applicationId: UUID!): [ApplicationConnectionProvider!]!
- getInviteSuggestions: [InviteSuggestion!]!
billingPortalSession(returnUrlPath: String, forPaymentMethodUpdate: Boolean): BillingSession!
listPlans: [BillingPlan!]!
getResourceCreditUsage: [BillingResourceCreditUsage!]!
+ getInviteSuggestions: [InviteSuggestion!]!
findWorkspaceInvitations: [WorkspaceInvitation!]!
getApprovedAccessDomains: [ApprovedAccessDomain!]!
getPageLayoutTabs(pageLayoutId: String!): [PageLayoutTab!]!
@@ -3716,10 +3716,6 @@ type Mutation {
revokeAllOtherUserSessions: Int!
deleteConnectedAccount(id: UUID!): ConnectedAccountPublicDTO!
updateOneApplicationVariable(key: String!, value: String!, applicationId: UUID!): Boolean!
- skipSyncEmailOnboardingStep(isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
- completeBookCallOnboardingStep(hasBookedCall: Boolean! = false, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
- triggerInstallAppsOnboardingStep(universalIdentifiers: [String!]!, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
- goBackToPreviousOnboardingStep: OnboardingStepNavigation!
checkoutSession(recurringInterval: SubscriptionInterval!, plan: BillingPlanKey! = PRO, requirePaymentMethod: Boolean! = true, successUrlPath: String): BillingSession!
createSubscriptionPaymentIntent(recurringInterval: SubscriptionInterval!, plan: BillingPlanKey! = PRO, requirePaymentMethod: Boolean! = true, successUrlPath: String, idempotencyKey: String!): BillingPaymentIntent!
createBillingPaymentMethodSetupIntent: BillingPaymentIntent!
@@ -3730,6 +3726,10 @@ type Mutation {
setResourceCreditSubscriptionPrice(priceId: String!): BillingUpdate!
endSubscriptionTrialPeriod: BillingEndTrialPeriod!
cancelSwitchResourceCreditPrice: BillingUpdate!
+ skipSyncEmailOnboardingStep(isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
+ completeBookCallOnboardingStep(hasBookedCall: Boolean! = false, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
+ triggerInstallAppsOnboardingStep(universalIdentifiers: [String!]!, isAutoSkipped: Boolean! = false): OnboardingStepSuccess!
+ goBackToPreviousOnboardingStep: OnboardingStepNavigation!
deleteWorkspaceInvitation(appTokenId: String!): String!
resendWorkspaceInvitation(appTokenId: String!): SendInvitations!
sendInvitations(emails: [String!]!, roleId: UUID): SendInvitations!
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 503aaeab466..fa67443329d 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1230,14 +1230,6 @@ export interface EnterpriseSubscriptionStatusDTO {
__typename: 'EnterpriseSubscriptionStatusDTO'
}
-export interface ApprovedAccessDomain {
- id: Scalars['UUID']
- domain: Scalars['String']
- isValidated: Scalars['Boolean']
- createdAt: Scalars['DateTime']
- __typename: 'ApprovedAccessDomain'
-}
-
export interface FileWithSignedUrl {
id: Scalars['UUID']
path: Scalars['String']
@@ -1400,6 +1392,44 @@ export interface BillingUpdate {
__typename: 'BillingUpdate'
}
+export interface UsageBreakdownItem {
+ key: Scalars['String']
+ label?: Scalars['String']
+ creditsUsed: Scalars['Float']
+ __typename: 'UsageBreakdownItem'
+}
+
+export interface UsageTimeSeries {
+ date: Scalars['String']
+ creditsUsed: Scalars['Float']
+ __typename: 'UsageTimeSeries'
+}
+
+export interface UsageUserDaily {
+ userWorkspaceId: Scalars['String']
+ dailyUsage: UsageTimeSeries[]
+ __typename: 'UsageUserDaily'
+}
+
+export interface UsageAnalytics {
+ usageByUser: UsageBreakdownItem[]
+ usageByOperationType: UsageBreakdownItem[]
+ usageByModel: UsageBreakdownItem[]
+ timeSeries: UsageTimeSeries[]
+ periodStart: Scalars['DateTime']
+ periodEnd: Scalars['DateTime']
+ userDailyUsage?: UsageUserDaily
+ __typename: 'UsageAnalytics'
+}
+
+export interface ApprovedAccessDomain {
+ id: Scalars['UUID']
+ domain: Scalars['String']
+ isValidated: Scalars['Boolean']
+ createdAt: Scalars['DateTime']
+ __typename: 'ApprovedAccessDomain'
+}
+
export interface InviteSuggestion {
email: Scalars['String']
displayName?: Scalars['String']
@@ -1474,36 +1504,6 @@ export interface ConnectedAccountPublicDTO {
__typename: 'ConnectedAccountPublicDTO'
}
-export interface UsageBreakdownItem {
- key: Scalars['String']
- label?: Scalars['String']
- creditsUsed: Scalars['Float']
- __typename: 'UsageBreakdownItem'
-}
-
-export interface UsageTimeSeries {
- date: Scalars['String']
- creditsUsed: Scalars['Float']
- __typename: 'UsageTimeSeries'
-}
-
-export interface UsageUserDaily {
- userWorkspaceId: Scalars['String']
- dailyUsage: UsageTimeSeries[]
- __typename: 'UsageUserDaily'
-}
-
-export interface UsageAnalytics {
- usageByUser: UsageBreakdownItem[]
- usageByOperationType: UsageBreakdownItem[]
- usageByModel: UsageBreakdownItem[]
- timeSeries: UsageTimeSeries[]
- periodStart: Scalars['DateTime']
- periodEnd: Scalars['DateTime']
- userDailyUsage?: UsageUserDaily
- __typename: 'UsageAnalytics'
-}
-
export interface FeatureFlag {
key: FeatureFlagKey
value: Scalars['Boolean']
@@ -3020,10 +3020,10 @@ export interface Query {
currentUserSessions: UserSession[]
myConnectedAccounts: ConnectedAccountPublicDTO[]
applicationConnectionProviders: ApplicationConnectionProvider[]
- getInviteSuggestions: InviteSuggestion[]
billingPortalSession: BillingSession
listPlans: BillingPlan[]
getResourceCreditUsage: BillingResourceCreditUsage[]
+ getInviteSuggestions: InviteSuggestion[]
findWorkspaceInvitations: WorkspaceInvitation[]
getApprovedAccessDomains: ApprovedAccessDomain[]
getPageLayoutTabs: PageLayoutTab[]
@@ -3177,10 +3177,6 @@ export interface Mutation {
revokeAllOtherUserSessions: Scalars['Int']
deleteConnectedAccount: ConnectedAccountPublicDTO
updateOneApplicationVariable: Scalars['Boolean']
- skipSyncEmailOnboardingStep: OnboardingStepSuccess
- completeBookCallOnboardingStep: OnboardingStepSuccess
- triggerInstallAppsOnboardingStep: OnboardingStepSuccess
- goBackToPreviousOnboardingStep: OnboardingStepNavigation
checkoutSession: BillingSession
createSubscriptionPaymentIntent: BillingPaymentIntent
createBillingPaymentMethodSetupIntent: BillingPaymentIntent
@@ -3191,6 +3187,10 @@ export interface Mutation {
setResourceCreditSubscriptionPrice: BillingUpdate
endSubscriptionTrialPeriod: BillingEndTrialPeriod
cancelSwitchResourceCreditPrice: BillingUpdate
+ skipSyncEmailOnboardingStep: OnboardingStepSuccess
+ completeBookCallOnboardingStep: OnboardingStepSuccess
+ triggerInstallAppsOnboardingStep: OnboardingStepSuccess
+ goBackToPreviousOnboardingStep: OnboardingStepNavigation
deleteWorkspaceInvitation: Scalars['String']
resendWorkspaceInvitation: SendInvitations
sendInvitations: SendInvitations
@@ -4649,15 +4649,6 @@ export interface EnterpriseSubscriptionStatusDTOGenqlSelection{
__scalar?: boolean | number
}
-export interface ApprovedAccessDomainGenqlSelection{
- id?: boolean | number
- domain?: boolean | number
- isValidated?: boolean | number
- createdAt?: boolean | number
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
export interface FileWithSignedUrlGenqlSelection{
id?: boolean | number
path?: boolean | number
@@ -4826,6 +4817,49 @@ export interface BillingUpdateGenqlSelection{
__scalar?: boolean | number
}
+export interface UsageBreakdownItemGenqlSelection{
+ key?: boolean | number
+ label?: boolean | number
+ creditsUsed?: boolean | number
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
+export interface UsageTimeSeriesGenqlSelection{
+ date?: boolean | number
+ creditsUsed?: boolean | number
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
+export interface UsageUserDailyGenqlSelection{
+ userWorkspaceId?: boolean | number
+ dailyUsage?: UsageTimeSeriesGenqlSelection
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
+export interface UsageAnalyticsGenqlSelection{
+ usageByUser?: UsageBreakdownItemGenqlSelection
+ usageByOperationType?: UsageBreakdownItemGenqlSelection
+ usageByModel?: UsageBreakdownItemGenqlSelection
+ timeSeries?: UsageTimeSeriesGenqlSelection
+ periodStart?: boolean | number
+ periodEnd?: boolean | number
+ userDailyUsage?: UsageUserDailyGenqlSelection
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
+export interface ApprovedAccessDomainGenqlSelection{
+ id?: boolean | number
+ domain?: boolean | number
+ isValidated?: boolean | number
+ createdAt?: boolean | number
+ __typename?: boolean | number
+ __scalar?: boolean | number
+}
+
export interface InviteSuggestionGenqlSelection{
email?: boolean | number
displayName?: boolean | number
@@ -4906,40 +4940,6 @@ export interface ConnectedAccountPublicDTOGenqlSelection{
__scalar?: boolean | number
}
-export interface UsageBreakdownItemGenqlSelection{
- key?: boolean | number
- label?: boolean | number
- creditsUsed?: boolean | number
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface UsageTimeSeriesGenqlSelection{
- date?: boolean | number
- creditsUsed?: boolean | number
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface UsageUserDailyGenqlSelection{
- userWorkspaceId?: boolean | number
- dailyUsage?: UsageTimeSeriesGenqlSelection
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
-export interface UsageAnalyticsGenqlSelection{
- usageByUser?: UsageBreakdownItemGenqlSelection
- usageByOperationType?: UsageBreakdownItemGenqlSelection
- usageByModel?: UsageBreakdownItemGenqlSelection
- timeSeries?: UsageTimeSeriesGenqlSelection
- periodStart?: boolean | number
- periodEnd?: boolean | number
- userDailyUsage?: UsageUserDailyGenqlSelection
- __typename?: boolean | number
- __scalar?: boolean | number
-}
-
export interface FeatureFlagGenqlSelection{
key?: boolean | number
value?: boolean | number
@@ -6534,10 +6534,10 @@ export interface QueryGenqlSelection{
currentUserSessions?: UserSessionGenqlSelection
myConnectedAccounts?: ConnectedAccountPublicDTOGenqlSelection
applicationConnectionProviders?: (ApplicationConnectionProviderGenqlSelection & { __args: {applicationId: Scalars['UUID']} })
- getInviteSuggestions?: InviteSuggestionGenqlSelection
billingPortalSession?: (BillingSessionGenqlSelection & { __args?: {returnUrlPath?: (Scalars['String'] | null), forPaymentMethodUpdate?: (Scalars['Boolean'] | null)} })
listPlans?: BillingPlanGenqlSelection
getResourceCreditUsage?: BillingResourceCreditUsageGenqlSelection
+ getInviteSuggestions?: InviteSuggestionGenqlSelection
findWorkspaceInvitations?: WorkspaceInvitationGenqlSelection
getApprovedAccessDomains?: ApprovedAccessDomainGenqlSelection
getPageLayoutTabs?: (PageLayoutTabGenqlSelection & { __args: {pageLayoutId: Scalars['String']} })
@@ -6736,10 +6736,6 @@ export interface MutationGenqlSelection{
revokeAllOtherUserSessions?: boolean | number
deleteConnectedAccount?: (ConnectedAccountPublicDTOGenqlSelection & { __args: {id: Scalars['UUID']} })
updateOneApplicationVariable?: { __args: {key: Scalars['String'], value: Scalars['String'], applicationId: Scalars['UUID']} }
- skipSyncEmailOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {isAutoSkipped: Scalars['Boolean']} })
- completeBookCallOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {hasBookedCall: Scalars['Boolean'], isAutoSkipped: Scalars['Boolean']} })
- triggerInstallAppsOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {universalIdentifiers: Scalars['String'][], isAutoSkipped: Scalars['Boolean']} })
- goBackToPreviousOnboardingStep?: OnboardingStepNavigationGenqlSelection
checkoutSession?: (BillingSessionGenqlSelection & { __args: {recurringInterval: SubscriptionInterval, plan: BillingPlanKey, requirePaymentMethod: Scalars['Boolean'], successUrlPath?: (Scalars['String'] | null)} })
createSubscriptionPaymentIntent?: (BillingPaymentIntentGenqlSelection & { __args: {recurringInterval: SubscriptionInterval, plan: BillingPlanKey, requirePaymentMethod: Scalars['Boolean'], successUrlPath?: (Scalars['String'] | null), idempotencyKey: Scalars['String']} })
createBillingPaymentMethodSetupIntent?: BillingPaymentIntentGenqlSelection
@@ -6750,6 +6746,10 @@ export interface MutationGenqlSelection{
setResourceCreditSubscriptionPrice?: (BillingUpdateGenqlSelection & { __args: {priceId: Scalars['String']} })
endSubscriptionTrialPeriod?: BillingEndTrialPeriodGenqlSelection
cancelSwitchResourceCreditPrice?: BillingUpdateGenqlSelection
+ skipSyncEmailOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {isAutoSkipped: Scalars['Boolean']} })
+ completeBookCallOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {hasBookedCall: Scalars['Boolean'], isAutoSkipped: Scalars['Boolean']} })
+ triggerInstallAppsOnboardingStep?: (OnboardingStepSuccessGenqlSelection & { __args: {universalIdentifiers: Scalars['String'][], isAutoSkipped: Scalars['Boolean']} })
+ goBackToPreviousOnboardingStep?: OnboardingStepNavigationGenqlSelection
deleteWorkspaceInvitation?: { __args: {appTokenId: Scalars['String']} }
resendWorkspaceInvitation?: (SendInvitationsGenqlSelection & { __args: {appTokenId: Scalars['String']} })
sendInvitations?: (SendInvitationsGenqlSelection & { __args: {emails: Scalars['String'][], roleId?: (Scalars['UUID'] | null)} })
@@ -8105,14 +8105,6 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
- const ApprovedAccessDomain_possibleTypes: string[] = ['ApprovedAccessDomain']
- export const isApprovedAccessDomain = (obj?: { __typename?: any } | null): obj is ApprovedAccessDomain => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isApprovedAccessDomain"')
- return ApprovedAccessDomain_possibleTypes.includes(obj.__typename)
- }
-
-
-
const FileWithSignedUrl_possibleTypes: string[] = ['FileWithSignedUrl']
export const isFileWithSignedUrl = (obj?: { __typename?: any } | null): obj is FileWithSignedUrl => {
if (!obj?.__typename) throw new Error('__typename is missing in "isFileWithSignedUrl"')
@@ -8241,6 +8233,46 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
+ const UsageBreakdownItem_possibleTypes: string[] = ['UsageBreakdownItem']
+ export const isUsageBreakdownItem = (obj?: { __typename?: any } | null): obj is UsageBreakdownItem => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isUsageBreakdownItem"')
+ return UsageBreakdownItem_possibleTypes.includes(obj.__typename)
+ }
+
+
+
+ const UsageTimeSeries_possibleTypes: string[] = ['UsageTimeSeries']
+ export const isUsageTimeSeries = (obj?: { __typename?: any } | null): obj is UsageTimeSeries => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isUsageTimeSeries"')
+ return UsageTimeSeries_possibleTypes.includes(obj.__typename)
+ }
+
+
+
+ const UsageUserDaily_possibleTypes: string[] = ['UsageUserDaily']
+ export const isUsageUserDaily = (obj?: { __typename?: any } | null): obj is UsageUserDaily => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isUsageUserDaily"')
+ return UsageUserDaily_possibleTypes.includes(obj.__typename)
+ }
+
+
+
+ const UsageAnalytics_possibleTypes: string[] = ['UsageAnalytics']
+ export const isUsageAnalytics = (obj?: { __typename?: any } | null): obj is UsageAnalytics => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isUsageAnalytics"')
+ return UsageAnalytics_possibleTypes.includes(obj.__typename)
+ }
+
+
+
+ const ApprovedAccessDomain_possibleTypes: string[] = ['ApprovedAccessDomain']
+ export const isApprovedAccessDomain = (obj?: { __typename?: any } | null): obj is ApprovedAccessDomain => {
+ if (!obj?.__typename) throw new Error('__typename is missing in "isApprovedAccessDomain"')
+ return ApprovedAccessDomain_possibleTypes.includes(obj.__typename)
+ }
+
+
+
const InviteSuggestion_possibleTypes: string[] = ['InviteSuggestion']
export const isInviteSuggestion = (obj?: { __typename?: any } | null): obj is InviteSuggestion => {
if (!obj?.__typename) throw new Error('__typename is missing in "isInviteSuggestion"')
@@ -8305,38 +8337,6 @@ export interface LogicFunctionLogsInput {applicationId?: (Scalars['UUID'] | null
- const UsageBreakdownItem_possibleTypes: string[] = ['UsageBreakdownItem']
- export const isUsageBreakdownItem = (obj?: { __typename?: any } | null): obj is UsageBreakdownItem => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isUsageBreakdownItem"')
- return UsageBreakdownItem_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const UsageTimeSeries_possibleTypes: string[] = ['UsageTimeSeries']
- export const isUsageTimeSeries = (obj?: { __typename?: any } | null): obj is UsageTimeSeries => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isUsageTimeSeries"')
- return UsageTimeSeries_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const UsageUserDaily_possibleTypes: string[] = ['UsageUserDaily']
- export const isUsageUserDaily = (obj?: { __typename?: any } | null): obj is UsageUserDaily => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isUsageUserDaily"')
- return UsageUserDaily_possibleTypes.includes(obj.__typename)
- }
-
-
-
- const UsageAnalytics_possibleTypes: string[] = ['UsageAnalytics']
- export const isUsageAnalytics = (obj?: { __typename?: any } | null): obj is UsageAnalytics => {
- if (!obj?.__typename) throw new Error('__typename is missing in "isUsageAnalytics"')
- return UsageAnalytics_possibleTypes.includes(obj.__typename)
- }
-
-
-
const FeatureFlag_possibleTypes: string[] = ['FeatureFlag']
export const isFeatureFlag = (obj?: { __typename?: any } | null): obj is FeatureFlag => {
if (!obj?.__typename) throw new Error('__typename is missing in "isFeatureFlag"')
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index b3d7a2ae994..1c99761d934 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -54,10 +54,10 @@ export default {
138,
147,
149,
- 157,
- 160,
- 162,
- 178,
+ 156,
+ 159,
+ 161,
+ 182,
186,
193,
194,
@@ -3040,23 +3040,6 @@ export default {
1
]
},
- "ApprovedAccessDomain": {
- "id": [
- 3
- ],
- "domain": [
- 1
- ],
- "isValidated": [
- 8
- ],
- "createdAt": [
- 4
- ],
- "__typename": [
- 1
- ]
- },
"FileWithSignedUrl": {
"id": [
3
@@ -3125,7 +3108,7 @@ export default {
3
],
"type": [
- 157
+ 156
],
"name": [
1
@@ -3158,7 +3141,7 @@ export default {
4
],
"targetRecordIdentifier": [
- 155
+ 154
],
"__typename": [
1
@@ -3184,7 +3167,7 @@ export default {
},
"MetadataEvent": {
"type": [
- 160
+ 159
],
"metadataName": [
1
@@ -3193,7 +3176,7 @@ export default {
1
],
"properties": [
- 158
+ 157
],
"updatedCollectionHash": [
1
@@ -3205,7 +3188,7 @@ export default {
"MetadataEventAction": {},
"ObjectRecordEvent": {
"action": [
- 162
+ 161
],
"objectNameSingular": [
1
@@ -3220,7 +3203,7 @@ export default {
1
],
"properties": [
- 158
+ 157
],
"__typename": [
1
@@ -3232,7 +3215,7 @@ export default {
1
],
"objectRecordEvent": [
- 161
+ 160
],
"__typename": [
1
@@ -3243,10 +3226,10 @@ export default {
1
],
"objectRecordEventsWithQueryIds": [
- 163
+ 162
],
"metadataEvents": [
- 159
+ 158
],
"__typename": [
1
@@ -3383,6 +3366,85 @@ export default {
1
]
},
+ "UsageBreakdownItem": {
+ "key": [
+ 1
+ ],
+ "label": [
+ 1
+ ],
+ "creditsUsed": [
+ 15
+ ],
+ "__typename": [
+ 1
+ ]
+ },
+ "UsageTimeSeries": {
+ "date": [
+ 1
+ ],
+ "creditsUsed": [
+ 15
+ ],
+ "__typename": [
+ 1
+ ]
+ },
+ "UsageUserDaily": {
+ "userWorkspaceId": [
+ 1
+ ],
+ "dailyUsage": [
+ 172
+ ],
+ "__typename": [
+ 1
+ ]
+ },
+ "UsageAnalytics": {
+ "usageByUser": [
+ 171
+ ],
+ "usageByOperationType": [
+ 171
+ ],
+ "usageByModel": [
+ 171
+ ],
+ "timeSeries": [
+ 172
+ ],
+ "periodStart": [
+ 4
+ ],
+ "periodEnd": [
+ 4
+ ],
+ "userDailyUsage": [
+ 173
+ ],
+ "__typename": [
+ 1
+ ]
+ },
+ "ApprovedAccessDomain": {
+ "id": [
+ 3
+ ],
+ "domain": [
+ 1
+ ],
+ "isValidated": [
+ 8
+ ],
+ "createdAt": [
+ 4
+ ],
+ "__typename": [
+ 1
+ ]
+ },
"InviteSuggestion": {
"email": [
1
@@ -3438,7 +3500,7 @@ export default {
1
],
"result": [
- 175
+ 179
],
"__typename": [
1
@@ -3455,7 +3517,7 @@ export default {
1
],
"connectionSecurity": [
- 178
+ 182
],
"__typename": [
1
@@ -3464,13 +3526,13 @@ export default {
"EmailConnectionSecurity": {},
"PublicImapSmtpCaldavConnectionParameters": {
"IMAP": [
- 177
+ 181
],
"SMTP": [
- 177
+ 181
],
"CALDAV": [
- 177
+ 181
],
"__typename": [
1
@@ -3526,68 +3588,6 @@ export default {
4
],
"connectionParameters": [
- 179
- ],
- "__typename": [
- 1
- ]
- },
- "UsageBreakdownItem": {
- "key": [
- 1
- ],
- "label": [
- 1
- ],
- "creditsUsed": [
- 15
- ],
- "__typename": [
- 1
- ]
- },
- "UsageTimeSeries": {
- "date": [
- 1
- ],
- "creditsUsed": [
- 15
- ],
- "__typename": [
- 1
- ]
- },
- "UsageUserDaily": {
- "userWorkspaceId": [
- 1
- ],
- "dailyUsage": [
- 182
- ],
- "__typename": [
- 1
- ]
- },
- "UsageAnalytics": {
- "usageByUser": [
- 181
- ],
- "usageByOperationType": [
- 181
- ],
- "usageByModel": [
- 181
- ],
- "timeSeries": [
- 182
- ],
- "periodStart": [
- 4
- ],
- "periodEnd": [
- 4
- ],
- "userDailyUsage": [
183
],
"__typename": [
@@ -5424,7 +5424,7 @@ export default {
4
],
"connectedAccount": [
- 180
+ 184
],
"__typename": [
1
@@ -5623,7 +5623,7 @@ export default {
1
],
"connectionSecurity": [
- 178
+ 182
],
"__typename": [
1
@@ -6666,10 +6666,10 @@ export default {
},
"Query": {
"navigationMenuItems": [
- 156
+ 155
],
"navigationMenuItem": [
- 156,
+ 155,
{
"id": [
3,
@@ -6715,7 +6715,7 @@ export default {
151
],
"getUsageAnalytics": [
- 184,
+ 174,
{
"input": [
380
@@ -6849,10 +6849,10 @@ export default {
}
],
"currentUserSessions": [
- 165
+ 164
],
"myConnectedAccounts": [
- 180
+ 184
],
"applicationConnectionProviders": [
130,
@@ -6863,11 +6863,8 @@ export default {
]
}
],
- "getInviteSuggestions": [
- 172
- ],
"billingPortalSession": [
- 170,
+ 169,
{
"returnUrlPath": [
1
@@ -6878,16 +6875,19 @@ export default {
}
],
"listPlans": [
- 168
+ 167
],
"getResourceCreditUsage": [
- 167
+ 166
+ ],
+ "getInviteSuggestions": [
+ 176
],
"findWorkspaceInvitations": [
- 175
+ 179
],
"getApprovedAccessDomains": [
- 152
+ 175
],
"getPageLayoutTabs": [
126,
@@ -7800,7 +7800,7 @@ export default {
}
],
"createManyNavigationMenuItems": [
- 156,
+ 155,
{
"inputs": [
399,
@@ -7809,7 +7809,7 @@ export default {
}
],
"createNavigationMenuItem": [
- 156,
+ 155,
{
"input": [
399,
@@ -7818,7 +7818,7 @@ export default {
}
],
"updateManyNavigationMenuItems": [
- 156,
+ 155,
{
"inputs": [
400,
@@ -7827,7 +7827,7 @@ export default {
}
],
"updateNavigationMenuItem": [
- 156,
+ 155,
{
"input": [
400,
@@ -7836,7 +7836,7 @@ export default {
}
],
"deleteManyNavigationMenuItems": [
- 156,
+ 155,
{
"ids": [
3,
@@ -7845,7 +7845,7 @@ export default {
}
],
"deleteNavigationMenuItem": [
- 156,
+ 155,
{
"id": [
3,
@@ -7854,7 +7854,7 @@ export default {
}
],
"createFileUpload": [
- 154,
+ 153,
{
"filename": [
1,
@@ -7877,7 +7877,7 @@ export default {
}
],
"completeFileUpload": [
- 153,
+ 152,
{
"fileId": [
1,
@@ -7901,7 +7901,7 @@ export default {
}
],
"uploadEmailAttachmentFile": [
- 153,
+ 152,
{
"file": [
402,
@@ -7910,7 +7910,7 @@ export default {
}
],
"uploadAiChatFile": [
- 153,
+ 152,
{
"file": [
402,
@@ -7919,7 +7919,7 @@ export default {
}
],
"uploadWorkflowFile": [
- 153,
+ 152,
{
"file": [
402,
@@ -7928,7 +7928,7 @@ export default {
}
],
"uploadWorkspaceLogo": [
- 153,
+ 152,
{
"file": [
402,
@@ -7937,7 +7937,7 @@ export default {
}
],
"uploadWorkspaceMemberProfilePicture": [
- 153,
+ 152,
{
"file": [
402,
@@ -7946,7 +7946,7 @@ export default {
}
],
"uploadFilesFieldFile": [
- 153,
+ 152,
{
"file": [
402,
@@ -7959,7 +7959,7 @@ export default {
}
],
"uploadFilesFieldFileByUniversalIdentifier": [
- 153,
+ 152,
{
"file": [
402,
@@ -8302,7 +8302,7 @@ export default {
26
],
"deleteConnectedAccount": [
- 180,
+ 184,
{
"id": [
3,
@@ -8327,46 +8327,8 @@ export default {
]
}
],
- "skipSyncEmailOnboardingStep": [
- 174,
- {
- "isAutoSkipped": [
- 8,
- "Boolean!"
- ]
- }
- ],
- "completeBookCallOnboardingStep": [
- 174,
- {
- "hasBookedCall": [
- 8,
- "Boolean!"
- ],
- "isAutoSkipped": [
- 8,
- "Boolean!"
- ]
- }
- ],
- "triggerInstallAppsOnboardingStep": [
- 174,
- {
- "universalIdentifiers": [
- 1,
- "[String!]!"
- ],
- "isAutoSkipped": [
- 8,
- "Boolean!"
- ]
- }
- ],
- "goBackToPreviousOnboardingStep": [
- 173
- ],
"checkoutSession": [
- 170,
+ 169,
{
"recurringInterval": [
138,
@@ -8386,7 +8348,7 @@ export default {
}
],
"createSubscriptionPaymentIntent": [
- 169,
+ 168,
{
"recurringInterval": [
138,
@@ -8410,22 +8372,22 @@ export default {
}
],
"createBillingPaymentMethodSetupIntent": [
- 169
+ 168
],
"switchSubscriptionInterval": [
- 171
+ 170
],
"switchBillingPlan": [
- 171
+ 170
],
"cancelSwitchBillingPlan": [
- 171
+ 170
],
"cancelSwitchBillingInterval": [
- 171
+ 170
],
"setResourceCreditSubscriptionPrice": [
- 171,
+ 170,
{
"priceId": [
1,
@@ -8434,10 +8396,48 @@ export default {
}
],
"endSubscriptionTrialPeriod": [
- 166
+ 165
],
"cancelSwitchResourceCreditPrice": [
- 171
+ 170
+ ],
+ "skipSyncEmailOnboardingStep": [
+ 178,
+ {
+ "isAutoSkipped": [
+ 8,
+ "Boolean!"
+ ]
+ }
+ ],
+ "completeBookCallOnboardingStep": [
+ 178,
+ {
+ "hasBookedCall": [
+ 8,
+ "Boolean!"
+ ],
+ "isAutoSkipped": [
+ 8,
+ "Boolean!"
+ ]
+ }
+ ],
+ "triggerInstallAppsOnboardingStep": [
+ 178,
+ {
+ "universalIdentifiers": [
+ 1,
+ "[String!]!"
+ ],
+ "isAutoSkipped": [
+ 8,
+ "Boolean!"
+ ]
+ }
+ ],
+ "goBackToPreviousOnboardingStep": [
+ 177
],
"deleteWorkspaceInvitation": [
1,
@@ -8449,7 +8449,7 @@ export default {
}
],
"resendWorkspaceInvitation": [
- 176,
+ 180,
{
"appTokenId": [
1,
@@ -8458,7 +8458,7 @@ export default {
}
],
"sendInvitations": [
- 176,
+ 180,
{
"emails": [
1,
@@ -8470,7 +8470,7 @@ export default {
}
],
"createApprovedAccessDomain": [
- 152,
+ 175,
{
"input": [
440,
@@ -8488,7 +8488,7 @@ export default {
}
],
"validateApprovedAccessDomain": [
- 152,
+ 175,
{
"input": [
442,
@@ -9806,7 +9806,7 @@ export default {
}
],
"uploadNewWorkspaceLogo": [
- 153,
+ 152,
{
"workspaceId": [
1,
@@ -10336,7 +10336,7 @@ export default {
3
],
"type": [
- 157
+ 156
],
"name": [
1
@@ -13111,7 +13111,7 @@ export default {
1
],
"connectionSecurity": [
- 178
+ 182
],
"__typename": [
1
@@ -13144,7 +13144,7 @@ export default {
},
"Subscription": {
"onEventSubscription": [
- 164,
+ 163,
{
"eventStreamId": [
1,
diff --git a/packages/twenty-docs/developers/extend/apps/logic/connections.mdx b/packages/twenty-docs/developers/extend/apps/logic/connections.mdx
index 958798cbe72..d4ad4c8e107 100644
--- a/packages/twenty-docs/developers/extend/apps/logic/connections.mdx
+++ b/packages/twenty-docs/developers/extend/apps/logic/connections.mdx
@@ -129,7 +129,7 @@ From there use `getConnection(connectedAccountId)` to read the fresh access toke
<Accordion title="Run a logic function on disconnect" description="Clean up when a connection is removed">
-Anything an app claims at connect time has to be released when the connection goes away. A Slack integration that claims a `team_id` on connect, for instance, has to release that claim so another workspace can connect the same Slack team. Set `onDisconnectLogicFunction` to reference a logic function in the same app, and it runs right after the `ConnectedAccount` is deleted.
+Anything an app claims at connect time has to be released when the connection goes away. A Slack integration that claims a `team_id` on connect, for instance, has to release that claim so another workspace can connect the same Slack team. Set `onDisconnectLogicFunction` to reference a logic function in the same app, and it runs right before the `ConnectedAccount` and its token are deleted, so the handler can still call the provider with `getConnection` to release anything the on-connect hook set up remotely.
```ts src/connection-providers/slack-connection.ts
export default defineConnectionProvider({
@@ -147,7 +147,7 @@ export default defineConnectionProvider({
});
```
-Like the on-connect hook it runs **asynchronously in the disconnecting workspace** and never blocks the disconnect. The handler receives the same payload shape:
+Unlike the on-connect hook it runs **inline in the disconnecting workspace**, once, without retries: a failure is captured and the disconnect still completes. The handler receives the same payload shape:
```ts
type OnDisconnectPayload = {
@@ -157,7 +157,7 @@ type OnDisconnectPayload = {
};
```
-The `ConnectedAccount` is already gone when the hook runs, so `getConnection(connectedAccountId)` no longer resolves. Anything the cleanup needs (a `team_id`, an external subscription id) must have been written to the [key-value store](/developers/extend/apps/logic/key-value-store) at connect time, keyed by `connectedAccountId`.
+The `ConnectedAccount` and its token are still present when the hook runs, so `getConnection(connectedAccountId)` resolves with a fresh access token and the handler can delete whatever it registered remotely. State the provider cannot give back (a `team_id`, an external subscription id) still belongs in the [key-value store](/developers/extend/apps/logic/key-value-store), written at connect time and keyed by `connectedAccountId`. Keep the handler short: it runs inside the disconnect request, so its `timeoutSeconds` is the upper bound on how long that request can take.
The hook fires when a connection is removed on its own. Uninstalling the app drops its connections through a database cascade instead, so the hook does not run there. Declare an `uninstallLogicFunction` on `defineApplication` for that path: it runs before the app's metadata is deleted, so it can still call `listConnections` and clean up whatever is left.
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-exception-code.enum.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-exception-code.enum.ts
index d39e72cdb7b..6033c8a6e48 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-exception-code.enum.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-exception-code.enum.ts
@@ -11,4 +11,5 @@ export enum ConnectionProviderExceptionCode {
CONNECTION_PROVIDER_NAME_ALREADY_EXISTS = 'CONNECTION_PROVIDER_NAME_ALREADY_EXISTS',
ON_CONNECT_LOGIC_FUNCTION_NOT_FOUND = 'ON_CONNECT_LOGIC_FUNCTION_NOT_FOUND',
ON_DISCONNECT_LOGIC_FUNCTION_NOT_FOUND = 'ON_DISCONNECT_LOGIC_FUNCTION_NOT_FOUND',
+ ON_DISCONNECT_LOGIC_FUNCTION_FAILED = 'ON_DISCONNECT_LOGIC_FUNCTION_FAILED',
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts
index b391c99d3b9..f8dba52141e 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider-lifecycle-hook.service.ts
@@ -7,6 +7,7 @@ import { type ConnectionProviderEntity } from 'src/engine/core-modules/applicati
import { ConnectionProviderException } from 'src/engine/core-modules/application/connection-provider/connection-provider.exception';
import { ConnectionProviderService } from 'src/engine/core-modules/application/connection-provider/connection-provider.service';
import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
+import { LogicFunctionExecutorService } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';
import { LOGIC_FUNCTION_QUEUE_RETRY_BACKOFF } from 'src/engine/core-modules/logic-function/logic-function-trigger/constants/logic-function-queue-retry-backoff.constant';
import {
LogicFunctionTriggerJob,
@@ -19,6 +20,11 @@ import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/works
type ConnectionLifecycleHook = 'onConnect' | 'onDisconnect';
+type ConnectionLifecycleHookProvider = Pick<
+ ConnectionProviderEntity,
+ 'id' | 'name'
+>;
+
const MISSING_LOGIC_FUNCTION_EXCEPTION_CODE_BY_HOOK: Record<
ConnectionLifecycleHook,
ConnectionProviderExceptionCode
@@ -35,6 +41,7 @@ export class ConnectionProviderLifecycleHookService {
private readonly connectionProviderService: ConnectionProviderService,
@InjectMessageQueue(MessageQueue.logicFunctionQueue)
private readonly messageQueueService: MessageQueueService,
+ private readonly logicFunctionExecutorService: LogicFunctionExecutorService,
private readonly workspaceCacheService: WorkspaceCacheService,
private readonly exceptionHandlerService: ExceptionHandlerService,
) {}
@@ -51,19 +58,37 @@ export class ConnectionProviderLifecycleHookService {
workspaceId: string;
connectedAccountId: string;
}): Promise<void> {
- await this.captureFailures(workspaceId, () =>
- this.enqueueLogicFunction({
+ await this.captureFailures(workspaceId, async () => {
+ const logicFunctionId = await this.resolveLogicFunctionId({
hook: 'onConnect',
logicFunctionUniversalIdentifier:
provider.onConnectLogicFunctionUniversalIdentifier,
provider,
workspaceId,
- connectedAccountId,
- }),
- );
+ });
+
+ if (!isDefined(logicFunctionId)) {
+ return;
+ }
+
+ await this.messageQueueService.add<LogicFunctionTriggerJobData>(
+ LogicFunctionTriggerJob.name,
+ {
+ logicFunctionId,
+ workspaceId,
+ payload: this.buildPayload({ provider, connectedAccountId }),
+ },
+ {
+ retryLimit: 3,
+ backoff: LOGIC_FUNCTION_QUEUE_RETRY_BACKOFF,
+ },
+ );
+ });
}
- async dispatchOnDisconnect({
+ // Runs inline, before the connected account and its token are deleted, so the
+ // hook can still call the provider to release what onConnect set up remotely.
+ async runOnDisconnect({
connectionProviderId,
workspaceId,
connectedAccountId,
@@ -77,15 +102,30 @@ export class ConnectionProviderLifecycleHookService {
await this.connectionProviderService.findOneByIdOrThrow(
connectionProviderId,
);
-
- await this.enqueueLogicFunction({
+ const logicFunctionId = await this.resolveLogicFunctionId({
hook: 'onDisconnect',
logicFunctionUniversalIdentifier:
provider.onDisconnectLogicFunctionUniversalIdentifier,
provider,
workspaceId,
- connectedAccountId,
});
+
+ if (!isDefined(logicFunctionId)) {
+ return;
+ }
+
+ const executionResult = await this.logicFunctionExecutorService.execute({
+ logicFunctionId,
+ workspaceId,
+ payload: this.buildPayload({ provider, connectedAccountId }),
+ });
+
+ if (isDefined(executionResult.error)) {
+ throw new ConnectionProviderException(
+ `onDisconnect logic function of connection provider ${provider.id} failed: ${executionResult.error.errorMessage}`,
+ ConnectionProviderExceptionCode.ON_DISCONNECT_LOGIC_FUNCTION_FAILED,
+ );
+ }
});
}
@@ -104,21 +144,33 @@ export class ConnectionProviderLifecycleHookService {
}
}
- private async enqueueLogicFunction({
+ private buildPayload({
+ provider,
+ connectedAccountId,
+ }: {
+ provider: ConnectionLifecycleHookProvider;
+ connectedAccountId: string;
+ }) {
+ return {
+ connectionProviderId: provider.id,
+ connectionProviderName: provider.name,
+ connectedAccountId,
+ };
+ }
+
+ private async resolveLogicFunctionId({
hook,
logicFunctionUniversalIdentifier,
provider,
workspaceId,
- connectedAccountId,
}: {
hook: ConnectionLifecycleHook;
logicFunctionUniversalIdentifier: string | null;
- provider: Pick<ConnectionProviderEntity, 'id' | 'name'>;
+ provider: ConnectionLifecycleHookProvider;
workspaceId: string;
- connectedAccountId: string;
- }): Promise<void> {
+ }): Promise<string | undefined> {
if (!isDefined(logicFunctionUniversalIdentifier)) {
- return;
+ return undefined;
}
const { flatLogicFunctionMaps } =
@@ -141,21 +193,6 @@ export class ConnectionProviderLifecycleHookService {
);
}
- await this.messageQueueService.add<LogicFunctionTriggerJobData>(
- LogicFunctionTriggerJob.name,
- {
- logicFunctionId: flatLogicFunction.id,
- workspaceId,
- payload: {
- connectionProviderId: provider.id,
- connectionProviderName: provider.name,
- connectedAccountId,
- },
- },
- {
- retryLimit: 3,
- backoff: LOGIC_FUNCTION_QUEUE_RETRY_BACKOFF,
- },
- );
+ return flatLogicFunction.id;
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.exception.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.exception.ts
index 2d786c4cec0..5a610576d2d 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.exception.ts
@@ -33,6 +33,8 @@ const getConnectionProviderExceptionUserFriendlyMessage = (
return msg`The logic function to run on connect was not found.`;
case ConnectionProviderExceptionCode.ON_DISCONNECT_LOGIC_FUNCTION_NOT_FOUND:
return msg`The logic function to run on disconnect was not found.`;
+ case ConnectionProviderExceptionCode.ON_DISCONNECT_LOGIC_FUNCTION_FAILED:
+ return msg`The logic function to run on disconnect failed.`;
default:
assertUnreachable(code);
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts
index 2a0e8da6086..3ae95b39e21 100644
--- a/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/connection-provider/connection-provider.module.ts
@@ -9,6 +9,7 @@ import { ConnectionProviderService } from 'src/engine/core-modules/application/c
import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
import { JwtModule } from 'src/engine/core-modules/jwt/jwt.module';
+import { LogicFunctionExecutorModule } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.module';
import { SecretEncryptionModule } from 'src/engine/core-modules/secret-encryption/secret-encryption.module';
import { SecureHttpClientModule } from 'src/engine/core-modules/secure-http-client/secure-http-client.module';
import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
@@ -28,6 +29,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache
UserEntity,
]),
JwtModule,
+ LogicFunctionExecutorModule,
SecretEncryptionModule,
SecureHttpClientModule,
TwentyConfigModule,
diff --git a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts
index b3a0cb20404..2aeb0faa24f 100644
--- a/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/connected-account/connected-account-metadata.service.ts
@@ -246,18 +246,26 @@ export class ConnectedAccountMetadataService {
`WorkspaceId: ${workspaceId} Deleting connected account ${id} with ${messageChannels.length} message channel(s) and ${calendarChannels.length} calendar channel(s)`,
);
- await this.appOAuthRevokeService.revokeIfApp(connectedAccount);
-
- await this.repository.delete({ id, workspaceId });
-
if (isDefined(connectedAccount.connectionProviderId)) {
- await this.connectionProviderLifecycleHookService.dispatchOnDisconnect({
+ await this.connectionProviderLifecycleHookService.runOnDisconnect({
connectionProviderId: connectedAccount.connectionProviderId,
workspaceId,
connectedAccountId: id,
});
}
+ // The hook may have refreshed the tokens through getConnection, and an
+ // overlapping delete may already have removed the row.
+ const latestConnectedAccount = await this.repository.findOne({
+ where: { id, workspaceId },
+ });
+
+ if (isDefined(latestConnectedAccount)) {
+ await this.appOAuthRevokeService.revokeIfApp(latestConnectedAccount);
+ }
+
+ await this.repository.delete({ id, workspaceId });
+
this.workspaceEventEmitter.emitCustomBatchEvent<MessageChannelDeletedEvent>(
MESSAGE_CHANNEL_DELETED_EVENT,
messageChannels.map((messageChannel) => ({
diff --git a/packages/twenty-server/test/integration/metadata/suites/application/connected-account-deletion-runs-on-disconnect-hook.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/connected-account-deletion-runs-on-disconnect-hook.integration-spec.ts
new file mode 100644
index 00000000000..64026facfc5
--- /dev/null
+++ b/packages/twenty-server/test/integration/metadata/suites/application/connected-account-deletion-runs-on-disconnect-hook.integration-spec.ts
@@ -0,0 +1,265 @@
+import { buildBaseManifest } from 'test/integration/metadata/suites/application/utils/build-base-manifest.util';
+import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';
+import { setupApplicationForSync } from 'test/integration/metadata/suites/application/utils/setup-application-for-sync.util';
+import { syncApplication } from 'test/integration/metadata/suites/application/utils/sync-application.util';
+import { findConnectionProvidersByApplication } from 'test/integration/metadata/suites/connection-provider/utils/find-connection-providers-by-application.util';
+import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
+import { deleteConnectedAccount } from 'test/integration/utils/query-messaging.util';
+import { type Manifest } from 'twenty-shared/application';
+import { ConnectedAccountProvider } from 'twenty-shared/types';
+import { v4 as uuidv4 } from 'uuid';
+
+import { AppOAuthRevokeService } from 'src/engine/core-modules/application/connection-provider/refresh/services/app-oauth-revoke.service';
+import { LogicFunctionExecutorService } from 'src/engine/core-modules/logic-function/logic-function-executor/logic-function-executor.service';
+import { LogicFunctionExecutionStatus } from 'src/engine/metadata-modules/logic-function/dtos/logic-function-execution-result.dto';
+import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+
+const PROVIDER_NAME = 'fathom';
+const REFRESHED_ACCESS_TOKEN = 'enc:v2:refreshed-by-hook';
+
+const buildManifestWithConnectionProvider = ({
+ appId,
+ roleId,
+ providerId,
+ logicFunctionId,
+ withOnDisconnectHook,
+}: {
+ appId: string;
+ roleId: string;
+ providerId: string;
+ logicFunctionId: string;
+ withOnDisconnectHook: boolean;
+}): Manifest =>
+ buildBaseManifest({
+ appId,
+ roleId,
+ overrides: {
+ connectionProviders: [
+ {
+ universalIdentifier: providerId,
+ name: PROVIDER_NAME,
+ displayName: 'Fathom',
+ type: 'oauth',
+ oauth: {
+ authorizationEndpoint: 'https://fathom.video/oauth2/authorize',
+ tokenEndpoint: 'https://api.fathom.ai/oauth2/token',
+ scopes: ['public_api'],
+ clientIdVariable: 'FATHOM_CLIENT_ID',
+ clientSecretVariable: 'FATHOM_CLIENT_SECRET',
+ },
+ ...(withOnDisconnectHook
+ ? {
+ onDisconnectLogicFunction: {
+ universalIdentifier: logicFunctionId,
+ },
+ }
+ : {}),
+ },
+ ],
+ logicFunctions: [
+ {
+ universalIdentifier: logicFunctionId,
+ name: 'Release remote resources',
+ description: 'On-disconnect cleanup logic function',
+ handlerName: 'handler',
+ sourceHandlerPath: 'src/disconnect.ts',
+ builtHandlerPath: 'dist/disconnect.mjs',
+ builtHandlerChecksum: 'checksum-disconnect',
+ httpRouteTriggerSettings: {
+ path: '/disconnect',
+ httpMethod: 'POST',
+ isAuthRequired: true,
+ },
+ },
+ ],
+ },
+ });
+
+const countConnectedAccounts = async (
+ connectedAccountId: string,
+): Promise<number> => {
+ const [{ count }] = await globalThis.testDataSource.query(
+ `SELECT COUNT(*)::int AS count FROM core."connectedAccount" WHERE id = $1`,
+ [connectedAccountId],
+ );
+
+ return count;
+};
+
+describe('Connected account deletion runs the on-disconnect hook', () => {
+ let appId: string;
+ let roleId: string;
+ let providerId: string;
+ let logicFunctionId: string;
+ let connectedAccountId: string;
+ let executeSpy: jest.SpyInstance;
+ let revokeSpy: jest.SpyInstance;
+ let connectedAccountCountDuringHook: number | undefined;
+
+ const syncTestApplication = ({
+ withOnDisconnectHook,
+ }: {
+ withOnDisconnectHook: boolean;
+ }) =>
+ syncApplication({
+ manifest: buildManifestWithConnectionProvider({
+ appId,
+ roleId,
+ providerId,
+ logicFunctionId,
+ withOnDisconnectHook,
+ }),
+ expectToFail: false,
+ });
+
+ const insertAppConnectedAccount = async (): Promise<void> => {
+ const [provider] = await findConnectionProvidersByApplication(appId);
+ const [userWorkspace] = await globalThis.testDataSource.query(
+ `SELECT id FROM core."userWorkspace" WHERE "workspaceId" = $1 LIMIT 1`,
+ [SEED_APPLE_WORKSPACE_ID],
+ );
+
+ await globalThis.testDataSource.query(
+ `INSERT INTO core."connectedAccount"
+ (id, handle, provider, visibility, "workspaceId", "userWorkspaceId", "applicationId", "connectionProviderId")
+ VALUES ($1, $2, $3, 'workspace', $4, $5, $6, $7)`,
+ [
+ connectedAccountId,
+ ConnectedAccountProvider.APP,
+ SEED_APPLE_WORKSPACE_ID,
+ userWorkspace.id,
+ provider.applicationId,
+ provider.id,
+ ],
+ );
+ };
+
+ beforeEach(async () => {
+ appId = uuidv4();
+ roleId = uuidv4();
+ providerId = uuidv4();
+ logicFunctionId = uuidv4();
+ connectedAccountId = uuidv4();
+ connectedAccountCountDuringHook = undefined;
+
+ await setupApplicationForSync({
+ applicationUniversalIdentifier: appId,
+ name: 'Test Application',
+ description: 'App for testing the on-disconnect logic function hook',
+ sourcePath: 'test-on-disconnect-hook',
+ });
+
+ const logicFunctionExecutorService =
+ getAppProviderByClassName<LogicFunctionExecutorService>(
+ 'LogicFunctionExecutorService',
+ );
+
+ // setupApplicationForSync leaves fake timers on, and the delete helper
+ // polls the job queues with real setTimeout calls.
+ jest.useRealTimers();
+
+ revokeSpy = jest
+ .spyOn(
+ getAppProviderByClassName<AppOAuthRevokeService>(
+ 'AppOAuthRevokeService',
+ ),
+ 'revokeIfApp',
+ )
+ .mockResolvedValue(undefined);
+
+ // Stands in for the token refresh getConnection performs inside a hook.
+ executeSpy = jest
+ .spyOn(logicFunctionExecutorService, 'execute')
+ .mockImplementation(async () => {
+ connectedAccountCountDuringHook =
+ await countConnectedAccounts(connectedAccountId);
+ await globalThis.testDataSource.query(
+ `UPDATE core."connectedAccount" SET "accessToken" = $1 WHERE id = $2`,
+ [REFRESHED_ACCESS_TOKEN, connectedAccountId],
+ );
+
+ return {
+ data: {},
+ duration: 1,
+ billedDurationMs: 1,
+ logs: '',
+ status: LogicFunctionExecutionStatus.SUCCESS,
+ };
+ });
+ }, 60000);
+
+ afterEach(async () => {
+ executeSpy.mockRestore();
+ revokeSpy.mockRestore();
+
+ await globalThis.testDataSource.query(
+ `DELETE FROM core."connectedAccount" WHERE id = $1`,
+ [connectedAccountId],
+ );
+ await cleanupApplicationAndAppRegistration({
+ applicationUniversalIdentifier: appId,
+ });
+ });
+
+ it('executes the hook while the connected account still exists, revokes the tokens it left behind, then deletes it', async () => {
+ await syncTestApplication({ withOnDisconnectHook: true });
+ await insertAppConnectedAccount();
+ const [provider] = await findConnectionProvidersByApplication(appId);
+
+ await deleteConnectedAccount(connectedAccountId);
+
+ expect(executeSpy).toHaveBeenCalledTimes(1);
+ expect(executeSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ workspaceId: SEED_APPLE_WORKSPACE_ID,
+ payload: {
+ connectionProviderId: provider.id,
+ connectionProviderName: PROVIDER_NAME,
+ connectedAccountId,
+ },
+ }),
+ );
+ expect(connectedAccountCountDuringHook).toBe(1);
+ expect(revokeSpy).toHaveBeenCalledWith(
+ expect.objectContaining({
+ id: connectedAccountId,
+ accessToken: REFRESHED_ACCESS_TOKEN,
+ }),
+ );
+ expect(await countConnectedAccounts(connectedAccountId)).toBe(0);
+ }, 60000);
+
+ it('still deletes the connected account when the hook returns an error', async () => {
+ executeSpy.mockResolvedValue({
+ data: null,
+ duration: 1,
+ billedDurationMs: 1,
+ logs: '',
+ status: LogicFunctionExecutionStatus.ERROR,
+ error: {
+ errorType: 'UnhandledError',
+ errorMessage: 'On-disconnect hook failed on purpose',
+ stackTrace: '',
+ },
+ });
+
+ await syncTestApplication({ withOnDisconnectHook: true });
+ await insertAppConnectedAccount();
+
+ await deleteConnectedAccount(connectedAccountId);
+
+ expect(executeSpy).toHaveBeenCalledTimes(1);
+ expect(await countConnectedAccounts(connectedAccountId)).toBe(0);
+ }, 60000);
+
+ it('does not execute any hook when the provider declares no on-disconnect logic function', async () => {
+ await syncTestApplication({ withOnDisconnectHook: false });
+ await insertAppConnectedAccount();
+
+ await deleteConnectedAccount(connectedAccountId);
+
+ expect(executeSpy).not.toHaveBeenCalled();
+ expect(await countConnectedAccounts(connectedAccountId)).toBe(0);
+ }, 60000);
+});